fix(parser): date parser issue for chinese in older w issues

sws2apps · Sep 17, 2024 · 6ded852 · 6ded852
1 parent 55768fb
commit 6ded852
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 48 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/common/date_parser.ts b/src/common/date_parser.ts
@@ -1,11 +1,5 @@
 import { JWEPUBParserError } from '../classes/error.js';
-import {
-  WDateParsing,
-  WDateParsingResult,
-  LangRegExp,
-  MWBDateParsingResult,
-  MWBDateParsing,
-} from '../types/index.js';
+import { WDateParsing, WDateParsingResult, LangRegExp, MWBDateParsingResult, MWBDateParsing } from '../types/index.js';
 import { getMonthNames } from './language_rules.js';
 
 const dateRangeSeparator = `\\s? bis |[-–—]| do | — | – \\s?`;
@@ -179,7 +173,7 @@ option2 = `(${wordWithDiacritics}) (\\d{1,2}), (\\d{4})`;
 const wDatePatternE = `${option1}|${option2}`;
 
 // date like 1-) 2024年12月16-22日; or 2) 2024年12月30日-2025年1月5日
-option1 = `(\\d{4})年(\\d{1,2})月(\\d{1,2})[-–](\\d{1,2})日`;
+option1 = `(\\d{4})年(\\d{1,2})月(\\d{1,2})[-–～](\\d{1,2})日`;
 option2 = `(\\d{4})年(\\d{1,2})月(\\d{1,2})日`;
 const wDatePatternJ = `${option1}|${option2}`;
 

diff --git a/src/node/index.ts b/src/node/index.ts
@@ -1,43 +1,14 @@
 import './utils.node.js';
-import { parseMWBSchedule, parseWSchedule, startParse } from '../common/parser.js';
+import { startParse } from '../common/parser.js';
 import { validateInput } from '../common/epub_validation.js';
-import { HTMLParse } from '../common/html_validation.js';
 
 export const loadEPUB = async (epubInput: string | Blob | { url: string }) => {
-	try {
-		validateInput(epubInput);
-
-		const data = await startParse(epubInput);
-		return data;
-	} catch (err) {
-		console.error(err);
-	}
-};
-
-export const parseMWB = (htmlString: string, mwbYear: number, mwbLang: string) => {
-	try {
-		// convert string to html
-		const htmlItem = HTMLParse(htmlString);
-		const article = htmlItem.querySelector('article')!;
-
-		// Step: Start Parsing
-		const data = parseMWBSchedule(article, mwbYear, mwbLang);
-		return data;
-	} catch (err) {
-		console.error(err);
-	}
-};
-
-export const parseW = (articleString: string, contentString: string, wLang: string) => {
-	try {
-		// convert string to html
-		const article = HTMLParse(articleString);
-		const content = HTMLParse(contentString);
-
-		// Step: Start Parsing
-		const data = parseWSchedule(article, content, wLang);
-		return data;
-	} catch (err) {
-		console.error(err);
-	}
+  try {
+    validateInput(epubInput);
+
+    const data = await startParse(epubInput);
+    return data;
+  } catch (err) {
+    console.error(err);
+  }
 };