Skip to content

Implement column checker #1411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vinoryz wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

Implement column checker #1411

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion scripts/artifacts/Ph51PossOptimizedAssetsIntResouData.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import os
from packaging import version
from scripts.ilapfuncs import artifact_processor, get_file_path, open_sqlite_db_readonly, get_sqlite_db_records, logfunc, iOS
from scripts.ilapfuncs import artifact_processor, get_file_path, open_sqlite_db_readonly, get_sqlite_db_records, logfunc, iOS, does_column_exist_in_db

@artifact_processor
def Ph51PossibleOptimizedAssetsIntResouPhDaPsql(files_found, report_folder, seeker, wrap_text, timezone_offset):
Expand All @@ -38,6 +38,17 @@ def Ph51PossibleOptimizedAssetsIntResouPhDaPsql(files_found, report_folder, seek
if version.parse(iosversion) <= version.parse("13.7"):
logfunc("Unsupported version for PhotoData-Photos.sqlite from iOS " + iosversion)
return (), [], source_path


if (version.parse(iosversion) >= version.parse("16")):
required_columns = ['ZDUPLICATEDETECTORPERCEPTUALPROCESSINGSTATE']
missing_columns = [col for col in required_columns if not does_column_exist_in_db(source_path, 'ZADDITIONALASSETATTRIBUTES', col)]

if missing_columns:
logfunc(f'Missing columns in ZADDITIONALASSETATTRIBUTES table: {", ".join(missing_columns)}')
return (), [], source_path


if (version.parse(iosversion) >= version.parse("14")) & (version.parse(iosversion) < version.parse("15")):
source_path = get_file_path(files_found, "Photos.sqlite")
if source_path is None or not os.path.exists(source_path):
Expand Down