Ran prettier and commented out VNDBAPI that I forgot to remove
Just in case I forget: ` bun prettier . --write`
This commit is contained in:
parent
d89d8be189
commit
540a772e6d
5 changed files with 37 additions and 40 deletions
|
|
@ -56,7 +56,7 @@ export class ComicVineAPI extends APIModel {
|
||||||
const fetchData = await requestUrl({
|
const fetchData = await requestUrl({
|
||||||
url: searchUrl,
|
url: searchUrl,
|
||||||
});
|
});
|
||||||
|
|
||||||
console.debug(fetchData);
|
console.debug(fetchData);
|
||||||
|
|
||||||
if (fetchData.status !== 200) {
|
if (fetchData.status !== 200) {
|
||||||
|
|
@ -68,31 +68,30 @@ export class ComicVineAPI extends APIModel {
|
||||||
const result = data.results;
|
const result = data.results;
|
||||||
|
|
||||||
return new ComicMangaModel({
|
return new ComicMangaModel({
|
||||||
type: MediaType.ComicManga,
|
type: MediaType.ComicManga,
|
||||||
title: result.name,
|
title: result.name,
|
||||||
englishTitle: result.name,
|
englishTitle: result.name,
|
||||||
alternateTitles: result.aliases,
|
alternateTitles: result.aliases,
|
||||||
plot: result.deck,
|
plot: result.deck,
|
||||||
year: result.start_year ?? '',
|
year: result.start_year ?? '',
|
||||||
dataSource: this.apiName,
|
dataSource: this.apiName,
|
||||||
url: result.site_detail_url,
|
url: result.site_detail_url,
|
||||||
id: `4050-${result.id}`,
|
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) ?? [],
|
released: true,
|
||||||
chapters: result.count_of_issues,
|
publishers: result.publisher?.name ?? [],
|
||||||
image: result.image?.original_url ?? '',
|
publishedFrom: result.start_year ?? 'unknown',
|
||||||
|
publishedTo: 'unknown',
|
||||||
|
status: result.status,
|
||||||
|
|
||||||
released: true,
|
userData: {
|
||||||
publishers: result.publisher?.name ?? [],
|
read: false,
|
||||||
publishedFrom: result.start_year ?? 'unknown',
|
lastRead: '',
|
||||||
publishedTo: 'unknown',
|
personalRating: 0,
|
||||||
status: result.status,
|
|
||||||
|
|
||||||
userData: {
|
|
||||||
read: false,
|
|
||||||
lastRead: '',
|
|
||||||
personalRating: 0,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
21
src/main.ts
21
src/main.ts
|
|
@ -12,7 +12,7 @@ import { OpenLibraryAPI } from './api/apis/OpenLibraryAPI';
|
||||||
import { SteamAPI } from './api/apis/SteamAPI';
|
import { SteamAPI } from './api/apis/SteamAPI';
|
||||||
import { WikipediaAPI } from './api/apis/WikipediaAPI';
|
import { WikipediaAPI } from './api/apis/WikipediaAPI';
|
||||||
import { ComicVineAPI } from './api/apis/ComicVineAPI';
|
import { ComicVineAPI } from './api/apis/ComicVineAPI';
|
||||||
import { VNDBAPI } from './api/apis/VNDBAPI';
|
//import { VNDBAPI } from './api/apis/VNDBAPI';
|
||||||
import { MediaDbFolderImportModal } from './modals/MediaDbFolderImportModal';
|
import { MediaDbFolderImportModal } from './modals/MediaDbFolderImportModal';
|
||||||
import type { MediaTypeModel } from './models/MediaTypeModel';
|
import type { MediaTypeModel } from './models/MediaTypeModel';
|
||||||
import { PropertyMapper } from './settings/PropertyMapper';
|
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 ComicVineAPI(this));
|
||||||
this.apiManager.registerAPI(new MobyGamesAPI(this));
|
this.apiManager.registerAPI(new MobyGamesAPI(this));
|
||||||
this.apiManager.registerAPI(new GiantBombAPI(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.apiManager.registerAPI(new LocGovAPI(this)); // TODO: parse data
|
||||||
|
|
||||||
this.mediaTypeManager = new MediaTypeManager();
|
this.mediaTypeManager = new MediaTypeManager();
|
||||||
|
|
@ -542,37 +542,36 @@ export default class MediaDbPlugin extends Plugin {
|
||||||
if (!activeFile) {
|
if (!activeFile) {
|
||||||
throw new Error('MDB | there is no active note');
|
throw new Error('MDB | there is no active note');
|
||||||
}
|
}
|
||||||
|
|
||||||
let metadata = this.getMetadataFromFileCache(activeFile);
|
let metadata = this.getMetadataFromFileCache(activeFile);
|
||||||
metadata = this.modelPropertyMapper.convertObjectBack(metadata);
|
metadata = this.modelPropertyMapper.convertObjectBack(metadata);
|
||||||
|
|
||||||
console.debug(`MDB | read metadata`, metadata);
|
console.debug(`MDB | read metadata`, metadata);
|
||||||
|
|
||||||
if (!metadata?.type || !metadata?.dataSource || !metadata?.id) {
|
if (!metadata?.type || !metadata?.dataSource || !metadata?.id) {
|
||||||
throw new Error('MDB | active note is not a Media DB entry or is missing metadata');
|
throw new Error('MDB | active note is not a Media DB entry or is missing metadata');
|
||||||
}
|
}
|
||||||
|
|
||||||
const validOldMetadata: MediaTypeModelObj = metadata as unknown as MediaTypeModelObj;
|
const validOldMetadata: MediaTypeModelObj = metadata as unknown as MediaTypeModelObj;
|
||||||
console.debug(`MDB | validOldMetadata`, validOldMetadata);
|
console.debug(`MDB | validOldMetadata`, validOldMetadata);
|
||||||
|
|
||||||
const oldMediaTypeModel = this.mediaTypeManager.createMediaTypeModelFromMediaType(validOldMetadata, validOldMetadata.type);
|
const oldMediaTypeModel = this.mediaTypeManager.createMediaTypeModelFromMediaType(validOldMetadata, validOldMetadata.type);
|
||||||
console.debug(`MDB | oldMediaTypeModel created`, oldMediaTypeModel);
|
console.debug(`MDB | oldMediaTypeModel created`, oldMediaTypeModel);
|
||||||
|
|
||||||
let newMediaTypeModel = await this.apiManager.queryDetailedInfoById(validOldMetadata.id, validOldMetadata.dataSource);
|
let newMediaTypeModel = await this.apiManager.queryDetailedInfoById(validOldMetadata.id, validOldMetadata.dataSource);
|
||||||
if (!newMediaTypeModel) {
|
if (!newMediaTypeModel) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
newMediaTypeModel = Object.assign(oldMediaTypeModel, newMediaTypeModel.getWithOutUserData());
|
newMediaTypeModel = Object.assign(oldMediaTypeModel, newMediaTypeModel.getWithOutUserData());
|
||||||
console.debug(`MDB | newMediaTypeModel after merge`, newMediaTypeModel);
|
console.debug(`MDB | newMediaTypeModel after merge`, newMediaTypeModel);
|
||||||
|
|
||||||
if (onlyMetadata) {
|
if (onlyMetadata) {
|
||||||
await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachFile: activeFile, folder: activeFile.parent ?? undefined, openNote: true });
|
await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachFile: activeFile, folder: activeFile.parent ?? undefined, openNote: true });
|
||||||
} else {
|
} else {
|
||||||
await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachTemplate: true, folder: activeFile.parent ?? undefined, openNote: true });
|
await this.createMediaDbNoteFromModel(newMediaTypeModel, { attachTemplate: true, folder: activeFile.parent ?? undefined, openNote: true });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async createEntriesFromFolder(folder: TFolder): Promise<void> {
|
async createEntriesFromFolder(folder: TFolder): Promise<void> {
|
||||||
const erroredFiles: { filePath: string; error: string }[] = [];
|
const erroredFiles: { filePath: string; error: string }[] = [];
|
||||||
|
|
|
||||||
|
|
@ -71,4 +71,4 @@ export class ComicMangaModel extends MediaTypeModel {
|
||||||
getSummary(): string {
|
getSummary(): string {
|
||||||
return this.title + ' (' + this.year + ')';
|
return this.title + ' (' + this.year + ')';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -62,12 +62,11 @@ export class PropertyMapper {
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (obj.type === 'manga') {
|
||||||
if (obj.type === "manga") {
|
obj.type = 'comicManga';
|
||||||
obj.type = "comicManga";
|
|
||||||
console.debug(`MDB | updated metadata type`, obj.type);
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -219,7 +219,7 @@ export class MediaDbSettingTab extends PluginSettingTab {
|
||||||
void this.plugin.saveSettings();
|
void this.plugin.saveSettings();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
new Setting(containerEl)
|
new Setting(containerEl)
|
||||||
.setName('Comic Vine Key')
|
.setName('Comic Vine Key')
|
||||||
.setDesc('API key for "www.comicvine.gamespot.com".')
|
.setDesc('API key for "www.comicvine.gamespot.com".')
|
||||||
.addText(cb => {
|
.addText(cb => {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue