From 03128c6b588a06f88d45df67a09d59fd34bbda63 Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Mon, 25 Apr 2022 01:27:36 +0100 Subject: [PATCH] Enable limited support for Zimit ZIMs #249 (#248) Former-commit-id: 7cec2025879b33b13fdec63c5ade01938ba42bab [formerly fb65802f6075bfd2de2f00c636b1c9f59b07a51f] [formerly 9d6091c79c2b24e714cb5214284aa1ebf2b0b0fb] [formerly db8e5eec98ea6333c6d34d6dd7e0c5c112a217aa [formerly cd8bb2cb5c381a6c936436cd9557f273d887264f [formerly 9b2a543c6c882c29e6889169fea914caa3136a32]]] Former-commit-id: a65562bd36582a4098179544d7f21aa8b80f6b18 [formerly f0c743ac1332a315dc2d5f6ab07819c9e2e686c5 [formerly 16371c7c46feca2993cac90d9c4a75ffb6bb264b]] Former-commit-id: c0629ff88c1118546471b0ac71e591eb8bf57ee5 [formerly 556babe8667fedfa263936450321e787b8cb522d] Former-commit-id: 86344e2f0b85c54f7af797613f0d63ae0836369e --- CHANGELOG.md | 1 + package.json | 7 ++- package.json.nwjs | 7 ++- scripts/Build-NWJS.ps1 | 7 ++- service-worker.js | 2 +- www/index.html | 1 + www/js/app.js | 122 ++++++++++++++++++++++++++++++++++------- www/js/init.js | 2 +- www/js/lib/images.js | 1 + www/js/lib/uiUtil.js | 20 ++++++- 10 files changed, 142 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a45e1198..a89cd785 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## In-progress release 1.9.8 +* FEATURE: Experimental support for reading Zimit ZIM archives * BUILD: Nightly builds of main app are now uploaded to a new server (with sftp instead of ssh) * BUILD: Deploy PWA image on a k8s cluster * BUILD: PWA images are now uploaded to ghcr.io instead of Docker Hub diff --git a/package.json b/package.json index 3414f813..db6b6e6f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "kiwix-js-electron", "productName": "Kiwix JS Electron", - "version": "1.9.7-E", + "version": "1.9.8-E", "description": "Kiwix JS packaged for the Electron framework", "main": "main.js", "build": { @@ -106,3 +106,8 @@ } } + + + + + diff --git a/package.json.nwjs b/package.json.nwjs index 70be3294..5402f4b8 100644 --- a/package.json.nwjs +++ b/package.json.nwjs @@ -1,7 +1,7 @@ { "name": "kiwix_js_windows", "productName": "Kiwix JS Windows", - "version": "1.9.5-N", + "version": "1.9.8-N", "description": "Kiwix JS Windows for NWJS", "main": "index.html", "domain": "kiwix.js.windows", @@ -88,3 +88,8 @@ } } + + + + + diff --git a/scripts/Build-NWJS.ps1 b/scripts/Build-NWJS.ps1 index 1f7c6856..a9b4fa5e 100644 --- a/scripts/Build-NWJS.ps1 +++ b/scripts/Build-NWJS.ps1 @@ -11,7 +11,7 @@ if (-Not $only32bit) { } $version10 = "0.62.0" # <<< value updated automatically from package.json if launched from Create-DraftRelease $versionXP = "0.14.7" -$appBuild = "1.9.5-N" # <<< value updated auotmatically from package.json if launched from Create-DraftRelease +$appBuild = "1.9.8-N" # <<< value updated auotmatically from package.json if launched from Create-DraftRelease # $ZIMbase = "wikipedia_en_100" # Check that the dev has included the correct archive in this branch $init_params = Get-Content -Raw "$PSScriptRoot\..\www\js\init.js" @@ -102,3 +102,8 @@ foreach ($build in $builds) { } + + + + + diff --git a/service-worker.js b/service-worker.js index c00a44b2..a865560e 100644 --- a/service-worker.js +++ b/service-worker.js @@ -29,7 +29,7 @@ * download and install a new copy; we have to hard code this here because it is needed before any other file * is cached in APP_CACHE */ -const appVersion = '1.9.7'; +const appVersion = '1.9.8'; /** * The name of the Cache API cache in which assets defined in regexpCachedContentTypes will be stored diff --git a/www/index.html b/www/index.html index c717c80b..c41357f9 100644 --- a/www/index.html +++ b/www/index.html @@ -123,6 +123,7 @@

Changes in version 1.0