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

FIX: the path parsing and the database file name have improved parsing

This commit is contained in:
JohnE 2016-02-26 01:18:17 -08:00
parent fd45cf6123
commit 19851a88eb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/android.py
View File

@ -24,6 +24,7 @@ class AndroidAppPull:
if (0 < stdout.find('failed')): if (0 < stdout.find('failed')):
logging.error("Error executing adb shell") logging.error("Error executing adb shell")
logging.info("Make sure adb is in root mode, 'adb root'") logging.info("Make sure adb is in root mode, 'adb root'")
return dir_names
strings = stdout.split('\n') strings = stdout.split('\n')
for sstr in strings: for sstr in strings:

6
libs/fingerprint.py
View File

@ -1,6 +1,7 @@
# #
# #
# #
import os
import re import re
import json import json
import sqlite3 import sqlite3
@ -73,8 +74,9 @@ class FingerprintDB:
try: try:
# extract file name from path+filename # extract file name from path+filename
self.metadata['db-name'] = ToolBox.parseFilenameIncExt(filein) self.metadata['db-name'] = os.path.basename(filein)
except: except Exception as ex:
logging.error(ex)
self.metadata['db-name'] = filein self.metadata['db-name'] = filein
try: try:
# read database schema, parse the schema # read database schema, parse the schema