More refactoring

src/app/app.module.ts

@@ -34,7 +34,6 @@ import { AppComponent } from './app.component';
 import { FanartApi } from './common/api/fanart/fanart.api';
 import { GitHubApi } from './common/api/git-hub/git-hub.api';
 import { LastfmApi } from './common/api/lastfm/lastfm.api';
-import { ContextMenuOpener } from './common/context-menu-opener';
 import { AlbumKeyGenerator } from './data/album-key-generator';
 import { DatabaseFactory } from './data/database-factory';
 import { DatabaseMigrator } from './data/database-migrator';
@@ -44,7 +43,6 @@ import { FolderTrackRepository } from './data/repositories/folder-track-reposito
 import { RemovedTrackRepository } from './data/repositories/removed-track-repository';
 import { TrackRepository } from './data/repositories/track-repository';
 import { DateTime } from './common/date-time';
-import { FileValidator } from './common/file-validator';
 import { GuidFactory } from './common/guid.factory';
 import { Hacks } from './common/hacks';
 import { ImageProcessor } from './common/image-processor';
@@ -65,7 +63,6 @@ import { NativeElementProxy } from './common/native-element-proxy';
 import { ArtistOrdering } from './common/ordering/artist-ordering';
 import { GenreOrdering } from './common/ordering/genre-ordering';
 import { TrackOrdering } from './common/ordering/track-ordering';
-import { PathValidator } from './common/path-validator';
 import { Scheduler } from './common/scheduling/scheduler';
 import { SemanticZoomHeaderAdder } from './common/semantic-zoom-header-adder';
 import { SettingsBase } from './common/settings/settings.base';
@@ -306,6 +303,9 @@ import { DesktopBase } from './common/io/desktop.base';
 import { FileAccessBase } from './common/io/file-access.base';
 import { FileMetadataFactoryBase } from './common/metadata/file-metadata.factory.base';
 import { SchedulerBase } from './common/scheduling/scheduler.base';
