From 540a772e6d59fb9c515810600a0045902c9bac99 Mon Sep 17 00:00:00 2001 From: ltctceplrm <14954927+ltctceplrm@users.noreply.github.com> Date: Wed, 12 Feb 2025 00:31:57 +0100 Subject: [PATCH] Ran prettier and commented out VNDBAPI that I forgot to remove Just in case I forget: ` bun prettier . --write` --- src/api/apis/ComicVineAPI.ts | 45 +++++++++++++++++----------------- src/main.ts | 21 ++++++++-------- src/models/ComicMangaModel.ts | 2 +- src/settings/PropertyMapper.ts | 7 +++--- src/settings/Settings.ts | 2 +- 5 files changed, 37 insertions(+), 40 deletions(-) diff --git a/src/api/apis/ComicVineAPI.ts b/src/api/apis/ComicVineAPI.ts index 6cfad99..86c9bf8 100644 --- a/src/api/apis/ComicVineAPI.ts +++ b/src/api/apis/ComicVineAPI.ts @@ -56,7 +56,7 @@ export class ComicVineAPI extends APIModel { const fetchData = await requestUrl({ url: searchUrl, }); - + console.debug(fetchData); if (fetchData.status !== 200) { @@ -68,31 +68,30 @@ export class ComicVineAPI extends APIModel { const result = data.results; return new ComicMangaModel({ - type: MediaType.ComicManga, - title: result.name, - englishTitle: result.name, - alternateTitles: result.aliases, - plot: result.deck, - year: result.start_year ?? '', - dataSource: this.apiName, - url: result.site_detail_url, - id: `4050-${result.id}`, + type: MediaType.ComicManga, + title: result.name, + englishTitle: result.name, + alternateTitles: result.aliases, + plot: result.deck, + year: result.start_year ?? '', + dataSource: this.apiName, + url: result.site_detail_url, + id: `4050-${result.id}`, + authors: result.people?.map((x: any) => x.name) ?? [], + chapters: result.count_of_issues, + image: result.image?.original_url ?? '', - authors: result.people?.map((x: any) => x.name) ?? [], - chapters: result.count_of_issues, - image: result.image?.original_url ?? '', + released: true, + publishers: result.publisher?.name ?? [], + publishedFrom: result.start_year ?? 'unknown', + publishedTo: 'unknown', + status: result.status, - released: true, - publishers: result.publisher?.name ?? [], - publishedFrom: result.start_year ?? 'unknown', - publishedTo: 'unknown', - status: result.status, - - userData: { - read: false, - lastRead: '', - personalRating: 0, + userData: { + read: false, + lastRead: '', + personalRating: 0, }, }); } diff --git a/src/main.ts b/src/main.ts index f7e4f5f..7cdf43a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -12,7 +12,7 @@ import { OpenLibraryAPI } from './api/apis/OpenLibraryAPI'; import { SteamAPI } from './api/apis/SteamAPI'; import { WikipediaAPI } from './api/apis/WikipediaAPI'; import { ComicVineAPI } from './api/apis/ComicVineAPI'; -import { VNDBAPI } from './api/apis/VNDBAPI'; +//import { VNDBAPI } from './api/apis/VNDBAPI'; import { MediaDbFolderImportModal } from './modals/MediaDbFolderImportModal'; import type { MediaTypeModel } from './models/MediaTypeModel'; import { PropertyMapper } from './settings/PropertyMapper'; @@ -58,7 +58,7 @@ export default class MediaDbPlugin extends Plugin { this.apiManager.registerAPI(new ComicVineAPI(this)); this.apiManager.registerAPI(new MobyGamesAPI(this)); this.apiManager.registerAPI(new GiantBombAPI(this)); - this.apiManager.registerAPI(new VNDBAPI(this)); + //this.apiManager.registerAPI(new VNDBAPI(this)); // this.apiManager.registerAPI(new LocGovAPI(this)); // TODO: parse data this.mediaTypeManager = new MediaTypeManager(); @@ -542,37 +542,36 @@ export default class MediaDbPlugin extends Plugin { if (!activeFile) { throw new Error('MDB | there is no active note'); } - + let metadata = this.getMetadataFromFileCache(activeFile); metadata = this.modelPropertyMapper.convertObjectBack(metadata); - + console.debug(`MDB | read metadata`, metadata); - + if (!metadata?.type || !metadata?.dataSource || !metadata?.id) { throw new Error('MDB | active note is not a Media DB entry or is missing metadata'); } - + const validOldMetadata: MediaTypeModelObj = metadata as unknown as MediaTypeModelObj; console.debug(`MDB | validOldMetadata`, validOldMetadata); - + const oldMediaTypeModel = this.mediaTypeManager.createMediaTypeModelFromMediaType(validOldMetadata, validOldMetadata.type); console.debug(`MDB | oldMediaTypeModel created`, oldMediaTypeModel); - + let newMediaTypeModel = await this.apiManager.queryDetailedInfoById(validOldMetadata.id, validOldMetadata.dataSource); if (!newMediaTypeModel) { return; } - + newMediaTypeModel = Object.assign(oldMediaTypeModel, newMediaTypeModel.getWithOutUserData()); console.debug(`MDB | newMediaTypeModel after merge`, newMediaTypeModel); - + if (onlyMetadata) { await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachFile: activeFile, folder: activeFile.parent ?? undefined, openNote: true }); } else { await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachTemplate: true, folder: activeFile.parent ?? undefined, openNote: true }); } } - async createEntriesFromFolder(folder: TFolder): Promise { const erroredFiles: { filePath: string; error: string }[] = []; diff --git a/src/models/ComicMangaModel.ts b/src/models/ComicMangaModel.ts index 21bd282..5677d72 100644 --- a/src/models/ComicMangaModel.ts +++ b/src/models/ComicMangaModel.ts @@ -71,4 +71,4 @@ export class ComicMangaModel extends MediaTypeModel { getSummary(): string { return this.title + ' (' + this.year + ')'; } -} \ No newline at end of file +} diff --git a/src/settings/PropertyMapper.ts b/src/settings/PropertyMapper.ts index 53ad049..e3be2c5 100644 --- a/src/settings/PropertyMapper.ts +++ b/src/settings/PropertyMapper.ts @@ -62,12 +62,11 @@ export class PropertyMapper { return obj; } - - if (obj.type === "manga") { - obj.type = "comicManga"; + if (obj.type === 'manga') { + obj.type = 'comicManga'; console.debug(`MDB | updated metadata type`, obj.type); } - if (MEDIA_TYPES.contains(obj.type as any)) { + if (MEDIA_TYPES.contains(obj.type as any)) { return obj; } diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts index b02994e..f880a35 100644 --- a/src/settings/Settings.ts +++ b/src/settings/Settings.ts @@ -219,7 +219,7 @@ export class MediaDbSettingTab extends PluginSettingTab { void this.plugin.saveSettings(); }); }); - new Setting(containerEl) + new Setting(containerEl) .setName('Comic Vine Key') .setDesc('API key for "www.comicvine.gamespot.com".') .addText(cb => {