From a912efdf224c31ab0e3ac65dda11fb510eb6673a Mon Sep 17 00:00:00 2001 From: JohnE Date: Tue, 27 Oct 2015 13:55:35 -0700 Subject: [PATCH] MOD: removed log statements, updated figerprint app_name --- dbfp.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dbfp.py b/dbfp.py index 6419027..96dd8c1 100644 --- a/dbfp.py +++ b/dbfp.py @@ -72,12 +72,10 @@ def __createFingerprint(dir_name): cdir = BASE_DIR + os.path.sep + dir_name + os.path.sep + "databases" logging.info("cdir=={}".format(cdir)) files = os.listdir(cdir) - except Exception, ex: - logging.error("Error listing the directory\n {}".format(ex)) + except: + # not finding a databases folder is normal, not all apps use sqlite return - logging.info("files=={}".format(files)) db = fingerprint.DBSchema() - count = 0 fdir = FP_BASE_DIR + os.path.sep + dir_name if (not mkdir(fdir)): logging.error('Error creating directory "{}"'.format(fdir)) @@ -87,13 +85,12 @@ def __createFingerprint(dir_name): logging.info('Parsing file "{}"'.format(ddir)) retVal = db.scanDBFile(ddir) if (retVal > 0): - fname = dir_name + "_fp" + str(count) + ".json" + fname = dir_name + "__" + filein + "__dbfp" + ".json" fdir_name = fdir + os.path.sep + fname fh = open(fdir_name, "w") - db.setAppName(filein) + db.setAppName(dir_name) db.writeFingerprint(fh) fh.close() - count = count + 1 # def mkdir(fdir):