New branch for firefox

chungym · Dec 22, 2021 · 3926671 · 3926671
1 parent ebde4c7
commit 3926671
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 175 deletions.
diff --git a/background.html b/background.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Background Page</title>
   <script src="js/tesseract.min.js"></script>
-  <script src="js/opencv.js"></script>
+  <script src="https://docs.opencv.org/4.5.4/opencv.js"></script>
   <script src="js/background.js"></script>
 </head>
 <body>

diff --git a/js/background.js b/js/background.js
@@ -4,6 +4,7 @@ console.log("bg script");
 var scheduler;
 const { createWorker, createScheduler } = Tesseract;
 
+var loader_ready = false;
 
 chrome.runtime.onInstalled.addListener(async () => {
 
@@ -42,7 +43,10 @@ function handleMessage(message, sender, sendResponse) {
       break
 
     case "BG_fetch":
-      fetchImg(message.data, sender.tab.id);
+      if (loader_ready)
+      {
+        fetchImg(message.data, sender.tab.id);
+      }
       break
 
     case "BG_recognize_bubble":
@@ -71,9 +75,9 @@ function loadWorkers(){
 
   option = {
     workerPath: 'js/worker.min.js',
-    langPath: 'traineddata',
+    langPath: 'https://tessdata.projectnaptha.com/4.0.0_best',
     corePath: 'js/tesseract-core.wasm.js',
-    cacheMethod: 'none',
+    cacheMethod: 'write',
     // CRITICAL (Content Security Policy): workerBlobURL must be set to false
     // The page's settings blocked the loading of a resource at blob:moz-extension:// .../... ("script-src").
     // Check: spawnWorker.js
@@ -110,6 +114,7 @@ function loadWorkers(){
     }
 
     await chrome.storage.local.set({load_busy: false});
+    loader_ready = true;
     console.log('worker loaded');
 
   })();
@@ -119,6 +124,7 @@ function loadWorkers(){
 
 function terminateWorkers(){
 
+  loader_ready = false;
   (async () => {
 
   await chrome.storage.local.set({load_busy: true});

diff --git a/js/opencv.js b/js/opencv.js
diff --git a/js/tesseract-core.asm.js b/js/tesseract-core.asm.js
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
   "name": "Manga JS Translator",
   "version": "1.0",
   "manifest_version": 2,
-  "content_security_policy": "script-src 'self' 'unsafe-eval' blob:; object-src 'self'",
+  "content_security_policy": "script-src 'self' 'unsafe-eval' https://docs.opencv.org blob:; object-src 'self'",
   "permissions": [
     "tabs",
     "storage",

diff --git a/popup.css b/popup.css
@@ -1,6 +1,5 @@
-html, body {
+body {
   width: 250px;
-  height: 100px;
   margin: 0;
   padding: 0;
 }

diff --git a/traineddata/jpn_vert.traineddata.gz b/traineddata/jpn_vert.traineddata.gz