Made several improvements

- Replaced interpolated string to a new function getDisabledMediaTypes()
- Added override for every API with the plugin settings for disabled media types
- Added _disabledMediaTypes for API's even if they are the only provider of a media type
- Replaced static apiMediaTypes to a dynamic version
This commit is contained in:
ltctceplrm 2025-03-08 02:35:09 +01:00
parent 666ca1e93b
commit 72198abd33
12 changed files with 69 additions and 33 deletions

View file

@ -18,8 +18,10 @@ export abstract class APIModel {
abstract getById(id: string): Promise<MediaTypeModel>; abstract getById(id: string): Promise<MediaTypeModel>;
abstract getDisabledMediaTypes(): MediaType[];
hasType(type: MediaType): boolean { hasType(type: MediaType): boolean {
const disabledMediaTypes = this.plugin.settings[`${this.apiName}_disabledMediaTypes` as keyof typeof this.plugin.settings] as MediaType[]; const disabledMediaTypes = this.getDisabledMediaTypes();
return this.types.includes(type) && !disabledMediaTypes.includes(type); return this.types.includes(type) && !disabledMediaTypes.includes(type);
} }

View file

@ -117,4 +117,7 @@ export class BoardGameGeekAPI extends APIModel {
}, },
}); });
} }
getDisabledMediaTypes(): MediaType[] {
return this.plugin.settings.BoardgameGeekAPI_disabledMediaTypes as MediaType[];
}
} }

View file

@ -95,4 +95,7 @@ export class ComicVineAPI extends APIModel {
}, },
}); });
} }
getDisabledMediaTypes(): MediaType[] {
return this.plugin.settings.ComicVineAPI_disabledMediaTypes as MediaType[];
}
} }

View file

@ -106,4 +106,7 @@ export class GiantBombAPI extends APIModel {
}, },
}); });
} }
getDisabledMediaTypes(): MediaType[] {
return this.plugin.settings.GiantBombAPI_disabledMediaTypes as MediaType[];
}
} }

View file

@ -195,4 +195,7 @@ export class MALAPI extends APIModel {
throw new Error(`MDB | Unknown media type for id ${id}`); throw new Error(`MDB | Unknown media type for id ${id}`);
} }
getDisabledMediaTypes(): MediaType[] {
return this.plugin.settings.MALAPI_disabledMediaTypes as MediaType[];
}
} }

View file

@ -107,4 +107,7 @@ export class MobyGamesAPI extends APIModel {
}, },
}); });
} }
getDisabledMediaTypes(): MediaType[] {
return this.plugin.settings.MobyGamesAPI_disabledMediaTypes as MediaType[];
}
} }

View file

@ -99,4 +99,7 @@ export class MusicBrainzAPI extends APIModel {
}, },
}); });
} }
getDisabledMediaTypes(): MediaType[] {
return this.plugin.settings.MusicBrainzAPI_disabledMediaTypes as MediaType[];
}
} }

View file

@ -223,4 +223,8 @@ export class OMDbAPI extends APIModel {
throw new Error(`MDB | Unknown media type for id ${id}`); throw new Error(`MDB | Unknown media type for id ${id}`);
} }
getDisabledMediaTypes(): MediaType[] {
return this.plugin.settings.OMDbAPI_disabledMediaTypes as MediaType[];
}
} }

View file

@ -89,4 +89,7 @@ export class OpenLibraryAPI extends APIModel {
}, },
}); });
} }
getDisabledMediaTypes(): MediaType[] {
return this.plugin.settings.OpenLibraryAPI_disabledMediaTypes as MediaType[];
}
} }

View file

@ -109,4 +109,7 @@ export class SteamAPI extends APIModel {
}, },
}); });
} }
getDisabledMediaTypes(): MediaType[] {
return this.plugin.settings.SteamAPI_disabledMediaTypes as MediaType[];
}
} }

View file

@ -79,4 +79,7 @@ export class WikipediaAPI extends APIModel {
userData: {}, userData: {},
}); });
} }
getDisabledMediaTypes(): MediaType[] {
return this.plugin.settings.WikipediaAPI_disabledMediaTypes as MediaType[];
}
} }

View file

