Merge pull request #230 from hjyssg/dev_frontend_0615

Bug fixing

src/TamperMonkeyScript/EhentaiHighighliger_many_request.js

@@ -123,9 +123,10 @@ async function highlightEhentaiThumbnail() {
 
             e.status = 0;
             if (text.includes("翻訳") || text.includes("翻译")) {
-                return;
+                continue;
             }
             const rr = parse(text);
+            console.log(`${ii}/${nodes.length}  ${text}`)
             const { status, similarTitles } = await checkIfDownload(text);
             e.status = status || 0;
             if (status === IS_IN_PC) {

src/client/AdminPage.js

@@ -315,6 +315,7 @@ export default class AdminPage extends Component {
 
                 <div className="author-link">
                     <a className="fab fa-github" title="Aji47's Github" href="https://github.com/hjyssg/ShiguReader" target="_blank"> Created By Aji47 </a>
+                    <img src="/public/favicon-96x96.png"></img>
                 </div>
             </div>)
 

src/client/OneBook.js

@@ -549,8 +549,6 @@ export default class OneBook extends Component {
   }
 
   onImageError() {
-    // https://stackoverflow.com/questions/5559578/having-links-relative-to-root
-    this.imgRef.src = "/error_loading.png";
     this.hideSpinner()
   }
 

src/client/subcomponent/BookImage.js

@@ -33,6 +33,9 @@ function BookImage(props, ref) {
   const onImageError = (error) => {
     console.error(error);
     onError && onError();
+
+    // https://stackoverflow.com/questions/5559578/having-links-relative-to-root
+    // this.imgRef.src = "/error_loading.png";
   };
 
 

src/name-parser/index.js

@@ -69,7 +69,7 @@ const sankuri_reg = /^サンクリ.*\d+/;
 const reitaisai_reg = /^例大祭.*\d+/;
 const tora_reg = /^とら祭り.*\d+/;
 const komitore_reg = /^こみトレ.*\d+/;
-const reg_list = [comicket_reg, air_comicket_reg, comicket_reg_2, comic_star_reg, love_live_event_reg,
+const reg_list = [comicket_reg_2, comicket_reg, air_comicket_reg, comic_star_reg, love_live_event_reg,
     comitea_reg, sankuri_reg, reitaisai_reg,
     tora_reg, komitore_reg, /みみけっと.*\d+/,
     /コミトレ.*\d+/, /FF\d+/, /iDOL SURVIVAL.*\d/i,
@@ -106,6 +106,16 @@ function getDateFromComiket(comiket) {
 
     if (comiket_to_date_table[comiket]) {
         result = comiket_to_date_table[comiket];
+    } else if (comiket.match(comicket_reg_2)) {
+        comiket = comiket.replace("C", "");
+        num = parseInt(comiket);
+        result = new Date(2022, 8, 13);
+
+        year = Math.floor(num / 2) + 2022;
+        const isSummer = num % 2 === 0;
+        month = isSummer ? 8 : 11;
+        const day = isSummer ? 10 : 28;
+        result = new Date(year, month, day);
     } else if (comiket.match(comicket_reg)) {
         comiket = comiket.replace("C", "");
         num = parseInt(comiket);
@@ -122,10 +132,6 @@ function getDateFromComiket(comiket) {
         } else {
             result = new Date(2020, 11, 30);
         }
-    } else if (comiket.match(comicket_reg_2)) {
-        comiket = comiket.replace("C", "");
-        num = parseInt(comiket);
-        result = new Date(2022, 8, 13);
     } else if (comiket.match(comic_star_reg)) {
         comiket = comiket.replace("COMIC1☆", "");
         num = parseInt(comiket);

src/test/parser.test.js

@@ -147,9 +147,16 @@ describe("name parser", () => {
   });
 
   it("tag time calculation", () => {
+    const C102T = parser
+    .getDateFromParse("(C102)[ fake_author ] apple")
+    .getTime();
     const C101T = parser
     .getDateFromParse("(C101)[ fake_author ] apple")
     .getTime();
+    const C100T = parser
+    .getDateFromParse("(C100)[ fake_author ] apple")
+    .getTime();
+
     const C96T = parser
       .getDateFromParse("(C96)[ fake_author ] apple")
       .getTime();
@@ -186,7 +193,11 @@ describe("name parser", () => {
     assert(C91T > C87T);
     assert(C85T > C84T);
     assert(C84T > C72T);
-    assert(C101T > C96T);
+
+    assert(C100T > C96T);
+    assert(C101T > C100T);
+    assert(C102T > C101T);
+
 
     const air2 = parser.getDateFromParse("(エアコミケ2) [ちんちん亭 (chin)] 12132").getTime();
     assert(air2 > C96T);