bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

better version

Browse source
This commit is contained in:
delli 2025-12-05 18:20:14 +01:00
commit 57e1cac929
3 changed files with 29 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DynamicIsland/ContentView.swift
View file

@ -28,7 +28,7 @@ struct ContentView: View {
@ObservedObject var privacyManager = PrivacyIndicatorManager.shared
@ObservedObject var doNotDisturbManager = DoNotDisturbManager.shared
@ObservedObject var lockScreenManager = LockScreenManager.shared
@ObservedObject var downloadManager = DownloadManager.shared
@State private var downloadManager = DownloadManager.shared
@Default(.enableStatsFeature) var enableStatsFeature
@Default(.showCpuGraph) var showCpuGraph

2
DynamicIsland/components/Downloads/DownloadLiveActivity.swift
View file

@ -11,7 +11,7 @@ import Defaults
struct DownloadLiveActivity: View {
@EnvironmentObject var vm: DynamicIslandViewModel
@ObservedObject var downloadManager = DownloadManager.shared
@State private var downloadManager = DownloadManager.shared
@State private var isHovering: Bool = false
@State private var gestureProgress: CGFloat = 0

91
DynamicIsland/managers/DownloadManager.swift
View file

@ -1,13 +1,15 @@
import Foundation
import Defaults
import SwiftUI
import Observation
import Defaults
@Observable
@MainActor
class DownloadManager: ObservableObject {
class DownloadManager {
static let shared = DownloadManager()
@Published private(set) var isDownloading: Bool = false
@Published private(set) var isDownloadCompleted: Bool = false
private(set) var isDownloading: Bool = false
private(set) var isDownloadCompleted: Bool = false
private let coordinator = DynamicIslandViewCoordinator.shared
private var source: DispatchSourceFileSystemObject?
@ -16,19 +18,18 @@ class DownloadManager: ObservableObject {
private var hasPerformedInitialScan: Bool = false
private var initialCrDownloadFiles: Set<String> = []
private var previousAllFiles: Set<String> = []
private var ignoredFiles: Set<String> = []
private var downloadsDirectory: URL? {
FileManager.default.urls(for: .downloadsDirectory, in: .userDomainMask).first
}
private init() {
init() {
requestDownloadsPermissionIfNeeded()
startMonitoringIfNeeded()
Defaults.publisher(.enableDownloadListener)
.sink { [weak self] change in
.sink { [weak self] _ in
guard let self else { return }
Task { @MainActor in
self.startMonitoringIfNeeded()
@ -56,10 +57,7 @@ class DownloadManager: ObservableObject {
let path = downloadsDirectory.path
let fd = open(path, O_EVTONLY)
guard fd >= 0 else {
print("DownloadManager: Failed to open Downloads directory at \(path)")
return
}
guard fd >= 0 else { return }
let src = DispatchSource.makeFileSystemObjectSource(
fileDescriptor: fd,
@ -78,21 +76,17 @@ class DownloadManager: ObservableObject {
source = src
src.resume()
// Initial scan
scanDownloadsDirectory()
print("DownloadManager: Started monitoring Downloads folder at \(path)")
}
private func stopMonitoring() {
source?.cancel()
source = nil
hasPerformedInitialScan = false
initialCrDownloadFiles.removeAll()
previousAllFiles.removeAll()
ignoredFiles.removeAll()
isDownloading = false
print("DownloadManager: Stopped monitoring Downloads folder")
}
private func scanDownloadsDirectory() {
@ -100,12 +94,13 @@ class DownloadManager: ObservableObject {
let crDownloadFiles: Set<String>
let allFiles: Set<String>
do {
let contents = try FileManager.default.contentsOfDirectory(
at: downloadsDirectory,
includingPropertiesForKeys: [.creationDateKey],
options: [.skipsHiddenFiles]
includingPropertiesForKeys: [.creationDateKey]
)
crDownloadFiles = Set(contents
.filter {
let ext = $0.pathExtension.lowercased()
@ -113,11 +108,11 @@ class DownloadManager: ObservableObject {
}
.map { $0.lastPathComponent }
)
allFiles = Set(contents.map { $0.lastPathComponent })
} catch {
print("DownloadManager: Failed to read Downloads directory: \(error)")
crDownloadFiles = []
allFiles = []
return
}
Task { @MainActor in
@ -126,90 +121,58 @@ class DownloadManager: ObservableObject {
}
private func processDownloadFiles(_ crDownloadFiles: Set<String>, allFiles: Set<String>) {
// Initial scan - track and ignore existing files
if !hasPerformedInitialScan {
hasPerformedInitialScan = true
initialCrDownloadFiles = crDownloadFiles
previousAllFiles = allFiles
ignoredFiles = crDownloadFiles
isDownloading = false
print("DownloadManager: initial scan - found \(crDownloadFiles.count) existing files, ignoring")
return
}
// Calculate differences
let newFiles = crDownloadFiles.subtracting(initialCrDownloadFiles)
let disappearedFiles = initialCrDownloadFiles.subtracting(crDownloadFiles)
let newRegularFiles = allFiles.subtracting(previousAllFiles).subtracting(crDownloadFiles)
// Log disappeared files
if !disappearedFiles.isEmpty {
print("DownloadManager: files disappeared: \(disappearedFiles.joined(separator: ", "))")
ignoredFiles.subtract(disappearedFiles)
}
// Log new regular files (potential completed downloads)
if !newRegularFiles.isEmpty {
print("DownloadManager: new regular files appeared: \(newRegularFiles.joined(separator: ", "))")
}
// Update tracked files BEFORE calculating active files
initialCrDownloadFiles = crDownloadFiles
previousAllFiles = allFiles
// Calculate active downloads
let activeFiles = crDownloadFiles.subtracting(ignoredFiles)
let hasActiveDownloads = !activeFiles.isEmpty
// Handle new downloads
if !newFiles.isEmpty {
let newActiveFiles = newFiles.subtracting(ignoredFiles)
if !newActiveFiles.isEmpty {
print("DownloadManager: new download detected: \(newActiveFiles.joined(separator: ", "))")
if !isDownloading {
updateDownloadingState(isActive: true)
}
}
}
// Handle state changes based on active downloads
// completion logic
if isDownloading {
if !hasActiveDownloads {
// No more active downloads
// Check if new regular files appeared (indicating successful completion)
if !newRegularFiles.isEmpty || disappearedFiles.isEmpty {
// Download completed successfully - show completion state
if !isDownloadCompleted {
print("DownloadManager: download completed successfully - showing completion")
updateDownloadingState(isActive: false)
}
} else {
// Download files disappeared but no new regular files appeared - cancelled
print("DownloadManager: download cancelled - closing immediately")
closeDownloadViewImmediately()
}
} else if !disappearedFiles.isEmpty {
// Some downloads finished but others remain
print("DownloadManager: some finished, \(activeFiles.count) still active")
}
} else if hasActiveDownloads {
// We're not showing UI but we have active downloads - this shouldn't happen
// but let's handle it gracefully
print("DownloadManager: active downloads found but UI closed - reopening")
updateDownloadingState(isActive: true)
}
}
private func requestDownloadsPermissionIfNeeded() {
guard let downloadsDirectory else { return }
_ = try? FileManager.default.contentsOfDirectory(
at: downloadsDirectory,
includingPropertiesForKeys: nil,
options: [.skipsHiddenFiles]
)
_ = try? FileManager.default.contentsOfDirectory(at: downloadsDirectory, includingPropertiesForKeys: nil)
}
private func updateDownloadingState(isActive: Bool) {
@ -223,7 +186,6 @@ class DownloadManager: ObservableObject {
withAnimation(.smooth) {
isDownloading = true
}
print("DownloadManager: download started")
coordinator.toggleExpandingView(
status: true,
type: .download,
@ -231,14 +193,13 @@ class DownloadManager: ObservableObject {
browser: .chromium
)
}
} else {
if isDownloading {
print("DownloadManager: download finished - showing completion")
withAnimation(.smooth) {
isDownloadCompleted = true
}
// Close after 2 seconds
completionTimer = Timer.scheduledTimer(withTimeInterval: 2.0, repeats: false) { [weak self] _ in
Task { @MainActor in
self?.closeDownloadView()
@ -253,7 +214,7 @@ class DownloadManager: ObservableObject {
isDownloading = false
isDownloadCompleted = false
}
print("DownloadManager: closing download view")
coordinator.toggleExpandingView(
status: false,
type: .download,
@ -270,7 +231,7 @@ class DownloadManager: ObservableObject {
isDownloading = false
isDownloadCompleted = false
}
print("DownloadManager: closing download view immediately (cancelled)")
coordinator.toggleExpandingView(
status: false,
type: .download,