Merge pull request #45 from psobot/psobot/keynote-12.2.1

Add support for Keynote 12.2.1.
psobot · Dec 3, 2022 · 7393e0c · 7393e0c
2 parents ad45c35 + 90909b8
commit 7393e0c
Show file tree

Hide file tree

Showing 16 changed files with 373 additions and 13 deletions.
diff --git a/keynote_parser/__init__.py b/keynote_parser/__init__.py
@@ -7,7 +7,7 @@
 __major_version__ = 1
 __patch_version__ = 2
 __supported_keynote_version__ = keynote_parser.macos_app_version.MacOSAppVersion(
-    "12.1", "7034.0.86", "1A95"
+    "12.2.1", "7035.0.161", "1A165"
 )
 __version_tuple__ = (
     __major_version__,

diff --git a/keynote_parser/mapping.py b/keynote_parser/mapping.py
@@ -219,6 +219,22 @@
     "260": "TSK.CommandAssetChunkArchive",
     "261": "TSK.AssetUploadStatusCommandArchive",
     "262": "TSK.AssetUnmaterializedOnServerCommandArchive",
+    "263": "TSK.CommandBehaviorArchive",
+    "264": "TSK.CommandBehaviorSelectionPathStorageArchive",
+    "265": "TSK.CommandActivityBehaviorArchive",
+    "273": "TSK.ActivityOnlyCommandArchive",
+    "275": "TSK.SetActivityAuthorShareParticipantIDCommandArchive",
+    "279": "TSK.ActivityAuthorCacheArchive",
+    "280": "TSK.ActivityStreamArchive",
+    "281": "TSK.ActivityArchive",
+    "282": "TSK.ActivityCommitCommandArchive",
+    "283": "TSK.ActivityStreamActivityArray",
+    "284": "TSK.ActivityStreamActivityArraySegment",
+    "285": "TSK.ActivityStreamRemovedAuthorAuditorPendingStateArchive",
+    "286": "TSK.ActivityAuthorArchive",
+    "287": "TSKSOS.ResetActivityStreamCommandArchive",
+    "288": "TSKSOS.RemoveAuthorIdentifiersCommandArchive",
+    "289": "TSK.ActivityCursorCollectionPersistenceWrapperArchive",
     "400": "TSS.StyleArchive",
     "401": "TSS.StylesheetArchive",
     "402": "TSS.ThemeArchive",
@@ -261,6 +277,8 @@
     "635": "TSA.TitlePlacementCommandArchive",
     "636": "TSA.GalleryInfoInsertItemsCommandArchive",
     "637": "TSA.GalleryInfoRemoveItemsCommandArchive",
+    "638": "TSASOS.VerifyActivityStreamWithServerCommandArchive",
+    "639": "TSASOS.InducedVerifyActivityStreamWithServerCommandArchive",
     "2001": "TSWP.StorageArchive",
     "2002": "TSWP.SelectionArchive",
     "2003": "TSWP.DrawableAttachmentArchive",

diff --git a/protos/KNArchives.proto b/protos/KNArchives.proto
@@ -302,6 +302,7 @@ message SlideNodeArchive {
   optional bool background_is_no_fill_or_color_fill_with_alpha = 28;
   optional .TSP.UUID template_slide_id = 29;
   repeated .TSP.UUID live_video_source_ids = 30;
+  repeated .KN.LiveVideoSourceUsageEntry live_video_source_usage_entries = 31;
   optional .TSP.Reference database_thumbnail = 3 [deprecated = true];
   repeated .TSP.Reference database_thumbnails = 9 [deprecated = true];
 }
@@ -325,6 +326,8 @@ message DesktopUILayoutArchive {
   optional bool showing_template_slides = 8;
   optional bool inspector_pane_autohidden = 9;
   optional bool element_list_visible = 10;
+  optional bool activity_stream_visible = 11;
+  optional bool activity_stream_was_visible = 12;
 }
 
 message UIStateArchive {
@@ -369,6 +372,7 @@ message UIStateArchive {
   optional .TSP.Reference selection_path_transformer = 38;
   optional bool shows_mobile_outline = 40;
   optional bool editing_disabled = 41;
+  optional float desktop_activity_stream_view_width = 42;
 }
 
 message IOSRestorableViewStateRootArchive {
@@ -651,6 +655,8 @@ message LiveVideoInfo {
   optional .TSP.Point normalized_offset = 4;
   optional int32 mask_kind = 5;
   optional double mask_corner_radius = 6;
+  optional int32 background_kind = 7;
+  optional .TSD.FillArchive background_fill = 8;
   extend .TSD.MovieArchive {
     optional .KN.LiveVideoInfo live_video_info = 100;
   }
@@ -692,6 +698,10 @@ message LiveVideoSourceCollection {
   optional .TSP.Reference default_source = 2;
 }
 
+message LiveVideoSourceUsageEntry {
+  repeated int32 background_kinds = 1;
+}
+
 message MotionBackgroundStylePropertiesArchive {
   optional string background_name = 1;
   optional string variant = 2;

diff --git a/protos/KNCommandArchives.proto b/protos/KNCommandArchives.proto
@@ -552,13 +552,17 @@ message CommandLiveVideoInfoSetValue {
     optional int32 mask_kind = 3;
     optional double mask_corner_radius = 4;
     optional bool is_placeholder = 5;
+    optional int32 background_kind = 6;
+    optional .TSD.FillArchive background_fill = 7;
   }
   enum Property {
     Scale = 0;
     NormalizedOffset = 1;
     MaskKind = 2;
     MaskCornerRadius = 3;
     IsPlaceholder = 4;
+    BackgroundKind = 5;
+    BackgroundFill = 6;
   }
   required .TSK.CommandArchive super = 1;
   required .TSP.UUIDPath live_video_info_id_path = 2;

diff --git a/protos/TSAArchives.proto b/protos/TSAArchives.proto
@@ -236,6 +236,14 @@ message GalleryItemSetValueCommand {
   optional .TSA.GalleryItemSetValueCommand.PropertyValue old_value = 5;
 }
 
+message CollaboratorGalleryItemCursor {
+  optional .TSP.UUID displayed_item_id = 1;
+  repeated .TSP.UUID item_ids = 2;
+  extend .TSK.CollaboratorCursorArchive {
+    optional .TSA.CollaboratorGalleryItemCursor gallery_item_cursor = 400;
+  }
+}
+
 message WebVideoInfo {
   optional string url = 1;
   optional .TSP.DataReference poster_image_data = 2;

diff --git a/protos/TSAArchives_sos.proto b/protos/TSAArchives_sos.proto
@@ -1,8 +1,19 @@
 syntax = "proto2";
 
+import "TSKArchives.proto";
 import "TSPMessages.proto";
 package TSASOS;
 
+message InducedVerifyActivityStreamWithServerCommandArchive {
+  required .TSK.CommandArchive super = 1;
+  repeated .TSP.Reference server_activities = 2;
+  optional bool server_activities_undefined = 3;
+  required double timestamp_of_last_activity_when_last_activity_coalescing = 4;
+  required int32 next_activity_to_transform_index = 5;
+  repeated .TSP.UUID author_identifiers_to_verify = 6;
+  optional bool author_identifiers_to_verify_undefined = 7;
+}
+
 message DrawableZOrderListArchive {
   optional .TSP.UUID container_id = 1;
   repeated .TSP.UUID drawable_id_list = 2;

diff --git a/protos/TSACommandArchives_sos.proto b/protos/TSACommandArchives_sos.proto
@@ -24,6 +24,10 @@ message CommandReapplyMasterArchive {
   required bool is_undo = 4;
 }
 
+message VerifyActivityStreamWithServerCommandArchive {
+  required .TSK.CommandArchive super = 1;
+}
+
 message VerifyDocumentWithServerCommandArchive {
   required .TSK.CommandArchive super = 1;
 }

diff --git a/protos/TSCHArchives.proto b/protos/TSCHArchives.proto
@@ -273,6 +273,23 @@ message PropertyValueStorageContainerReferenceLinesArchive {
   optional .TSP.Reference theme_preset_reference_line_style = 3;
 }
 
+message CollaboratorCDECursorSubselectionArchive {
+  optional int32 row_location = 1;
+  optional int32 row_length = 2;
+  optional int32 column_location = 3;
+  optional int32 column_length = 4;
+  extend .TSK.CollaboratorCursorArchive {
+    optional .TSCH.CollaboratorCDECursorSubselectionArchive cde_cursor_subselection = 300;
+  }
+}
+
+message CollaboratorChartTitleCursorSubselectionArchive {
+  optional bool chart_title_selected = 1;
+  extend .TSK.CollaboratorCursorArchive {
+    optional .TSCH.CollaboratorChartTitleCursorSubselectionArchive chart_title_cursor_subselection = 301;
+  }
+}
+
 extend .TSCH.ChartArchive {
   optional bool scene3d_settings_constant_depth = 10002;
   optional string last_applied_fill_set_lookup_string = 10004;

diff --git a/protos/TSDArchives.proto b/protos/TSDArchives.proto
@@ -401,6 +401,7 @@ message ImageArchive {
   optional .TSP.Path traced_path = 19;
   optional .TSD.Attribution attribution = 20;
   optional bool should_trace_pdf_content = 21;
+  optional bool background_removed = 22;
   extensions 100 to 999;
 }
 
@@ -560,6 +561,7 @@ message CommentStorageArchive {
   optional .TSP.Date creation_date = 2;
   optional .TSP.Reference author = 3;
   repeated .TSP.Reference replies = 4;
+  optional .TSP.UUID storage_uuid = 5;
 }
 
 message ReplaceAnnotationAuthorCommandArchive {

diff --git a/protos/TSDCommandArchives.proto b/protos/TSDCommandArchives.proto
@@ -232,6 +232,8 @@ message ImageMaskCommandArchive {
   required .TSD.InfoCommandArchive super = 1;
   optional .TSP.Reference newMaskInfo = 2;
   optional .TSP.Reference oldMaskInfo = 3;
+  optional bool background_removed = 4;
+  optional bool old_background_removed = 5;
 }
 
 message ImageAdjustmentsCommandArchive {
@@ -383,6 +385,8 @@ message ImageInfoAbstractGeometryCommandArchive {
   optional .TSD.PathSourceArchive old_mask_path_source = 7;
   optional .TSP.Size new_image_original_size = 8;
   optional .TSP.Size old_image_original_size = 9;
+  optional bool background_removed = 10;
+  optional bool old_background_removed = 11;
 }
 
 message ImageInfoGeometryCommandArchive {