null

.github/workflows/AutoRelease.yml

@@ -4,7 +4,7 @@ name: Auto release developer-build
 
 on:
   push:
-    branches: [ ExperimentalTabMode ] 
+    branches: [ ExperimentalTabMode ]
   workflow_dispatch:
     inputs:
       version:
@@ -21,11 +21,11 @@ jobs:
       matrix:
         node-version: [18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-        
+
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v6
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -34,7 +34,7 @@ jobs:
       shell: cmd
       run: |
         set version=${{ github.event.inputs.version }}
-        Get-Command "jq.exe"
+        where jq.exe
         jq.exe --version
 
         echo do some git configuration
@@ -49,20 +49,20 @@ jobs:
         )
 
         echo extract version numbers
-        jq.exe (.version^|split(\".\")^|map(tonumber)^|.[0]) < plugin/manifest.json > milestone_version.txt
-        jq.exe (.version^|split(\".\")^|map(tonumber)^|.[1]) < plugin/manifest.json > major_version.txt
-        jq.exe (.version^|split(\".\")^|map(tonumber)^|.[2]) < plugin/manifest.json > minor_version.txt
-        jq.exe (.version^|split(\".\")^|map(tonumber)^|.[3]) < plugin/manifest.json > dev_version.txt
-        
+        jq.exe "(.version | split(\".\") | map(tonumber) | .[0])" plugin/manifest.json > milestone_version.txt
+        jq.exe "(.version | split(\".\") | map(tonumber) | .[1])" plugin/manifest.json > major_version.txt
+        jq.exe "(.version | split(\".\") | map(tonumber) | .[2])" plugin/manifest.json > minor_version.txt
+        jq.exe "(.version | split(\".\") | map(tonumber) | .[3])" plugin/manifest.json > dev_version.txt
+
         set /p var_mil=<milestone_version.txt
         set /p var_maj=<major_version.txt
         set /p var_min=<minor_version.txt
         set /p var_dev=<dev_version.txt
-        jq.exe -r (.version^|split(\".\")^|map(tonumber)^|(.[0]^|=%var_mil%)^|(.[1]^|=%var_maj%)^|(.[2]^|=%var_min%)^|(.[3]^|=0)^|map(tostring)^|join(\".\")) < plugin/manifest.json > old_change_log_version.txt
+        jq.exe -r "(.version | split(\".\") | map(tonumber) | .[0] = %var_mil% | .[1] = %var_maj% | .[2] = %var_min% | .[3] = 0 | map(tostring) | join(\".\"))" plugin/manifest.json > old_change_log_version.txt
 
         set /p var_old_change_log_version=<old_change_log_version.txt
         echo save old_change_log_version with %var_old_change_log_version%
-        
+
         if "milestone"=="%version%" (
           echo if milestone
           set /A var_mil+=1
@@ -81,28 +81,52 @@ jobs:
               set /A var_min+=1
               set var_dev=0
             ) else (
-          	  echo else dev
+              echo else dev
               set /A var_dev+=1
             )
           )
         )
 
         echo save complete version number in new_version.txt
-        jq.exe (.version^|split(\".\")^|map(tonumber)^|(.[0]^|=%var_mil%)^|(.[1]^|=%var_maj%)^|(.[2]^|=%var_min%)^|(.[3]^|=%var_dev%)^|map(tostring)^|join(\".\")) < plugin/manifest.json > new_version.txt
+        jq.exe -r "(.version | split(\".\") | map(tonumber) | .[0] = %var_mil% | .[1] = %var_maj% | .[2] = %var_min% | .[3] = %var_dev% | map(tostring) | join(\".\"))" plugin/manifest.json > new_version.txt
         set /p var_build=<new_version.txt
 
         echo save new_manifest.json with new version number %var_build%
-        jq.exe (.version^|=\"%var_build%\") plugin/manifest.json > new_manifest.json
+        jq.exe --arg version "%var_build%" ".version = $version" plugin/manifest.json > new_manifest.json
         echo move new_manifest.json to manifest.json
         move /y new_manifest.json plugin/manifest.json
 
         echo cleanup new_version.txt
         jq.exe -r . new_version.txt > new_clean_version.txt
-        
+
         echo npm install/ run
     - run: npm install
     - run: npm run lint
-
+
+    - name: Install crx3
+      shell: bash
+      run: npm install -g crx3
+
+    - name: Restore PEM key
+      shell: bash
+      run: |
+        echo "${{ secrets.CRX_PRIVATE_KEY }}" | base64 -d > key.pem
+
+    - name: Build CRX
+      shell: bash
+      run: |
+        set -e
+
+        VERSION=$(cat new_clean_version.txt)
+
+        cd eslint
+        unzip -o "WebToEpub${VERSION}.zip" -d chrome_unpacked
+
+        crx3 --key=../key.pem chrome_unpacked
+
+        mv chrome_unpacked.crx "../WebToEpub${VERSION}.crx"
+        rm -rf chrome_unpacked
+
     - name: commit/ push git changes
       shell: cmd
       run: |
@@ -114,11 +138,11 @@ jobs:
         git push
         git rev-parse --verify HEAD > commit_sha.txt
 
-        
+
     - name: Release latest developer build
       shell: cmd
       run: |
-        
+
         set version=${{ github.event.inputs.version }}
 
         set /p var_build=<new_clean_version.txt
@@ -128,7 +152,7 @@ jobs:
         if "0.0.0.0" == "%var_old_change_log_version%" (
           set var_old_change_log_version=0.0.0.167
         )
-     
+
         if "milestone"=="%version%" (
           set normal_release=1
         ) else (
@@ -145,7 +169,7 @@ jobs:
 
         echo rename release files
         cd eslint
-        move /y WebToEpub%var_build%.xpi WebToEpub%var_build%.Firefox.zip
+        move /y WebToEpub%var_build%.xpi WebToEpub%var_build%.Firefox.xpi
         move /y WebToEpub%var_build%.zip WebToEpub%var_build%.Chrome.zip
         cd ..
 
@@ -160,30 +184,32 @@ jobs:
 
           echo create %var_build% release:
           gh release create %var_build% --latest -t "Release %var_build%" --target "ExperimentalTabMode" -F output.txt
-          
+
           echo add files to release.
-          gh release upload %var_build% eslint/WebToEpub%var_build%.Firefox.zip
+          gh release upload %var_build% eslint/WebToEpub%var_build%.Firefox.xpi
           gh release upload %var_build% eslint/WebToEpub%var_build%.Chrome.zip
+          gh release upload %var_build% WebToEpub%var_build%.crx
         ) else (
           echo Create developer-build release notes.
           echo Latest developer build of WebToEpub with the latest fixes. > output.txt
           echo To install the Addon pick the file suitable for you, >> output.txt
-          echo * WebToEpub%var_build%.Firefox.zip for Firefox >> output.txt
+          echo * WebToEpub%var_build%.Firefox.xpi for Firefox >> output.txt
           echo * WebToEpub%var_build%.Chrome.zip for Chrome >> output.txt
           echo.>> output.txt
           echo follow the "How to install from Source (for people who are not developers)" instructions at: https://github.com/dteviot/WebToEpub/tree/ExperimentalTabMode#user-content-installation>> output.txt
           echo.>> output.txt
           echo **Full Changelog**: https://github.com/dteviot/WebToEpub/compare/%var_old_change_log_version%...developer-build >> output.txt
 
           echo delete old developer-build release:
-          gh release delete developer-build --cleanup-tag
+          gh release delete developer-build --cleanup-tag --yes >nul 2>&1
 
           echo create developer-build release:
           gh release create developer-build -p -t "Latest developer build" --target "ExperimentalTabMode" -F output.txt
-          
+
           echo add files to release.
-          gh release upload developer-build eslint/WebToEpub%var_build%.Firefox.zip
+          gh release upload developer-build eslint/WebToEpub%var_build%.Firefox.xpi
           gh release upload developer-build eslint/WebToEpub%var_build%.Chrome.zip
+          gh release upload developer-build WebToEpub%var_build%.crx
         )
       env:
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ github.token }}

plugin/_locales/en/messages.json

@@ -368,8 +368,8 @@
 		"description": "Show more Metadata options to user"
 	},
 	"__MSG_label_Manual_Delay_Per_Chapter__": {
-		"message": "Delay per chapter in ms",
-		"description": "Delay per chapter in ms"
+		"message": "Manual Throttle|Delay per chapter",
+		"description": "Manual Throttle|Delay per chapter"
 	},
 	"__MSG_label_Manually_Select_Parser__": {
 		"message": "Manually Select Parser:",

plugin/css/default.css

@@ -107,15 +107,15 @@ button:disabled {
 }
 
 
-input[type=text], input[type=url], textarea, select, #manualDelayPerChapterTag {
+input[type=text], input[type=url], textarea, select {
     padding: 4px;
     border: 1px #CCC solid;
     border-radius: 3px;
     max-width: 400px;
     min-width: 356px;
 }
 
-#advancedOptionsSection textarea, #advancedOptionsSection select, #manualDelayPerChapterTag {
+#advancedOptionsSection textarea, #advancedOptionsSection select {
     min-width: inherit !important;
 }
 
@@ -321,4 +321,4 @@ button {
     }
     #sbFilters input[type=text], #sbFilters input[type=url], #sbFilters textarea, #sbFilters select {
         width: calc(100% - 15px);
-    }
+    }