fix: date handling and multi-dropbox support

klieber · Sep 5, 2020 · a088651 · a088651
1 parent 8a3e499
commit a088651
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/provider/dropbox/dropbox-client-factory.js b/lib/provider/dropbox/dropbox-client-factory.js
@@ -7,7 +7,7 @@ module.exports = {
   create: async (config) => {
     const tokenStore = new DropboxTokenStore(config.token_store);
     let token = tokenStore.read();
-    let authorizationCode = process.env.DROPBOX_AUTH_CODE;
+    let authorizationCode = config.auth_code;
 
     if (!token && !authorizationCode) {
       logger.debug('no access token or authorization code available');

diff --git a/lib/provider/dropbox/index.js b/lib/provider/dropbox/index.js
@@ -6,7 +6,8 @@ tmp.setGracefulCleanup();
 
 const DEFAULTS = {
   source: '/Camera Uploads',
-  token_store: './.dropbox-token'
+  token_store: './.dropbox-token',
+  auth_code: process.env.DROPBOX_AUTH_CODE
 };
 
 module.exports = {

diff --git a/lib/support/date-extractor.js b/lib/support/date-extractor.js
@@ -22,7 +22,9 @@ async function extractDateFromExif(filename) {
   if (metadata) {
     dateObject = metadata.DateTimeOriginal || metadata.DateTimeDigitized || metadata.CreateDate || metadata.ModifyDate;
 
-    if (!dateObject && metadata.GPSDateStamp) {
+    if (dateObject && (typeof dateObject === 'string' || dateObject instanceof String)) {
+      dateObject = new Date(dateObject);
+    } else if (!dateObject && metadata.GPSDateStamp) {
       let gpsDate = metadata.GPSDateStamp.replace(/:/g, '-');
       let gpsTime = metadata.GPSTimeStamp || '12:00:00';
       dateObject = new Date(`${gpsDate}T${gpsTime}.000Z`);