diff --git a/dbfp.py b/dbfp.py index 96dd8c1..1fb6d1b 100644 --- a/dbfp.py +++ b/dbfp.py @@ -20,7 +20,7 @@ def main(): parseArgs() # -def compareFingerprintDir(filein, filejson, fpdir): +def compareFingerprintDir(filein, fpdir): db = fingerprint.DBSchema() # @@ -112,7 +112,7 @@ def parseArgs(): parser = argparse.ArgumentParser(description='Fingerprint a sqlite database based on its schema') parser.add_argument('-f', '--file', required=False) parser.add_argument('-fd', '--fpdir', required=False, help="path to dirctory of fingerprint files") - parser.add_argument('-fp', '--fp', required=False, help="fingerprint file to use in comparison") + parser.add_argument('-fp', '--fingerprint', required=False, help="fingerprint file to use in comparison") parser.add_argument('-an', '--app_name', required=False) parser.add_argument('-av', '--app_version', required=False) parser.add_argument('-n', '--notes', required=False) @@ -125,8 +125,8 @@ def parseArgs(): filename = toolbox.ToolBox.parseFilename(args.file) fileout = filename + "_" + timestr + '.json' createFingerprint(args.file, fileout, args.verbose, args.app_name, args.app_version, args.notes) - elif (args.fp and args.fpdir): - compareFingerprintDir(args.file, args.fp, args.fpdir) + elif (args.file and args.fpdir): + compareFingerprintDir(args.file, args.fpdir) elif (args.fp): compareFingerprint(args.file, args.fp) elif (args.pull): @@ -134,31 +134,31 @@ def parseArgs(): else: parser.print_help() - return + # return - if (args.pull): - fingerprintDir() - return + # if (args.pull): + # fingerprintDir() + # return - if (args.file is None) or (args.fp is None) or (args.pull is None): - parser.print_help() - return + # if (args.file is None) or (args.fp is None) or (args.pull is None): + # parser.print_help() + # return - # compare a sqlite database file to all fingerprints - if (args.fp and args.fpdir): - compareFingerprintDir(args.file, args.fp, args.fpdir) - return + # # compare a sqlite database file to all fingerprints + # if (args.fp and args.fpdir): + # compareFingerprintDir(args.file, args.fp, args.fpdir) + # return - # compare a sqlite database file to a fingerprint - if (args.fp): - compareFingerprint(args.file, args.fp) - return + # # compare a sqlite database file to a fingerprint + # if (args.fp): + # compareFingerprint(args.file, args.fp) + # return - # create a fingerprint from the sqlite file - filename = toolbox.ToolBox.parseFilename(args.file) - fileout = filename + "_" + timestr + '.json' - createFingerprint(args.file, fileout, args.verbose, args.app_name, args.app_version, args.notes) + # # create a fingerprint from the sqlite file + # filename = toolbox.ToolBox.parseFilename(args.file) + # fileout = filename + "_" + timestr + '.json' + # createFingerprint(args.file, fileout, args.verbose, args.app_name, args.app_version, args.notes) if __name__ == "__main__": diff --git a/libs/fingerprint.py b/libs/fingerprint.py index a705feb..a953644 100644 --- a/libs/fingerprint.py +++ b/libs/fingerprint.py @@ -71,6 +71,16 @@ class DBSchema: return 1 + # + def writeFingerprint(self, filein): + self.DBSchema() + retVal = self.scanDBFile(filein) + if (retVal > 0): + fh = open(fileout, "w") + self.__writeFingerprint(fh) + fh.close() + else: + print self.getErrorString(retVal) # import fingerprint from a json file def importJson(self, filejson): @@ -201,7 +211,7 @@ class DBSchema: tableDef.toJSON() - def writeFingerprint(self, filehandle): + def __writeFingerprint(self, filehandle): ahash = {} thash = {} dmhash = {} diff --git a/libs/fingerprint_comp.py b/libs/fingerprint_comp.py index 9d75657..07151c9 100644 --- a/libs/fingerprint_comp.py +++ b/libs/fingerprint_comp.py @@ -1,6 +1,7 @@ # # # +from libs import fingerprint class FingerprintRunner: @@ -16,3 +17,7 @@ class FingerprintRunner: def dirCompare(self, folder): return + + def compareFingerprint(self, fp1, fp2): + pass + diff --git a/tests/test-data/cache4 4-15-2014 - Copy.db b/tests/test-data/cache4 4-15-2014 - Copy.db deleted file mode 100755 index 0e93ce3..0000000 Binary files a/tests/test-data/cache4 4-15-2014 - Copy.db and /dev/null differ diff --git a/tests/test-data/cache4 4-15-2014.db b/tests/test-data/cache4 4-15-2014.db deleted file mode 100755 index 0e93ce3..0000000 Binary files a/tests/test-data/cache4 4-15-2014.db and /dev/null differ diff --git a/tests/test-data/cache4 blue phone day 1.db b/tests/test-data/cache4 blue phone day 1.db deleted file mode 100755 index 012e1d6..0000000 Binary files a/tests/test-data/cache4 blue phone day 1.db and /dev/null differ diff --git a/tests/test-data/cache4.db b/tests/test-data/cache4.db deleted file mode 100755 index d243e2f..0000000 Binary files a/tests/test-data/cache4.db and /dev/null differ diff --git a/tests/test-data/contacts2.db b/tests/test-data/contacts2.db deleted file mode 100755 index aec6e88..0000000 Binary files a/tests/test-data/contacts2.db and /dev/null differ diff --git a/tests/test-data/database.db b/tests/test-data/database.db deleted file mode 100755 index fb19d48..0000000 Binary files a/tests/test-data/database.db and /dev/null differ diff --git a/tests/test-data/profilecache.db b/tests/test-data/profilecache.db deleted file mode 100755 index 553c671..0000000 Binary files a/tests/test-data/profilecache.db and /dev/null differ diff --git a/tests/test-data/tc.db b/tests/test-data/tc.db deleted file mode 100755 index d2db81d..0000000 Binary files a/tests/test-data/tc.db and /dev/null differ diff --git a/tests/test-data/test1.db b/tests/test-data/test1.db deleted file mode 100755 index 7ed5759..0000000 Binary files a/tests/test-data/test1.db and /dev/null differ diff --git a/tests/test-data/test2.db b/tests/test-data/test2.db deleted file mode 100755 index d8caa67..0000000 Binary files a/tests/test-data/test2.db and /dev/null differ