injectlib/Adobe-Downloader
1
1
Fork 0
mirror of https://github.com/X1a0He/Adobe-Downloader.git synced 2025-11-25 11:18:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Show module list only in DEBUG mode

Browse Source
This commit is contained in:
X1a0He
2025-03-27 17:14:34 +08:00
parent 434e1ead09
commit bdc698b3e4
4 changed files with 63 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Adobe Downloader.xcodeproj/project.pbxproj
View File

@@ -416,7 +416,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 151;
CURRENT_PROJECT_VERSION = 200;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Adobe Downloader/Preview Content\"";
DEVELOPMENT_TEAM = TG862GVKHK;
@@ -432,7 +432,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.5.1;
MARKETING_VERSION = 2.0.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.x1a0he.macOS.Adobe-Downloader";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -450,7 +450,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 151;
CURRENT_PROJECT_VERSION = 200;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Adobe Downloader/Preview Content\"";
DEVELOPMENT_TEAM = TG862GVKHK;
@@ -466,7 +466,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.5.1;
MARKETING_VERSION = 2.0.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.x1a0he.macOS.Adobe-Downloader";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;

124
Adobe Downloader/Utils/NewDownloadUtils.swift
View File

@@ -606,48 +606,44 @@ class NewDownloadUtils {
return
}
Task {
await MainActor.run {
package.downloadedSize = package.downloadSize
package.progress = 1.0
package.status = .completed
package.downloaded = true
Task { @MainActor in
package.downloadedSize = package.downloadSize
package.progress = 1.0
package.status = .completed
package.downloaded = true
var totalDownloaded: Int64 = 0
var totalSize: Int64 = 0
var totalDownloaded: Int64 = 0
var totalSize: Int64 = 0
for prod in task.dependenciesToDownload {
for pkg in prod.packages {
totalSize += pkg.downloadSize
if pkg.downloaded {
totalDownloaded += pkg.downloadSize
}
for prod in task.dependenciesToDownload {
for pkg in prod.packages {
totalSize += pkg.downloadSize
if pkg.downloaded {
totalDownloaded += pkg.downloadSize
}
}
task.totalSize = totalSize
task.totalDownloadedSize = totalDownloaded
task.totalProgress = Double(totalDownloaded) / Double(totalSize)
task.totalSpeed = 0
let allCompleted = task.dependenciesToDownload.allSatisfy {
product in product.packages.allSatisfy { $0.downloaded }
}
if allCompleted {
task.setStatus(.completed(DownloadStatus.CompletionInfo(
timestamp: Date(),
totalTime: Date().timeIntervalSince(task.createAt),
totalSize: totalSize
)))
}
product.updateCompletedPackages()
}
task.totalSize = totalSize
task.totalDownloadedSize = totalDownloaded
task.totalProgress = Double(totalDownloaded) / Double(totalSize)
task.totalSpeed = 0
let allCompleted = task.dependenciesToDownload.allSatisfy {
product in product.packages.allSatisfy { $0.downloaded }
}
if allCompleted {
task.setStatus(.completed(DownloadStatus.CompletionInfo(
timestamp: Date(),
totalTime: Date().timeIntervalSince(task.createAt),
totalSize: totalSize
)))
}
product.updateCompletedPackages()
await globalNetworkManager?.saveTask(task)
await MainActor.run {
globalNetworkManager?.objectWillChange.send()
}
globalNetworkManager?.objectWillChange.send()
continuation.resume()
}
},
@@ -777,7 +773,7 @@ class NewDownloadUtils {
var request = URLRequest(url: url)
request.httpMethod = "GET"
var headers = NetworkConstants.adobeRequestHeaders
let headers = NetworkConstants.adobeRequestHeaders
headers.forEach { request.setValue($0.value, forHTTPHeaderField: $0.key) }
@@ -841,41 +837,35 @@ class NewDownloadUtils {
return
}
Task {
await MainActor.run {
aproPackage.downloadedSize = aproPackage.downloadSize
aproPackage.progress = 1.0
aproPackage.status = .completed
aproPackage.downloaded = true
Task { @MainActor in
aproPackage.downloadedSize = aproPackage.downloadSize
aproPackage.progress = 1.0
aproPackage.status = .completed
aproPackage.downloaded = true
var totalDownloaded: Int64 = 0
var totalSize: Int64 = 0
var totalDownloaded: Int64 = 0
var totalSize: Int64 = 0
totalSize += aproPackage.downloadSize
if aproPackage.downloaded {
totalDownloaded += aproPackage.downloadSize
}
task.totalSize = totalSize
task.totalDownloadedSize = totalDownloaded
task.totalProgress = Double(totalDownloaded) / Double(totalSize)
task.totalSpeed = 0
task.setStatus(.completed(DownloadStatus.CompletionInfo(
timestamp: Date(),
totalTime: Date().timeIntervalSince(task.createAt),
totalSize: totalSize
)))
task.objectWillChange.send()
totalSize += aproPackage.downloadSize
if aproPackage.downloaded {
totalDownloaded += aproPackage.downloadSize
}
task.totalSize = totalSize
task.totalDownloadedSize = totalDownloaded
task.totalProgress = Double(totalDownloaded) / Double(totalSize)
task.totalSpeed = 0
task.setStatus(.completed(DownloadStatus.CompletionInfo(
timestamp: Date(),
totalTime: Date().timeIntervalSince(task.createAt),
totalSize: totalSize
)))
task.objectWillChange.send()
await globalNetworkManager?.saveTask(task)
await MainActor.run {
globalNetworkManager?.updateDockBadge()
globalNetworkManager?.objectWillChange.send()
}
globalNetworkManager?.updateDockBadge()
globalNetworkManager?.objectWillChange.send()
continuation.resume()
}
},

3
Adobe Downloader/Views/VersionPickerView.swift
View File

@@ -389,7 +389,7 @@ private struct VersionDetails: View {
DependenciesList(dependencies: info.languageSet.first?.dependencies ?? [])
.padding(.leading, 8)
}
#if DEBUG
if hasModules {
if hasDependencies {
Divider()
@@ -417,6 +417,7 @@ private struct VersionDetails: View {
ModulesList(modules: info.modules)
.padding(.leading, 8)
}
#endif
}
.background(Color(NSColor.controlBackgroundColor).opacity(0.5))
.cornerRadius(6)

3
Localizables/Localizable.xcstrings
View File

@@ -1166,9 +1166,6 @@
}
}
}
},
"可选模块" : {
},
"命令已复制到剪贴板" : {