Skip to content

Commit 5eec98d

Browse files
ltctceplrmltctceplrm
committed
Ran formatter, removed unused array and updated APIModel.ts
1 parent f520604 commit 5eec98d

File tree

8 files changed

+44
-45
lines changed

8 files changed

+44
-45
lines changed

‎src/api/APIManager.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class APIManager {
1818
console.debug(`MDB | api manager queried with "${query}"`);
1919

2020
let res: MediaTypeModel[] = [];
21-
21+
2222
for (const api of this.apis) {
2323
if (apisToQuery.contains(api.apiName)) {
2424
const apiRes = await api.searchByTitle(query);

‎src/api/APIModel.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { MediaTypeModel } from '../models/MediaTypeModel';
22
import { MediaType } from '../utils/MediaType';
3+
import { MediaDbPluginSettings } from 'src/settings/Settings';
34
import MediaDbPlugin from '../main';
45

56
export abstract class APIModel {
@@ -19,7 +20,7 @@ export abstract class APIModel {
1920
abstract getById(id: string): Promise<MediaTypeModel>;
2021

2122
hasType(type: MediaType): boolean {
22-
if (this.types.contains(type) && !(this.plugin.settings[[this.apiName, type].filter(s => s).join('') as keyof typeof this.plugin.settings] === false)){
23+
if (this.types.contains(type) && !(this.plugin.settings[(this.apiName + type) as keyof MediaDbPluginSettings] === false)) {
2324
return true;
2425
}
2526
}
@@ -32,4 +33,4 @@ export abstract class APIModel {
3233
}
3334
return false;
3435
}
35-
}
36+
}

‎src/main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,4 @@ export default class MediaDbPlugin extends Plugin {
671671

672672
await this.saveData(this.settings);
673673
}
674-
}
674+
}

‎src/modals/MediaDbAdvancedSearchModal.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,20 +89,20 @@ export class MediaDbAdvancedSearchModal extends Modal {
8989
for (const api of this.plugin.apiManager.apis) {
9090
const apiToggleListElementWrapper = contentEl.createEl('div', { cls: 'media-db-plugin-list-wrapper' });
9191

92-
const apiToggleTextWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' });
93-
apiToggleTextWrapper.createEl('span', { text: api.apiName, cls: 'media-db-plugin-list-text' });
94-
apiToggleTextWrapper.createEl('small', { text: api.apiDescription, cls: 'media-db-plugin-list-text' });
92+
const apiToggleTextWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-text-wrapper' });
93+
apiToggleTextWrapper.createEl('span', { text: api.apiName, cls: 'media-db-plugin-list-text' });
94+
apiToggleTextWrapper.createEl('small', { text: api.apiDescription, cls: 'media-db-plugin-list-text' });
9595

96-
const apiToggleComponentWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-toggle' });
96+
const apiToggleComponentWrapper = apiToggleListElementWrapper.createEl('div', { cls: 'media-db-plugin-list-toggle' });
9797

98-
const apiToggleComponent = new ToggleComponent(apiToggleComponentWrapper);
99-
apiToggleComponent.setTooltip(api.apiName);
100-
apiToggleComponent.setValue(this.selectedApis.find(x => x.name === api.apiName).selected);
101-
apiToggleComponent.onChange(value => {
102-
this.selectedApis.find(x => x.name === api.apiName).selected = value;
103-
});
104-
apiToggleComponentWrapper.appendChild(apiToggleComponent.toggleEl);
105-
}
98+
const apiToggleComponent = new ToggleComponent(apiToggleComponentWrapper);
99+
apiToggleComponent.setTooltip(api.apiName);
100+
apiToggleComponent.setValue(this.selectedApis.find(x => x.name === api.apiName).selected);
101+
apiToggleComponent.onChange(value => {
102+
this.selectedApis.find(x => x.name === api.apiName).selected = value;
103+
});
104+
apiToggleComponentWrapper.appendChild(apiToggleComponent.toggleEl);
105+
}
106106

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

‎src/modals/MediaDbSearchModal.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,8 @@ export class MediaDbSearchModal extends Modal {
7676

7777
const placeholder = 'Search by title';
7878
const searchComponent = new TextComponent(contentEl);
79-
const toggleComponents = [];
8079
let currentToggle: ToggleComponent = null;
81-
80+
8281
searchComponent.inputEl.style.width = '100%';
8382
searchComponent.setPlaceholder(placeholder);
8483
searchComponent.setValue(this.query);
@@ -119,7 +118,6 @@ export class MediaDbSearchModal extends Modal {
119118
}
120119
});
121120
apiToggleComponentWrapper.appendChild(apiToggleComponent.toggleEl);
122-
toggleComponents.push(apiToggleComponent);
123121
}
124122

125123
contentEl.createDiv({ cls: 'media-db-plugin-spacer' });
@@ -146,4 +144,4 @@ export class MediaDbSearchModal extends Modal {
146144
const { contentEl } = this;
147145
contentEl.empty();
148146
}
149-
}
147+
}

‎src/settings/Settings.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
176176
});
177177
});
178178

