diff options
| author | bob <bcz@cs.brown.edu> | 2020-02-11 14:19:59 -0500 |
|---|---|---|
| committer | bob <bcz@cs.brown.edu> | 2020-02-11 14:19:59 -0500 |
| commit | 12001b438b9be01c67090b7d54607d80d94026fd (patch) | |
| tree | a290bedd5daeb8ba93d075bc56131a05461e49cf /src/server | |
| parent | be02a5529f472507512a127cd8de5cde300eff88 (diff) | |
| parent | ed947b320de772d63e7b462e78910db11c0a8fd3 (diff) | |
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/ApiManagers/GooglePhotosManager.ts | 11 | ||||
| -rw-r--r-- | src/server/DashUploadUtils.ts | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/server/ApiManagers/GooglePhotosManager.ts b/src/server/ApiManagers/GooglePhotosManager.ts index 1727cc5a6..3236d1ee2 100644 --- a/src/server/ApiManagers/GooglePhotosManager.ts +++ b/src/server/ApiManagers/GooglePhotosManager.ts @@ -21,7 +21,6 @@ interface GooglePhotosUploadFailure { } interface MediaItem { baseUrl: string; - filename: string; } interface NewMediaItem { description: string; @@ -83,12 +82,12 @@ export default class GooglePhotosManager extends ApiManager { method: Method.POST, subscription: "/googlePhotosMediaDownload", secureHandler: async ({ req, res }) => { - const contents: { mediaItems: MediaItem[] } = req.body; + const { mediaItems } = req.body as { mediaItems: MediaItem[] }; let failed = 0; - if (contents) { + if (mediaItems) { const completed: Opt<DashUploadUtils.ImageUploadInformation>[] = []; - for (const item of contents.mediaItems) { - const results = await DashUploadUtils.InspectImage(item.baseUrl); + for (const { baseUrl } of mediaItems) { + const results = await DashUploadUtils.InspectImage(baseUrl); if (results instanceof Error) { failed++; continue; @@ -96,7 +95,7 @@ export default class GooglePhotosManager extends ApiManager { const { contentSize, ...attributes } = results; const found: Opt<DashUploadUtils.ImageUploadInformation> = await Database.Auxiliary.QueryUploadHistory(contentSize); if (!found) { - const upload = await DashUploadUtils.UploadInspectedImage({ contentSize, ...attributes }, item.filename, prefix).catch(error => _error(res, downloadError, error)); + const upload = await DashUploadUtils.UploadInspectedImage({ contentSize, ...attributes }, undefined, prefix, false).catch(error => _error(res, downloadError, error)); if (upload) { completed.push(upload); await Database.Auxiliary.LogUpload(upload); diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts index 4e6bbaa3f..83a0064e8 100644 --- a/src/server/DashUploadUtils.ts +++ b/src/server/DashUploadUtils.ts @@ -223,7 +223,7 @@ export namespace DashUploadUtils { }); } - export const UploadInspectedImage = async (metadata: InspectionResults, filename?: string, prefix = ""): Promise<ImageUploadInformation> => { + export const UploadInspectedImage = async (metadata: InspectionResults, filename?: string, prefix = "", cleanUp = true): Promise<ImageUploadInformation> => { const { requestable, source, ...remaining } = metadata; const extension = `.${remaining.contentType.split("/")[1].toLowerCase()}`; const resolved = filename || `${prefix}upload_${Utils.GenerateGuid()}${extension}`; @@ -237,7 +237,7 @@ export namespace DashUploadUtils { for (const suffix of Object.keys(writtenFiles)) { information.serverAccessPaths[suffix] = serverPathToFile(Directory.images, writtenFiles[suffix]); } - if (isLocal().test(source)) { + if (isLocal().test(source) && cleanUp) { unlinkSync(source); } return information; |