From 0157c0adf9241da718ffaf68375a34fe3f6fb4bb Mon Sep 17 00:00:00 2001 From: ltctceplrm <14954927+ltctceplrm@users.noreply.github.com> Date: Thu, 1 Feb 2024 18:20:56 +0100 Subject: [PATCH] Added media type passed along with the apis to query and the title --- src/api/APIManager.ts | 4 ++-- src/main.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/APIManager.ts b/src/api/APIManager.ts index 527eee3..bae09fa 100644 --- a/src/api/APIManager.ts +++ b/src/api/APIManager.ts @@ -18,12 +18,12 @@ export class APIManager { * @param query * @param apisToQuery */ - async query(query: string, apisToQuery: string[]): Promise { + async query(query: string, apisToQuery: string[], mediaType: string): Promise { console.debug(`MDB | api manager queried with "${query}"`); let res: MediaTypeModel[] = []; for (const api of this.apis) { - if (apisToQuery.contains(api.apiName) && (this.plugin.settings[[api.apiName, "game"].filter(s => s).join('') as keyof typeof this.plugin.settings] || this.plugin.settings[[api.apiName, "default"].filter(s => s).join('') as keyof typeof this.plugin.settings])) { + if (apisToQuery.contains(api.apiName) && (this.plugin.settings[[api.apiName, mediaType].filter(s => s).join('') as keyof typeof this.plugin.settings] || this.plugin.settings[[api.apiName, "default"].filter(s => s).join('') as keyof typeof this.plugin.settings])) { const apiRes = await api.searchByTitle(query); res = res.concat(apiRes); } diff --git a/src/main.ts b/src/main.ts index 9858c7b..7b96a1e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -156,7 +156,7 @@ export default class MediaDbPlugin extends Plugin { */ async createLinkWithSearchModal(): Promise { const apiSearchResults: MediaTypeModel[] = await this.modalHelper.openAdvancedSearchModal({}, async advancedSearchModalData => { - return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis); + return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis, "default"); }); if (!apiSearchResults) { @@ -186,7 +186,7 @@ export default class MediaDbPlugin extends Plugin { let apiSearchResults: MediaTypeModel[] = await this.modalHelper.openSearchModal(searchModalOptions ?? {}, async searchModalData => { types = searchModalData.types; const apis = this.apiManager.apis.filter(x => x.hasTypeOverlap(searchModalData.types)).map(x => x.apiName); - return await this.apiManager.query(searchModalData.query, apis); + return await this.apiManager.query(searchModalData.query, apis, searchModalData.types.toString()); }); if (!apiSearchResults) { @@ -218,7 +218,7 @@ export default class MediaDbPlugin extends Plugin { async createEntryWithAdvancedSearchModal(): Promise { const apiSearchResults: MediaTypeModel[] = await this.modalHelper.openAdvancedSearchModal({}, async advancedSearchModalData => { - return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis); + return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis, "default"); }); if (!apiSearchResults) { @@ -570,7 +570,7 @@ export default class MediaDbPlugin extends Plugin { let results: MediaTypeModel[] = []; try { - results = await this.apiManager.query(title, [selectedAPI]); + results = await this.apiManager.query(title, [selectedAPI], "default"); } catch (e) { erroredFiles.push({ filePath: file.path, error: e.toString() }); continue;