vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-10 04:30:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix year data

Browse Source
This commit is contained in:
jeffvli
2022-10-30 20:17:06 -07:00
parent df1844b74c
commit 04afa13eae
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/queue/navidrome/navidrome.scanner.ts
+11 -13
View File
@@ -111,7 +111,7 @@ export const scanAlbums = async (
task: Task task: Task
) => { ) => {
await prisma.task.update({ await prisma.task.update({
data: { message: 'Scanning artists' }, data: { message: 'Scanning albums' },
where: { id: task.id }, where: { id: task.id },
}); });
@@ -193,6 +193,8 @@ export const scanAlbums = async (
albumArtistConnect && aaConnect.push(albumArtistConnect); albumArtistConnect && aaConnect.push(albumArtistConnect);
const year = album.minYear === 0 ? null : album.minYear;
await prisma.album.upsert({ await prisma.album.upsert({
create: { create: {
albumArtists: { connect: aaConnect }, albumArtists: { connect: aaConnect },
@@ -201,10 +203,8 @@ export const scanAlbums = async (
genres: { connect: genresConnect }, genres: { connect: genresConnect },
images: { connect: imagesConnect }, images: { connect: imagesConnect },
name: album.name, name: album.name,
releaseDate: album?.minYear releaseDate: year ? new Date(year, 0).toISOString() : undefined,
? new Date(album.minYear, 0).toISOString() releaseYear: year,
: undefined,
releaseYear: album.minYear,
remoteCreatedAt: album.createdAt, remoteCreatedAt: album.createdAt,
remoteId: album.id, remoteId: album.id,
serverFolders: { connect: { id: serverFolder.id } }, serverFolders: { connect: { id: serverFolder.id } },
@@ -218,10 +218,8 @@ export const scanAlbums = async (
genres: { connect: genresConnect }, genres: { connect: genresConnect },
images: { connect: imagesConnect }, images: { connect: imagesConnect },
name: album.name, name: album.name,
releaseDate: album?.minYear releaseDate: year ? new Date(year, 0).toISOString() : null,
? new Date(album.minYear, 0).toISOString() releaseYear: year,
: undefined,
releaseYear: album.minYear,
remoteCreatedAt: album.createdAt, remoteCreatedAt: album.createdAt,
remoteId: album.id, remoteId: album.id,
serverFolders: { connect: { id: serverFolder.id } }, serverFolders: { connect: { id: serverFolder.id } },
@@ -248,7 +246,7 @@ const scanSongs = async (
task: Task task: Task
) => { ) => {
await prisma.task.update({ await prisma.task.update({
data: { message: 'Scanning artists' }, data: { message: 'Scanning songs' },
where: { id: task.id }, where: { id: task.id },
}); });
@@ -391,10 +389,10 @@ const scanAll = async (
}); });
for (const serverFolder of serverFolders) { for (const serverFolder of serverFolders) {
await scanGenres(server, task); // await scanGenres(server, task);
await scanAlbumArtists(server, serverFolder, task); // await scanAlbumArtists(server, serverFolder, task);
await scanAlbums(server, serverFolder, task); await scanAlbums(server, serverFolder, task);
await scanSongs(server, serverFolder, task); // await scanSongs(server, serverFolder, task);
await prisma.serverFolder.update({ await prisma.serverFolder.update({
data: { lastScannedAt: new Date() }, data: { lastScannedAt: new Date() },
server/queue/navidrome/navidrome.utils.ts
+6 -8
View File
@@ -40,6 +40,8 @@ const insertSongGroup = async (
const pathSplit = song.path.split('/'); const pathSplit = song.path.split('/');
const parentPath = pathSplit.slice(0, pathSplit.length - 1).join('/'); const parentPath = pathSplit.slice(0, pathSplit.length - 1).join('/');
const year = song.year === 0 ? null : song.year;
return { return {
create: { create: {
albumArtistId: albumArtist?.id, albumArtistId: albumArtist?.id,
@@ -57,10 +59,8 @@ const insertSongGroup = async (
}, },
genres: { connect: genresConnect }, genres: { connect: genresConnect },
name: song.title, name: song.title,
releaseDate: song?.year releaseDate: year ? new Date(year, 0).toISOString() : undefined,
? new Date(song.year, 0).toISOString() releaseYear: year,
: undefined,
releaseYear: song?.year,
remoteCreatedAt: song.createdAt, remoteCreatedAt: song.createdAt,
remoteId: song.id, remoteId: song.id,
serverFolders: { connect: { id: serverFolder.id } }, serverFolders: { connect: { id: serverFolder.id } },
@@ -85,10 +85,8 @@ const insertSongGroup = async (
}, },
genres: { connect: genresConnect }, genres: { connect: genresConnect },
name: song.title, name: song.title,
releaseDate: song?.year releaseDate: year ? new Date(song.year, 0).toISOString() : undefined,
? new Date(song.year, 0).toISOString() releaseYear: year,
: undefined,
releaseYear: song?.year,
remoteCreatedAt: song.createdAt, remoteCreatedAt: song.createdAt,
remoteId: song.id, remoteId: song.id,
serverFolders: { connect: { id: serverFolder.id } }, serverFolders: { connect: { id: serverFolder.id } },