From 747e7f14257ab7456807a908cdff8b9327b26a3b Mon Sep 17 00:00:00 2001
From: Lerking <33354709+Lerking@users.noreply.github.com>
Date: Tue, 13 Feb 2018 14:10:56 +0100
Subject: [PATCH] Add files via upload

---
 h2inc.py     | 13 ++++++++++---
 h2inc_gui.py |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/h2inc.py b/h2inc.py
index c3ee4be..1eff57e 100644
--- a/h2inc.py
+++ b/h2inc.py
@@ -8,7 +8,6 @@
 import os
 import sys
 from h2inc_parser import parseline, parseparsed
-from h2inc_gui import currentfile_update
 import h2inc_gui
 
 tupline = []
@@ -47,26 +46,32 @@ def sourcedir_foldercnt(sourcedir):
     #print(len(folderlist))
     return cnt
 
-def process_files(sourcedir, destdir):
+def process_files(sourcedir, destdir, filevar):
     #global folderlist
     global filelist
     global preproc
     outfile = ''
     cnt = 0
     for f in filelist:
+        current_cnt = 0
         inputfile = f
         filehandle = open(f, 'r')
-        #cnt += 1
+        current_cnt += 1
+        filevar = current_cnt
         print(os.path.basename(f))
         currentfile_update(os.path.basename(f))
         for lines in filehandle:
             print(lines)
             preproc = preproc+tuple([parseline(lines)])
         filehandle.close()
+        current_cnt += 1
+        filevar = current_cnt
         for elements in preproc:
             outfile = outfile+parseparsed(elements)
         outputfile = os.path.splitext(inputfile)[0]+'.inc'
         outputfile = str(outputfile).replace(str(sourcedir.get()), str(destdir.get()))
+        current_cnt += 1
+        filevar = current_cnt
         print(outputfile)
         if not os.path.exists(os.path.dirname(outputfile)):
             try:  
@@ -77,4 +82,6 @@ def process_files(sourcedir, destdir):
         newfile = open(outputfile, "w")
         newfile.write(outfile)
         newfile.close()
+        current_cnt += 1
+        filevar = current_cnt
         cnt += 1
diff --git a/h2inc_gui.py b/h2inc_gui.py
index 368447f..b406bc3 100644
--- a/h2inc_gui.py
+++ b/h2inc_gui.py
@@ -22,7 +22,7 @@ class h2incGUI:
         self.sourcedir = StringVar()
         self.destdir = StringVar()
         self.addinc = StringVar()
-        self.cfilevar = 0
+        self.cfilevar = DoubleVar()
         self.totalvar = 0
         self.filecnt = 0
         self.infofolder = 'Number of folders: 0'
@@ -153,7 +153,7 @@ class h2incGUI:
                         raise
         destdir.set(dest)
         print ('Destination directory: ', destdir.get())
-        process_files(sourcedir, destdir)
+        process_files(sourcedir, destdir, self.cfilevar)
         
     def cfileprogress_update(cnt):
         self.cfilevar = cnt