Merge pull request #942 from snoop168/lava-output-dev

Chrome Fix and TextInputSession Fix

scripts/artifacts/biomeTextinputses.py

@@ -21,7 +21,7 @@
 import blackboxprotobuf
 from scripts.ccl_segb.ccl_segb import read_segb_file
 from scripts.ccl_segb.ccl_segb_common import EntryState
-from scripts.ilapfuncs import artifact_processor, webkit_timestampsconv, convert_utc_human_to_timezone
+from scripts.ilapfuncs import artifact_processor, convert_utc_human_to_timezone, convert_ts_int_to_timezone, webkit_timestampsconv
 
 
 @artifact_processor
@@ -52,9 +52,13 @@ def get_biomeTextinputses(files_found, report_folder, seeker, wrap_text, timezon
                 protostuff, types = blackboxprotobuf.decode_message(record.data, typess)
 
                 duration = protostuff['1']
-                #Seems like the time is stored with an extra cocoa core offset added? we have to subtract it
-                timestart = (webkit_timestampsconv(protostuff['2']-978307200))
-                timestart = convert_utc_human_to_timezone(timestart, timezone_offset)
+                # Records in "restricted" folder seem to have time in Unix time, whereas public was cocoa time
+                if 'restricted' in file_found:
+                    timestart = (convert_ts_int_to_timezone(protostuff['2'], timezone_offset))
+                else:
+                    timestart = (webkit_timestampsconv(protostuff['2']))
+                    timestart = convert_utc_human_to_timezone(timestart, timezone_offset)
+
                 bundleid = (protostuff.get('3',''))
 
                 data_list.append((ts, timestart, record.state.name, bundleid, duration, filename,

scripts/artifacts/chrome.py

@@ -1463,6 +1463,7 @@ def chromeOfflinePages(files_found, report_folder, seeker, wrap_text, timezone_o
     return all_data_headers, all_data, report_file
 
 
+@artifact_processor
 def chromeMediaHistorySessions(files_found, report_folder, seeker, wrap_text, timezone_offset):
     # all_data will be a consolidated list of all browsers with an extra column to discriminate the browser
     all_data = []