Skip to content

Commit bb27908

Browse files
Johann-PLWJohann-PLW
committed
Update fileApps.py - Fix timeline issues
1 parent 2b1d069 commit bb27908

2 files changed

Lines changed: 97 additions & 180 deletions

File tree

‎scripts/artifacts/filesApps.py‎

Lines changed: 97 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919

2020
import nska_deserialize as nd
2121

22-
from datetime import datetime
2322
from scripts.builds_ids import OS_build
2423
from scripts.artifact_report import ArtifactHtmlReport
25-
from scripts.ilapfuncs import logfunc, tsv, timeline, open_sqlite_db_readonly, convert_ts_int_to_timezone, \
26-
convert_ts_human_to_utc, convert_utc_human_to_timezone, convert_bytes_to_unit
24+
from scripts.ilapfuncs import logfunc, tsv, timeline, open_sqlite_db_readonly, convert_bytes_to_unit, convert_ts_int_to_timezone
2725

2826

2927
def get_tree_structure(cursor):
@@ -82,13 +80,13 @@ def get_filesApps_server(file_found, report_folder):
8280

8381
description = 'Device names that are able to sync to iCloud Drive.'
8482
report = ArtifactHtmlReport('iCloud Sync Device Names')
85-
report.start_artifact_report(report_folder, 'iCloud Sync Device Names', description)
83+
report.start_artifact_report(report_folder, 'Files App - iCloud Sync Device Names', description)
8684
report.add_script()
8785
devices_data_headers = ('#', 'Device Name')
8886
report.write_artifact_data_table(devices_data_headers, devices_data_list, file_found)
8987
report.end_artifact_report()
9088

91-
tsvname = 'iCloud Sync Device Names'
89+
tsvname = 'Files App - iCloud Sync Device Names'
9290
tsv(report_folder, devices_data_headers, devices_data_list, tsvname)
9391

9492
else:
@@ -122,6 +120,7 @@ def get_filesApps_server(file_found, report_folder):
122120

123121
users_data_dict[user_key] = user_fullName
124122

123+
db.close()
125124
return devices_dict, users_data_dict
126125

127126

