release: v1.3.1

2025-11-25 03:14:57 +08:00 · 2024-11-19 01:06:30 +08:00
parent 0e672d5599
commit 9fb6825a17
7 changed files with 95 additions and 43 deletions
--- a/Downloader.xcodeproj/project.pbxproj
+++ b/Downloader.xcodeproj/project.pbxproj
@@ -418,7 +418,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 130;
+				CURRENT_PROJECT_VERSION = 131;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Adobe Downloader/Preview Content\"";
 				DEVELOPMENT_TEAM = TG862GVKHK;
@@ -434,7 +434,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.x1a0he.macOS.Adobe-Downloader";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -452,7 +452,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 130;
+				CURRENT_PROJECT_VERSION = 131;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Adobe Downloader/Preview Content\"";
 				DEVELOPMENT_TEAM = TG862GVKHK;
@@ -468,7 +468,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.3.0;
+				MARKETING_VERSION = 1.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.x1a0he.macOS.Adobe-Downloader";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
--- a/Downloader.xcodeproj/xcshareddata/xcschemes/Adobe
+++ b/Downloader.xcodeproj/xcshareddata/xcschemes/Adobe
@@ -31,7 +31,7 @@
      shouldAutocreateTestPlan = "YES">
   </TestAction>
   <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
--- a/Downloader/Models/DownloadTask.swift
+++ b/Downloader/Models/DownloadTask.swift
@@ -77,16 +77,20 @@ class NewDownloadTask: Identifiable, ObservableObject, Equatable  {
    @Published var totalPackages: Int = 0

    func setStatus(_ newStatus: DownloadStatus) {
-        totalStatus = newStatus
-        objectWillChange.send()
+        DispatchQueue.main.async {
+            self.totalStatus = newStatus
+            self.objectWillChange.send()
+        }
    }

    func updateProgress(downloaded: Int64, total: Int64, speed: Double) {
-        totalDownloadedSize = downloaded
-        totalSize = total
-        totalSpeed = speed
-        totalProgress = total > 0 ? Double(downloaded) / Double(total) : 0
-        objectWillChange.send()
+        DispatchQueue.main.async {
+            self.totalDownloadedSize = downloaded
+            self.totalSize = total
+            self.totalSpeed = speed
+            self.totalProgress = total > 0 ? Double(downloaded) / Double(total) : 0
+            self.objectWillChange.send()
+        }
    }

    init(sapCode: String, version: String, language: String, displayName: String, directory: URL, productsToDownload: [ProductsToDownload] = [], retryCount: Int = 0, createAt: Date, totalStatus: DownloadStatus? = nil, totalProgress: Double, totalDownloadedSize: Int64 = 0, totalSize: Int64 = 0, totalSpeed: Double = 0, currentPackage: Package? = nil, platform: String) {
--- a/appcast.xml
+++ b/appcast.xml
@@ -2,6 +2,46 @@
 <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
    <channel>
        <title>Adobe Downloader</title>
+        <item>
+            <title>1.3.1</title>
+            <pubDate>Tue, 19 Nov 2024 00:57:21 +0800</pubDate>
+            <sparkle:version>131</sparkle:version>
+            <sparkle:shortVersionString>1.3.1</sparkle:shortVersionString>
+            <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+            <enclosure url="https://github.com/X1a0He/Adobe-Downloader/releases/download/1.3.1/Adobe.Downloader.dmg"
+                       length="3289746" type="application/octet-stream"
+                       sparkle:edSignature="jfqqHn1Y2f4ZikEFkEXrTaD1bqZc2CoMQjfEMGL42GS6fqlB0zS6IYftspKZg3+R95tRL/BlwTIDCBqE2pvfCQ=="/>
+            <description>
+                <![CDATA[
+                    <style>ul{margin-top: 0;margin-bottom: 7;padding-left: 18;}</style>
+                    <h4>Adobe Downloader 更新日志: </h4>
+                    <ul>
+                        <li>1. 模拟官方 Adobe Creative Cloud 的包依赖下载逻辑</li>
+                        <li>2. 由于上述更新，修复了某些包下载数量仍然不足的问题</li>
+                        <li>3. 修复了当已存在 HDBox 和 IPCBox 的时候，下载 X1a0He CC 组件后，并不会替换掉原来的组件的问题</li>
+                        <li>4. 修复了 Acrobat 产品在暂停和取消时仍处于下载状态的问题</li>
+                        <li>5. 底部增加产品数量显示，居中显示警示标语</li>
+                        <li>6. 增加部分语言选择</li>
+                        <li>7. 优化了版本选择页面的排序展示</li>
+                        <li>8. 优化了产品处理和解析速度，弃用 xml 处理和解析，采用 json 的形式处理</li>
+                    </ul>
+                    <h4>PS: M1 Max上已测试大部份产品正常下载并安装，Intel未测试，有问题请提issues</h4>
+                    <hr>
+                    <h4>Adobe Downloader Changes: </h4>
+                    <ul>
+                        <li>1. Simulate the package dependency download logic of the official Adobe Creative Cloud</li>
+                        <li>2. Due to the above updates, the problem of insufficient download quantity of some packages has been fixed</li>
+                        <li>3. Fixed when HDBox and IPCBox already exist, the problem that the original components will not be replaced after downloading X1a0He CC components</li>
+                        <li>4. Fixed the problem that Acrobat products are still in downloading status when paused and canceled</li>
+                        <li>5. Add product quantity display at the bottom and display warning slogan in the center</li>
+                        <li>6. Add some language selections</li>
+                        <li>7. Optimize the sorting display of the version selection page</li>
+                        <li>8. Optimize product processing and parsing speed, abandon xml processing and parsing, and use json processing</li>
+                    </ul>
+                    <h4>PS: Most products have been tested on M1 Max and downloaded and installed normally, but Intel has not been tested. If you have any questions, please raise issues</h4>
+                ]]>
+            </description>
+        </item>
        <item>
            <title>1.3.0</title>
            <pubDate>Sat, 16 Nov 2024 14:42:55 +0800</pubDate>
--- a/readme-en.md
+++ b/readme-en.md
@@ -70,26 +70,21 @@ when prompted.

 - For historical update logs, please go to [Update Log](update-log.md)

- 2024-11-16 14:30 Update Log
+- 2024-11-19 00:55 Update Log

 ```markdown
-1. Added optional API versions (v4, v5, v6) [Older API means longer waiting time]
-2. Introduced Privilege Helper to handle all operations that require permissions
-3. Modified the function of downloading the Setup component from Github, and changed it to downloading the simplified
-   version of CC from the official website, called X1a0He CC
-4. Adjusted the detection of CC component backup and processing status, and separated the detection mechanism of the two
-5. Removed the installation log display
-6. Adjusted the method of obtaining the version number of the Setup component
-7. Fixed the problem that AppCardView still shows downloading after the task download is completed
-8. Fixed the problem that error code 107 appears during installation due to architecture file errors under Intel
-   architecture
-9. Fixed the problem that the progress is stuck when installing for the first time or under certain circumstances, but
-   in fact the installation has been completed
-10. Fixed the problem of incomplete or incomplete file package download
-11. Added reset program configuration, it is recommended to run the reset program once in this version
+1. Simulate the package dependency download logic of the official Adobe Creative Cloud
+2. Due to the above updates, the problem of insufficient download quantity of some packages has been fixed
+3. Fixed when HDBox and IPCBox already exist, the problem that the original components will not be replaced after
+   downloading X1a0He CC components
+4. Fixed the problem that Acrobat products are still in downloading status when paused and canceled
+5. Add product quantity display at the bottom and display warning slogan in the center
+6. Add some language selections
+7. Optimize the sorting display of the version selection page
+8. Optimize product processing and parsing speed, abandon xml processing and parsing, and use json processing

-PS: CC components are all from Adobe Creative Cloud official extraction, you can download the latest version at any
-time, but the processing may fail
+PS: Most products have been tested on M1 Max and downloaded and installed normally, but Intel has not been tested. If
+you have any questions, please raise issues
 ```

 ### Language friendly
--- a/readme.md
+++ b/readme.md
@@ -59,22 +59,19 @@

 - 更多关于 App 的更新日志，请查看 [Update Log](update-log.md)

- 2024-11-16 14:30 更新日志
+- 2024-11-19 00:55 更新日志

 ```markdown
-1. 新增可选API版本 (v4, v5, v6)【更老的API意味着更长的等待时间】
-2. 引入 Privilege Helper 来处理所有需要权限的操作
-3. 修改从 Github 下载 Setup 组件功能，改为从官方下载简化版CC，称为 X1a0He CC
-4. 调整 CC 组件备份与处理状态检测，分离二者的检测机制
-5. 移除了安装日志显示
-6. 调整 Setup 组件版本号的获取方式
-7. 修复了当任务下载完成后，AppCardView 仍显示下载中的问题
-8. 修复了 Intel 架构下，安装时因架构文件错误出现错误代码 107 的问题
-9. 修复了当初次或某种情况下安装会导致进度卡住但事实上已经安装完成的问题
-10. 修复了文件包下载不完全或不完整的问题
-11. 新增重置程序配置，建议该版本先运行一次重置程序
+1. 模拟官方 Adobe Creative Cloud 的包依赖下载逻辑
+2. 由于上述更新，修复了某些包下载数量仍然不足的问题
+3. 修复了当已存在 HDBox 和 IPCBox 的时候，下载 X1a0He CC 组件后，并不会替换掉原来的组件的问题
+4. 修复了 Acrobat 产品在暂停和取消时仍处于下载状态的问题
+5. 底部增加产品数量显示，居中显示警示标语
+6. 增加部分语言选择
+7. 优化了版本选择页面的排序展示
+8. 优化了产品处理和解析速度，弃用 xml 处理和解析，采用 json 的形式处理

-PS: CC 组件的来源均为 Adobe Creative Cloud 官方提取，可随时下载到最新版，但处理可能会失败
+PS: M1 Max上已测试大部份产品正常下载并安装，Intel未测试，有问题请提issues
 ```

 ### 语言支持
--- a/update-log.md
+++ b/update-log.md
@@ -1,6 +1,6 @@
 # Change Log

-## 2024-11-19 14:30 更新日志
+## 2024-11-19 00:55 更新日志

 [//]: # (1.3.1)

@@ -13,6 +13,22 @@
 6. 增加部分语言选择
 7. 优化了版本选择页面的排序展示
 8. 优化了产品处理和解析速度，弃用 xml 处理和解析，采用 json 的形式处理
+
+PS: M1 Max上已测试大部份产品正常下载并安装，Intel未测试，有问题请提issues
+====================
+
+1. Simulate the package dependency download logic of the official Adobe Creative Cloud
+2. Due to the above updates, the problem of insufficient download quantity of some packages has been fixed
+3. Fixed when HDBox and IPCBox already exist, the problem that the original components will not be replaced after
+   downloading X1a0He CC components
+4. Fixed the problem that Acrobat products are still in downloading status when paused and canceled
+5. Add product quantity display at the bottom and display warning slogan in the center
+6. Add some language selections
+7. Optimize the sorting display of the version selection page
+8. Optimize product processing and parsing speed, abandon xml processing and parsing, and use json processing
+
+PS: Most products have been tested on M1 Max and downloaded and installed normally, but Intel has not been tested. If
+you have any questions, please raise issues
 ```

 ## 2024-11-16 14:30 更新日志