Fixed a build issue

digimezzo · Aug 9, 2023 · e65dc80 · e65dc80
2 parents 8ecfa74 + 249dcdf
commit e65dc80
Show file tree

Hide file tree

Showing 9 changed files with 797 additions and 604 deletions.
diff --git a/src/app/common/metadata/file-metadata-factory.ts b/src/app/common/metadata/file-metadata-factory.ts
@@ -4,7 +4,6 @@ import { BaseFileAccess } from '../io/base-file-access';
 import { BaseFileMetadataFactory } from './base-file-metadata-factory';
 import { IFileMetadata } from './i-file-metadata';
 import { MusicMetadataFileMetadata } from './music-metadata-file-meta-data';
-import { TagLibFileMetadata } from './tag-lib-file-metadata';
 
 @Injectable()
 export class FileMetadataFactory implements BaseFileMetadataFactory {
@@ -17,13 +16,13 @@ export class FileMetadataFactory implements BaseFileMetadataFactory {
 
         switch (fileExtension) {
             case FileFormats.mp3:
-                fileMetadata = new TagLibFileMetadata(path);
+                fileMetadata = new MusicMetadataFileMetadata(path);
                 break;
             case FileFormats.flac:
-                fileMetadata = new TagLibFileMetadata(path);
+                fileMetadata = new MusicMetadataFileMetadata(path);
                 break;
             case FileFormats.ogg:
-                fileMetadata = new TagLibFileMetadata(path);
+                fileMetadata = new MusicMetadataFileMetadata(path);
                 break;
             case FileFormats.m4a:
                 fileMetadata = new MusicMetadataFileMetadata(path);
@@ -32,10 +31,10 @@ export class FileMetadataFactory implements BaseFileMetadataFactory {
                 fileMetadata = new MusicMetadataFileMetadata(path);
                 break;
             case FileFormats.wav:
-                fileMetadata = new TagLibFileMetadata(path);
+                fileMetadata = new MusicMetadataFileMetadata(path);
                 break;
             default:
-                fileMetadata = new TagLibFileMetadata(path);
+                fileMetadata = new MusicMetadataFileMetadata(path);
                 break;
         }
 

diff --git a/...llection/collection-tracks/collection-tracks-table/collection-tracks-table.component.html b/...llection/collection-tracks/collection-tracks-table/collection-tracks-table.component.html
@@ -111,7 +111,7 @@
                 class="tracks-table-row"
                 [ngClass]="{ 'selected-item-background-important': track.isSelected }"
                 (mousedown)="setSelectedTracks($event, track)"
-                (dblclick)="playbackService.enqueueAndPlayTracksFromDoubleClick(this.orderedTracks, track)"
+                (dblclick)="playbackService.enqueueAndPlayTracksStartingFromGivenTrack(this.orderedTracks, track)"
                 (contextmenu)="onTrackContextMenuAsync($event, track)"
             >
                 <td>

diff --git a/src/app/components/collection/track-browser/track-browser.component.html b/src/app/components/collection/track-browser/track-browser.component.html
@@ -22,7 +22,7 @@
             <app-track
                 [track]="track"
                 canShowHeader="true"
-                (dblclick)="playbackService.enqueueAndPlayTracksFromDoubleClick(this.orderedTracks, track)"
+                (dblclick)="playbackService.enqueueAndPlayTracksStartingFromGivenTrack(this.orderedTracks, track)"
                 (contextmenu)="onTrackContextMenuAsync($event, track)"
             ></app-track>
         </div>

diff --git a/src/app/services/file/file.service.spec.ts b/src/app/services/file/file.service.spec.ts
@@ -78,7 +78,7 @@ describe('FileService', () => {
             expect(service).toBeDefined();
         });
 
-        it('should enqueue all playable tracks found as parameters and play the first track when arguments are received', async () => {
+        it('should enqueue all playable tracks that are found as parameters', async () => {
             // Arrange
             const service: BaseFileService = createService();
 
@@ -93,12 +93,13 @@ describe('FileService', () => {
                         It.is<TrackModel[]>(
                             (trackModels: TrackModel[]) =>
                                 trackModels.length === 2 && trackModels[0].path === 'file 1.mp3' && trackModels[1].path === 'file 2.ogg'
-                    )),
+                        )
+                    ),
                 Times.once()
             );
         });
 
-        it('should not enqueue and play anything if parameters are undefined when arguments are received', async () => {
+        it('should not enqueue anything if parameters are undefined when arguments are received', async () => {
             // Arrange
             const service: BaseFileService = createService();
 
@@ -110,7 +111,7 @@ describe('FileService', () => {
             playbackServiceMock.verify((x) => x.enqueueAndPlayTracks(It.isAny()), Times.never());
         });
 
-        it('should not enqueue and play anything if parameters are empty when arguments are received', async () => {
+        it('should not enqueue anything if parameters are empty when arguments are received', async () => {
             // Arrange
             const service: BaseFileService = createService();
 
@@ -122,7 +123,7 @@ describe('FileService', () => {
             playbackServiceMock.verify((x) => x.enqueueAndPlayTracks(It.isAny()), Times.never());
         });
 
-        it('should not enqueue and play anything if there are no playable tracks found as parameters when arguments are received', async () => {
+        it('should not enqueue anything if there are no playable tracks found as parameters when arguments are received', async () => {
             // Arrange
             const service: BaseFileService = createService();
 
@@ -163,7 +164,7 @@ describe('FileService', () => {
     });
 
     describe('enqueueParameterFilesAsync', () => {
-        it('should enqueue all playable tracks found as parameters and play the first track', async () => {
+        it('should enqueue all playable tracks found as parameters', async () => {
             // Arrange
             applicationMock.setup((x) => x.getParameters()).returns(() => ['file 1.mp3', 'file 2.ogg', 'file 3.bmp']);
             const service: BaseFileService = createService();
@@ -184,7 +185,7 @@ describe('FileService', () => {
             );
         });
 
-        it('should not enqueue and play anything if parameters are undefined', async () => {
+        it('should not enqueue anything if parameters are undefined', async () => {
             // Arrange
             applicationMock.setup((x) => x.getParameters()).returns(() => undefined);
             const service: BaseFileService = createService();
@@ -196,7 +197,7 @@ describe('FileService', () => {
             playbackServiceMock.verify((x) => x.enqueueAndPlayTracks(It.isAny()), Times.never());
         });
 
-        it('should not enqueue and play anything if parameters are empty', async () => {
+        it('should not enqueue anything if parameters are empty', async () => {
             // Arrange
             applicationMock.setup((x) => x.getParameters()).returns(() => []);
             const service: BaseFileService = createService();
@@ -208,7 +209,7 @@ describe('FileService', () => {
             playbackServiceMock.verify((x) => x.enqueueAndPlayTracks(It.isAny()), Times.never());
         });
 
-        it('should not enqueue and play anything if there are no playable tracks found as parameters', async () => {
+        it('should not enqueue anything if there are no playable tracks found as parameters', async () => {
             // Arrange
             applicationMock.setup((x) => x.getParameters()).returns(() => ['file 1.png', 'file 2.mkv', 'file 3.bmp']);
             const service: BaseFileService = createService();

diff --git a/src/app/services/playback/base-playback.service.ts b/src/app/services/playback/base-playback.service.ts
@@ -30,6 +30,7 @@ export abstract class BasePlaybackService {
     public abstract toggleLoopMode(): void;
     public abstract toggleIsShuffled(): void;
     public abstract enqueueAndPlayTracks(tracksToEnqueue: TrackModel[]): void;
+    public abstract enqueueAndPlayTracksStartingFromGivenTrack(tracksToEnqueue: TrackModel[], trackToPlay: TrackModel): void;
     public abstract enqueueAndPlayArtist(artistToPlay: ArtistModel, artistType: ArtistType): void;
     public abstract enqueueAndPlayGenre(genreToPlay: GenreModel): void;
     public abstract enqueueAndPlayAlbum(albumToPlay: AlbumModel): void;