FIN: pull feature uses "data" and "fingerprint" folder. all pulled and fingerprint data looks correct
This commit is contained in:
parent
d94f5c8659
commit
80cf71ab11
36
dbfp.py
36
dbfp.py
|
@ -66,34 +66,36 @@ def fingerprintDir():
|
|||
ap.pullApp(BASE_DIR, dir_name)
|
||||
__createFingerprint(dir_name)
|
||||
|
||||
|
||||
|
||||
|
||||
#
|
||||
def __createFingerprint(dir_name):
|
||||
try:
|
||||
cdir = dir_name + os.path.sep + "databases"
|
||||
cdir = BASE_DIR + os.path.sep + dir_name + os.path.sep + "databases"
|
||||
logging.info("cdir=={}".format(cdir))
|
||||
files = os.listdir(cdir)
|
||||
except:
|
||||
except Exception, ex:
|
||||
logging.error("Error listing the directory\n {}".format(ex))
|
||||
return
|
||||
|
||||
|
||||
logging.info("files=={}".format(files))
|
||||
db = fingerprint.DBSchema()
|
||||
for filein in files:
|
||||
count = 0
|
||||
retVal = db.scanDBFile(filein)
|
||||
fdir = FP_BASE_DIR + os.path.sep + dir_name
|
||||
if (not mkdir(fdir)):
|
||||
logging.error('Error creating directory "{}"'.format(fdir))
|
||||
return
|
||||
for filein in files:
|
||||
ddir = cdir + os.path.sep + filein
|
||||
logging.info('Parsing file "{}"'.format(ddir))
|
||||
retVal = db.scanDBFile(ddir)
|
||||
if (retVal > 0):
|
||||
cdir = FP_BASE_DIR + os.path.sep + dir_name
|
||||
if (not mkdir(cdir)):
|
||||
break
|
||||
fname = dir_name + "_" + str(count) + ".json"
|
||||
fh = open(fname, "w")
|
||||
fname = dir_name + "_fp" + str(count) + ".json"
|
||||
fdir_name = fdir + os.path.sep + fname
|
||||
fh = open(fdir_name, "w")
|
||||
db.setAppName(filein)
|
||||
db.writeFingerprint(fh)
|
||||
fh.close()
|
||||
count = count + 1
|
||||
|
||||
|
||||
|
||||
|
||||
#
|
||||
def mkdir(fdir):
|
||||
retval = False
|
||||
try:
|
||||
|
|
Loading…
Reference in New Issue