Skip to content

Commit 675a0f7

Browse files
committed
Removed "default" setting and only check if media type is false or not
1 parent 0157c0a commit 675a0f7

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

src/api/APIManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class APIManager {
2323

2424
let res: MediaTypeModel[] = [];
2525
for (const api of this.apis) {
26-
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])) {
26+
if (apisToQuery.contains(api.apiName) && !(this.plugin.settings[[api.apiName, mediaType].filter(s => s).join('') as keyof typeof this.plugin.settings] === false)) {
2727
const apiRes = await api.searchByTitle(query);
2828
res = res.concat(apiRes);
2929
}

src/main.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ export default class MediaDbPlugin extends Plugin {
156156
*/
157157
async createLinkWithSearchModal(): Promise<void> {
158158
const apiSearchResults: MediaTypeModel[] = await this.modalHelper.openAdvancedSearchModal({}, async advancedSearchModalData => {
159-
return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis, "default");
159+
return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis, "");
160160
});
161161

162162
if (!apiSearchResults) {
@@ -218,7 +218,7 @@ export default class MediaDbPlugin extends Plugin {
218218

219219
async createEntryWithAdvancedSearchModal(): Promise<void> {
220220
const apiSearchResults: MediaTypeModel[] = await this.modalHelper.openAdvancedSearchModal({}, async advancedSearchModalData => {
221-
return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis, "default");
221+
return await this.apiManager.query(advancedSearchModalData.query, advancedSearchModalData.apis, "");
222222
});
223223

224224
if (!apiSearchResults) {
@@ -570,7 +570,7 @@ export default class MediaDbPlugin extends Plugin {
570570

571571
let results: MediaTypeModel[] = [];
572572
try {
573-
results = await this.apiManager.query(title, [selectedAPI], "default");
573+
results = await this.apiManager.query(title, [selectedAPI], "");
574574
} catch (e) {
575575
erroredFiles.push({ filePath: file.path, error: e.toString() });
576576
continue;

src/modals/MediaDbAdvancedSearchModal.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ export class MediaDbAdvancedSearchModal extends Modal {
8787

8888
// const apiToggleComponents: Component[] = [];
8989
for (const api of this.plugin.apiManager.apis) {
90-
if (this.plugin.settings[[api.apiName, "default"].filter(s => s).join('') as keyof typeof this.plugin.settings] || this.plugin.settings[[api.apiName, "game"].filter(s => s).join('') as keyof typeof this.plugin.settings] || this.plugin.settings[[api.apiName, "series"].filter(s => s).join('') as keyof typeof this.plugin.settings] || this.plugin.settings[[api.apiName, "movie"].filter(s => s).join('') as keyof typeof this.plugin.settings]) {
91-
const apiToggleListElementWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' });
90+
const apiToggleListElementWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' });
9291

9392
const apiToggleTextWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' });
9493
apiToggleTextWrapper.createEl('span', { text: api.apiName, cls: 'media-db-plugin-list-text' });
@@ -104,7 +103,6 @@ export class MediaDbAdvancedSearchModal extends Modal {
104103
});
105104
apiToggleComponentWrapper.appendChild(apiToggleComponent.toggleEl);
106105
}
107-
}
108106

109107
contentEl.createDiv({ cls: 'media-db-plugin-spacer' });
110108

src/settings/Settings.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ export interface MediaDbPluginSettings {
2626
MALAPIseries: boolean;
2727
SteamAPIgame: boolean;
2828
MobyGamesAPIgame: boolean;
29-
BoardGameGeekAPIdefault: boolean;
30-
MALAPIMangadefault: boolean;
31-
MusicBrainzAPIdefault: boolean;
32-
OpenLibraryAPIdefault: boolean;
33-
WikipediaAPIdefault: boolean;
3429

3530
movieTemplate: string;
3631
seriesTemplate: string;
@@ -88,11 +83,6 @@ const DEFAULT_SETTINGS: MediaDbPluginSettings = {
8883
MALAPImovie: true,
8984
SteamAPIgame: true,
9085
MobyGamesAPIgame: true,
91-
BoardGameGeekAPIdefault: true,
92-
MALAPIMangadefault: true,
93-
MusicBrainzAPIdefault: true,
94-
OpenLibraryAPIdefault: true,
95-
WikipediaAPIdefault: true,
9686

9787
movieTemplate: '',
9888
seriesTemplate: '',

0 commit comments

Comments
 (0)