From 80cf71ab11c8b7e349588531d4f1b69d4391ae36 Mon Sep 17 00:00:00 2001
From: JohnE <git@malloc.io>
Date: Tue, 27 Oct 2015 13:11:22 -0700
Subject: [PATCH] FIN: pull feature uses "data" and "fingerprint" folder. all
 pulled and fingerprint data looks correct

---
 dbfp.py | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/dbfp.py b/dbfp.py
index 21a79f4..6419027 100644
--- a/dbfp.py
+++ b/dbfp.py
@@ -10,7 +10,7 @@ from libs import toolbox
 from libs import android
 from subprocess import Popen, PIPE, check_call
 
-BASE_DIR = "data"
+BASE_DIR    = "data"
 FP_BASE_DIR = "fingerprints"
 
 
@@ -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()
+  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:
-    count = 0
-    retVal = db.scanDBFile(filein)
+    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: