MOD: removed log statements, updated figerprint app_name

This commit is contained in:
JohnE 2015-10-27 13:55:35 -07:00
parent 80cf71ab11
commit a912efdf22
1 changed files with 4 additions and 7 deletions

11
dbfp.py
View File

@ -72,12 +72,10 @@ def __createFingerprint(dir_name):
cdir = BASE_DIR + os.path.sep + dir_name + os.path.sep + "databases" cdir = BASE_DIR + os.path.sep + dir_name + os.path.sep + "databases"
logging.info("cdir=={}".format(cdir)) logging.info("cdir=={}".format(cdir))
files = os.listdir(cdir) files = os.listdir(cdir)
except Exception, ex: except:
logging.error("Error listing the directory\n {}".format(ex)) # not finding a databases folder is normal, not all apps use sqlite
return return
logging.info("files=={}".format(files))
db = fingerprint.DBSchema() db = fingerprint.DBSchema()
count = 0
fdir = FP_BASE_DIR + os.path.sep + dir_name fdir = FP_BASE_DIR + os.path.sep + dir_name
if (not mkdir(fdir)): if (not mkdir(fdir)):
logging.error('Error creating directory "{}"'.format(fdir)) logging.error('Error creating directory "{}"'.format(fdir))
@ -87,13 +85,12 @@ def __createFingerprint(dir_name):
logging.info('Parsing file "{}"'.format(ddir)) logging.info('Parsing file "{}"'.format(ddir))
retVal = db.scanDBFile(ddir) retVal = db.scanDBFile(ddir)
if (retVal > 0): if (retVal > 0):
fname = dir_name + "_fp" + str(count) + ".json" fname = dir_name + "__" + filein + "__dbfp" + ".json"
fdir_name = fdir + os.path.sep + fname fdir_name = fdir + os.path.sep + fname
fh = open(fdir_name, "w") fh = open(fdir_name, "w")
db.setAppName(filein) db.setAppName(dir_name)
db.writeFingerprint(fh) db.writeFingerprint(fh)
fh.close() fh.close()
count = count + 1
# #
def mkdir(fdir): def mkdir(fdir):