aboutsummaryrefslogtreecommitdiff
path: root/src/server/apis/google/GooglePhotosUploadUtils.ts
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/apis/google/GooglePhotosUploadUtils.ts')
-rw-r--r--src/server/apis/google/GooglePhotosUploadUtils.ts10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/apis/google/GooglePhotosUploadUtils.ts b/src/server/apis/google/GooglePhotosUploadUtils.ts
index 032bc2a2d..9b3e68761 100644
--- a/src/server/apis/google/GooglePhotosUploadUtils.ts
+++ b/src/server/apis/google/GooglePhotosUploadUtils.ts
@@ -78,8 +78,8 @@ export namespace GooglePhotosUploadUtils {
export namespace IOUtils {
- export const Download = async (url: string, filename?: string): Promise<Opt<DownloadInformation>> => {
- const resolved = filename || `upload_${Utils.GenerateGuid()}${path.extname(url).toLowerCase()}`;
+ export const Download = async (url: string, filename?: string, prefix = ""): Promise<Opt<DownloadInformation>> => {
+ const resolved = filename || `${prefix}upload_${Utils.GenerateGuid()}${path.extname(url).toLowerCase()}`;
const mediaPath = Paths.uploadDirectory + resolved;
return new Promise<DownloadInformation>((resolve, reject) => {
request.head(url, (error, res) => {
@@ -87,10 +87,10 @@ export namespace GooglePhotosUploadUtils {
return reject(error);
}
const information: DownloadInformation = {
- mediaPath,
- contentType: res.headers['content-type'],
+ fileName: resolved,
contentSize: res.headers['content-length'],
- fileName: resolved
+ contentType: res.headers['content-type'],
+ mediaPath
};
request(url).pipe(fs.createWriteStream(mediaPath)).on('close', () => resolve(information));
});