From 5eec98d127e549f6d5d59407dff2d6d2daca7ea5 Mon Sep 17 00:00:00 2001 From: ltctceplrm <14954927+ltctceplrm@users.noreply.github.com> Date: Sat, 16 Mar 2024 14:18:14 +0100 Subject: [PATCH] Ran formatter, removed unused array and updated APIModel.ts --- src/api/APIManager.ts | 2 +- src/api/APIModel.ts | 5 +-- src/main.ts | 2 +- src/modals/MediaDbAdvancedSearchModal.ts | 24 ++++++------- src/modals/MediaDbSearchModal.ts | 6 ++-- src/settings/Settings.ts | 46 ++++++++++++------------ src/utils/MediaTypeManager.ts | 2 +- src/utils/Utils.ts | 2 +- 8 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/api/APIManager.ts b/src/api/APIManager.ts index 8cec919..17f0f36 100644 --- a/src/api/APIManager.ts +++ b/src/api/APIManager.ts @@ -18,7 +18,7 @@ export class APIManager { console.debug(`MDB | api manager queried with "${query}"`); let res: MediaTypeModel[] = []; - + for (const api of this.apis) { if (apisToQuery.contains(api.apiName)) { const apiRes = await api.searchByTitle(query); diff --git a/src/api/APIModel.ts b/src/api/APIModel.ts index 1dc05da..1088367 100644 --- a/src/api/APIModel.ts +++ b/src/api/APIModel.ts @@ -1,5 +1,6 @@ import { MediaTypeModel } from '../models/MediaTypeModel'; import { MediaType } from '../utils/MediaType'; +import { MediaDbPluginSettings } from 'src/settings/Settings'; import MediaDbPlugin from '../main'; export abstract class APIModel { @@ -19,7 +20,7 @@ export abstract class APIModel { abstract getById(id: string): Promise; hasType(type: MediaType): boolean { - if (this.types.contains(type) && !(this.plugin.settings[[this.apiName, type].filter(s => s).join('') as keyof typeof this.plugin.settings] === false)){ + if (this.types.contains(type) && !(this.plugin.settings[(this.apiName + type) as keyof MediaDbPluginSettings] === false)) { return true; } } @@ -32,4 +33,4 @@ export abstract class APIModel { } return false; } -} \ No newline at end of file +} diff --git a/src/main.ts b/src/main.ts index af8a5cb..46f0b7d 100644 --- a/src/main.ts +++ b/src/main.ts @@ -671,4 +671,4 @@ export default class MediaDbPlugin extends Plugin { await this.saveData(this.settings); } -} \ No newline at end of file +} diff --git a/src/modals/MediaDbAdvancedSearchModal.ts b/src/modals/MediaDbAdvancedSearchModal.ts index 3093ac0..9a79ac1 100644 --- a/src/modals/MediaDbAdvancedSearchModal.ts +++ b/src/modals/MediaDbAdvancedSearchModal.ts @@ -89,20 +89,20 @@ export class MediaDbAdvancedSearchModal extends Modal { for (const api of this.plugin.apiManager.apis) { const apiToggleListElementWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' }); - const apiToggleTextWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' }); - apiToggleTextWrapper.createEl('span', { text: api.apiName, cls: 'media-db-plugin-list-text' }); - apiToggleTextWrapper.createEl('small', { text: api.apiDescription, cls: 'media-db-plugin-list-text' }); + const apiToggleTextWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' }); + apiToggleTextWrapper.createEl('span', { text: api.apiName, cls: 'media-db-plugin-list-text' }); + apiToggleTextWrapper.createEl('small', { text: api.apiDescription, cls: 'media-db-plugin-list-text' }); - const apiToggleComponentWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-toggle' }); + const apiToggleComponentWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-toggle' }); - const apiToggleComponent = new ToggleComponent(apiToggleComponentWrapper); - apiToggleComponent.setTooltip(api.apiName); - apiToggleComponent.setValue(this.selectedApis.find(x => x.name === api.apiName).selected); - apiToggleComponent.onChange(value => { - this.selectedApis.find(x => x.name === api.apiName).selected = value; - }); - apiToggleComponentWrapper.appendChild(apiToggleComponent.toggleEl); - } + const apiToggleComponent = new ToggleComponent(apiToggleComponentWrapper); + apiToggleComponent.setTooltip(api.apiName); + apiToggleComponent.setValue(this.selectedApis.find(x => x.name === api.apiName).selected); + apiToggleComponent.onChange(value => { + this.selectedApis.find(x => x.name === api.apiName).selected = value; + }); + apiToggleComponentWrapper.appendChild(apiToggleComponent.toggleEl); + } contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); diff --git a/src/modals/MediaDbSearchModal.ts b/src/modals/MediaDbSearchModal.ts index b27c64f..5e3cb99 100644 --- a/src/modals/MediaDbSearchModal.ts +++ b/src/modals/MediaDbSearchModal.ts @@ -76,9 +76,8 @@ export class MediaDbSearchModal extends Modal { const placeholder = 'Search by title'; const searchComponent = new TextComponent(contentEl); - const toggleComponents = []; let currentToggle: ToggleComponent = null; - + searchComponent.inputEl.style.width = '100%'; searchComponent.setPlaceholder(placeholder); searchComponent.setValue(this.query); @@ -119,7 +118,6 @@ export class MediaDbSearchModal extends Modal { } }); apiToggleComponentWrapper.appendChild(apiToggleComponent.toggleEl); - toggleComponents.push(apiToggleComponent); } contentEl.createDiv({ cls: 'media-db-plugin-spacer' }); @@ -146,4 +144,4 @@ export class MediaDbSearchModal extends Modal { const { contentEl } = this; contentEl.empty(); } -} \ No newline at end of file +} diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts index 76b7e63..5acf317 100644 --- a/src/settings/Settings.ts +++ b/src/settings/Settings.ts @@ -176,7 +176,7 @@ export class MediaDbSettingTab extends PluginSettingTab { }); }); - new Setting(containerEl) + new Setting(containerEl) .setName('Moby Games key') .setDesc('API key for "www.mobygames.com".') .addText(cb => { @@ -223,10 +223,10 @@ export class MediaDbSettingTab extends PluginSettingTab { .setDesc( fragWithHTML( "Your custom date format. Use 'YYYY-MM-DD' for example.
" + - "For more syntax, refer to format reference.
" + - "Your current syntax looks like this: " + - this.plugin.dateFormatter.getPreview() + - '', + "For more syntax, refer to format reference.
" + + "Your current syntax looks like this: " + + this.plugin.dateFormatter.getPreview() + + '', ), ) .addText(cb => { @@ -278,23 +278,23 @@ export class MediaDbSettingTab extends PluginSettingTab { containerEl.createEl('h3', { text: 'APIs Per Media Type' }); containerEl.createEl('h5', { text: 'Movies' }); new Setting(containerEl) - .setName('OMDb API') - .setDesc('Use OMDb API for movies.') - .addToggle(cb => { - cb.setValue(this.plugin.settings.OMDbAPImovie).onChange(data => { - this.plugin.settings.OMDbAPImovie = data; - this.plugin.saveSettings(); + .setName('OMDb API') + .setDesc('Use OMDb API for movies.') + .addToggle(cb => { + cb.setValue(this.plugin.settings.OMDbAPImovie).onChange(data => { + this.plugin.settings.OMDbAPImovie = data; + this.plugin.saveSettings(); + }); }); - }); new Setting(containerEl) - .setName('MAL API') - .setDesc('Use MAL API for movies.') - .addToggle(cb => { - cb.setValue(this.plugin.settings.MALAPImovie).onChange(data => { - this.plugin.settings.MALAPImovie = data; - this.plugin.saveSettings(); + .setName('MAL API') + .setDesc('Use MAL API for movies.') + .addToggle(cb => { + cb.setValue(this.plugin.settings.MALAPImovie).onChange(data => { + this.plugin.settings.MALAPImovie = data; + this.plugin.saveSettings(); + }); }); - }); containerEl.createEl('h5', { text: 'Series' }); new Setting(containerEl) .setName('OMDb API') @@ -305,7 +305,7 @@ export class MediaDbSettingTab extends PluginSettingTab { this.plugin.saveSettings(); }); }); - new Setting(containerEl) + new Setting(containerEl) .setName('MAL API') .setDesc('Use MAL API for series.') .addToggle(cb => { @@ -315,7 +315,7 @@ export class MediaDbSettingTab extends PluginSettingTab { }); }); containerEl.createEl('h5', { text: 'Games' }); - new Setting(containerEl) + new Setting(containerEl) .setName('OMDb API') .setDesc('Use OMDb API for games.') .addToggle(cb => { @@ -324,7 +324,7 @@ export class MediaDbSettingTab extends PluginSettingTab { this.plugin.saveSettings(); }); }); - new Setting(containerEl) + new Setting(containerEl) .setName('Steam API') .setDesc('Use OMDb API for games.') .addToggle(cb => { @@ -333,7 +333,7 @@ export class MediaDbSettingTab extends PluginSettingTab { this.plugin.saveSettings(); }); }); - new Setting(containerEl) + new Setting(containerEl) .setName('MobyGames API') .setDesc('Use MobyGames API for games.') .addToggle(cb => { diff --git a/src/utils/MediaTypeManager.ts b/src/utils/MediaTypeManager.ts index 54679af..50ec761 100644 --- a/src/utils/MediaTypeManager.ts +++ b/src/utils/MediaTypeManager.ts @@ -28,7 +28,7 @@ export class MediaTypeManager { mediaTemplateMap: Map; mediaFolderMap: Map; - constructor() {} + constructor() { } updateTemplates(settings: MediaDbPluginSettings): void { this.mediaFileNameTemplateMap = new Map(); diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts index ccb21b9..56cb080 100644 --- a/src/utils/Utils.ts +++ b/src/utils/Utils.ts @@ -207,7 +207,7 @@ export function unCamelCase(str: string): string { // space before last upper in a sequence followed by lower .replace(/\b([A-Z]+)([A-Z])([a-z])/, '$1 $2$3') // uppercase the first character - .replace(/^./, function (str) { + .replace(/^./, function(str) { return str.toUpperCase(); }) );