From 956adb828d1dabe74636401d4177aa4e554bcc35 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 6 Aug 2019 08:56:07 +0200 Subject: [PATCH 1/6] Update VERSIONS.LST --- VERSIONS.LST | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSIONS.LST b/VERSIONS.LST index 19b4970..990433a 100644 --- a/VERSIONS.LST +++ b/VERSIONS.LST @@ -1,3 +1,3 @@ -# ver|url|checksum, and | as separator, one version per || #||3.0.2|https://github.com/neox95/CNIRevelator/releases/download/3.0.2/CNIRevelator.zip|f472ee2edbff1ae62a30211614d15674bcc31ca7||3.0.3|https://github.com/neox95/CNIRevelator/releases/download/3.0.3/CNIRevelator.zip|046df2a2923ecc6ee3e3d8d61bcc7bd8b570b3ed|| -3.0.1|https://github.com/neox95/CNIRevelator/releases/download/3.0.1/CNIRevelator.zip|bd585c98435395471d14c89405f68ace4ec89256 +# ver|url|checksum, and | as separator, one version per || +3.0.1|https://github.com/neox95/CNIRevelator/releases/download/3.0.1/CNIRevelator.zip|bd585c98435395471d14c89405f68ace4ec89256#||3.0.2|https://github.com/neox95/CNIRevelator/releases/download/3.0.2/CNIRevelator.zip|f472ee2edbff1ae62a30211614d15674bcc31ca7||3.0.3|https://github.com/neox95/CNIRevelator/releases/download/3.0.3/CNIRevelator.zip|046df2a2923ecc6ee3e3d8d61bcc7bd8b570b3ed|| From 8dacb2836cac5538a0ccfe00e452aa639da5b236 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 6 Aug 2019 09:48:31 +0200 Subject: [PATCH 2/6] Correcting an update system bug --- src/globs.py | 2 +- src/updater.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/globs.py b/src/globs.py index 2ed5910..42066d1 100644 --- a/src/globs.py +++ b/src/globs.py @@ -26,7 +26,7 @@ import os # CNIRevelator version verType = "alpha" -version = [3, 0, 3] +version = [3, 0, 1] verstring_full = "{}.{}.{} {}".format(version[0], version[1], version[2], verType) verstring = "{}.{}".format(version[0], version[1]) debug = True diff --git a/src/updater.py b/src/updater.py index 6e302bf..217ccc0 100644 --- a/src/updater.py +++ b/src/updater.py @@ -143,7 +143,7 @@ def getLatestVersion(credentials): finalurl = url finalchecksum = checksum else: - finalurl = None + finalurl = url finalchecksum = None return (finalver, finalurl, finalchecksum) @@ -243,9 +243,6 @@ def batch(credentials): launcherWindow.printmsg('Success !') - # Install Tesseract ! - tessInstall(UPATH, credentials) - # Cleanup try: os.remove(globs.CNIRFolder + '\\downloads\\CNIPackage.zip') From 31a4a981e0e749fa17b8609cd28cb67feec3dc3a Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 6 Aug 2019 09:50:34 +0200 Subject: [PATCH 3/6] Preparing release 3.0.4 --- src/globs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/globs.py b/src/globs.py index 42066d1..d1383f3 100644 --- a/src/globs.py +++ b/src/globs.py @@ -26,7 +26,7 @@ import os # CNIRevelator version verType = "alpha" -version = [3, 0, 1] +version = [3, 0, 4] verstring_full = "{}.{}.{} {}".format(version[0], version[1], version[2], verType) verstring = "{}.{}".format(version[0], version[1]) debug = True From b3b898fb9974cbd5fc250d22aca13aafd636e861 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 6 Aug 2019 09:51:58 +0200 Subject: [PATCH 4/6] Preparing release 3.0.4 --- src/globs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/globs.py b/src/globs.py index d1383f3..e2adb9d 100644 --- a/src/globs.py +++ b/src/globs.py @@ -31,7 +31,8 @@ verstring_full = "{}.{}.{} {}".format(version[0], version[1], version[2], v verstring = "{}.{}".format(version[0], version[1]) debug = True -changelog = "Version 3.0.3 \nMise-à-jour mineure avec les corrections suivantes :\n- Correction d'un bug affectant le changelog\n- Correction d'une erreur avec la touche Suppr Arrière et Suppr causant une perte de données\n\n" + \ +changelog = "Version 3.0.4 \nMise-à-jour mineure avec les corrections suivantes :\n- Correction d'un bug affectant le système de mise-à-jour\n\n" + \ +"Version 3.0.3 \nMise-à-jour mineure avec les corrections suivantes :\n- Correction d'un bug affectant le changelog\n- Correction d'une erreur avec la touche Suppr Arrière et Suppr causant une perte de données\n\n" + \ "Version 3.0.2 \nMise-à-jour mineure avec les corrections suivantes :\n- Changement d'icône de l'exécutable\n- Correction d'un bug affectant le logging\n- Correction d'un bug affectant la détection de documents\n- Et autres modifications mineures\n\n" + \ "Version 3.0.1 \nMise-à-jour majeure avec les corrections suivantes :\n- Renouvellement de la signature numérique de l'exécutable\n- Amélioration de présentation du log en cas d'erreur\n- Refonte totale du code source et désobfuscation\n- Téléchargements en HTTPS fiables avec somme de contrôle\n- Nouveaux terminaux d'entrées : un rapide (731) et un complet\n- Détection des documents améliorée, possibilité de choix plus fin\nEt les regressions suivantes :\n- Suppression temporaire de la fonction de lecture OCR. Retour planifié pour une prochaine version" From 2fd33961b3241b7afce34df7abc52b47da89132c Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 6 Aug 2019 09:54:37 +0200 Subject: [PATCH 5/6] Preparing release 3.0.4 --- VERSIONS.LST | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSIONS.LST b/VERSIONS.LST index 990433a..00b518e 100644 --- a/VERSIONS.LST +++ b/VERSIONS.LST @@ -1,3 +1,3 @@ # ver|url|checksum, and | as separator, one version per || -3.0.1|https://github.com/neox95/CNIRevelator/releases/download/3.0.1/CNIRevelator.zip|bd585c98435395471d14c89405f68ace4ec89256#||3.0.2|https://github.com/neox95/CNIRevelator/releases/download/3.0.2/CNIRevelator.zip|f472ee2edbff1ae62a30211614d15674bcc31ca7||3.0.3|https://github.com/neox95/CNIRevelator/releases/download/3.0.3/CNIRevelator.zip|046df2a2923ecc6ee3e3d8d61bcc7bd8b570b3ed|| +3.0.4|https://github.com/neox95/CNIRevelator/releases/download/3.0.4/CNIRevelator.zip|4d27371f1fd83c94d9560d352709e5aa037f5547|| From cdb4f605710b5d0e2e56853eff14502c1493b05e Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 6 Aug 2019 09:57:35 +0200 Subject: [PATCH 6/6] test --- VERSIONS.LST | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSIONS.LST b/VERSIONS.LST index 00b518e..189e3af 100644 --- a/VERSIONS.LST +++ b/VERSIONS.LST @@ -1,3 +1,3 @@ # ver|url|checksum, and | as separator, one version per || -3.0.4|https://github.com/neox95/CNIRevelator/releases/download/3.0.4/CNIRevelator.zip|4d27371f1fd83c94d9560d352709e5aa037f5547|| +3.0.5|https://github.com/neox95/CNIRevelator/releases/download/3.0.4/CNIRevelator.zip|4d27371f1fd83c94d9560d352709e5aa037f5547||