From 99980028d0a6371df2adfb73c5885df193fe4d1a Mon Sep 17 00:00:00 2001 From: mProjectsCode Date: Thu, 5 May 2022 21:03:47 +0200 Subject: [PATCH] release year in title --- src/api/apis/OMDbAPI.ts | 4 ++-- src/modals/MediaDbSearchResultModal.ts | 2 +- src/models/MediaTypeModel.ts | 1 + src/models/MovieModel.ts | 2 +- src/utils/Utils.ts | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/api/apis/OMDbAPI.ts b/src/api/apis/OMDbAPI.ts index 02af6f6..85072f4 100644 --- a/src/api/apis/OMDbAPI.ts +++ b/src/api/apis/OMDbAPI.ts @@ -36,7 +36,7 @@ export class OMDbAPI extends APIModel { for (const value of data.Search) { if (value.Type === 'movie') { - ret.push(new MovieModel({title: value.Title, id: value.imdbID, dataSource: this.apiName, type: 'movie'} as MovieModel)); + ret.push(new MovieModel({title: value.Title, id: value.imdbID, dataSource: this.apiName, type: 'movie', premiere: value.Year} as MovieModel)); } } @@ -54,7 +54,7 @@ export class OMDbAPI extends APIModel { const data = await fetchData.json(); if (data.Type === 'movie') { - const model = new MovieModel({title: data.Title, id: data.imdbID, dataSource: this.apiName, type: 'movie'} as MovieModel); + const model = new MovieModel({title: data.Title, id: data.imdbID, dataSource: this.apiName, type: 'movie', premiere: data.Year} as MovieModel); // TODO: mapping diff --git a/src/modals/MediaDbSearchResultModal.ts b/src/modals/MediaDbSearchResultModal.ts index 0106f02..0686ed1 100644 --- a/src/modals/MediaDbSearchResultModal.ts +++ b/src/modals/MediaDbSearchResultModal.ts @@ -20,7 +20,7 @@ export class MediaDbSearchResultModal extends SuggestModal { // Renders each suggestion item. renderSuggestion(item: MediaTypeModel, el: HTMLElement) { - el.createEl('div', {text: item.title}); + el.createEl('div', {text: item.premiere ? `${item.title} (${item.premiere})` : `${item.title}`}); el.createEl('small', {text: `${item.type} from ${item.dataSource}`}); } diff --git a/src/models/MediaTypeModel.ts b/src/models/MediaTypeModel.ts index a57ba4b..58e8e0d 100644 --- a/src/models/MediaTypeModel.ts +++ b/src/models/MediaTypeModel.ts @@ -1,6 +1,7 @@ export abstract class MediaTypeModel { type: string; title: string; + premiere: string; dataSource: string; id: string; diff --git a/src/models/MovieModel.ts b/src/models/MovieModel.ts index 7bb3fd3..3b2e446 100644 --- a/src/models/MovieModel.ts +++ b/src/models/MovieModel.ts @@ -5,6 +5,7 @@ import {stringifyYaml} from 'obsidian'; export class MovieModel extends MediaTypeModel { type: string; title: string; + premiere: string; dataSource: string; id: string; @@ -15,7 +16,6 @@ export class MovieModel extends MediaTypeModel { image: string; released: boolean; - premiere: string; watched: boolean; lastWatched: string; diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts index 80cdb0b..d6d4ba2 100644 --- a/src/utils/Utils.ts +++ b/src/utils/Utils.ts @@ -9,7 +9,7 @@ export function sleep(ms: number) { } export function getFileName(item: MediaTypeModel) { - return replaceIllegalFileNameCharactersInString(item.title); + return replaceIllegalFileNameCharactersInString(item.premiere ? `${item.title} (${item.premiere})` : `${item.title}`); } export function replaceIllegalFileNameCharactersInString(string: string) {