Merge branch 'master' into recording-jenny

1 files changed, 8 insertions, 4 deletions

diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 5a19477dd..634548154 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -3,7 +3,7 @@ import { Method, _success } from "../RouteManager";
 import * as formidable from 'formidable';
 import v4 = require('uuid/v4');
 const AdmZip = require('adm-zip');
-import { extname, basename, dirname } from 'path';
+import { extname, basename, dirname, } from 'path';
 import { createReadStream, createWriteStream, unlink, writeFile } from "fs";
 import { publicDirectory, filesDirectory } from "..";
 import { Database } from "../database";
@@ -13,10 +13,8 @@ import { AcceptableMedia, Upload } from "../SharedMediaTypes";
 import { normalize } from "path";
 import RouteSubscriber from "../RouteSubscriber";
 const imageDataUri = require('image-data-uri');
-import { isWebUri } from "valid-url";
-import { Opt } from "../../fields/Doc";
 import { SolrManager } from "./SearchManager";
-import { StringDecoder } from "string_decoder";
+const fs = require('fs');
 
 export enum Directory {
       parsed_files = "parsed_files",
@@ -260,10 +258,16 @@ export default class UploadManager extends ApiManager {
                         const uri = req.body.uri;
                         const filename = req.body.name;
                         const origSuffix = req.body.nosuffix ? SizeSuffix.None : SizeSuffix.Original;
+                        const deleteFiles = req.body.replaceRootFilename;
                         if (!uri || !filename) {
                               res.status(401).send("incorrect parameters specified");
                               return;
                         }
+                        if (deleteFiles) {
+                              const path = serverPathToFile(Directory.images, "");
+                              const regex = new RegExp(`${deleteFiles}.*`);
+                              fs.readdirSync(path).filter((f: any) => regex.test(f)).map((f: any) => fs.unlinkSync(path + f));
+                        }
                         return imageDataUri.outputFile(uri, serverPathToFile(Directory.images, InjectSize(filename, origSuffix))).then((savedName: string) => {
                               const ext = extname(savedName).toLowerCase();
                               const { pngs, jpgs } = AcceptableMedia;