From 44abeb9b0d76f87ad7621e39b02fe1463f9f4ed2 Mon Sep 17 00:00:00 2001
From: neox95 <neox@os-k.eu>
Date: Sun, 11 Aug 2019 17:08:49 +0200
Subject: [PATCH] Preparing 3.0.7 release

---
 .gitignore   |   1 +
 id-card.ico  | Bin 1901 -> 0 bytes
 make.bat     |   4 ++--
 src/globs.py |   7 ++++---
 src/mrz.py   |  48 +++++++++++++++++++++++-------------------------
 5 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 id-card.ico

diff --git a/.gitignore b/.gitignore
index a3bf738..93d25c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ src/Tesseract-OCR4/*
 src/downloads/*
 src/config/*
 src/logs/*
+signtool_8.1/*
diff --git a/id-card.ico b/id-card.ico
deleted file mode 100644
index efa86e4bc2d929c43599b2b48a2b3b15813b4f6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1901
zcmcgtYgE!_9De_RiVOtGL~CBU%*r*jZCP0XIh{5ytmUnla<QpRvMGW$)W23}vuUkT
zYo)Db7p<VQBuo64&34knG)rX!tT_!+@iIg-9d-QB*_Z9hcHVQ|%kTMpd4A`4p9cWQ
zv;ZKPb_@u!0KmrdI`DarF9Ej@XSx!$_<4T;-t<5KYi_FSNV*UMfQ7>r@6ExfCkK^V
z1wDQw(Ie;O8<O;t*zE2jee5PX4%)`cE98}Gs+7lh=i<Ow2z`EJ)DsR+6;gqE9SYpR
zfLu#}nGdkefD{0nN&(#+f?5A5&^7U0R;%Junnn1~ct0_984x)X@~L~PI1*=I?x;;G
zZ@%UA4Flk*k5j_1#Z=2U!;d9CAKfzbIi?$v1PwS?llLs4Rd*TKW|cN}ZkO4BMk4R#
zx{eYQ%fJpQkC}=Fcv{P#*lr>UU<D3fV&;%Wen|n*B@;k8k+*73bQeVb*hEt$8l?S{
zUXA`YgcVvvPW0_pGdGR1Wm(fbIzM%yX_Q(e%uL<cFD9d1Nbn-P?X>?r_$(GNlP{d+
zEkVc_bqjg#>|v5F0HrI(HD(84Q$+?4yy!Lf?98my=}}$L)>%Wpn+J##RW&EJZ`%p#
z2qCr4D~hBb+5X&>`+>W+Lj6>4Wl?$hZOZB6wJI7hn@`U#UT^gLfLx81#MNpxx=!e)
zVkgHIkYO!F6XmNc>uz1T7)mXUO_;<-J025vj?1B!{82Gssv=u_8x)_=c<7GXBd3CB
zS;|aC!ymJ&*elW=KZd%}=??b4S;=unzS08jt}2Z(el3W{BB%`f%TQX!d7F{^U1&)s
zE8Nh+?Ezf&ux8k%B;kI9Pw$vBuuyOkH;#3}4+?Ic(e}kZXh3&yoGO{prR&#@Nzf}0
zdZINXMd;sq&53Nq-A1cIr#aDCYcAKnyLk?gB7&3FsLx^bH%C{Z+Xn3gZ_WcLu1U)v
zDSJ2)jx_iE!2>9%JYu2yZg8W<7bA>Wya0=MMG&}oZU>j$H&HP@8+mkRjUo7>-dNPo
z3t@hV`5)aX2G;*nQ}cl0k;T<oyWunfEkc4mUDG-;M0$~LkJ#2z+I{V9p4i0Pj5#KL
z`j~+#s}hn8++vN`)frU#VY|7F%t^hs+36`=GA&Dc0EgIS=3N*_+!nC|H1)3yP!^WR
zE2;Q=ys0j#Y)(vy=p3+J1h3Xc9Zl&hDw;Wic5iC<Bs8(j#i65mnMxm9Ktyi26kPfG
zP`G&X&x4cxNXEM(`vQA?l76aWlzkBLst$(`<l(|jir;&YoVFJya3+dwvY>)}X_g2s
zp2JdK^fS#Y40`L^3Z2y#CXLs^2&tm3Fv!K~)fx^Gbq3Y8>$OI2SkH&;M6)|S!+J7n
zt)9jiL2?w`KRJA7{KKR{7v|YrOf$d9d9B;`Jik<1bz&v@(2dlXTlER@u>cDEV0i{(
z<pzfvYeE1X<{_EqEaCmLw7%Smb6D7nI8Z}`H4QCk>;q3A$uD~b(z9F|5@etDDmpxY
zFc2fH*bVAjxy1txIaaEXHa#P!d;whVre0OMx9rO-2PEnf-n~P@=~DuajoX^->33tt
zhsn9$)*gwzo?+$0Hr($YF&v)hF=M?SY0hnq9@pg-EkU=jb#nfOC}Z3L`1cHVGK+W_
zCE4G)x8~=o%YBc^O_b9NY~og^G$;RRg$E?z?;pHA?T@Vam6zaqu%t>h)bkQtxT8~@
zH%`ujMTK=?7iFbYmBMFl46z_sMv30^mJt>NXK(s}j{$<v^<^l8bByxg02ZW>b9z06
z+TfN9s4M7CpNC0;zj^2qlzMx-^im+eujYyafkDyZgj?D7r5WqtZ`akDx=_gWxh$tF
z(=c40SzS&XN?GV8-s9_dZy__&JEVuxz^Asinl)c10G(7ogy2E!KN|H*h3)g?@y#G_
zT{rZ`$cG`FJGgeTNrHys`XI?WFg`m*X$5jK@o*$~ZIKN%XcAP~alTuoC($u1S4yn$
z2@fm*JgH|hbCcx?RGZ?VUDT)xjHNS}twZf4kPk@T{&BS`Y?{t|&z!I1$7V7Bbq2K<
z_6!|te~MAJyIG@CWqFP#X!BrR*-}_^oAUo>%v_Gm0=?j3<w3oQWC~2M#V5%7iWe*Q
EFPIMq@c;k-

diff --git a/make.bat b/make.bat
index eefda6d..bbe8cd2 100644
--- a/make.bat
+++ b/make.bat
@@ -4,7 +4,7 @@ title Compilation de CNIRevelator
 
 
 
-call pyinstaller -w -D --exclude-module PyQt5 --bootloader-ignore-signals --add-data "C:\Users\pf04950\AppData\Local\Continuum\anaconda3\Lib\site-packages\tld\res\effective_tld_names.dat.txt";"tld\res" --add-data "id-card.ico";"id-card.ico" -i "id-card.ico" -n CNIRevelator src\CNIRevelator.py 
+call pyinstaller -w -D --exclude-module PyQt5 --bootloader-ignore-signals --add-data "C:\Users\adrie\Anaconda3\Lib\site-packages\tld\res\effective_tld_names.dat.txt";"tld\res" --add-data "src\id-card.ico";"id-card.ico" -i "src\id-card.ico" -n CNIRevelator src\CNIRevelator.py 
 
 
 
@@ -12,7 +12,7 @@ copy LICENSE dist\CNIRevelator\LICENSE
 copy src\id-card.ico dist\CNIRevelator\id-card.ico
 copy src\background.png dist\CNIRevelator\background.png
 
-D:\Public\CNIRevelator-master\CNIRevelator-master\signtool_8.1\signtool\signtool.exe  sign /n "CNIRevelator by Adrien Bourmault (neox95)" dist\CNIRevelator\CNIRevelator.exe
+signtool_8.1\signtool\signtool.exe  sign /n "CNIRevelator by Adrien Bourmault (neox95)" dist\CNIRevelator\CNIRevelator.exe
 
 pause
 
diff --git a/src/globs.py b/src/globs.py
index 295eb29..56622db 100644
--- a/src/globs.py
+++ b/src/globs.py
@@ -25,13 +25,14 @@
 import os
 
 # CNIRevelator version
-verType             = "alpha"
-version             = [3, 0, 6]
+verType             = "final release"
+version             = [3, 0, 7]
 verstring_full      = "{}.{}.{} {}".format(version[0], version[1], version[2], verType)
 verstring           = "{}.{}".format(version[0], version[1])
 debug = True
 
-changelog           =   "Version 3.0.6 \nMise-à-jour mineure avec les corrections suivantes :\n- Changement de l'apparence du launcher de l'application\n- Améliorations de l'interface, notamment de la stabilité\n- Ajout de la signature numérique de l'exécutable\n\n" + \
+changelog           =   "Version 3.0.7 \nMise-à-jour majeure avec les corrections suivantes :\n- Refonte de l'interface utilisateur\n- Fonction OCR intégrée à l'application avec support des TIFF et JPEG\n- Corrections d'erreurs sur le traitement des VISA de type A et B, ainsi que les titres de séjour\n\n" + \
+"Version 3.0.6 \nMise-à-jour mineure avec les corrections suivantes :\n- Changement de l'apparence du launcher de l'application\n- Améliorations de l'interface, notamment de la stabilité\n- Ajout de la signature numérique de l'exécutable\n\n" + \
 "Version 3.0.5 \nMise-à-jour mineure avec les corrections suivantes :\n- Changement de l'icône de l'exécutable afin de refléter le changement de version majeur accompli en 3.0\n\n" + \
 "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" + \
diff --git a/src/mrz.py b/src/mrz.py
index 4619d8a..e51fad6 100644
--- a/src/mrz.py
+++ b/src/mrz.py
@@ -640,27 +640,26 @@ AC = [
   "Certificat de membre d'équipage"
 ]
 
-## XXXXXXXXXXX
-# VB = [
-#   ["11222333333333333333333333333333333333333333", "444444444566677777789AAAAAABCCCCCCCCCCCCCCCDE"],
-#   {
-#     "1": ["2", "CODE", "V."],
-#     "2": ["3", "PAYS", "[A-Z]+"],
-#     "3": ["39", "NOM", "[A-Z]+"],
-#     "4": ["9", "NO", ".+"],
-#     "5": ["1", "CTRL", "[0-9]","4"],
-#     "6": ["3", "NAT", "[A-Z]+"],
-#     "7": ["6", "BDATE", "[0-9]+"],
-#     "8": ["1", "CTRL", "[0-9]", "7"],
-#     "9": ["1", "SEX", "[A-Z]"],
-#     "A": ["6", "EDATE", "[0-9]+"],
-#     "B": ["1", "CTRL", "[0-9]", "A"],
-#     "C": ["14", "FACULT", ".+"]
-#   },
-#   "Visa de type B"
-# ]
-
 VA = [
+  ["11222333333333333333333333333333333333333333", "444444444566677777789AAAAAABCCCCCCCCCCCCCCCCC"],
+  {
+    "1": ["2", "CODE", "V."],
+    "2": ["3", "PAYS", "[A-Z]+"],
+    "3": ["39", "NOM", "[A-Z]+"],
+    "4": ["9", "NO", ".+"],
+    "5": ["1", "CTRL", "[0-9]","4"],
+    "6": ["3", "NAT", "[A-Z]+"],
+    "7": ["6", "BDATE", "[0-9]+"],
+    "8": ["1", "CTRL", "[0-9]", "7"],
+    "9": ["1", "SEX", "[A-Z]"],
+    "A": ["6", "EDATE", "[0-9]+"],
+    "B": ["1", "CTRL", "[0-9]", "A"],
+    "C": ["16", "FACULT", ".+"]
+  },
+  "Visa de type A"
+]
+
+VB = [
   ["112223333333333333333333333333333333", "444444444566677777789AAAAAABCCCCCC"],
   {
     "1": ["2", "CODE", "V."],
@@ -676,14 +675,14 @@ VA = [
     "B": ["1", "CTRL", "[0-9]", "A"],
     "C": ["8", "FACULT", ".+"]
   },
-  "Visa de type A"
+  "Visa de type B"
 ]
 
 TSF = [
   ["112223333333333333333333333333333333", "444444444566677777789AAAAAABCCCCCC"],
   {
     "1": ["2", "CODE", "TS"],
-    "2": ["3", "PAYS", "[A-Z]+"],
+    "2": ["3", "PAYS", "FRA"],
     "3": ["31", "NOM", "([A-Z]|<)+"],
     "4": ["9", "NO", ".+"],
     "5": ["1", "CTRL", "[0-9]","4"],
@@ -695,7 +694,7 @@ TSF = [
     "B": ["1", "CTRL", "[0-9]", "A"],
     "C": ["8", "FACULT", ".+"]
   },
-  "Titre de séjour"
+  "Carte de séjour"
 ]
 
 I__ = [
@@ -752,8 +751,7 @@ DL = [
   "Permis de conduire"
 ]
 
-#TYPES = [ID, I__, VB, VA, AC, I_, IP, P, DL]
-TYPES = [IDFR, I__, VA, AC, I_, IP, P, DL, TSF]
+TYPES = [IDFR, I__, VB, VA, AC, I_, IP, P, DL, TSF]
 
 # longest document MRZ line
 longest = max([len(x[0][0]) for x in TYPES])