2 files changed, 68 insertions, 12 deletions

diff --git a/src/server/apis/google/CustomizedWrapper/filters.js b/src/server/apis/google/CustomizedWrapper/filters.js
new file mode 100644
index 000000000..576a90b75
--- /dev/null
+++ b/src/server/apis/google/CustomizedWrapper/filters.js
@@ -0,0 +1,46 @@
+'use strict';
+
+const DateFilter = require('../common/date_filter');
+const MediaTypeFilter = require('./media_type_filter');
+const ContentFilter = require('./content_filter');
+
+class Filters {
+    constructor(includeArchivedMedia = false) {
+        this.includeArchivedMedia = includeArchivedMedia;
+    }
+
+    setDateFilter(dateFilter) {
+        this.dateFilter = dateFilter;
+        return this;
+    }
+
+    setContentFilter(contentFilter) {
+        this.contentFilter = contentFilter;
+        return this;
+    }
+
+    setMediaTypeFilter(mediaTypeFilter) {
+        this.mediaTypeFilter = mediaTypeFilter;
+        return this;
+    }
+
+    setIncludeArchivedMedia(includeArchivedMedia) {
+        this.includeArchivedMedia = includeArchivedMedia;
+        return this;
+    }
+
+    toJSON() {
+        return {
+            dateFilter: this.dateFilter instanceof DateFilter ? this.dateFilter.toJSON() : this.dateFilter,
+            mediaTypeFilter: this.mediaTypeFilter instanceof MediaTypeFilter ?
+                this.mediaTypeFilter.toJSON() :
+                this.mediaTypeFilter,
+            contentFilter: this.contentFilter instanceof ContentFilter ?
+                this.contentFilter.toJSON() :
+                this.contentFilter,
+            includeArchivedMedia: this.includeArchivedMedia
+        };
+    }
+}
+
+module.exports = Filters;
\ No newline at end of file
diff --git a/src/server/apis/google/GooglePhotosUploadUtils.ts b/src/server/apis/google/GooglePhotosUploadUtils.ts
index 447ed23ac..1a8adc836 100644
--- a/src/server/apis/google/GooglePhotosUploadUtils.ts
+++ b/src/server/apis/google/GooglePhotosUploadUtils.ts
@@ -5,7 +5,7 @@ import { Utils } from '../../../Utils';
 import * as path from 'path';
 import { Opt } from '../../../new_fields/Doc';
 import * as sharp from 'sharp';
-import { MediaItemCreationResult } from './SharedTypes';
+import { MediaItemCreationResult, NewMediaItemResult } from './SharedTypes';
 
 const uploadDirectory = path.join(__dirname, "../../public/files/");
 
@@ -55,24 +55,34 @@ export namespace GooglePhotosUploadUtils {
 
 
 
-    export const CreateMediaItems = (newMediaItems: any[], album?: { id: string }): Promise<MediaItemCreationResult> => {
-        return new Promise<MediaItemCreationResult>((resolve, reject) => {
+    export const CreateMediaItems = async (newMediaItems: any[], album?: { id: string }): Promise<MediaItemCreationResult> => {
+        const quota = newMediaItems.length;
+        let handled = 0;
+        const newMediaItemResults: NewMediaItemResult[] = [];
+        while (handled < quota) {
+            const cap = Math.min(newMediaItems.length, handled + 50);
+            const batch = newMediaItems.slice(handled, cap);
+            console.log(batch.length);
             const parameters = {
                 method: 'POST',
                 headers: headers('json'),
                 uri: prepend('mediaItems:batchCreate'),
-                body: { newMediaItems } as any,
+                body: { newMediaItems: batch } as any,
                 json: true
             };
             album && (parameters.body.albumId = album.id);
-            request(parameters, (error, _response, body) => {
-                if (error) {
-                    reject(error);
-                } else {
-                    resolve(body);
-                }
-            });
-        });
+            newMediaItemResults.push(...(await new Promise<MediaItemCreationResult>((resolve, reject) => {
+                request(parameters, (error, _response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        resolve(body);
+                    }
+                });
+            })).newMediaItemResults);
+            handled = cap;
+        }
+        return { newMediaItemResults };
     };
 
 }