From b19750dcaa0969281ac21a92f330e17b9b89b630 Mon Sep 17 00:00:00 2001
From: JohnE <git@malloc.io>
Date: Sat, 20 Feb 2016 01:42:47 -0800
Subject: [PATCH] FIN: fingerprint insert complete

---
 dbfp.py                   | 24 ++++++++++++++----------
 libs/fingerprint_index.py |  7 +++----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/dbfp.py b/dbfp.py
index f3d5634..3c78ca4 100644
--- a/dbfp.py
+++ b/dbfp.py
@@ -133,16 +133,20 @@ def queryMD5(fp_dir, md5_db):
 
 #
 def insertFP(db_file, fp_file, fp_idx_dir):
-  dbfp = FingerprintDB()
-  fpidx = FingerprintIndex()
-  fpidx.openIndex(fp_idx_dir)
-  if (db_file):
-    dbfp.scanDBFile(db_file)
-    # db.debugFingerprint()
-    fpidx.insertFP(dbfp, db_file)
-  elif (fp_file):
-    db.importJson(fp_file)
-    fpidx.insertFP(dbfp, fp_file)
+  try:
+    dbfp = FingerprintDB()
+    fpidx = FingerprintIndex()
+    fpidx.openIndex(fp_idx_dir)
+    if (db_file):
+      dbfp.scanDBFile(db_file)
+      # db.debugFingerprint()
+      fpidx.insertFP(dbfp, db_file)
+    elif (fp_file):
+      dbfp.importJson(fp_file)
+      fpidx.insertFP(dbfp, fp_file)
+    print "Insert suceessful"
+  except Exception as ex:
+    print ex
 
 # in_dir:  fully qualified directory path to find sqlite files
 def __createFingerprint(in_dir, out_dir, dir_name):
diff --git a/libs/fingerprint_index.py b/libs/fingerprint_index.py
index 82acb60..d52cdcf 100644
--- a/libs/fingerprint_index.py
+++ b/libs/fingerprint_index.py
@@ -37,8 +37,8 @@ class FingerprintIndex:
     try:
       if (os.path.isfile(fq_fpidx)):
         self.db_conn = sql.connect(fq_fpidx)
-        logging.info("DB Open SUCCESSFUL")
         self.cur = self.db_conn.cursor()
+        logging.info("DB Open SUCCESSFUL")
       else:
         logging.info("No index file found, creating index now...")
         self.__createIndex(fp_dir)
@@ -79,11 +79,10 @@ class FingerprintIndex:
     return rows
 
   def insertFP(self, dbfp, file_name):
-    print "***** ***** WTF ***** *****"
     try:
-      print "WTF222: {}".format(dbfp.table_hashes.values())
       self.__insertMod_md5_all(dbfp.db_hash, dbfp.table_hashes.values(), file_name)
       self.__insertMod_md5_tables(dbfp.table_hashes.values(), file_name)
+      self.db_conn.commit()
     except Exception as ex:
       logging.error(ex)
       raise FingerprintIndexOpen("Error inserting fingerprint into index file\n")
@@ -171,7 +170,7 @@ class FingerprintIndex:
   #
   def __insertMod_md5_all(self, md5_db, md5_list, filename):
     try:
-      # logging.info("INSERT INTO md5_index VALUES(?, ?, ?): {}; {}; {}".format(md5_all, str(md5_list), filename))
+      logging.info("INSERT INTO md5_all VALUES({}, {}, {}, 1)".format(md5_db, ','.join(md5_list), filename))
       self.db_conn.execute(
         '''
         INSERT INTO md5_all VALUES(?, ?, ?, ?)