feat: add some keywords

yjl9903 · Apr 12, 2023 · b6b1eb6 · b6b1eb6
1 parent 5c4005e
commit b6b1eb6
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/packages/anitomy/src/index.ts b/packages/anitomy/src/index.ts
@@ -53,8 +53,10 @@ export function resolveOptions(options: Partial<AnitomyOptions>): AnitomyOptions
 function resolveResult(result: ParsedResult): AnitomyResult {
   const resolved: AnitomyResult = {
     title: result['title'],
-    season: result['season'],
     type: result['type'],
+    season: result['season'],
+    year: result['year'],
+    month: undefined,
     language: result['language'],
     subtitles: result['subtitles'],
     episode: {

diff --git a/packages/anitomy/src/keyword.ts b/packages/anitomy/src/keyword.ts
@@ -174,7 +174,10 @@ export class KeywordManager {
       'TVRIP',
       'TV-RIP',
       'WEBCAST',
-      'WEBRIP'
+      'WEBDL',
+      'WEB-DL',
+      'WEBRIP',
+      'WEB-RIP'
     ]);
 
     // Language
@@ -185,7 +188,9 @@ export class KeywordManager {
       'JAP',
       'PT-BR',
       'SPANISH',
-      'VOSTFR'
+      'VOSTFR',
+      'CHT',
+      'CHS'
     ]);
     add(ElementCategory.Language, optionsUnidentifiable, ['ESP', 'ITA']);
 

diff --git a/packages/anitomy/src/parser/index.ts b/packages/anitomy/src/parser/index.ts
@@ -68,6 +68,10 @@ export function parse(tokens: Token[], options: AnitomyOptions) {
             word = word.slice(1);
             break;
           case ElementCategory.VolumePrefix:
+            result = mergeResult(
+              result,
+              checkExtentKeyword(ElementCategory.VolumeNumber, tokens, i)
+            );
             continue;
         }
       } else {

diff --git a/packages/anitomy/src/types.ts b/packages/anitomy/src/types.ts
@@ -17,9 +17,13 @@ export type ParsedResult = Partial<Record<ElementCategory, string>>;
 export interface AnitomyResult {
   title: string | undefined;
 
+  type: string | undefined;
+
   season: string | undefined;
 
-  type: string | undefined;
+  year: string | undefined;
+
+  month: string | undefined;
 
   language: string | undefined;
 

diff --git a/packages/anitomy/test/__snapshots__/index.test.ts.snap b/packages/anitomy/test/__snapshots__/index.test.ts.snap
@@ -15,7 +15,8 @@ exports[`parse > should work 1`] = `
     "extension": undefined,
     "name": "[Lilith-Raws] 熊熊勇闖異世界 PUNCH！ / Kuma Kuma Kuma Bear S02 - 02 [Baha][WEB-DL][1080p][AVC AAC][CHT][MP4]",
   },
-  "language": undefined,
+  "language": "CHT",
+  "month": undefined,
   "prefix": {
     "episode": undefined,
     "season": undefined,
@@ -32,6 +33,7 @@ exports[`parse > should work 1`] = `
   "volume": {
     "number": undefined,
   },
+  "year": undefined,
 }
 `;
 
@@ -50,7 +52,8 @@ exports[`parse > should work 2`] = `
     "extension": undefined,
     "name": "[ANi] 機動戰士鋼彈 水星的魔女 Season 2 - 13 [1080P][Baha][WEB-DL][AAC AVC][CHT][MP4]",
   },
-  "language": undefined,
+  "language": "CHT",
+  "month": undefined,
   "prefix": {
     "episode": undefined,
     "season": undefined,
@@ -67,6 +70,7 @@ exports[`parse > should work 2`] = `
   "volume": {
     "number": undefined,
   },
+  "year": undefined,
 }
 `;
 
@@ -86,6 +90,7 @@ exports[`parse > should work 3`] = `
     "name": "[爱恋字幕社][4月新番][魔法使的新娘2][Mahoutsukai no Yome S2][01][1080P][MP4][GB][简中]",
   },
   "language": undefined,
+  "month": undefined,
   "prefix": {
     "episode": undefined,
     "season": undefined,
@@ -102,6 +107,7 @@ exports[`parse > should work 3`] = `
   "volume": {
     "number": undefined,
   },
+  "year": undefined,
 }
 `;
 
@@ -121,6 +127,7 @@ exports[`parse > should work 4`] = `
     "name": "[桜都字幕组] 总之就是非常可爱 S2 / Tonikaku Kawaii S2 [01][1080p][简体内嵌]",
   },
   "language": undefined,
+  "month": undefined,
   "prefix": {
     "episode": undefined,
     "season": undefined,
@@ -137,6 +144,7 @@ exports[`parse > should work 4`] = `
   "volume": {
     "number": undefined,
   },
+  "year": undefined,
 }
 `;
 
@@ -156,6 +164,7 @@ exports[`parse > should work 5`] = `
     "name": "【喵萌奶茶屋】★04月新番★[百合是我的工作！/我的百合乃工作是也！/私の百合はお仕事です！/Watashi no Yuri wa Oshigoto desu!][01][720p][繁日雙語][招募翻譯校對]",
   },
   "language": undefined,
+  "month": undefined,
   "prefix": {
     "episode": undefined,
     "season": undefined,
@@ -172,5 +181,6 @@ exports[`parse > should work 5`] = `
   "volume": {
     "number": undefined,
   },
+  "year": undefined,
 }
 `;