Add files via upload

Gui test/h2inc_fp.py

@@ -9,11 +9,11 @@ import os
 import sys
 import io
 import time
-from h2inc_globals import destdir, defdest, filelist
+from h2inc_globals import destdir, defdest, filelist, folderlist, cnt, srcdir
 
 def sourcedir_filecnt(sourcedir):
     ### Return the number of files, ending with '.h', in sourcedir - including subdirectories ###
-    cnt = 0
+    global cnt
     global filelist
     global srcdir
     srcdir = sourcedir
@@ -28,7 +28,7 @@ def sourcedir_filecnt(sourcedir):
 
 def sourcedir_foldercnt(sourcedir):
     ### Return the number of folders, if it contains '*.h' files, in sourcedir - including subdirectories ###
-    global cnt
+    cnt = 0
     global folderlist
     for folderName, subfolders, files in os.walk(sourcedir):
         if subfolders:

Gui test/h2inc_globals.py

@@ -19,7 +19,7 @@ fileindex = 0
 filecnt = 0
 incinc = ''
 defdir = False
-defsrc = 'usr/include'
+defsrc = '/usr/include'
 defdest = '~/include'
 count = 0
 

Gui test/h2inc_gtk.py

@@ -12,7 +12,7 @@ import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, Gio, GObject as gobject
 #import time
-from h2inc_globals import defsrc, destdir, defdest, filelist
+from h2inc_globals import defsrc, destdir, defdest, filelist, cnt, srcdir
 from h2inc_mp import Worker, start_workers
 from h2inc_fp import sourcedir_filecnt, sourcedir_foldercnt
 
@@ -24,6 +24,7 @@ class H2INC:
     def __init__(self):
 
         self.filecnt = 0
+        self.foldercnt = 0
         self.fileindex = 0
         self.process = None
         self.app = Gtk.Application.new("org.h2inc", Gio.ApplicationFlags(0))
@@ -111,10 +112,10 @@ class H2INC:
                 self.obj("destination_entry").set_sensitive(True)
                 self.obj("destination_button").set_sensitive(True)
                 self.obj("numfiles_label").set_text(str(self.filecnt))
-                self.obj("progress_label").set_text("{} of {}".format(fileindex, self.filecnt))
-                foldercnt = sourcedir_foldercnt(dialog.get_filename())
-                if foldercnt >0:
-                    self.obj("numfolders_label").set_text(str(foldercnt))
+                self.obj("progress_label").set_text("{} of {}".format(self.fileindex, self.filecnt))
+                self.foldercnt = sourcedir_foldercnt(dialog.get_filename())
+                if self.foldercnt >0:
+                    self.obj("numfolders_label").set_text(str(self.foldercnt))
         elif response == Gtk.ResponseType.CANCEL:
             print("Cancel")
 
@@ -151,7 +152,7 @@ class H2INC:
         global destdir
         global incinc
         if self.obj("include_checkbutton").get_active() == True:
-            incinc = '¨~/include'
+            incinc = '~/include'
             destdir = destdir+incinc
         if self.obj("include_checkbutton").get_active() == False:
             incinc = ''
@@ -175,12 +176,15 @@ class H2INC:
             self.obj("source_entry").set_sensitive(False)
             self.obj("source_button").set_sensitive(False)
             self.obj("translation_frame").set_sensitive(True)
-            filecnt = sourcedir_filecnt(defsrc)
-            if filecnt >0:
-                print(filecnt)
-                foldercnt = sourcedir_foldercnt(defsrc)
-                if foldercnt >0:
-                    self.obj("numfolders_label").set_text(str(foldercnt))
+            self.filecnt = sourcedir_filecnt(srcdir)
+            if self.filecnt >0:
+                print(self.filecnt)
+                self.obj("numfiles_label").set_text(str(self.filecnt))
+                self.obj("progress_label").set_text("{} of {}".format(self.fileindex, self.filecnt))
+                self.foldercnt = sourcedir_foldercnt(srcdir)
+                if self.foldercnt >0:
+                    print(self.foldercnt)
+                    self.obj("numfolders_label").set_text(str(self.foldercnt))
 
     def on_translate_button_clicked(self, widget, data=None):
         self.obj("sourceframe").set_sensitive(False)

Gui test/h2inc_mp.py

@@ -9,7 +9,7 @@ import multiprocessing
 from queue import Queue
 from threading import Thread
 import threading
-from h2inc_globals import filelist
+from h2inc_globals import filelist, cnt
 from h2inc_fp import process_file
 
 num_cores = multiprocessing.cpu_count()