179-
new Setting(containerEl)
179+
new Setting(containerEl)
180180
.setName('Moby Games key')
181181
.setDesc('API key for "www.mobygames.com".')
182182
.addText(cb => {
@@ -223,10 +223,10 @@ export class MediaDbSettingTab extends PluginSettingTab {
223223
.setDesc(
224224
fragWithHTML(
225225
"Your custom date format. Use <em>'YYYY-MM-DD'</em> for example.<br>" +
226-
"For more syntax, refer to <a href='https://momentjs.com/docs/#/displaying/format/'>format reference</a>.<br>" +
227-
"Your current syntax looks like this: <b><a id='media-db-dateformat-preview' style='pointer-events: none; cursor: default; text-decoration: none;'>" +
228-
this.plugin.dateFormatter.getPreview() +
229-
'</a></b>',
226+
"For more syntax, refer to <a href='https://momentjs.com/docs/#/displaying/format/'>format reference</a>.<br>" +
227+
"Your current syntax looks like this: <b><a id='media-db-dateformat-preview' style='pointer-events: none; cursor: default; text-decoration: none;'>" +
228+
this.plugin.dateFormatter.getPreview() +
229+
'</a></b>',
230230
),
231231
)
232232
.addText(cb => {
@@ -278,23 +278,23 @@ export class MediaDbSettingTab extends PluginSettingTab {
278278
containerEl.createEl('h3', { text: 'APIs Per Media Type' });
279279
containerEl.createEl('h5', { text: 'Movies' });
280280
new Setting(containerEl)
281-
.setName('OMDb API')
282-
.setDesc('Use OMDb API for movies.')
283-
.addToggle(cb => {
284-
cb.setValue(this.plugin.settings.OMDbAPImovie).onChange(data => {
285-
this.plugin.settings.OMDbAPImovie = data;
286-
this.plugin.saveSettings();
281+
.setName('OMDb API')
282+
.setDesc('Use OMDb API for movies.')
283+
.addToggle(cb => {
284+
cb.setValue(this.plugin.settings.OMDbAPImovie).onChange(data => {
285+
this.plugin.settings.OMDbAPImovie = data;
286+
this.plugin.saveSettings();
287+
});
287288
});
288-
});
289289
new Setting(containerEl)
290-
.setName('MAL API')
291-
.setDesc('Use MAL API for movies.')
292-
.addToggle(cb => {
293-
cb.setValue(this.plugin.settings.MALAPImovie).onChange(data => {
294-
this.plugin.settings.MALAPImovie = data;
295-
this.plugin.saveSettings();
290+
.setName('MAL API')
291+
.setDesc('Use MAL API for movies.')
292+
.addToggle(cb => {
293+
cb.setValue(this.plugin.settings.MALAPImovie).onChange(data => {
294+
this.plugin.settings.MALAPImovie = data;
295+
this.plugin.saveSettings();
296+
});
296297
});
297-
});
298298
containerEl.createEl('h5', { text: 'Series' });
299299
new Setting(containerEl)
300300
.setName('OMDb API')
@@ -305,7 +305,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
305305
this.plugin.saveSettings();
306306
});
307307
});
308-
new Setting(containerEl)
308+
new Setting(containerEl)
309309
.setName('MAL API')
310310
.setDesc('Use MAL API for series.')
311311
.addToggle(cb => {
@@ -315,7 +315,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
315315
});
316316
});
317317
containerEl.createEl('h5', { text: 'Games' });
318-
new Setting(containerEl)
318+
new Setting(containerEl)
319319
.setName('OMDb API')
320320
.setDesc('Use OMDb API for games.')
321321
.addToggle(cb => {
@@ -324,7 +324,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
324324
this.plugin.saveSettings();
325325
});
326326
});
327-
new Setting(containerEl)
327+
new Setting(containerEl)
328328
.setName('Steam API')
329329
.setDesc('Use OMDb API for games.')
330330
.addToggle(cb => {
@@ -333,7 +333,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
333333
this.plugin.saveSettings();
334334
});
335335
});
336-
new Setting(containerEl)
336+
new Setting(containerEl)
337337
.setName('MobyGames API')
338338
.setDesc('Use MobyGames API for games.')
339339
.addToggle(cb => {

‎src/utils/MediaTypeManager.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class MediaTypeManager {
2828
mediaTemplateMap: Map<MediaType, string>;
2929
mediaFolderMap: Map<MediaType, string>;
3030

31-
constructor() {}
31+
constructor() { }
3232

3333
updateTemplates(settings: MediaDbPluginSettings): void {
3434
this.mediaFileNameTemplateMap = new Map<MediaType, string>();

‎src/utils/Utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ export function unCamelCase(str: string): string {
207207
// space before last upper in a sequence followed by lower
208208
.replace(/\b([A-Z]+)([A-Z])([a-z])/, '$1 $2$3')
209209
// uppercase the first character
210-
.replace(/^./, function (str) {
210+
.replace(/^./, function(str) {
211211
return str.toUpperCase();
212212
})
213213
);

0 commit comments

Comments
 (0)