@@ -155,13 +154,13 @@ def get_filesApp_client(file_found, ci_device_names, ci_users, timezone_offset,
155154

156155
description = ' List of applications that sync data in iCloud '
157156
report = ArtifactHtmlReport('iCloud Application List')
158-
report.start_artifact_report(report_folder, 'iCloud Application List', description)
157+
report.start_artifact_report(report_folder, 'Files App - iCloud Application List', description)
159158
report.add_script()
160159
app_data_headers = ('Application Bundle ID', 'Number of folders', 'Number of files', 'Total size in bytes', 'Total size' )
161160
report.write_artifact_data_table(app_data_headers, app_data_list, file_found)
162161
report.end_artifact_report()
163162

164-
tsvname = 'iCloud Application List'
163+
tsvname = 'Files App - iCloud Application List'
165164
tsv(report_folder, app_data_headers, app_data_list, tsvname)
166165

167166
else:
@@ -199,6 +198,8 @@ def get_filesApp_client(file_found, ci_device_names, ci_users, timezone_offset,
199198
ci_all_rows = cursor.fetchall()
200199
ci_usageentries = len(ci_all_rows)
201200
ci_data_list = []
201+
ci_tlactivity_list = []
202+
ci_tlactivity_deleted_list = []
202203
ci_sharing_list = []
203204
ci_tagged_list = []
204205
ci_favourite_list = []
@@ -237,9 +238,16 @@ def get_filesApp_client(file_found, ci_device_names, ci_users, timezone_offset,
237238
if ci_deleted:
238239
ci_deleted_list.append((ci_app_id, ci_path, ci_deleted, ci_ext, ci_size_in_bytes, ci_size,
239240
ci_cdate, ci_mdate, ci_lodate, ci_device, ci_shared, ci_visible))
241+
if ci_cdate:
242+
ci_tlactivity_deleted_list.append((ci_cdate, ci_app_id, ci_path, ci_filename, ci_ext,
243+
ci_size_in_bytes, ci_size, ci_mdate, ci_lodate, ci_device,
244+
ci_shared, ci_visible))
240245
else:
241246
ci_data_list.append((ci_app_id, ci_path, ci_filename, ci_ext, ci_size_in_bytes, ci_size,
242247
ci_cdate, ci_mdate, ci_lodate, ci_device, ci_shared, ci_visible))
248+
if ci_cdate:
249+
ci_tlactivity_list.append((ci_cdate, ci_app_id, ci_path, ci_filename, ci_ext, ci_size_in_bytes,
250+
ci_size, ci_mdate, ci_lodate, ci_device, ci_shared, ci_visible))
243251

244252
if ci_sharing_options == 8 or ci_sharing_options == 12:
245253
ci_sharing_permissions = "Anyone with the link can make changes"
@@ -267,96 +275,100 @@ def get_filesApp_client(file_found, ci_device_names, ci_users, timezone_offset,
267275

268276
description = ' Files stored in iCloud Drive with their metadata. '
269277
report = ArtifactHtmlReport('Files stored in iCloud Drive')
270-
report.start_artifact_report(report_folder, 'Files stored in iCloud Drive', description)
278+
report.start_artifact_report(report_folder, 'Files App - Files stored in iCloud Drive', description)
271279
report.add_script()
272280
ci_data_headers = ('Application Bundle ID', 'Path', 'Filename', 'Hidden extension', 'Size in bytes',
273281
'Size', 'Created', 'Modified', 'Last opened', 'From Device Name', 'Shared?', 'Visible?')
274282
report.write_artifact_data_table(ci_data_headers, ci_data_list, file_found)
275283
report.end_artifact_report()
276284

277-
tsvname = 'Files stored in iCloud Drive'
285+
tsvname = 'Files App - Files stored in iCloud Drive'
278286
tsv(report_folder, ci_data_headers, ci_data_list, tsvname)
279287

280-
# tlactivity = 'Files stored in iCloud Drive'
281-
# timeline(report_folder, tlactivity, ci_data_list, ci_data_headers)
282-
283-
else:
284-
logfunc('No file data found in Files App')
285-
286-
# Recently Deleted Items
287288

288-
if ci_deleted_list:
289-
description = ' Recently deleted files stored in iCloud Drive with their metadata. '
290-
report = ArtifactHtmlReport('Recently deleted files stored in iCloud Drive')
291-
report.start_artifact_report(report_folder, 'Recently deleted files stored in iCloud Drive', description)
292-
report.add_script()
293-
ci_data_headers = ('Application Bundle ID', 'Path', 'Filename', 'Hidden extension', 'Size in bytes',
294-
'Size', 'Created', 'Modified', 'Last opened', 'From Device Name', 'Shared?', 'Visible?')
295-
report.write_artifact_data_table(ci_data_headers, ci_deleted_list, file_found)
296-
report.end_artifact_report()
297-
298-
tsvname = 'Recently deleted files stored in iCloud Drive'
299-
tsv(report_folder, ci_data_headers, ci_deleted_list, tsvname)
289+
ci_tlactivity_headers = ('Created', 'Application Bundle ID', 'Path', 'Filename', 'Hidden extension',
290+
'Size in bytes', 'Size', 'Modified', 'Last opened', 'From Device Name',
291+
'Shared?', 'Visible?')
292+
tlactivity = 'Files App - Files stored in iCloud Drive'
293+
timeline(report_folder, tlactivity, ci_tlactivity_list, ci_tlactivity_headers)
300294

301-
# tlactivity = 'Recently deleted files stored in iCloud Drive'
302-
# timeline(report_folder, tlactivity, ci_deleted_list, ci_data_headers)
303-
304-
else:
305-
logfunc('No recently deleted file data found in Files App')
306-
307-
# Shared Items
295+
# Recently Deleted Items
296+
297+
if ci_deleted_list:
298+
description = ' Recently deleted files stored in iCloud Drive with their metadata. '
299+
report = ArtifactHtmlReport('Recently deleted files stored in iCloud Drive')
300+
report.start_artifact_report(report_folder, 'Files App - Recently deleted files', description)
301+
report.add_script()
302+
ci_data_headers = ('Application Bundle ID', 'Path', 'Filename', 'Hidden extension', 'Size in bytes',
303+
'Size', 'Created', 'Modified', 'Last opened', 'From Device Name', 'Shared?', 'Visible?')
304+
report.write_artifact_data_table(ci_data_headers, ci_deleted_list, file_found)
305+
report.end_artifact_report()
306+
307+
tsvname = 'Files App - Recently deleted files'
308+
tsv(report_folder, ci_data_headers, ci_deleted_list, tsvname)
308309

309-
if ci_sharing_list:
310-
description = ' Shared files stored in iCloud Drive with their metadata. '
311-
report = ArtifactHtmlReport('Shared files stored in iCloud Drive')
312-
report.start_artifact_report(report_folder, 'Shared files stored in iCloud Drive', description)
313-
report.add_script()
314-
ci_sharing_data_headers = ('Application Bundle ID', 'Path', 'Filename', 'Sharing type', 'Permissions',
315-
'Hidden extension', 'Size in bytes', 'Size', 'Created', 'Modified', 'Last opened',)
316-
report.write_artifact_data_table(ci_sharing_data_headers, ci_sharing_list, file_found)
317-
report.end_artifact_report()
310+
tlactivity = 'Files App - Recently deleted files'
311+
timeline(report_folder, tlactivity, ci_deleted_list, ci_data_headers)
318312

319-
tsvname = 'Shared files stored in iCloud Drive'
320-
tsv(report_folder, ci_sharing_data_headers, ci_sharing_list, tsvname)
313+
else:
314+
logfunc('No recently deleted file data found in Files App')
321315

322-
else:
323-
logfunc('No shared file data found in Files App')
324-
325-
# Tagged Items
326-
327-
if ci_tagged_list:
328-
description = ' Tagged files in iCloud Drive with their metadata. '
329-
report = ArtifactHtmlReport('Tagged files in iCloud Drive')
330-
report.start_artifact_report(report_folder, 'Tagged files in iCloud Drive', description)
331-
report.add_script()
332-
ci_tagged_data_headers = ('Application Bundle ID', 'Path', 'Filename', 'Hidden extension', 'Tags', \
333-
'Size in bytes', 'Size', 'Created', 'Modified', 'Last opened',)
334-
report.write_artifact_data_table(ci_tagged_data_headers, ci_tagged_list, file_found)
335-
report.end_artifact_report()
316+
# Shared Items
317+
318+
if ci_sharing_list:
319+
description = ' Shared files stored in iCloud Drive with their metadata. '
320+
report = ArtifactHtmlReport('Shared files stored in iCloud Drive')
321+
report.start_artifact_report(report_folder, 'Files App - Shared files', description)
322+
report.add_script()
323+
ci_sharing_data_headers = ('Application Bundle ID', 'Path', 'Filename', 'Sharing type', 'Permissions',
324+
'Hidden extension', 'Size in bytes', 'Size', 'Created', 'Modified', 'Last opened',)
325+
report.write_artifact_data_table(ci_sharing_data_headers, ci_sharing_list, file_found)
326+
report.end_artifact_report()
327+
328+
tsvname = 'Files App - Shared files'
329+
tsv(report_folder, ci_sharing_data_headers, ci_sharing_list, tsvname)
336330

337-
tsvname = 'Tagged files in iCloud Drive'
338-
tsv(report_folder, ci_tagged_data_headers, ci_tagged_list, tsvname)
339-
340-
else:
341-
logfunc('No tagged file data found in Files App')
331+
else:
332+
logfunc('No shared file data found in Files App')
342333

343-
# Favourite Items
334+
# Tagged Items
335+
336+
if ci_tagged_list:
337+
description = ' Tagged files in iCloud Drive with their metadata. '
338+
report = ArtifactHtmlReport('Tagged files in iCloud Drive')
339+
report.start_artifact_report(report_folder, 'Files App - Tagged files', description)
340+
report.add_script()
341+
ci_tagged_data_headers = ('Application Bundle ID', 'Path', 'Filename', 'Hidden extension', 'Tags', \
342+
'Size in bytes', 'Size', 'Created', 'Modified', 'Last opened',)
343+
report.write_artifact_data_table(ci_tagged_data_headers, ci_tagged_list, file_found)
344+
report.end_artifact_report()
345+
346+
tsvname = 'Files App - Tagged files'
347+
tsv(report_folder, ci_tagged_data_headers, ci_tagged_list, tsvname)
344348

345-
if ci_favourite_list:
346-
description = ' Favourite files in iCloud Drive with their metadata. '
347-
report = ArtifactHtmlReport('Favourite files in iCloud Drive')
348-
report.start_artifact_report(report_folder, 'Favourite files in iCloud Drive', description)
349-
report.add_script()
350-
ci_favourite_data_headers = ('Application Bundle ID', 'Path', 'Filename', 'Hidden extension', \
351-
'Size in bytes', 'Size', 'Created', 'Modified', 'Last opened',)
352-
report.write_artifact_data_table(ci_favourite_data_headers, ci_favourite_list, file_found)
353-
report.end_artifact_report()
349+
else:
350+
logfunc('No tagged file data found in Files App')
351+
352+
# Favourite Items
353+
354+
if ci_favourite_list:
355+
description = ' Favourite files in iCloud Drive with their metadata. '
356+
report = ArtifactHtmlReport('Favourite files in iCloud Drive')
357+
report.start_artifact_report(report_folder, 'Files App - Favourite files', description)
358+
report.add_script()
359+
ci_favourite_data_headers = ('Application Bundle ID', 'Path', 'Filename', 'Hidden extension', \
360+
'Size in bytes', 'Size', 'Created', 'Modified', 'Last opened',)
361+
report.write_artifact_data_table(ci_favourite_data_headers, ci_favourite_list, file_found)
362+
report.end_artifact_report()
363+
364+
tsvname = 'Files App - Favourite files'
365+
tsv(report_folder, ci_favourite_data_headers, ci_favourite_list, tsvname)
354366

355-
tsvname = 'Favourite files in iCloud Drive'
356-
tsv(report_folder, ci_favourite_data_headers, ci_favourite_list, tsvname)
357-
367+
else:
368+
logfunc('No tagged file data found in Files App')
369+
358370
else:
359-
logfunc('No tagged file data found in Files App')
371+
logfunc('No file data found in Files App')
360372

361373

362374
# iOS Updated
@@ -382,23 +394,24 @@ def get_filesApp_client(file_found, ci_device_names, ci_users, timezone_offset,
382394
os_data_list.append((os_date, os_os, os_version))
383395

384396
description = ' Operating System Updates '
385-
report = ArtifactHtmlReport('Operating System Updates')
386-
report.start_artifact_report(report_folder, 'Operating System Updates', description)
397+
report = ArtifactHtmlReport('Files App - Operating System Updates')
398+
report.start_artifact_report(report_folder, 'Files App - OS Updates', description)
387399
report.add_script()
388400
os_data_headers = ('Date and Time', 'OS Build', 'OS Version')
389401
report.write_artifact_data_table(os_data_headers, os_data_list, file_found)
390402
report.end_artifact_report()
391403

392-
tsvname = 'Operating System Updates'
404+
tsvname = 'Files App - OS Updates'
393405
tsv(report_folder, os_data_headers, os_data_list, tsvname)
394406

395-
tlactivity = 'Operating System Updates'
407+
tlactivity = 'Files App - OS Updates'
396408
timeline(report_folder, tlactivity, os_data_list, os_data_headers)
397409

398-
399410
else:
400411
logfunc('No OS update data found in Files App')
401412

413+
db.close()
414+
402415

403416
def get_filesApp(files_found, report_folder, seeker, wrap_text, timezone_offset):
404417
client_db = ''

‎scripts/artifacts/filesAppsm.py‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)