diff options
| author | Sam Wilkins <samwilkins333@gmail.com> | 2019-09-12 14:16:13 -0400 |
|---|---|---|
| committer | Sam Wilkins <samwilkins333@gmail.com> | 2019-09-12 14:16:13 -0400 |
| commit | 0678fd826627c878c3215a019ac829d899d33995 (patch) | |
| tree | fe29edb7a14c149032065c0e876b56102d4dcb31 /src/server/apis/google/GooglePhotosUploadUtils.ts | |
| parent | 435e0ae7bf1177ae7c3b3b7acc241f070dfa824f (diff) | |
| parent | 91480dbd1b734795f514281ee0a2dac2442d6e84 (diff) | |
fixed upload handling:
Diffstat (limited to 'src/server/apis/google/GooglePhotosUploadUtils.ts')
| -rw-r--r-- | src/server/apis/google/GooglePhotosUploadUtils.ts | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/server/apis/google/GooglePhotosUploadUtils.ts b/src/server/apis/google/GooglePhotosUploadUtils.ts index 0215c533f..e91f8352b 100644 --- a/src/server/apis/google/GooglePhotosUploadUtils.ts +++ b/src/server/apis/google/GooglePhotosUploadUtils.ts @@ -52,6 +52,7 @@ export namespace GooglePhotosUploadUtils { }; return new Promise<any>((resolve, reject) => request(parameters, (error, _response, body) => { if (error) { + console.log(error); return reject(error); } resolve(body); @@ -124,7 +125,8 @@ export namespace DownloadUtils { export const UploadImage = async (url: string, filename?: string, prefix = ""): Promise<Opt<UploadInformation>> => { const resolved = filename ? sanitize(filename) : generate(prefix, url); - const extension = (path.extname(url) || path.extname(resolved)).toLowerCase() || ".png"; + let extension = path.extname(url) || path.extname(resolved); + extension && (extension = extension.toLowerCase()); let information: UploadInformation = { mediaPaths: [], fileNames: { clean: resolved } @@ -151,12 +153,13 @@ export namespace DownloadUtils { suffix: size.suffix })) ]; + let nonVisual = false; if (pngs.includes(extension)) { resizers.forEach(element => element.resizer = element.resizer.png()); } else if (jpgs.includes(extension)) { resizers.forEach(element => element.resizer = element.resizer.jpeg()); } else if (![...imageFormats, ...videoFormats].includes(extension.toLowerCase())) { - return resolve(undefined); + nonVisual = true; } if (imageFormats.includes(extension)) { for (let resizer of resizers) { @@ -172,7 +175,7 @@ export namespace DownloadUtils { }); } } - if (!isLocal) { + if (!isLocal || nonVisual) { await new Promise<void>(resolve => { stream(url).pipe(fs.createWriteStream(uploadDirectory + resolved)).on('close', resolve); }); |
