diff --git a/dbfp.py b/dbfp.py index cea3390..dc7975e 100644 --- a/dbfp.py +++ b/dbfp.py @@ -154,8 +154,9 @@ def queryMD5(fp_dir, md5_db): try: fp = FingerprintIndex() fp.openIndex(fp_dir) - results = fp.findDB(md5_db) - print results + results = fp.queryMetadata(md5_db) + for row in results: + print "[{}]\nDB: {}\nFP: {}\nDate: {}\n".format(row[0], row[2], row[3], row[4]) except Exception as ex: print "ERROR: {}".format(ex) diff --git a/libs/fingerprint_index.py b/libs/fingerprint_index.py index d964c35..b9b07fa 100644 --- a/libs/fingerprint_index.py +++ b/libs/fingerprint_index.py @@ -97,6 +97,12 @@ class FingerprintIndex: rows = self.__qDatabaseMD5(md5_db) return rows + # + def queryMetadata(self, md5_db): + rows = self.__qMetadata(md5_db) + return rows + + # def insertFP(self, dbfp, file_name): try: self.__insertMod_md5_all(dbfp.db_hash, dbfp.table_hashes.values(), file_name) @@ -134,6 +140,22 @@ class FingerprintIndex: except Exception as ex: logging.error(ex) + # + def __qMetadata(self, md5_db): + try: + rows = self.cur.execute(''' + SELECT app_name, app_ver, db_file, fp_file, scan_date + FROM metadata + WHERE md5_db=? + ''', [md5_db]) + + results = [] + for row in rows: + results.append((row[0], row[1], row[2], row[3], row[4])) + return results + except Exception as ex: + logging.error(ex) + # def __createIndex(self, fp_dir): fq_fpidx = fp_dir + os.path.sep + INDEX_FILENAME