From ffb037b1fe858f382969bb5a591420ff0be7bdb2 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 17 Jan 2009 02:24:00 +0900
Subject: [PATCH] Added output totals for bulk import

---
 pyfpdb/GuiBulkImport.py |  4 ++--
 pyfpdb/fpdb_import.py   | 23 ++++++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py
index e3bee81c..7aa33527 100644
--- a/pyfpdb/GuiBulkImport.py
+++ b/pyfpdb/GuiBulkImport.py
@@ -31,8 +31,8 @@ class GuiBulkImport (threading.Thread):
 		self.importer.addImportDirectory(self.path)
 		self.importer.setCallHud(False)
 		starttime = time()
-		self.importer.runImport()
-		print "GuiBulkImport.import_dir done in %s" %(time() - starttime)
+		(stored, dups, partial, errs, ttime) = self.importer.runImport()
+		print "GuiBulkImport.import_dir done: Stored: %d Dupllicates: %d Partial: %d Errors: %d in %s" %(stored, dups, partial, errs, time() - starttime)
 		
 	def load_clicked(self, widget, data=None):
 		self.inputFile=self.chooser.get_filename()
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 9ff475e6..4c555a28 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -113,10 +113,21 @@ class Importer:
     #Run full import on filelist
     def runImport(self):
         fpdb_simple.prepareBulkImport(self.fdb)
+        totstored = 0
+        totdups = 0
+        totpartial = 0
+        toterrors = 0
+        tottime = 0
         for file in self.filelist:
-            self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1])
+            (stored, duplicates, partial, errors, ttime) = self.import_file_dict(file, self.filelist[file][0], self.filelist[file][1])
+            totstored += stored
+            totdups += duplicates
+            totpartial += partial
+            toterrors += errors
+            tottime += ttime
         fpdb_simple.afterBulkImport(self.fdb)
         fpdb_simple.analyzeDB(self.fdb)
+        return (totstored, totdups, totpartial, toterrors, tottime)
 
     #Run import on updated files, then store latest update time.
     def runUpdated(self):
@@ -143,10 +154,11 @@ class Importer:
     # This is now an internal function that should not be called directly.
     def import_file_dict(self, file, site, filter):
         if(filter == "passthrough"):
-            self.import_fpdb_file(file, site)
+            (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(file, site)
         else:
             #Load filter, and run filtered file though main importer
-            self.import_fpdb_file(file, site)
+            (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(file, site)
+        return (stored, duplicates, partial, errors, ttime)
 
 
     def import_fpdb_file(self, file, site):
@@ -276,7 +288,8 @@ class Importer:
                                 print "Total stored:", stored, "duplicates:", duplicates, "partial/damaged:", partial, "errors:", errors, " time:", (time() - starttime)
                             sys.exit(0)
                 startpos=endpos
-        print "Total stored:", stored, "duplicates:", duplicates, "partial:", partial, "errors:", errors, " time:", (time() - starttime)
+        ttime = time() - starttime
+        print "Total stored:", stored, "duplicates:", duplicates, "partial:", partial, "errors:", errors, " time:", ttime
         
         if stored==0:
             if duplicates>0:
@@ -290,7 +303,7 @@ class Importer:
             #todo: this will cause return of an unstored hand number if the last hand was error or partial
         self.fdb.db.commit()
         self.handsId=handsId
-        return handsId
+        return (stored, duplicates, partial, errors, ttime)
 
     def parseTourneyHistory(self):
         print "Tourney history parser stub"