From 3fb212eb601dbaff28a61100fc0478b1c706a3b8 Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Thu, 19 Sep 2019 16:30:14 -0400
Subject: organized and genericized

---
 src/server/apis/google/GooglePhotosUploadUtils.ts | 6 +++---
 src/server/index.ts                               | 8 +-------
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/server')

diff --git a/src/server/apis/google/GooglePhotosUploadUtils.ts b/src/server/apis/google/GooglePhotosUploadUtils.ts
index 7eaf8a8b7..fc6772ffd 100644
--- a/src/server/apis/google/GooglePhotosUploadUtils.ts
+++ b/src/server/apis/google/GooglePhotosUploadUtils.ts
@@ -5,9 +5,9 @@ import { Utils } from '../../../Utils';
 import * as path from 'path';
 import { Opt } from '../../../new_fields/Doc';
 import * as sharp from 'sharp';
-import { MediaItemCreationResult, NewMediaItemResult } from './SharedTypes';
-import { NewMediaItem } from '../..';
-import { TimeUnit } from "../../index";
+import { MediaItemCreationResult } from './SharedTypes';
+import { NewMediaItem } from "../../index";
+const { TimeUnit } = require("../../../extensions/ArrayExtensions");
 
 const uploadDirectory = path.join(__dirname, "../../public/files/");
 
diff --git a/src/server/index.ts b/src/server/index.ts
index 2d6c99d8a..1f411ade2 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -837,12 +837,6 @@ export interface NewMediaItem {
     };
 }
 
-export enum TimeUnit {
-    Milliseconds,
-    Seconds,
-    Minutes
-}
-
 app.post(RouteStore.googlePhotosMediaUpload, async (req, res) => {
     const mediaInput: GooglePhotosUploadUtils.MediaInput[] = req.body.media;
     await GooglePhotosUploadUtils.initialize({ uploadDirectory, credentialsPath, tokenPath });
@@ -865,7 +859,7 @@ app.post(RouteStore.googlePhotosMediaUpload, async (req, res) => {
         return newMediaItems;
     };
     const batcher = { batchSize: 25 };
-    const interval = { magnitude: 100, unit: TimeUnit.Milliseconds };
+    const interval = { magnitude: 100, unit: ArrayExtensions.TimeUnit.Milliseconds };
 
     const newMediaItems = await mediaInput.batchedMapInterval(batcher, dispatchUpload, interval);
 
-- 
cgit v1.2.3-70-g09d2