Merge pull request #30 from psobot/psobot/update-to-keynote-10.2

Add support for Keynote 10.2.

Author: psobot

keynote_parser/__init__.py

@@ -5,9 +5,9 @@
 import keynote_parser.macos_app_version
 
 __major_version__ = 1
-__patch_version__ = 4
+__patch_version__ = 0
 __supported_keynote_version__ = keynote_parser.macos_app_version.MacOSAppVersion(
-    "10.1", "6913", "1A148"
+    "10.2", "7028.0.88", "1A122"
 )
 __version_tuple__ = (
     __major_version__,

protos/TSAArchives.proto

@@ -49,6 +49,7 @@ message DocumentArchive {
   optional .TSP.Reference annotation_cache_deprecated_2 = 13;
   optional bool collaborative_media_compatibility_upgrade_did_fail = 14;
   optional bool can_use_hevc = 15;
+  optional bool is_content_master = 16;
 }
 
 message FunctionBrowserStateArchive {
@@ -163,6 +164,15 @@ message GalleryInfoSetValueCommandArchive {
   optional .TSA.GalleryInfoSetValueCommandArchive.PropertyValue old_value = 5;
 }
 
+message GalleryInfoInsertItemsCommandArchive {
+  required .TSD.ContainerInsertChildrenCommandArchive super = 1;
+  repeated .TSP.Reference items = 2;
+}
+
+message GalleryInfoRemoveItemsCommandArchive {
+  required .TSD.ContainerRemoveChildrenCommandArchive super = 1;
+}
+
 message GalleryItemSetGeometryCommand {
   required .TSK.CommandArchive super = 1;
   optional .TSP.UUIDPath item_id_path = 2;

protos/TSDArchives.proto

@@ -481,9 +481,11 @@ message FreehandDrawingToolkitUIState {
     Pencil = 1;
     Crayon = 2;
     Fill = 3;
+    Eraser = 4;
+    MarqueeSelect = 5;
   }
   optional .TSP.Color current_color = 1 [deprecated = true];
-  optional .TSD.FreehandDrawingToolkitUIState.FreehandDrawingToolType most_recent_pen_tool_type = 2;
+  optional .TSD.FreehandDrawingToolkitUIState.FreehandDrawingToolType most_recent_restorable_tool_type = 2;
   optional float pen_tool_opacity = 3;
   optional float pen_tool_unscaled_width = 4;
   optional float pencil_tool_opacity = 5;

protos/TSKArchives.proto

@@ -15,25 +15,41 @@ message TreeNode {
   optional .TSP.Reference object = 3;
 }
 
-message CommandHistory {
-  message SelectionBehaviorEntry {
-    required .TSP.Reference command = 1;
-    required .TSP.Reference command_selection_behavior = 2;
-  }
+message LocalCommandHistoryItem {
+  optional .TSP.Reference command = 1;
+  optional .TSP.Reference selection_behavior = 2;
+}
+
+message LocalCommandHistoryArray {
+  required .TSP.LargeArray large_array = 1;
+}
+
+message LocalCommandHistoryArraySegment {
+  required .TSP.LargeObjectArraySegment large_object_array_segment = 1;
+}
+
+message LocalCommandHistory {
   required uint32 undo_count = 1;
-  repeated .TSP.Reference commands = 2;
-  repeated .TSP.Reference marked_redo_commands = 3 [deprecated = true];
-  optional .TSP.Reference pending_preflight_command = 4 [deprecated = true];
-  repeated .TSK.CommandHistory.SelectionBehaviorEntry selection_behavior_entries = 5;
+  optional .TSP.Reference items_array = 2;
   optional bool fixed_radar_13365177 = 10;
 }
 
+message CollaborationCommandHistoryArray {
+  required .TSP.LargeArray large_array = 1;
+}
+
+message CollaborationCommandHistoryArraySegment {
+  required .TSP.LargeObjectArraySegment large_object_array_segment = 1;
+}
+
 message CollaborationCommandHistory {
-  repeated .TSK.CollaborationCommandHistoryItem undo_items = 1;
-  repeated .TSK.CollaborationCommandHistoryItem redo_items = 2;
-  optional .TSP.UUID local_identifier = 3;
-  repeated .TSP.Reference undo_transformer_entries = 4;
-  repeated .TSP.Reference redo_transformer_entries = 5;
+  message ItemList {
+    optional .TSP.Reference items_array = 1;
+    repeated .TSP.Reference transformer_entries = 2;
+  }
+  optional .TSP.UUID local_identifier = 1;
+  optional .TSK.CollaborationCommandHistory.ItemList undo_items = 2;
+  optional .TSK.CollaborationCommandHistory.ItemList redo_items = 3;
 }
 
 message CollaborationCommandHistoryItem {
@@ -557,4 +573,18 @@ message DataReferenceRecord {
   repeated .TSP.DataReference unbounded_referenced_datas = 3;
 }
 
+message PencilAnnotationUIState {
+  enum PencilAnnotationToolType {
+    Pen = 0;
+    Highlighter = 1;
+  }
+  optional .TSK.PencilAnnotationUIState.PencilAnnotationToolType current_tool_type = 1;
+  optional .TSP.Color pen_tool_color = 2;
+  optional float pen_tool_opacity = 3;
+  optional float pen_tool_width = 4;
+  optional .TSP.Color highlighter_tool_color = 5;
+  optional float highlighter_tool_opacity = 6;
+  optional float highlighter_tool_width = 7;
+}
+
 

protos/TSPArchiveMessages.proto

@@ -73,6 +73,8 @@ message ComponentInfo {
   optional bool can_be_dropped = 17;
   repeated .TSP.ComponentExternalReference versioned_external_references = 18;
   optional bool is_wasteful = 19;
+  repeated uint64 ambiguous_object_identifiers = 20;
+  optional uint32 required_package_identifier = 21;
 }
 
 message ComponentExternalReference {
@@ -146,6 +148,7 @@ message DataInfo {
   optional .TSP.DataInfo.DownloadPriority download_priority = 9 [default = Default];
   optional .TSP.DataAttributes attributes = 10;
   optional .TSP.EncryptionInfo encryption_info = 11;
+  optional bytes last_mismatched_digest = 12;
   optional string pasteboard_external_file_path = 99;
 }
 
@@ -200,8 +203,21 @@ message ObjectSerializationDirectory {
   repeated .TSP.ObjectSerializationDirectory.Entry entries = 1;
 }
 
+message DataPropertiesEntryV1 {
+  required bytes digest = 1;
+  optional bool expects_matched_digest = 2;
+  optional double creation_time_interval_since_1970 = 3;
+  repeated uint32 creation_version = 4;
+  optional bytes last_mismatched_digest = 5;
+}
+
+message DataPropertiesV1 {
+  repeated .TSP.DataPropertiesEntryV1 properties = 1;
+}
+
 message DocumentMetadata {
   optional bool is_in_collaboration_mode = 1;
+  optional .TSP.DataPropertiesV1 data_properties_v1 = 3;
 }
 
 message SupportMetadata {

protos/TSPMessages.proto

@@ -241,35 +241,5 @@ message LargeUUIDArray {
   optional .TSP.LargeArray large_array = 1;
 }
 
-message StringToObjectDictionaryElement {
-  required string key = 1;
-  required .TSP.Reference object = 2;
-}
-
-message LargeDictionarySegment {
-  optional bool should_delay_archiving = 1;
-  optional uint32 delayed_archiving_priority = 2;
-  optional string package_locator = 3;
-}
-
-message LargeStringToObjectDictionarySegment {
-  optional .TSP.LargeDictionarySegment large_dictionary_segment = 1;
-  repeated .TSP.StringToObjectDictionaryElement elements = 2;
-}
-
-message LargeDictionary {
-  repeated .TSP.Range ranges = 1;
-  repeated .TSP.Reference segments = 2;
-  optional uint64 count = 3;
-  optional uint64 max_segment_object_count = 4;
-  optional uint64 max_segment_size = 5;
-  optional bool should_delay_archiving = 6;
-  optional uint32 delayed_archiving_priority = 7;
-  optional bool store_outside_object_archive = 8;
-}
-
-message LargeStringToObjectDictionary {
-  optional .TSP.LargeDictionary large_dictionary = 1;
-}
 
 

protos/TSSArchives.proto

@@ -51,6 +51,7 @@ message StylesheetArchive {
   optional bool can_cull_styles = 6;
   optional .TSS.StylesheetArchive.VersionedStyles styles_for_10_0 = 7;
   optional .TSS.StylesheetArchive.VersionedStyles styles_for_10_1 = 8;
+  optional .TSS.StylesheetArchive.VersionedStyles styles_for_10_2 = 9;
 }
 
 message ThemeArchive {