fix(rules): update week date extraction for watchtower

sws2apps · Aug 8, 2024 · 42a5ad4 · 42a5ad4
1 parent aafe90f
commit 42a5ad4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/common/parsing_rules.ts b/src/common/parsing_rules.ts
@@ -141,7 +141,14 @@ export const extractWTStudyDate = (src: string, lang: string) => {
         const monthNames = getMonthNames(lang);
 
         for (const splitted of split) {
+          const results = <{ month: number; index: number }[]>[];
+
           for (const month of monthNames) {
+            const obj = {
+              month: month.index,
+              index: -1,
+            };
+
             const monthLang = month.name.toLowerCase();
             let searchKey = `(${monthLang})`;
 
@@ -153,29 +160,37 @@ export const extractWTStudyDate = (src: string, lang: string) => {
             const array2 = regex.exec(splitted);
 
             if (Array.isArray(array2)) {
-              if (array2.index < 29) {
-                const regex = /\d+/g;
-                const match = textSearch.match(regex);
+              obj.index = array2.index;
+            }
 
-                if (lang === 'J') {
-                  varDay = +match![2];
-                }
+            results.push(obj);
+          }
 
-                if (lang !== 'J') {
-                  varDay = +match![0];
-                }
+          const monthsParsed = results.filter((item) => item.index !== -1).sort((a, b) => a.index - b.index);
 
-                monthIndex = month.index;
+          if (monthsParsed.length > 0) {
+            const firstMonth = monthsParsed.at(0);
 
-                const findYear = /\b\d{4}\b/;
-                const array3 = findYear.exec(dateValue);
-                if (array3 !== null) {
-                  varYear = +array3[0];
-                }
+            const regex = /\d+/g;
+            const match = textSearch.match(regex);
 
-                break outerLoop;
-              }
+            if (lang === 'J') {
+              varDay = +match![2];
             }
+
+            if (lang !== 'J') {
+              varDay = +match![0];
+            }
+
+            monthIndex = firstMonth?.month;
+
+            const findYear = /\b\d{4}\b/;
+            const array3 = findYear.exec(dateValue);
+            if (array3 !== null) {
+              varYear = +array3[0];
+            }
+
+            break outerLoop;
           }
         }
       }