gsadmin/Firelink
1
0
Fork 0
mirror of https://github.com/nimbold/Firelink.git synced 2026-08-05 17:08:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve correct filename for auto-captured downloads

Browse Source
This commit is contained in:
NimBold
2026-06-11 03:32:14 +03:30
parent 55c6dbf41b
commit 39355f8d2d
8 changed files with 955 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Firelink/DownloadController.swift
+6 -5
View File
@@ -129,7 +129,7 @@ final class DownloadController: ObservableObject {
}
}
func add(urlText: String, connectionsPerServer: Int? = nil, queueID: UUID = DownloadQueue.mainQueueID) {
func add(urlText: String, connectionsPerServer: Int? = nil, queueID: UUID = DownloadQueue.mainQueueID, filename: String? = nil) {
guard let url = URL(string: urlText.trimmingCharacters(in: .whitespacesAndNewlines)),
let scheme = url.scheme?.lowercased(),
["http", "https", "ftp", "sftp"].contains(scheme) else {
@@ -137,11 +137,12 @@ final class DownloadController: ObservableObject {
return
}
let fileName = FileClassifier.fileName(from: url)
let category = FileClassifier.category(forFileName: fileName)
let explicitName = filename?.trimmingCharacters(in: .whitespacesAndNewlines)
let resolvedFileName = (explicitName != nil && !explicitName!.isEmpty) ? explicitName! : FileClassifier.fileName(from: url)
let category = FileClassifier.category(forFileName: resolvedFileName)
let item = DownloadItem(
url: url,
fileName: fileName,
fileName: resolvedFileName,
category: category,
destinationDirectory: settings.destinationDirectory(for: category),
connectionsPerServer: min(max(connectionsPerServer ?? settings.perServerConnections, 1), 16),
@@ -154,7 +155,7 @@ final class DownloadController: ObservableObject {
}
downloads.append(item)
engineMessage = "Added \(fileName) to \(category.rawValue)."
engineMessage = "Added \(resolvedFileName) to \(category.rawValue)."
saveDownloads()
}
Sources/Firelink/LocalExtensionServer.swift
+2 -1
View File
@@ -198,6 +198,7 @@ final class LocalExtensionServer: @unchecked Sendable {
let urls: [String]
let referer: String?
let silent: Bool?
let filename: String?
}
do {
@@ -227,7 +228,7 @@ final class LocalExtensionServer: @unchecked Sendable {
NSApp.activate(ignoringOtherApps: true)
} else {
for validURL in validURLs {
self.downloadController.add(urlText: validURL)
self.downloadController.add(urlText: validURL, filename: payload.filename)
}
self.downloadController.startQueue()
}