From 8d9c9d0f51be91ee10b631be9f464af0822bb9be Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Fri, 20 Sep 2019 16:39:14 -0400
Subject: integrated with array batcher npm module

---
 src/server/apis/google/GooglePhotosUploadUtils.ts | 49 +++++++++++------------
 1 file changed, 24 insertions(+), 25 deletions(-)

(limited to 'src/server/apis/google')

diff --git a/src/server/apis/google/GooglePhotosUploadUtils.ts b/src/server/apis/google/GooglePhotosUploadUtils.ts
index 29575763c..40564ff3b 100644
--- a/src/server/apis/google/GooglePhotosUploadUtils.ts
+++ b/src/server/apis/google/GooglePhotosUploadUtils.ts
@@ -7,7 +7,7 @@ import { Opt } from '../../../new_fields/Doc';
 import * as sharp from 'sharp';
 import { MediaItemCreationResult } from './SharedTypes';
 import { NewMediaItem } from "../../index";
-import { batchedMapInterval, FixedBatcher, TimeUnit, Interval } from "array-batcher";
+import BatchedArray, { FixedBatcher, TimeUnit, Interval } from "array-batcher";
 
 const uploadDirectory = path.join(__dirname, "../../public/files/");
 
@@ -62,30 +62,29 @@ export namespace GooglePhotosUploadUtils {
     };
 
     export const CreateMediaItems = async (newMediaItems: NewMediaItem[], album?: { id: string }): Promise<MediaItemCreationResult> => {
-        const createFromUploadTokens = async (batch: NewMediaItem[]) => {
-            const parameters = {
-                method: 'POST',
-                headers: headers('json'),
-                uri: prepend('mediaItems:batchCreate'),
-                body: { newMediaItems: batch } as any,
-                json: true
-            };
-            album && (parameters.body.albumId = album.id);
-            return (await new Promise<MediaItemCreationResult>((resolve, reject) => {
-                request(parameters, (error, _response, body) => {
-                    if (error) {
-                        reject(error);
-                    } else {
-                        resolve(body);
-                    }
-                });
-            })).newMediaItemResults;
-        };
-        const batcher: FixedBatcher = { batchSize: 50 };
-        const interval: Interval = { magnitude: 100, unit: TimeUnit.Milliseconds };
-
-        const newMediaItemResults = await batchedMapInterval(newMediaItems, batcher, createFromUploadTokens, interval);
-
+        const newMediaItemResults = await BatchedArray.from(newMediaItems).batchedMapInterval({
+            batcher: { batchSize: 50 },
+            interval: { magnitude: 100, unit: TimeUnit.Milliseconds },
+            converter: async (batch: NewMediaItem[]) => {
+                const parameters = {
+                    method: 'POST',
+                    headers: headers('json'),
+                    uri: prepend('mediaItems:batchCreate'),
+                    body: { newMediaItems: batch } as any,
+                    json: true
+                };
+                album && (parameters.body.albumId = album.id);
+                return (await new Promise<MediaItemCreationResult>((resolve, reject) => {
+                    request(parameters, (error, _response, body) => {
+                        if (error) {
+                            reject(error);
+                        } else {
+                            resolve(body);
+                        }
+                    });
+                })).newMediaItemResults;
+            }
+        });
         return { newMediaItemResults };
     };
 
-- 
cgit v1.2.3-70-g09d2