@ -9,6 +9,7 @@ import { PropertyMapping, PropertyMappingModel, PropertyMappingOption } from './
import PropertyMappingModelsComponent from './PropertyMappingModelsComponent.svelte'; import PropertyMappingModelsComponent from './PropertyMappingModelsComponent.svelte';
import { FileSuggest } from './suggesters/FileSuggest'; import { FileSuggest } from './suggesters/FileSuggest';
import { FolderSuggest } from './suggesters/FolderSuggest'; import { FolderSuggest } from './suggesters/FolderSuggest';
import type { MediaType } from 'src/utils/MediaType';
export interface MediaDbPluginSettings { export interface MediaDbPluginSettings {
OMDbKey: string; OMDbKey: string;
@ -28,6 +29,10 @@ export interface MediaDbPluginSettings {
SteamAPI_disabledMediaTypes: string[]; SteamAPI_disabledMediaTypes: string[];
MobyGamesAPI_disabledMediaTypes: string[]; MobyGamesAPI_disabledMediaTypes: string[];
GiantBombAPI_disabledMediaTypes: string[]; GiantBombAPI_disabledMediaTypes: string[];
WikipediaAPI_disabledMediaTypes: string[];
BoardgameGeekAPI_disabledMediaTypes: string[];
MusicBrainzAPI_disabledMediaTypes: string[];
OpenLibraryAPI_disabledMediaTypes: string[];
movieTemplate: string; movieTemplate: string;
seriesTemplate: string; seriesTemplate: string;
mangaTemplate: string; mangaTemplate: string;
@ -85,6 +90,10 @@ const DEFAULT_SETTINGS: MediaDbPluginSettings = {
SteamAPI_disabledMediaTypes: [], SteamAPI_disabledMediaTypes: [],
MobyGamesAPI_disabledMediaTypes: [], MobyGamesAPI_disabledMediaTypes: [],
GiantBombAPI_disabledMediaTypes: [], GiantBombAPI_disabledMediaTypes: [],
WikipediaAPI_disabledMediaTypes: [],
BoardgameGeekAPI_disabledMediaTypes: [],
MusicBrainzAPI_disabledMediaTypes: [],
OpenLibraryAPI_disabledMediaTypes: [],
movieTemplate: '', movieTemplate: '',
seriesTemplate: '', seriesTemplate: '',
mangaTemplate: '', mangaTemplate: '',
@ -291,23 +300,14 @@ export class MediaDbSettingTab extends PluginSettingTab {
// Create a map to store APIs for each media type // Create a map to store APIs for each media type
const mediaTypeApiMap = new Map<string, string[]>(); const mediaTypeApiMap = new Map<string, string[]>();
const apiMediaTypes = {
OMDbAPI: ['movie', 'series', 'game'],
MALAPI: ['movie', 'series'],
MALAPIManga: ['comicManga'],
ComicVineAPI: ['comicManga'],
SteamAPI: ['game'],
MobyGamesAPI: ['game'],
GiantBombAPI: ['game'],
};
// Populate the map with APIs for each media type // Populate the map with APIs for each media type dynamically
for (const [api, mediaTypes] of Object.entries(apiMediaTypes)) { for (const api of this.plugin.apiManager.apis) {
for (const mediaType of mediaTypes) { for (const MediaType of api.types) {
if (!mediaTypeApiMap.has(mediaType)) { if (!mediaTypeApiMap.has(MediaType)) {
mediaTypeApiMap.set(mediaType, []); mediaTypeApiMap.set(MediaType, []);
} }
mediaTypeApiMap.get(mediaType)!.push(api); mediaTypeApiMap.get(MediaType)!.push(api.apiName);
} }
} }
@ -315,26 +315,29 @@ export class MediaDbSettingTab extends PluginSettingTab {
const filteredMediaTypes = Array.from(mediaTypeApiMap.entries()).filter(([_, apis]) => apis.length > 1); const filteredMediaTypes = Array.from(mediaTypeApiMap.entries()).filter(([_, apis]) => apis.length > 1);
// Dynamically create settings based on the filtered media types and their APIs // Dynamically create settings based on the filtered media types and their APIs
for (const [mediaType, apis] of filteredMediaTypes) { for (const [MediaType, apis] of filteredMediaTypes) {
new Setting(containerEl).setName(`Select APIs for ${unCamelCase(mediaType)}`).setHeading(); new Setting(containerEl).setName(`Select APIs for ${unCamelCase(MediaType)}`).setHeading();
for (const apiName of apis) { for (const apiName of apis) {
const disabledMediaTypes = this.plugin.settings[`${apiName}_disabledMediaTypes` as keyof typeof this.plugin.settings] as string[]; const api = this.plugin.apiManager.apis.find(api => api.apiName === apiName);
new Setting(containerEl) if (api) {
.setName(apiName) const disabledMediaTypes = api.getDisabledMediaTypes();
.setDesc(`Use ${apiName} API for ${unCamelCase(mediaType)}.`) new Setting(containerEl)
.addToggle(cb => { .setName(apiName)
cb.setValue(!disabledMediaTypes.includes(mediaType)).onChange(data => { .setDesc(`Use ${apiName} API for ${unCamelCase(MediaType)}.`)
if (data) { .addToggle(cb => {
const index = disabledMediaTypes.indexOf(mediaType); cb.setValue(!disabledMediaTypes.includes(MediaType as MediaType)).onChange(data => {
if (index > -1) { if (data) {
disabledMediaTypes.splice(index, 1); const index = disabledMediaTypes.indexOf(MediaType as MediaType);
if (index > -1) {
disabledMediaTypes.splice(index, 1);
}
} else {
disabledMediaTypes.push(MediaType as MediaType);
} }
} else { void this.plugin.saveSettings();
disabledMediaTypes.push(mediaType); });
}
void this.plugin.saveSettings();
}); });
}); }
} }
} }