From 04afa13eae6f3dd0f56700f5d8863736b2cb1baa Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sun, 30 Oct 2022 20:17:06 -0700
Subject: [PATCH] Fix year data

---
 server/queue/navidrome/navidrome.scanner.ts | 24 ++++++++++-----------
 server/queue/navidrome/navidrome.utils.ts   | 14 ++++++------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/server/queue/navidrome/navidrome.scanner.ts b/server/queue/navidrome/navidrome.scanner.ts
index d7a59299e..5fdef5302 100644
--- a/server/queue/navidrome/navidrome.scanner.ts
+++ b/server/queue/navidrome/navidrome.scanner.ts
@@ -111,7 +111,7 @@ export const scanAlbums = async (
   task: Task
 ) => {
   await prisma.task.update({
-    data: { message: 'Scanning artists' },
+    data: { message: 'Scanning albums' },
     where: { id: task.id },
   });
 
@@ -193,6 +193,8 @@ export const scanAlbums = async (
 
       albumArtistConnect && aaConnect.push(albumArtistConnect);
 
+      const year = album.minYear === 0 ? null : album.minYear;
+
       await prisma.album.upsert({
         create: {
           albumArtists: { connect: aaConnect },
@@ -201,10 +203,8 @@ export const scanAlbums = async (
           genres: { connect: genresConnect },
           images: { connect: imagesConnect },
           name: album.name,
-          releaseDate: album?.minYear
-            ? new Date(album.minYear, 0).toISOString()
-            : undefined,
-          releaseYear: album.minYear,
+          releaseDate: year ? new Date(year, 0).toISOString() : undefined,
+          releaseYear: year,
           remoteCreatedAt: album.createdAt,
           remoteId: album.id,
           serverFolders: { connect: { id: serverFolder.id } },
@@ -218,10 +218,8 @@ export const scanAlbums = async (
           genres: { connect: genresConnect },
           images: { connect: imagesConnect },
           name: album.name,
-          releaseDate: album?.minYear
-            ? new Date(album.minYear, 0).toISOString()
-            : undefined,
-          releaseYear: album.minYear,
+          releaseDate: year ? new Date(year, 0).toISOString() : null,
+          releaseYear: year,
           remoteCreatedAt: album.createdAt,
           remoteId: album.id,
           serverFolders: { connect: { id: serverFolder.id } },
@@ -248,7 +246,7 @@ const scanSongs = async (
   task: Task
 ) => {
   await prisma.task.update({
-    data: { message: 'Scanning artists' },
+    data: { message: 'Scanning songs' },
     where: { id: task.id },
   });
 
@@ -391,10 +389,10 @@ const scanAll = async (
       });
 
       for (const serverFolder of serverFolders) {
-        await scanGenres(server, task);
-        await scanAlbumArtists(server, serverFolder, task);
+        // await scanGenres(server, task);
+        // await scanAlbumArtists(server, serverFolder, task);
         await scanAlbums(server, serverFolder, task);
-        await scanSongs(server, serverFolder, task);
+        // await scanSongs(server, serverFolder, task);
 
         await prisma.serverFolder.update({
           data: { lastScannedAt: new Date() },
diff --git a/server/queue/navidrome/navidrome.utils.ts b/server/queue/navidrome/navidrome.utils.ts
index d45dcf9d3..6ed9e1c7f 100644
--- a/server/queue/navidrome/navidrome.utils.ts
+++ b/server/queue/navidrome/navidrome.utils.ts
@@ -40,6 +40,8 @@ const insertSongGroup = async (
     const pathSplit = song.path.split('/');
     const parentPath = pathSplit.slice(0, pathSplit.length - 1).join('/');
 
+    const year = song.year === 0 ? null : song.year;
+
     return {
       create: {
         albumArtistId: albumArtist?.id,
@@ -57,10 +59,8 @@ const insertSongGroup = async (
         },
         genres: { connect: genresConnect },
         name: song.title,
-        releaseDate: song?.year
-          ? new Date(song.year, 0).toISOString()
-          : undefined,
-        releaseYear: song?.year,
+        releaseDate: year ? new Date(year, 0).toISOString() : undefined,
+        releaseYear: year,
         remoteCreatedAt: song.createdAt,
         remoteId: song.id,
         serverFolders: { connect: { id: serverFolder.id } },
@@ -85,10 +85,8 @@ const insertSongGroup = async (
         },
         genres: { connect: genresConnect },
         name: song.title,
-        releaseDate: song?.year
-          ? new Date(song.year, 0).toISOString()
-          : undefined,
-        releaseYear: song?.year,
+        releaseDate: year ? new Date(song.year, 0).toISOString() : undefined,
+        releaseYear: year,
         remoteCreatedAt: song.createdAt,
         remoteId: song.id,
         serverFolders: { connect: { id: serverFolder.id } },