also push changes at app start

kjyv · Sep 24, 2024 · a7ae758 · a7ae758
1 parent 7187521
commit a7ae758
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/SparkleShare-Mac/SparkleShare_MacApp.swift b/SparkleShare-Mac/SparkleShare_MacApp.swift
@@ -45,8 +45,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
                                                           name: NSWorkspace.didWakeNotification,
                                                           object: nil)
         setupPullDirectoriesTimer()
-        print("Checking all remote directories for changes...")
-        pullAllDirectories()
+        print("Checking all directories for changes...")
+        syncAllDirectories()
     }
 
     private func setupStatusBar() {
@@ -55,7 +55,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         let menu = NSMenu()
         menu.addItem(NSMenuItem(title: "SparkleShare Mac", action: nil, keyEquivalent: ""))
         menu.addItem(NSMenuItem(title: "Settings", action: #selector(showAddDirectoryWindow), keyEquivalent: "a"))
-        menu.addItem(NSMenuItem(title: "Force sync", action: #selector(pullAllDirectories), keyEquivalent: "s"))
+        menu.addItem(NSMenuItem(title: "Force sync", action: #selector(syncAllDirectories), keyEquivalent: "s"))
         menu.addItem(NSMenuItem.separator())
         menu.addItem(NSMenuItem(title: "Quit", action: #selector(quitApp), keyEquivalent: "q"))
         statusItem?.menu = menu
@@ -95,11 +95,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         window?.orderFrontRegardless()
         NSApp.activate(ignoringOtherApps: true)
     }
-
+    
     @objc private func pullAllDirectories() {
         syncHandler.pullAllDirectories()
     }
 
+    @objc private func syncAllDirectories() {
+        syncHandler.pullAllDirectories()
+        syncHandler.pushAllDirectories()
+    }
+
     private func setupPullDirectoriesTimer() {
         pullDirectoriesTimer = Timer.scheduledTimer(timeInterval: 300, target: self, selector: #selector(pullAllDirectories), userInfo: nil, repeats: true)
     }

diff --git a/SparkleShare-Mac/SyncHandler.swift b/SparkleShare-Mac/SyncHandler.swift
@@ -120,6 +120,12 @@ class SyncHandler: ObservableObject {
         }
     }
 
+    func pushAllDirectories() {
+        for directory in monitoredDirectories {
+            syncChangesUp(in: directory, changedFiles: [])
+        }
+    }
+
     func cloneRepository(from url: URL, to localParentUrl: URL, errorMessage: inout String) -> URL? {
         let gitRepository = GitRepository(repositoryPath: localParentUrl)
         let result = gitRepository.clone(from: url, errorMessage: &errorMessage)