From a93da58a87e7a7b1ed9b57b81e43ac692c9d47aa Mon Sep 17 00:00:00 2001 From: Alperen Elhan Date: Fri, 4 Nov 2022 21:45:54 +0300 Subject: [PATCH] fix: pass include anilist manga to search --- src/server/trpc/router/manga.ts | 10 +++++----- src/server/utils/mangal.ts | 11 ++++++++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/server/trpc/router/manga.ts b/src/server/trpc/router/manga.ts index 7213f4b..c84b72b 100644 --- a/src/server/trpc/router/manga.ts +++ b/src/server/trpc/router/manga.ts @@ -175,8 +175,8 @@ export const mangaRouter = t.router({ mangaDetail.metadata.cover?.large || mangaDetail.metadata.cover?.medium, authors: mangaDetail.metadata.staff?.story ? [...mangaDetail.metadata.staff.story] : [], - characters: mangaDetail.metadata.characters, - genres: mangaDetail.metadata.genres, + characters: mangaDetail.metadata.characters ? [...mangaDetail.metadata.characters] : [], + genres: mangaDetail.metadata.genres ? [...mangaDetail.metadata.genres] : [], startDate: mangaDetail.metadata.startDate ? new Date( mangaDetail.metadata.startDate.year, @@ -193,9 +193,9 @@ export const mangaRouter = t.router({ : undefined, status: mangaDetail.metadata.status, summary: mangaDetail.metadata.summary, - synonyms: mangaDetail.metadata.synonyms, - tags: mangaDetail.metadata.tags, - urls: mangaDetail.metadata.urls, + synonyms: mangaDetail.metadata.synonyms ? [...mangaDetail.metadata.synonyms] : [], + tags: mangaDetail.metadata.tags ? [...mangaDetail.metadata.tags] : [], + urls: mangaDetail.metadata.urls ? [...mangaDetail.metadata.urls] : [], }, }, }, diff --git a/src/server/utils/mangal.ts b/src/server/utils/mangal.ts index 43a9aac..c7147a9 100644 --- a/src/server/utils/mangal.ts +++ b/src/server/utils/mangal.ts @@ -167,7 +167,15 @@ export const updateExistingMangaMetadata = async (libraryPath: string, title: st export const search = async (source: string, keyword: string): Promise => { try { - const { stdout, command } = await execa('mangal', ['inline', '--source', source, '--query', keyword, '-j']); + const { stdout, command } = await execa('mangal', [ + 'inline', + '--source', + source, + '--include-anilist-manga', + '--query', + keyword, + '-j', + ]); logger.info(`Search manga with following command: ${command}`); return JSON.parse(stdout); } catch (err) { @@ -216,6 +224,7 @@ export const getMangaDetail = async (source: string, title: string): Promise