CalvinBackup/mvt
1
0
Fork 0
mirror of https://github.com/mvt-project/mvt.git synced 2026-02-13 00:52:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle better some empty database issues in iOS backups

Browse Source
This commit is contained in:
tek
2023-05-25 00:24:34 +02:00
parent d0e24c6369
commit c2d740ed36
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mvt/ios/modules/mixed/contacts.py
View File

@@ -40,14 +40,18 @@ class Contacts(IOSExtraction):
conn = sqlite3.connect(self.file_path)
cur = conn.cursor()
cur.execute("""
SELECT
multi.value, person.first, person.middle, person.last,
person.organization
FROM ABPerson person, ABMultiValue multi
WHERE person.rowid = multi.record_id and multi.value not null
ORDER by person.rowid ASC;
""")
try:
cur.execute("""
SELECT
multi.value, person.first, person.middle, person.last,
person.organization
FROM ABPerson person, ABMultiValue multi
WHERE person.rowid = multi.record_id and multi.value not null
ORDER by person.rowid ASC;
""")
except sqlite3.OperationalError as e:
self.log.info("Error while reading the contact table: %s", e)
return None
names = [description[0] for description in cur.description]
for row in cur:

6
mvt/ios/modules/mixed/interactionc.py
View File

@@ -284,7 +284,11 @@ class InteractionC(IOSExtraction):
try:
cur.execute(QUERIES[2])
except sqlite3.OperationalError:
cur.execute(QUERIES[3])
try:
cur.execute(QUERIES[3])
except sqlite3.OperationalError as e:
self.log.info("Error while reading the InteractionC table: %s", e)
return None
names = [description[0] for description in cur.description]
for item in cur: