Bugfix for chapters.

sbarex · May 31, 2021 · 2c124ac · 2c124ac
1 parent 502a45b
commit 2c124ac
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog
 =======
 
+### 1.5.3
+- Bugfix for chapters.
+
 ### 1.5.2
 - Bugfix on ratio. 
 - Bugfix of ffmpeg and metadata engine disabled.

diff --git a/MediaInfo.xcodeproj/project.pbxproj b/MediaInfo.xcodeproj/project.pbxproj
@@ -11264,7 +11264,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -11281,7 +11281,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.MediaInfo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -11299,7 +11299,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -11316,7 +11316,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.MediaInfo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -11332,7 +11332,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_ASSET_PATHS = "MediaInfo\\ Finder\\ Extension/Assets_menu.xcassets";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -11347,7 +11347,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.sbarex.MediaInfo.Finder-Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -11364,7 +11364,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_ASSET_PATHS = "MediaInfo\\ Finder\\ Extension/Assets_menu.xcassets";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -11379,7 +11379,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.sbarex.MediaInfo.Finder-Extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -11439,7 +11439,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				HEADER_SEARCH_PATHS = (
@@ -11459,7 +11459,7 @@
 					"$(BUILT_PRODUCTS_DIR)/libwebp",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.MediaInfoHelperXPC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -11477,7 +11477,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				HEADER_SEARCH_PATHS = (
@@ -11497,7 +11497,7 @@
 					"$(BUILT_PRODUCTS_DIR)/libwebp",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.MediaInfoHelperXPC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -11514,7 +11514,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				HEADER_SEARCH_PATHS = (
@@ -11534,7 +11534,7 @@
 					"$(BUILT_PRODUCTS_DIR)/libwebp",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.MediaInfoSettingsXPC;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -11550,7 +11550,7 @@
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				HEADER_SEARCH_PATHS = (
@@ -11570,7 +11570,7 @@
 					"$(BUILT_PRODUCTS_DIR)/libwebp",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.MediaInfoSettingsXPC;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/MediaInfoHelperXPC/info/MediaInfoItems.swift b/MediaInfoHelperXPC/info/MediaInfoItems.swift
@@ -749,20 +749,20 @@ extension ChaptersInfo {
         let n = coder.decodeInteger(forKey: "chapters_count")
         var chapters: [Chapter] = []
         for i in 0 ..< n {
-            guard let c = coder.decodeObject(forKey: "chapter_\(i)") as? NSCoder else {
+            guard let d = coder.decodeObject(forKey: "chapter_\(i)") as? Data, let c = try? NSKeyedUnarchiver(forReadingFrom: d), let chapter = Chapter(coder: c) else {
                 continue
             }
-            if let chapter = Chapter(coder: c) {
-                chapters.append(chapter)
-            }
+            chapters.append(chapter)
         }
         return chapters
     }
 
     func encodeChapters(in coder: NSCoder) {
         coder.encode(self.chapters.count, forKey: "chapters_count")
         for i in 0 ..< self.chapters.count {
-            coder.encode(self.chapters[i], forKey: "chapter_\(i)")
+            let c = NSKeyedArchiver(requiringSecureCoding: coder.requiresSecureCoding)
+            self.chapters[i].encode(with: c)
+            coder.encode(c.encodedData, forKey: "chapter_\(i)")
         }
     }
 

diff --git a/docs/appcast.xml b/docs/appcast.xml
@@ -44,7 +44,7 @@
         </item>
         <item>
             <title>1.5.2</title>
-            <pubDate>sab, 29 Mag 2021 23:43:12 +0100</pubDate>
+            <pubDate>lun, 31 Mag 2021 13:43:12 +0100</pubDate>
             <sparkle:minimumSystemVersion>10.15</sparkle:minimumSystemVersion>
             <enclosure url="https://github.com/sbarex/MediaInfo/releases/download/1.5.2/MediaInfo.zip" sparkle:version="15" sparkle:shortVersionString="1.5.2" type="application/octet-stream" sparkle:edSignature="HjgLy8ktr1dt35lQ/iUo7I6cJiZHjssa16u8Yb6Q67nT8mgeoEsdZqTxeXUNc1MD403aPv9TIhAnjpleejQbDg==" length="20824158"/>
             <description><![CDATA[
@@ -56,5 +56,17 @@
             ]]>
             </description>
         </item>
+        <item>
+            <title>1.5.3</title>
+            <pubDate>lun, 31 Mag 2021 15:53:12 +0100</pubDate>
+            <sparkle:minimumSystemVersion>10.15</sparkle:minimumSystemVersion>
+            <enclosure url="https://github.com/sbarex/MediaInfo/releases/download/1.5.2/MediaInfo.zip" sparkle:version="16" sparkle:shortVersionString="1.5.3" type="application/octet-stream" sparkle:edSignature="hQXPkd55WWS3aqBxaY7VrNL7LmpoOXsz6o8LmQ3BxRi5H6feEsEAHpDO/ozCP3SHrgfR/YT+LeNb528KR+IWCw==" length="20825675"/>
+            <description><![CDATA[
+                <ul>
+                    <li>Bugfix for chapters.</li>
+                </ul>
+            ]]>
+            </description>
+        </item>
     </channel>
 </rss>