j3g
/
dbfp_pub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIN: fingerprint insert complete

This commit is contained in:
JohnE 2016-02-20 01:42:47 -08:00
parent 3afbd57d78
commit b19750dcaa
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbfp.py
View File

@ -133,6 +133,7 @@ def queryMD5(fp_dir, md5_db):
# #
def insertFP(db_file, fp_file, fp_idx_dir): def insertFP(db_file, fp_file, fp_idx_dir):
try:
dbfp = FingerprintDB() dbfp = FingerprintDB()
fpidx = FingerprintIndex() fpidx = FingerprintIndex()
fpidx.openIndex(fp_idx_dir) fpidx.openIndex(fp_idx_dir)
@ -141,8 +142,11 @@ def insertFP(db_file, fp_file, fp_idx_dir):
# db.debugFingerprint() # db.debugFingerprint()
fpidx.insertFP(dbfp, db_file) fpidx.insertFP(dbfp, db_file)
elif (fp_file): elif (fp_file):
db.importJson(fp_file) dbfp.importJson(fp_file)
fpidx.insertFP(dbfp, 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 # in_dir: fully qualified directory path to find sqlite files
def __createFingerprint(in_dir, out_dir, dir_name): def __createFingerprint(in_dir, out_dir, dir_name):

7
libs/fingerprint_index.py
View File

@ -37,8 +37,8 @@ class FingerprintIndex:
try: try:
if (os.path.isfile(fq_fpidx)): if (os.path.isfile(fq_fpidx)):
self.db_conn = sql.connect(fq_fpidx) self.db_conn = sql.connect(fq_fpidx)
logging.info("DB Open SUCCESSFUL")
self.cur = self.db_conn.cursor() self.cur = self.db_conn.cursor()
logging.info("DB Open SUCCESSFUL")
else: else:
logging.info("No index file found, creating index now...") logging.info("No index file found, creating index now...")
self.__createIndex(fp_dir) self.__createIndex(fp_dir)
@ -79,11 +79,10 @@ class FingerprintIndex:
return rows return rows
def insertFP(self, dbfp, file_name): def insertFP(self, dbfp, file_name):
print "***** ***** WTF ***** *****"
try: try:
print "WTF222: {}".format(dbfp.table_hashes.values())
self.__insertMod_md5_all(dbfp.db_hash, dbfp.table_hashes.values(), file_name) self.__insertMod_md5_all(dbfp.db_hash, dbfp.table_hashes.values(), file_name)
self.__insertMod_md5_tables(dbfp.table_hashes.values(), file_name) self.__insertMod_md5_tables(dbfp.table_hashes.values(), file_name)
self.db_conn.commit()
except Exception as ex: except Exception as ex:
logging.error(ex) logging.error(ex)
raise FingerprintIndexOpen("Error inserting fingerprint into index file\n") 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): def __insertMod_md5_all(self, md5_db, md5_list, filename):
try: 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( self.db_conn.execute(
''' '''
INSERT INTO md5_all VALUES(?, ?, ?, ?) INSERT INTO md5_all VALUES(?, ?, ?, ?)