j3g
/
dbfp_pub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIN: pull feature uses "data" and "fingerprint" folder. all pulled and fingerprint data looks correct

This commit is contained in:
JohnE 2015-10-27 13:11:22 -07:00
parent d94f5c8659
commit 80cf71ab11
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dbfp.py
View File

@ -10,7 +10,7 @@ from libs import toolbox
from libs import android from libs import android
from subprocess import Popen, PIPE, check_call from subprocess import Popen, PIPE, check_call
BASE_DIR = "data" BASE_DIR = "data"
FP_BASE_DIR = "fingerprints" FP_BASE_DIR = "fingerprints"
@ -66,34 +66,36 @@ def fingerprintDir():
ap.pullApp(BASE_DIR, dir_name) ap.pullApp(BASE_DIR, dir_name)
__createFingerprint(dir_name) __createFingerprint(dir_name)
#
def __createFingerprint(dir_name): def __createFingerprint(dir_name):
try: 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) files = os.listdir(cdir)
except: except Exception, ex:
logging.error("Error listing the directory\n {}".format(ex))
return return
logging.info("files=={}".format(files))
db = fingerprint.DBSchema() 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))
return
for filein in files: for filein in files:
count = 0 ddir = cdir + os.path.sep + filein
retVal = db.scanDBFile(filein) logging.info('Parsing file "{}"'.format(ddir))
retVal = db.scanDBFile(ddir)
if (retVal > 0): if (retVal > 0):
cdir = FP_BASE_DIR + os.path.sep + dir_name fname = dir_name + "_fp" + str(count) + ".json"
if (not mkdir(cdir)): fdir_name = fdir + os.path.sep + fname
break fh = open(fdir_name, "w")
fname = dir_name + "_" + str(count) + ".json" db.setAppName(filein)
fh = open(fname, "w")
db.writeFingerprint(fh) db.writeFingerprint(fh)
fh.close() fh.close()
count = count + 1 count = count + 1
#
def mkdir(fdir): def mkdir(fdir):
retval = False retval = False
try: try: