raise FpdbHandDuplicate error on duplicate insert attempt, catch it in import_file_dict, increment duplicates count

pyfpdb/Hand.py

@@ -229,8 +229,7 @@ db: a connected Database object"""
             # TourneysPlayers
         else:
             log.info("Hand.insert(): hid #: %s is a duplicate" % hh['siteHandNo'])
-            #Raise Duplicate exception?
-            pass
+            raise FpdbHandDuplicate(hh['siteHandNo'])
 
     def updateHudCache(self, db):
         db.storeHudCache(self.dbid_gt, self.dbid_pids, self.starttime, self.stats.getHandsPlayers())
@@ -1597,4 +1596,3 @@ ORDER BY
 
 
     return h
-

pyfpdb/fpdb_import.py

@@ -437,13 +437,15 @@ class Importer:
 
                 for hand in handlist:
                     if hand is not None:
-                        #try, except duplicates here?
                         hand.prepInsert(self.database)
+                        try:
                             hand.insert(self.database)
-
+                        except Exceptions.FpdbHandDuplicate:
+                            duplicates += 1
+                        else:
                             if self.callHud and hand.dbid_hands != 0:
                                 to_hud.append(hand.dbid_hands)
-                    else:
+                    else: # TODO: Treat empty as an error, or just ignore?
                         log.error("Hand processed but empty")
                 self.database.commit()
                 # Call hudcache update if not in bulk import mode
@@ -461,6 +463,7 @@ class Importer:
 
                 errors = getattr(hhc, 'numErrors')
                 stored = getattr(hhc, 'numHands')
+                stored -= duplicates
             else:
                 # conversion didn't work
                 # TODO: appropriate response?