Merge pull request #10 from rombat/fix/datetime-format

feat: datetime format added as an option

README.md

@@ -58,6 +58,8 @@ Syncs playcounts, track ratings, loved tracks and last played date from MusicBee
 
 * `-f, --first` : runs sync for the first time: **add** MusicBee playcount to Navidrome playcount. If not used, playcount will be updated only if greater than Navidrome's one (see [Notes](#-notes)). 
 * `--csv <path>` : MusicBee CSV source file path. By default if not passed, will look for a file named `MusicBee_Export.csv` in the same folder as `musicbee-navidrome-sync.exe`
+* `--datetime-format <format>` : MusicBee CSV datetime format. Default: `"DD/MM/YYYY HH:mm"`. Use available formats from https://day.js.org/docs/en/display/format`
+
 
 ### albumsSync
 

index.js

@@ -22,19 +22,17 @@ const commandLinesOptions = {
     flags: '-u, --user <user_name>',
     description: 'choose Navidrome username (by default if not used, the first user will be used)'
   },
+  datetimeFormat: {
+    flags: '--datetime-format <format>',
+    description: 'MusicBee CSV datetime format. Default: "DD/MM/YYYY HH:mm"',
+    defaultValue: 'DD/MM/YYYY HH:mm'
+  },
   verbose: {
     flags: '--verbose',
     description: 'verbose debugging'
   }
 };
 
-program
-  .name('musicbee-navidrome-sync')
-  .description(
-    'MusicBee to Navidrome Sync (MBNDS) : Tools to sync MusicBee DB to Navidrome DB\nhttps://github.com/rombat/musicbee-navidrome-sync'
-  )
-  .version(packageJson.version, '-v, --version', 'output the current version');
-
 program
   .command('fullSync')
   .description('sync playcounts, track ratings, loved tracks and last played from MusicBee DB to Navidrome DB')
@@ -43,8 +41,20 @@ program
   .option(commandLinesOptions.verbose.flags, commandLinesOptions.verbose.description)
   .option(commandLinesOptions.csv.flags, commandLinesOptions.description, commandLinesOptions.defaultValue)
   .option(commandLinesOptions.db.flags, commandLinesOptions.db.description, commandLinesOptions.db.defaultValue)
+  .option(
+    commandLinesOptions.datetimeFormat.flags,
+    commandLinesOptions.datetimeFormat.description,
+    commandLinesOptions.datetimeFormat.defaultValue
+  )
   .action(runAction);
 
+program
+  .name('musicbee-navidrome-sync')
+  .description(
+    'MusicBee to Navidrome Sync (MBNDS) : Tools to sync MusicBee DB to Navidrome DB\nhttps://github.com/rombat/musicbee-navidrome-sync'
+  )
+  .version(packageJson.version, '-v, --version', 'output the current version');
+
 program
   .command('albumsSync')
   .description('update all albums playcounts and ratings based on existing Navidrome DB')

lib/handlers/MBNDSynchronizer.js

@@ -71,6 +71,12 @@ class MBNDSynchronizer {
       throw new Error('DB file not found');
     }
 
+    if (options.datetimeFormat && !dayjs(dayjs().format(options.datetimeFormat), options.datetimeFormat).isValid()) {
+      throw new Error(
+        `Invalid datetime format : ${options.datetimeFormat}. Please use available formats from https://day.js.org/docs/en/display/format`
+      );
+    }
+
     this.backupDbFile();
 
     this.sequelize = await dbManager.init(paths.dbFilePath);
@@ -163,10 +169,10 @@ class MBNDSynchronizer {
           }
           return rating;
         },
-        dateAdded: item => (dayjs(item, 'DD/MM/YYYY HH:mm').isValid() ? dayjs(item, 'DD/MM/YYYY HH:mm').utc() : null),
-        lastPlayed: item => (dayjs(item, 'DD/MM/YYYY HH:mm').isValid() ? dayjs(item, 'DD/MM/YYYY HH:mm').utc() : null),
-        dateModified: item => (dayjs(item, 'DD/MM/YYYY HH:mm').isValid() ? dayjs(item, 'DD/MM/YYYY HH:mm').utc() : null),
-        love: item => (!!item.trim() ? 1 : 0)
+        dateAdded: item => (dayjs(item, options.datetimeFormat).isValid() ? dayjs(item, options.datetimeFormat).utc() : null),
+        lastPlayed: item => (dayjs(item, options.datetimeFormat).isValid() ? dayjs(item, options.datetimeFormat).utc() : null),
+        dateModified: item => (dayjs(item, options.datetimeFormat).isValid() ? dayjs(item, options.datetimeFormat).utc() : null),
+        love: item => (!!item?.trim() ? 1 : 0)
       }
     })
       .preFileLine((fileLineString, lineIdx) => {

package.json

@@ -1,13 +1,14 @@
 {
   "name": "musicbee-navidrome-sync",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "sync ratings and playcount from musicbee db to navidrome db",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "fullSync": "node index.js fullSync",
     "albumsSync": "node index.js albumsSync",
-    "artistsSync": "node index.js artistsSync"
+    "artistsSync": "node index.js artistsSync",
+    "build": "pkg ."
   },
   "author": "rombat",
   "license": "GNU GPL V3.0",
@@ -28,6 +29,7 @@
   "pkg": {
     "assets": ["node_modules/**/*"],
     "targets": [ "node16-win-x64"],
-    "outputPath": "dist"
+    "outputPath": "dist",
+    "outputName": "musicbee-navidrome-sync"
   }
 }