From e311c278e7ab073d15e9bb6bb4f44bbf8daaee6c Mon Sep 17 00:00:00 2001
From: Jan Lerking <jan.lerking@gmail.com>
Date: Mon, 19 Feb 2018 04:36:37 +0100
Subject: [PATCH] Added multiprocessing testing

---
 __pycache__/h2inc.cpython-35.pyc     | Bin 3748 -> 3818 bytes
 __pycache__/h2inc_gui.cpython-35.pyc | Bin 6817 -> 6564 bytes
 h2inc_gui.py                         |  16 ++---
 mp_counter.py                        |  29 ++++++++
 mp_test.py                           |  40 +++++++++++
 multiprocessing_test.py              | 104 +++++++++++++++++++++++++++
 6 files changed, 181 insertions(+), 8 deletions(-)
 create mode 100644 mp_counter.py
 create mode 100644 mp_test.py

diff --git a/__pycache__/h2inc.cpython-35.pyc b/__pycache__/h2inc.cpython-35.pyc
index 1df678b448d8ede54381f4d4cfdc83334602eb8a..2dec8fc417e5ee7a12f514df8a54c322b679b88d 100644
GIT binary patch
delta 467
zcmYk1ze@u#6vtog(!16sQngi)wrZ_P{Z$bJM<<;G(MiFU(wtCfdq?g%h)M?qag?mO
ziM#kuh#>9(CpS0$0rBNr4CM2^`6lnZyobV9VP=%`fmZGM@IC|Z3ICRbdJ}i}ay!%C
z_G~!Gz$L)p5C{q)0avJpK{z1XSdV~6f=I<W3t|97I@UQ53<Qt$=+nm;ArsFBR+W&d
zy0IV0yjrE}%WK%^9H4<D&>#?5aAJc%L9r>hu;3h>1Vj!*uB!3zy`<!rqg~;Jk!VS6
zbplOyeZQ?!-Cn2O^raVSyVD3X3#8xl!mxhaYI`z`SruD5q2H5DPg9exX@H69jTT2X
z%*06q*bZ^XFp+c5KXkz*1yx~pi4tCHs#kVEN~+AamSi4{N<tPf$Vr1~1M}>!lcjC^
zj+{k9-Sc9$iz1{5FttxHR>ssj&pUC2BlXR9W((-*R5R$|6uoXFr|>Lu2IB^E1|_vW
UxJb&XKbTJwW--o&Sdy*$0@s3LWB>pF

delta 477
zcmYk0!7D^T9LImZdGGC8%&=>%D31_&6elE#gWO0tU`yJ}TW#&zT{CZskOSqcNiL3Z
zaFeTl!ga1r{1s;2O6J#mf1jD}cc$NW@Dz;qGuF9Vx-Ib>z$g4$#PFKg^8If7YMHyh
zJ-7iV<$z~^`zhyvXMuO5+zY%Dcvs2=;1oDZx$pJs9C7e1B6End>fU+ANwwn6U(J}$
zF96C$5y}Xs1CS6{Kghu)fy99e0@nz5Qh;3!uoL1|=n7^YX`e?j;Z-5J?1?r-<0z8y
zuu`o>p`$ah(Go|Ic5O;yMHEb`Eqyl6+IcnN`GrMuA+tun$zTQ<iqW?vZ`#Kp#p$CL
z7-Lm=Y##%4$TrlAOQ$?d;-+@D8;zQF;&M~iP&!FSv{P@z+HD$7eX!w$*jUmv0@#b<
z%=EA*eABce&!p~&TeYP6JASo(ED~dhJvGt2Ssb!hv@&32)JmWpx@RWG3{q@YKT=``
N|0_Zn&C@KM{Q=$sVp9MB

diff --git a/__pycache__/h2inc_gui.cpython-35.pyc b/__pycache__/h2inc_gui.cpython-35.pyc
index 38443b4e657532bdce36945974900011e17b5c15..2867d0063d7d36da02b5e6ec7c7b8e042b105fa5 100644
GIT binary patch
delta 1248
zcmZuwNlz3(6z-m-r)LW&%K(~4Fd~f+#9^X=M2$ud?t(#Fhi1BGXz9(@JqFNZ67|5%
zLtQ+XxLi!Um@)nV5BdX$iFNRzm+@x&1HM-cLX<;&{ncB#zIyM~i_+_2x;vlGd^T5a
zynmPe8jH1*=8xEnERVCv#51|X))FV#L?Xuql1=$Y^Gk9xE@zpN{?MgJMp0Uoq`N8U
zu@sXHNt)J<ve%i9GG`0f;S$eOJiG3=fv>x*xFktj2|}x~xXcs2ZY;HuWFoq}qE35t
zsF)M|oPEj;VE)f+Ssr3%bKeR>7^TUe;RlGrFu?(KJU@wX5ArV?qh#2Rz!lvvEVm-!
zw#mVe8C(G_iK~~vtAQB=tpsjcD%lhdEYl5nW&z2H=Z3n?6OLz?JZqSt36ACJq1j4P
zY|7D>ET`^hjTj7|0eTU%80;ZV2ISk@M<Giwq!@(uabh_Hu2!m+ZQj>`tD%Rd6HAe)
zLaHpc>Qz14FwreII(Rl$sRN*D3gc|7t$#1?tbt{eqv}^Yw`$euV1hy?B&(o17#Fs^
z!t(XB&(4a2Y<=FeK{P45QJ8r=JTJWdda3YAq7P?C@YcpqPq<nxTdozB%U!q&9<uN4
zp`2+NJKoC5K}y)gx;v&Cr-@Poj|U;}qz@L}EnYK2I7hDY1Um^X5L_gfBDhL$f}oq=
z3WBCYdPFJ7#Z#f_`1D^vP&`jZ6~h7w#knm*G}!#zQIs1bPHTe{e&8m-ErQzwLTs7X
z9Kj`mO@SmK(l(6@$DLXbRg%PRR7><&jPB<Aj-dY$uAozDKJS{6<uUfFTWg;~6NvL>
ziCt&Ig;Ku|QNX>XM%Vp2@IaHpS)<U`{?Gr5>`h^Dw`kTe%9MG0qXO#%V2661^oxK~
zQ9x>ajv{{~m96#EMy{bB1_?+t6bU?ndjy*YucuhO`*5<J_TFiTJ9J<WPkF(JuZIiJ
zNjufI^|0!JgCnpU@Z`c_dbBhXQETb0&_h6-;7Z*$@Y(S+zE*2RpT{v*MM|x1an;c+
P*Y-UBKOqvc`$~TRlD9ln

delta 1353
zcmZ{jO>7fK6o6;^v)=Vj9GPGzG)-)N3Qh<~>o|b~+LRUqDM(dYp=b`6jdzo5Snpc1
zYntR@i6FJ-ju2e?bKnr6B1@c5FI>1*szB_4Q!hSoiBzd4-kXh;NG-DV^PBfG^WMBS
zzg2#&YWYki`GWnx9zW4uM<UM>oxdYDD4h}Wv4?b4{1v-M&x%6)4|=ZiGCmolNug*@
zt8rpfh|y2BNrd_Z@*^SZW5h^FAw{++1x;;IE+@%)ju;tYOp6h%L?^|9Hqk#NO;bHn
zRs60_BovHVpAt{BQ9397)Sgo&?kC5pELnH$R>Sd{y3>skLYU(DR{i!Si#2s)qZ>yR
zikn;Nw{DBq&AB2IyUC*vUr5zxNqnDrQz(H~newCX$5H0T5XXg`o(I22>0jEXP*DT~
zif$N|Q<r}K69X<c;Pc=kO#Pa>tK9UwZVZ-P1$BzcEz|K?at(wn*YR~bh&5cpWGTb+
zP2R8^-8Z`l^i4GM4Xe>=blWP%Yk+cukH8-v3gr(`M#X#eAM+IY6cMtD(<r3@fm&a&
zZ1axJnd-Zc2S`BzRdvkIa#q|G*EUQr=j8${L8{*39P&puCcf({!UeVZO27wwzXIp8
zOKrKWtuLE4mn}*4u3;ID%1CQ-?_z?aJXt!kjFfvOs7N+s7V|yWA#6^d)@qhx`L)_%
zSa~oUgwS;O6aQq_GLaAHI6V|8(F=4q(z(^YLzR!fhaVBS+&AqR6frW0dOi>0O>Q}U
z5M4EWK8L1xL=JHtaRIS__yRGF$Rj=jl$9{gA}Y`nBz&{cgngM5peUw=7YX+&D@h-i
zveC}lT!pqVxpJ0c+xZp5Rm37fCVLH~>xfSg`w3zSVQ!zJbP<7B_O4I%Tn_dAWS<24
zUHH5K0HIl`bsi0TMQK^=9xnIGQ{;J<z{)R+iF|cYCQ*QOSq;mT`xemw2a3fF7hXjW
zGfdA96i+_2AZl)e59L6;<6<X&dsue1g4@v`+PjuLFHtGnD@uoI=#bc(xzHY#Azl?$
z&wPo;k0P)lK8{#IFvNb*dm;AV37F8I25%;1VTZtpiGK%&msou56MWM+5n*GoQa*^l
nJ_JguX~3&w8a!reOJ9cBS7pd*%VKInw;bDboBuu08Jc+qYbH1d

diff --git a/h2inc_gui.py b/h2inc_gui.py
index 9f40709..bba1337 100644
--- a/h2inc_gui.py
+++ b/h2inc_gui.py
@@ -27,7 +27,7 @@ class h2incGUI:
         self.filecnt = 0
         self.infofolder = 'Number of folders: 0'
         self.infofile = 'Number of headers: 0'
-        self.currentfile = 'Current file: '
+        #self.currentfile = 'Current file: '
         self.totprogress = 'Total progress: '
         self.sourcedir.set('Select source directory!')
         self.destdir.set('Select destination directory!')
@@ -91,13 +91,13 @@ class h2incGUI:
         self.progressframe.grid(row=4, rowspan=2, column=0, columnspan=3, sticky=N+S+E+W, padx=5, pady=5)
         self.progressframe.grid_columnconfigure(1, weight=1)
 
-        self.cfilelabel = Label(self.progressframe, text=self.currentfile)
-        self.cfilelabel.grid(row=6, column=0, sticky=W, padx=5, pady=5)
-        self.cfilelabel.config(state=DISABLED)
+        #self.cfilelabel = Label(self.progressframe, text=self.currentfile)
+        #self.cfilelabel.grid(row=6, column=0, sticky=W, padx=5, pady=5)
+        #self.cfilelabel.config(state=DISABLED)
 
-        self.cfileprogress = ttk.Progressbar(self.progressframe, orient='horizontal', mode='determinate')
-        self.cfileprogress.grid(row=7, column=0, columnspan=3, sticky=N+S+E+W, padx=5, pady=5)
-        self.cfileprogress.config(variable=self.cfilevar, maximum=3)
+        #self.cfileprogress = ttk.Progressbar(self.progressframe, orient='horizontal', mode='determinate')
+        #self.cfileprogress.grid(row=7, column=0, columnspan=3, sticky=N+S+E+W, padx=5, pady=5)
+        #self.cfileprogress.config(variable=self.cfilevar, maximum=3)
 
         self.totallabel = Label(self.progressframe, text=self.totprogress)
         self.totallabel.grid(row=8, column=0, sticky=W, padx=5, pady=5)
@@ -154,7 +154,7 @@ class h2incGUI:
                         raise
         destdir.set(dest)
         print ('Destination directory: ', destdir.get())
-        process_files(source, dest)
+        process_files(self, source, dest)
         
     def cfileprogress_update(cnt):
         self.cfilevar = cnt
diff --git a/mp_counter.py b/mp_counter.py
new file mode 100644
index 0000000..b4b112c
--- /dev/null
+++ b/mp_counter.py
@@ -0,0 +1,29 @@
+import time
+from multiprocessing import Process, Value, Lock
+
+class Counter(object):
+    def __init__(self, initval=0):
+        self.val = Value('i', initval)
+        self.lock = Lock()
+
+    def increment(self):
+        with self.lock:
+            self.val.value += 1
+
+    def value(self):
+        with self.lock:
+            return self.val.value
+
+def func(counter):
+    for i in range(50):
+        time.sleep(0.01)
+        counter.increment()
+
+if __name__ == '__main__':
+    counter = Counter(0)
+    procs = [Process(target=func, args=(counter,)) for i in range(10)]
+
+    for p in procs: p.start()
+    for p in procs: p.join()
+
+    print (counter.value())
\ No newline at end of file
diff --git a/mp_test.py b/mp_test.py
new file mode 100644
index 0000000..742fe5c
--- /dev/null
+++ b/mp_test.py
@@ -0,0 +1,40 @@
+import tkinter as tk
+from tkinter import ttk
+import tkinter.messagebox
+
+import time # to simulate long-running function
+
+from threading import Thread
+
+class RedactionSolutions:
+
+    def __init__(self, master):
+        tk.Button(master, text="Run RS Wizard", fg='green', command=self.run).grid(row=5)
+
+    def long_running_function(self):
+        #self.working = tk.Label(root, text='In Progress. Please Wait...')
+        self.working = ttk.Progressbar(root, orient='horizontal', mode='determinate')
+        self.working.config(value=0, maximum=10)
+        self.working.grid(row=6, columnspan=2)
+
+        for x in range(10):
+            print(x)
+            self.working.config(value=x)
+            time.sleep(1)
+
+        restart = tkinter.messagebox.askquestion('RS Wizard', 'Redaction complete! See file location for result.\nWould you like to redact another file?')
+        if restart == 'yes':
+            #self.reset()
+            self.working.grid_forget()
+        else:
+            root.destroy()
+
+    def run(self):
+        Thread(target=self.long_running_function).start()
+
+
+
+root = tk.Tk()
+root.wm_title("RS Wizard")
+RedactionSolutions(root)
+root.mainloop()
\ No newline at end of file
diff --git a/multiprocessing_test.py b/multiprocessing_test.py
index 931843d..748c70c 100755
--- a/multiprocessing_test.py
+++ b/multiprocessing_test.py
@@ -19,6 +19,110 @@ import time
 import random
 import string
 import shutil
+from tkinter import Tk, ttk, Label, Button, LabelFrame
+from tkinter import filedialog, Entry, Checkbutton
+from tkinter import Grid, StringVar, DoubleVar
+from tkinter import N, E, S, W
+from tkinter import DISABLED, NORMAL
+from os import errno
+import os
+from os.path import expanduser
+import platform
+class file_progress:
+    def __init__(self, master):
+        self.sourcedir = StringVar()
+        self.destdir = StringVar()
+        self.addinc = StringVar()
+        self.cfilevar = DoubleVar()
+        self.totalvar = 0
+        self.filecnt = 0
+        self.infofolder = 'Number of folders: 0'
+        self.infofile = 'Number of headers: 0'
+        self.currentfile = 'Current file: '
+        self.totprogress = 'Total progress: '
+        self.sourcedir.set('Select source directory!')
+        self.destdir.set('Select destination directory!')
+
+        self.master = master
+        self.master.title('File progress')
+        self.master.grid_columnconfigure(1, weight=1)
+
+        self.frame = LabelFrame(master, text='Progress')
+        self.frame.grid(row=0, column=0, columnspan=3, sticky=N+S+E+W, padx=5, pady=5)
+        self.frame.grid_columnconfigure(1, weight=1)
+
+        self.totallabel = Label(self.frame, text=self.totprogress)
+        self.totallabel.grid(row=8, column=0, sticky=W, padx=5, pady=5)
+        self.totallabel.config(state=DISABLED)
+
+        self.totalprogress = ttk.Progressbar(self.frame, orient='horizontal', mode='determinate')
+        self.totalprogress.grid(row=9, column=0, columnspan=3, sticky=N+S+E+W, padx=5, pady=5)
+        self.totalprogress.config(variable=self.totalvar, maximum=self.filecnt)
+
+    def select_sourcedir(self, sourcedir):
+        root.directory = os.path.abspath(filedialog.askdirectory())
+        if root.directory:
+            sourcedir.set(root.directory)
+            filecnt = sourcedir_filecnt(root.directory)
+            if filecnt > 0:
+                tempstr = 'Number of headers: '+str(filecnt)
+                temptot = 'Total progress: 0 of '+str(filecnt)
+                print ('Source directory: ', sourcedir.get())
+                self.destlabel.config(state=NORMAL)
+                self.destentry.config(state=NORMAL)
+                self.destdir_button.config(state=NORMAL)
+                self.infofiles.config(text=tempstr)
+                self.totallabel.config(text=temptot)
+                self.filecnt = filecnt
+                foldercnt = sourcedir_foldercnt(root.directory)
+                if foldercnt > 0:
+                    tempstr = 'Number of folders: '+str(foldercnt)
+                    self.infofolders.config(text=tempstr)
+
+    def select_destdir(self, destdir):
+        root.directory = filedialog.askdirectory()
+        if root.directory:
+            destdir.set(root.directory)
+            print ('Destination directory: ', destdir.get())
+            self.incchkbox.config(state=NORMAL)
+            self.infofolders.config(state=NORMAL)
+            self.infofiles.config(state=NORMAL)
+            self.translate_button.config(state=NORMAL)
+            self.cfilelabel.config(state=NORMAL)
+            self.totallabel.config(state=NORMAL)
+
+    def translate(self, destdir, sourcedir, addinc):
+        doinc = addinc.get()
+        dest = destdir.get()
+        source = sourcedir.get()
+        if doinc == 'yes':
+            dest = dest+'/include'
+            print(os.path.exists(os.path.dirname(dest)))
+            if not os.path.exists(os.path.dirname(dest)):
+                try:  
+                    os.makedirs(os.path.dirname(dest))
+                except OSError as exc: # Guard against race condition
+                    if exc.errno != errno.EEXIST:
+                        raise
+        destdir.set(dest)
+        print ('Destination directory: ', destdir.get())
+        process_files(source, dest)
+        
+    def cfileprogress_update(cnt):
+        self.cfilevar = cnt
+
+    def currentfile_update(current):
+        self.currentfile = 'Current file: '+current
+
+root = Tk()
+root.update()
+#root.minsize(350, 210)
+#width = (root.winfo_screenwidth()/2)-(350/2)
+#height = (root.winfo_screenheight()/2)-(210/2)
+#root.geometry('+%d+%d' % (width, height))
+root.resizable(False, False)
+f_progress = file_progress(root)
+root.mainloop()
 
 cpu_info = cpuinfo.get_cpu_info()
 num_cores = mp.cpu_count()