+import { ContextMenuOpener } from './ui/components/context-menu-opener';
+import { PathValidator } from './common/validation/path-validator';
+import { FileValidator } from './common/validation/file-validator';
 
 export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader {
     return new TranslateHttpLoader(http, './assets/i18n/', '.json');

src/app/common/api/git-hub/git-hub.api.ts

@@ -7,7 +7,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Strings } from '../../strings';
+import { StringUtils } from '../../utils/string-utils';
 
 @Injectable()
 export class GitHubApi {
@@ -26,7 +26,7 @@ export class GitHubApi {
         }
 
         if (latestRelease != undefined && latestRelease.tag_name != undefined) {
-            return Strings.replaceFirst(latestRelease.tag_name, 'v', '');
+            return StringUtils.replaceFirst(latestRelease.tag_name, 'v', '');
         }
 
         return '';

src/app/common/api/lastfm/lastfm-album.ts

@@ -1,4 +1,4 @@
-import { Strings } from '../../strings';
+import { StringUtils } from '../../utils/string-utils';
 
 export class LastfmAlbum {
     public name: string;
@@ -11,23 +11,23 @@ export class LastfmAlbum {
     public imageMega: string;
 
     public largestImage(): string {
-        if (!Strings.isNullOrWhiteSpace(this.imageMega)) {
+        if (!StringUtils.isNullOrWhiteSpace(this.imageMega)) {
             return this.imageMega;
         }
 
-        if (!Strings.isNullOrWhiteSpace(this.imageExtraLarge)) {
+        if (!StringUtils.isNullOrWhiteSpace(this.imageExtraLarge)) {
             return this.imageExtraLarge;
         }
 
-        if (!Strings.isNullOrWhiteSpace(this.imageLarge)) {
+        if (!StringUtils.isNullOrWhiteSpace(this.imageLarge)) {
             return this.imageLarge;
         }
 
-        if (!Strings.isNullOrWhiteSpace(this.imageMedium)) {
+        if (!StringUtils.isNullOrWhiteSpace(this.imageMedium)) {
             return this.imageMedium;
         }
 
-        if (!Strings.isNullOrWhiteSpace(this.imageSmall)) {
+        if (!StringUtils.isNullOrWhiteSpace(this.imageSmall)) {
             return this.imageSmall;
         }
 

src/app/common/api/lastfm/lastfm-artist.ts

@@ -1,5 +1,5 @@
-import { Strings } from '../../strings';
 import { LastfmBiography } from './lastfm-biography';
+import { StringUtils } from '../../utils/string-utils';
 
 export class LastfmArtist {
     public name: string;
@@ -14,23 +14,23 @@ export class LastfmArtist {
     public biography: LastfmBiography | undefined;
 
     public largestImage(): string {
-        if (!Strings.isNullOrWhiteSpace(this.imageMega)) {
+        if (!StringUtils.isNullOrWhiteSpace(this.imageMega)) {
             return this.imageMega;
         }
 
-        if (!Strings.isNullOrWhiteSpace(this.imageExtraLarge)) {
+        if (!StringUtils.isNullOrWhiteSpace(this.imageExtraLarge)) {
             return this.imageExtraLarge;
         }
 
-        if (!Strings.isNullOrWhiteSpace(this.imageLarge)) {
+        if (!StringUtils.isNullOrWhiteSpace(this.imageLarge)) {
             return this.imageLarge;
         }
 
-        if (!Strings.isNullOrWhiteSpace(this.imageMedium)) {
+        if (!StringUtils.isNullOrWhiteSpace(this.imageMedium)) {
             return this.imageMedium;
         }
 
-        if (!Strings.isNullOrWhiteSpace(this.imageSmall)) {
+        if (!StringUtils.isNullOrWhiteSpace(this.imageSmall)) {
             return this.imageSmall;
         }
 

src/app/common/api/lastfm/lastfm.api.ts

@@ -10,10 +10,10 @@ import { Md5 } from 'md5-typescript';
 import fetch from 'node-fetch';
 import { SensitiveInformation } from '../../application/sensitive-information';
 import { DateTime } from '../../date-time';
-import { Strings } from '../../strings';
 import { LastfmAlbum } from './lastfm-album';
 import { LastfmArtist } from './lastfm-artist';
 import { LastfmBiography } from './lastfm-biography';
+import {StringUtils} from "../../utils/string-utils";
 
 @Injectable()
 export class LastfmApi {
@@ -47,7 +47,7 @@ export class LastfmApi {
             ['api_key', SensitiveInformation.lastfmApiKey],
         ]);
 
-        if (!Strings.isNullOrWhiteSpace(languageCode)) {
+        if (!StringUtils.isNullOrWhiteSpace(languageCode)) {
             parameters.set('lang', languageCode);
         }
 
@@ -102,7 +102,7 @@ export class LastfmApi {
             ['api_key', SensitiveInformation.lastfmApiKey],
         ]);
 
-        if (!Strings.isNullOrWhiteSpace(languageCode)) {
+        if (!StringUtils.isNullOrWhiteSpace(languageCode)) {
             parameters.set('lang', languageCode);
         }
 
@@ -129,7 +129,7 @@ export class LastfmApi {
         artist: string,
         trackTitle: string,
         albumTitle: string,
-        playbackStartTime: Date
+        playbackStartTime: Date,
     ): Promise<boolean> {
         let isScrobbleSuccessful: boolean = false;
 
@@ -143,7 +143,7 @@ export class LastfmApi {
             ['sk', sessionKey],
         ]);
 
-        if (!Strings.isNullOrWhiteSpace(albumTitle)) {
+        if (!StringUtils.isNullOrWhiteSpace(albumTitle)) {
             parameters.set('album', albumTitle);
         }
 
@@ -171,7 +171,7 @@ export class LastfmApi {
             ['sk', sessionKey],
         ]);
 
-        if (!Strings.isNullOrWhiteSpace(albumTitle)) {
+        if (!StringUtils.isNullOrWhiteSpace(albumTitle)) {
             parameters.set('album', albumTitle);
         }
 

src/app/common/api/lyrics/web-search-lyrics/sources/a-z-lyrics-source.ts

@@ -1,7 +1,7 @@
 import { IWebSearchLyricsSource } from './i-web-search-lyrics-source';
 import htmlParser from 'node-html-parser';
 import { HTMLElement } from 'node-html-parser';
-import { Strings } from '../../../../strings';
+import { StringUtils } from '../../../../utils/string-utils';
 
 export class AZLyricsSource implements IWebSearchLyricsSource {
     public get name(): string {
@@ -20,10 +20,10 @@ export class AZLyricsSource implements IWebSearchLyricsSource {
 
         const content: string | undefined = possibleContent?.textContent.trim();
 
-        if (Strings.isNullOrWhiteSpace(content)) {
+        if (StringUtils.isNullOrWhiteSpace(content)) {
             return '';
         }
 
-        return Strings.replaceAll(content!, '\n\n', '\n');
+        return StringUtils.replaceAll(content!, '\n\n', '\n');
     }
 }

src/app/common/api/lyrics/web-search-lyrics/web-search-lyrics.api.ts

@@ -6,12 +6,12 @@ import { WebSearchResult } from './web-search-result';
 import { WebSearchApi } from './web-search.api';
 import { IWebSearchLyricsSource } from './sources/i-web-search-lyrics-source';
 import { AZLyricsSource } from './sources/a-z-lyrics-source';
-import { Strings } from '../../../strings';
 import { HttpClient } from '@angular/common/http';
 import { GeniusSource } from './sources/genius-source';
 import { MusixmatchSource } from './sources/musixmatch-source';
 import { LyricsSource } from './sources/lyrics-source';
 import { Logger } from '../../../logger';
+import { StringUtils } from '../../../utils/string-utils';
 
 @Injectable()
 export class WebSearchLyricsApi implements ILyricsApi {
@@ -43,13 +43,13 @@ export class WebSearchLyricsApi implements ILyricsApi {
             webSearchResults.filter((x: WebSearchResult) => [...this.sources.keys()].includes(x.name)) || [];
 
         for (const possibleSite of possibleSites) {
-            if (!Strings.isNullOrWhiteSpace(possibleSite.name)) {
+            if (!StringUtils.isNullOrWhiteSpace(possibleSite.name)) {
                 try {
                     const source: IWebSearchLyricsSource = this.sources.get(possibleSite.name)!;
                     const htmlString: string = await this.httpClient.get(possibleSite.fullUrl, { responseType: 'text' }).toPromise();
                     const lyricsText: string = source.parse(htmlString);
 
-                    if (Strings.isNullOrWhiteSpace(lyricsText)) {
+                    if (StringUtils.isNullOrWhiteSpace(lyricsText)) {
                         continue;
                     }
 

src/app/common/api/lyrics/web-search-lyrics/web-search.api.ts

@@ -8,7 +8,7 @@ import { Injectable } from '@angular/core';
 
 import { HttpClient } from '@angular/common/http';
 import { WebSearchResult } from './web-search-result';
-import { Strings } from '../../../strings';
+import { StringUtils } from '../../../utils/string-utils';
 
 @Injectable()
 export class WebSearchApi {
@@ -20,14 +20,14 @@ export class WebSearchApi {
     public async webSearchAsync(query: string): Promise<WebSearchResult[]> {
         const vqd: string = await this.getVqdAsync(query);
 
-        if (Strings.isNullOrWhiteSpace(vqd)) {
+        if (StringUtils.isNullOrWhiteSpace(vqd)) {
             throw new Error(`Failed to get the VQD for query "${query}".`);
         }
 
         const requestUrl: string = `https://links.duckduckgo.com/d.js?${this.getSearchRequestParams(query, vqd).toString()}`;
         const responseString: string = await this.performGetRequestAsync(requestUrl);
 
-        if (Strings.isNullOrWhiteSpace(responseString)) {
+        if (StringUtils.isNullOrWhiteSpace(responseString)) {
             return [];
         }
 
@@ -39,7 +39,7 @@ export class WebSearchApi {
 
         const rawSearchResults: string = matches[1].replace(/\\t/g, ' ');
 
-        if (Strings.isNullOrWhiteSpace(rawSearchResults)) {
+        if (StringUtils.isNullOrWhiteSpace(rawSearchResults)) {
             return [];
         }
 

src/app/common/native-element-proxy.ts

@@ -11,10 +11,6 @@ export class NativeElementProxy {
             return 0;
         }
 
-        // if (!(element.nativeElement instanceof HTMLElement)) {
-        //     return 0;
-        // }
-
         const htmlElement: HTMLElement = element.nativeElement;
 
         if (htmlElement.offsetWidth == undefined) {

src/app/common/semantic-zoomable.ts

@@ -1,5 +1,5 @@
 import { Constants } from './application/constants';
-import { Strings } from './strings';
+import { StringUtils } from './utils/string-utils';
 
 export abstract class SemanticZoomable {
     public abstract name: string;
@@ -8,7 +8,7 @@ export abstract class SemanticZoomable {
     public isZoomHeader: boolean = false;
 
     public get sortableName(): string {
-        return Strings.getSortableString(this.name, true);
+        return StringUtils.getSortableString(this.name, true);
     }
 
     public get zoomHeader(): string {

src/app/common/collections.ts → src/app/common/utils/collections-utils.ts

@@ -1,4 +1,4 @@
-export class Collections {
+export class CollectionUtils {
     public static groupBy<S, T>(list: T[], keyGetter: (T) => S): Map<S, T[]> {
         const map: Map<S, T[]> = new Map();