new feature: edit artist images

src/app/app.module.ts

@@ -312,6 +312,7 @@ import { ArtistArtworkCacheService } from './services/artist-artwork-cache/artis
 import { ArtistModelFactory } from './services/artist/artist-model-factory';
 import { ArtistsKeyGenerator } from './data/artists-key-generator';
 import { MusicBrainzApi } from './common/api/musicbrainz/musicbrainz.api';
+import { EditArtistDialogComponent } from './ui/components/dialogs/edit-artist-dialog/edit-artist-dialog.component';
 
 export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader {
     return new TranslateHttpLoader(http, './assets/i18n/', '.json');
@@ -483,6 +484,7 @@ export function settingsInitializerFactory(settings: SettingsBase) {
         EditTracksDialogComponent,
         EditAlbumDialogComponent,
         IterableMenuComponent,
+        EditArtistDialogComponent,
     ],
     imports: [
         BrowserAnimationsModule,

src/app/common/api/fanart/fanart.api.ts

@@ -6,13 +6,26 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { SensitiveInformation } from '../../application/sensitive-information';
 
+interface FanartResponse {
+    artistthumb: [
+        {
+            url: string;
+        },
+    ];
+}
+
 @Injectable()
 export class FanartApi {
     public constructor(private httpClient: HttpClient) {}
 
     public async getArtistThumbnailAsync(musicBrainzId: string): Promise<string> {
+        const thumbnailUrls: string[] = await this.getAllArtistThumbnailsAsync(musicBrainzId);
+        return thumbnailUrls[0];
+    }
+
+    public async getAllArtistThumbnailsAsync(musicBrainzId: string): Promise<string[]> {
         const url: string = `http://webservice.fanart.tv/v3/music/${musicBrainzId}?api_key=${SensitiveInformation.fanartApiKey}`;
-        const response: any = await this.httpClient.get<any>(url).toPromise();
-        return response.artistthumb?.[0]?.url;
+        const response: FanartResponse = await this.httpClient.get<any>(url).toPromise();
+        return response.artistthumb?.map((value): string => value.url) ?? [];
     }
 }

src/app/common/application/i18n.spec.ts

@@ -123,6 +123,8 @@ describe('validate i18n', () => {
         'edit-playlist',
         'edit-track',
         'edit-tracks',
+        'edit-artist',
+        'search-online-images',
         'embedded-lyrics',
         'enable-discord-rich-presence',
         'enable-gapless-playback',
@@ -197,6 +199,7 @@ describe('validate i18n', () => {
         'no-biography-found',
         'no-folders-in-collection',
         'no-image-found-online',
+        'no-images-found-online',
         'no-lyrics',
         'no-lyrics-found',
         'no-playlists',
@@ -398,6 +401,7 @@ describe('validate i18n', () => {
         'large-size',
         'xl-size',
         'overwrite-manually-edited-covers',
+        'overwrite-manually-edited-artist-images',
         'restore-ratings-from-backup',
         'restore-ratings-from-backup-description',
         'ratings-backup',

src/app/data/database-migrator.ts

@@ -20,6 +20,7 @@ import { Migration9 } from './migrations/migration9';
 import { Migration10 } from './migrations/migration10';
 import { Migration11 } from "./migrations/migration11";
 import { Migration12 } from "./migrations/migration12";
+import { Migration13 } from "./migrations/migration13";
 
 @Injectable()
 export class DatabaseMigrator implements DatabaseMigratorBase {
@@ -36,6 +37,7 @@ export class DatabaseMigrator implements DatabaseMigratorBase {
         new Migration10(),
         new Migration11(),
         new Migration12(),
+        new Migration13(),
     ];
 
     public constructor(

src/app/data/entities/artist-artwork.ts

@@ -1,5 +1,9 @@
 export class ArtistArtwork {
-    public constructor(public artist: string, public artworkId: string) {}
+    public constructor(
+        public artist: string,
+        public artworkId: string,
+        public isManuallySet: number = 0,
+    ) {}
 
     public artistArtworkId: string;
 }

src/app/data/migrations/migration13.ts

@@ -0,0 +1,10 @@
+import { Migration } from '../migration';
+
+export class Migration13 extends Migration {
+    public id: number = 13;
+    public name: string = 'Migration13';
+
+    public up(): void {
+        this.sql('ALTER TABLE ArtistArtwork ADD COLUMN IsManuallySet INTEGER DEFAULT 0;');
+    }
+}

src/app/data/repositories/artist-artwork-repository.base.ts

@@ -5,8 +5,10 @@ export abstract class ArtistArtworkRepositoryBase {
     public abstract getNumberOfArtistArtworkThatHasNoTrack(): number;
     public abstract deleteArtistArtworkThatHasNoTrack(): number;
     public abstract addArtistArtwork(artistArtwork: ArtistArtwork): void;
+    public abstract updateArtistArtwork(artistArtwork: ArtistArtwork): void;
     public abstract getAllArtistArtwork(): ArtistArtwork[] | undefined;
     public abstract getArtistArtworkForArtists(artists: string[]): ArtistArtwork[];
     public abstract deleteArtistArtworkWithDefaultId(): number;
-    public abstract deleteAllArtistArtwork(): number
+    public abstract deleteAllArtistArtwork(): number;
+    public abstract clearManuallySetFlag(): void;
 }

src/app/data/repositories/artist-artwork-repository.spec.ts

@@ -15,6 +15,7 @@ describe('ArtistArtworkRepository', () => {
                     ArtistArtworkID	    INTEGER,
                     Artist	            TEXT,
                     ArtworkID	        TEXT,
+                    IsManuallySet	    INTEGER,
                     PRIMARY KEY(ArtistArtworkID)
             );`,
         );
@@ -32,10 +33,10 @@ describe('ArtistArtworkRepository', () => {
     }
 
     function fillTestData(): void {
-        const statement = database.prepare('INSERT INTO ArtistArtwork (Artist, ArtworkID) VALUES (?, ?);');
-        statement.run('metallica', 'artist-1');
-        statement.run('aerosmith', 'artist-2');
-        statement.run('alanis morissette', 'artist-3');
+        const statement = database.prepare('INSERT INTO ArtistArtwork (Artist, ArtworkID, IsManuallySet) VALUES (?, ?, ?);');
+        statement.run('metallica', 'artist-1', 0);
+        statement.run('aerosmith', 'artist-2', 0);
+        statement.run('alanis morissette', 'artist-3', 1);
     }
 
     beforeEach(() => {
@@ -73,6 +74,20 @@ describe('ArtistArtworkRepository', () => {
         });
     });
 
+    describe('updateArtistArtwork', () => {
+        it('should update the artworkId of an existing artist in the database', () => {
+            // Arrange, Act
+            const artistArtwork: ArtistArtwork = new ArtistArtwork('metallica', 'artist-99');
+            repository.updateArtistArtwork(artistArtwork);
+
+            // Assert
+            const artworkInDatabase: ArtistArtwork[] = repository.getArtistArtworkForArtists(['metallica']);
+            expect(artworkInDatabase).not.toBeUndefined();
+            expect(artworkInDatabase.length).toEqual(1);
+            expect(artworkInDatabase[0].artworkId).toEqual('artist-99');
+        });
+    });
+
     describe('getAllArtistArtwork', () => {
         it('should return all entries in the table', () => {
             // Arrange, Act
@@ -180,14 +195,26 @@ describe('ArtistArtworkRepository', () => {
     });
 
     describe('deleteAllArtistArtwork', () => {
-        it('should delete all artist artwork', () => {
-            // Arrange, Act
+        it('should delete all artist artwork including manually set images', () => {
+            // Arrange
+            repository.clearManuallySetFlag();
+
+            // Act
             const deletedRows: number = repository.deleteAllArtistArtwork();
 
             // Assert
             expect(deletedRows).toEqual(3);
             expect(repository.getNumberOfArtistArtwork()).toEqual(0);
         });
+
+        it('should delete all artist artwork except manually set images', () => {
+            // Arrange, Act
+            const deletedRows: number = repository.deleteAllArtistArtwork();
+
+            // Assert
+            expect(deletedRows).toEqual(2);
+            expect(repository.getNumberOfArtistArtwork()).toEqual(1);
+        });
     });
 
     describe('deleteArtistArtworkWithDefaultId', () => {

src/app/data/repositories/artist-artwork-repository.ts

@@ -15,8 +15,13 @@ export class ArtistArtworkRepository implements ArtistArtworkRepositoryBase {
     public constructor(private databaseFactory: DatabaseFactory) {}
 
     public addArtistArtwork(artistArtwork: ArtistArtwork): void {
-        const statement = this.database.prepare('INSERT INTO ArtistArtwork (Artist, ArtworkID) VALUES (?, ?);');
-        statement.run(artistArtwork.artist.toLowerCase(), artistArtwork.artworkId);
+        const statement = this.database.prepare('INSERT INTO ArtistArtwork (Artist, ArtworkID, isManuallySet) VALUES (?, ?, ?);');
+        statement.run(artistArtwork.artist.toLowerCase(), artistArtwork.artworkId, artistArtwork.isManuallySet);
+    }
+
+    public updateArtistArtwork(artistArtwork: ArtistArtwork): void {
+        const statement = this.database.prepare('UPDATE ArtistArtwork SET ArtworkID = ?, isManuallySet = ? WHERE Artist = ?;');
+        statement.run(artistArtwork.artworkId, artistArtwork.isManuallySet, artistArtwork.artist.toLowerCase());
     }
 
     public getAllArtistArtwork(): ArtistArtwork[] | undefined {
@@ -79,7 +84,7 @@ export class ArtistArtworkRepository implements ArtistArtworkRepositoryBase {
     }
 
     public deleteAllArtistArtwork(): number {
-        const statement = this.database.prepare(`DELETE FROM ArtistArtwork WHERE 1=1;`);
+        const statement = this.database.prepare(`DELETE FROM ArtistArtwork WHERE IsManuallySet = 0;`);
         const info = statement.run();
         return info.changes;
     }
@@ -90,6 +95,11 @@ export class ArtistArtworkRepository implements ArtistArtworkRepositoryBase {
         return info.changes;
     }
 
+    public clearManuallySetFlag(): void {
+        const statement = this.database.prepare(`UPDATE ArtistArtwork SET IsManuallySet = 0 WHERE IsManuallySet = 1;`);
+        statement.run();
+    }
+
     private get database(): any {
         return this.databaseFactory.create();
     }

src/app/services/dialog/dialog.service.base.ts

@@ -1,6 +1,7 @@
 import { PlaylistModel } from '../playlist/playlist-model';
 import { TrackModel } from '../track/track-model';
 import { AlbumModel } from '../album/album-model';
+import { ArtistModel } from '../artist/artist-model';
 
 export abstract class DialogServiceBase {
     public abstract showConfirmationDialogAsync(dialogTitle: string, dialogText: string): Promise<boolean>;
@@ -19,6 +20,7 @@ export abstract class DialogServiceBase {
     public abstract showEditColumnsDialogAsync(): Promise<void>;
     public abstract showEditTracksAsync(tracks: TrackModel[]): Promise<boolean>;
     public abstract showEditAlbumsAsync(albums: AlbumModel[]): Promise<void>;
+    public abstract showEditArtistAsync(artist: ArtistModel): Promise<void>;
     public abstract cannotPlayM4aFileAsync(): Promise<void>;
     public abstract cannotPlayAudioFileAsync(): Promise<void>;
 }

src/app/services/dialog/dialog.service.ts

@@ -22,6 +22,8 @@ import { EditSmartPlaylistDialogComponent } from '../../ui/components/dialogs/ed
 import { FileFormats } from '../../common/application/file-formats';
 import { AlbumModel } from '../album/album-model';
 import { EditAlbumDialogComponent } from '../../ui/components/dialogs/edit-album-dialog/edit-album-dialog.component';
+import { ArtistModel } from '../artist/artist-model';
+import { EditArtistDialogComponent } from '../../ui/components/dialogs/edit-artist-dialog/edit-artist-dialog.component';
 
 @Injectable()
 export class DialogService implements DialogServiceBase {
@@ -153,10 +155,20 @@ export class DialogService implements DialogServiceBase {
         await dialogRef.afterClosed().toPromise();
     }
 
+    public async showEditArtistAsync(artist: ArtistModel): Promise<void> {
+        const dialogRef: MatDialogRef<EditArtistDialogComponent> = this.dialog.open(EditArtistDialogComponent, {
+            data: artist,
+            maxWidth: '750px',
+        });
+
+        await dialogRef.afterClosed().toPromise();
+    }
+
     public async cannotPlayM4aFileAsync(): Promise<void> {
         const message: string = await this.translatorService.getAsync('cannot-play-m4a-file');
         this.showErrorDialog(message);
     }
+
     public async cannotPlayAudioFileAsync(): Promise<void> {
         const message: string = await this.translatorService.getAsync('cannot-play-audio-file');
         this.showErrorDialog(message);

src/app/services/indexing/artist-artwork-adder.ts

@@ -8,9 +8,13 @@ import { ArtistArtworkRepositoryBase } from '../../data/repositories/artist-artw
 import { TrackRepositoryBase } from '../../data/repositories/track-repository.base';
 import { NotificationServiceBase } from '../notification/notification.service.base';
 import { ArrayUtils } from '../../common/utils/array-utils';
+import { Observable, Subject } from 'rxjs';
 
 @Injectable({ providedIn: 'root' })
 export class ArtistArtworkAdder {
+    private artistArtworkChanged: Subject<void> = new Subject();
+    public readonly artistArtworkChanged$: Observable<void> = this.artistArtworkChanged.asObservable();
+
     public constructor(
         private artistArtworkCacheService: ArtistArtworkCacheServiceBase,
         private artistArtworkRepository: ArtistArtworkRepositoryBase,
@@ -69,8 +73,20 @@ export class ArtistArtworkAdder {
                     }
                 }
             } catch (e: unknown) {
-                this.logger.error(e, `Could not add artist artwork for '${artist}'`, 'ArtistArtworkAdder', 'addMissingArtistArtworkAsync');
+                this.logger.error(e, `Could not add artist artwork for '${artist}'`, 'ArtistArtworkAdder', 'addArtistArtworkAsync');
             }
         }
     }
+
+    public async updateArtistArtworkAsync(artist: string, artistArtwork: Buffer, isManuallySet: boolean): Promise<void> {
+        const artistArtworkCacheId: ArtistArtworkCacheId | undefined =
+            await this.artistArtworkCacheService.addArtworkDataToCacheAsync(artistArtwork);
+        if (artistArtworkCacheId != undefined) {
+            const newArtistArtwork: ArtistArtwork = new ArtistArtwork(artist, artistArtworkCacheId.id, isManuallySet ? 1 : 0);
+            this.artistArtworkRepository.updateArtistArtwork(newArtistArtwork);
+            this.artistArtworkChanged.next();
+        } else {
+            throw new Error(`Could not update artist artwork for '${artist}'`);
+        }
+    }
 }

src/app/services/indexing/artist-artwork-indexer.spec.ts

@@ -115,7 +115,7 @@ describe('ArtistArtworkIndexer', () => {
             notificationServiceMock.verify((x) => x.updatingArtistArtworkAsync(), Times.once());
         });
 
-        it('should delete all artist artwork from cache', async () => {
+        it('should delete all artist artwork from database', async () => {
             // Arrange, Act
             await artistArtworkIndexer.refreshAllArtistsArtworkAsync();
 

src/app/services/indexing/indexing.service.spec.ts

@@ -16,6 +16,7 @@ import { TrackFiller } from './track-filler';
 import { SchedulerBase } from '../../common/scheduling/scheduler.base';
 import { ArtistArtworkIndexer } from './artist-artwork-indexer';
 import { Track } from '../../data/entities/track';
+import { ArtistArtworkRepositoryBase } from '../../data/repositories/artist-artwork-repository.base';
 
 describe('IndexingService', () => {
     let notificationServiceMock: IMock<NotificationServiceBase>;
@@ -31,6 +32,7 @@ describe('IndexingService', () => {
     let loggerMock: IMock<Logger>;
     let trackRepositoryMock: IMock<TrackRepositoryBase>;
     let albumArtworkRepositoryMock: IMock<AlbumArtworkRepositoryBase>;
+    let artistArtworkRepositoryMock: IMock<ArtistArtworkRepositoryBase>;
 
     let folderService_foldersChanged: Subject<void>;
 
@@ -51,6 +53,7 @@ describe('IndexingService', () => {
         loggerMock = Mock.ofType<Logger>();
         trackRepositoryMock = Mock.ofType<TrackRepositoryBase>();
         albumArtworkRepositoryMock = Mock.ofType<AlbumArtworkRepositoryBase>();
+        artistArtworkRepositoryMock = Mock.ofType<ArtistArtworkRepositoryBase>();
 
         folderService_foldersChanged = new Subject();
         const folderService_foldersChanged$: Observable<void> = folderService_foldersChanged.asObservable();
@@ -73,6 +76,7 @@ describe('IndexingService', () => {
             albumArtworkIndexerMock.object,
             artistArtworkIndexerMock.object,
             albumArtworkRepositoryMock.object,
+            artistArtworkRepositoryMock.object,
             trackRepositoryMock.object,
             trackFillerMock.object,
             desktopMock.object,
@@ -105,14 +109,27 @@ describe('IndexingService', () => {
             artistArtworkIndexerMock.verify((x) => x.refreshMissingArtistsArtworkAsync(), Times.once());
         });
 
-        it('should refresh all artists artwork', async () => {
+        it('should refresh all artists artwork including manually set images', async () => {
             // Arrange
             const sut: IndexingService = createSut();
 
             // Act
             await sut.indexArtistArtworkOnlyAsync(false);
 
             // Assert
+            artistArtworkRepositoryMock.verify((x) => x.clearManuallySetFlag(), Times.never());
+            artistArtworkIndexerMock.verify((x) => x.refreshAllArtistsArtworkAsync(), Times.once());
+        });
+
+        it('should refresh all artists artwork except manually set images', async () => {
+            // Arrange
+            const sut: IndexingService = createSut();
+
+            // Act
+            await sut.indexArtistArtworkOnlyAsync(false, true);
+
+            // Assert
+            artistArtworkRepositoryMock.verify((x) => x.clearManuallySetFlag(), Times.once());
             artistArtworkIndexerMock.verify((x) => x.refreshAllArtistsArtworkAsync(), Times.once());
         });
     });