Merge pull request #61 from jamf/Bug-fixes-for-1.5.0

Fixed a couple of items that were low hanging fruit

Author: HarryStrandJamf

CHANGELOG.md

@@ -6,10 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.5.0] - 2025-1-29
 ### Features
-- Changed the prompt for password for a file share to also include the username so it's possible to change it from what Jamf Pro uses. It will save the last username that was used successfully.
-- Added the option in settings to restrict deletions after synchronization and manual deletions either entirely or to allow only deleting files or allowing deletion of both files and packages.
-- Added a --dryRun command line flag so you can see what will be copied and deleted without actually doing anything, and also added a dry run checkbox to the main view.
-- Added a view where Jamf Pro servers can be activated or deactivated, and added a setting to have it display at startup before it reads any data from the servers. By limiting the number of active servers, startup time can be greatly reduced.
+- Added the option in settings to restrict deletions after synchronization and manual deletions either entirely or to allow only deleting files or allowing deletion of both files and packages. (Issue #42)
+- Changed the prompt for password for a file share to also include the username so it's possible to change it from what Jamf Pro uses. It will save the last username that was used successfully. (Potential fix for issue #48 and #49)
+- Added a --dryRun command line flag so you can see what will be copied and deleted without actually doing anything, and also added a dry run checkbox to the main view. (Issue #51)
+- Added a view where Jamf Pro servers can be activated or deactivated, and added a setting to have it display at startup before it reads any data from the servers. By limiting the number of active servers, startup time can be greatly reduced. (Issue #55)
+- Made it so you can upload zip files when clicking the + button for a distribution point. (Issue #59)
+### Bug fixes
+- Made it unmount file shares after command line processing is completed. (Issue #50)
 
 ## [1.4.0] - 2024-10-25
 ### Features

Jamf Sync.xcodeproj/xcshareddata/xcschemes/Jamf Sync.xcscheme

@@ -79,13 +79,17 @@
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "&quot;Demo Folder 2&quot;"
+            argument = "&quot;Demo folder 1&quot;"
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-d"
             isEnabled = "NO">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "StrandlandM1:HarryTest"
+            isEnabled = "NO">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "Cloud:HarryTest"
             isEnabled = "NO">

JamfSync/Model/DataModel.swift

@@ -48,9 +48,9 @@ class DataModel: ObservableObject {
     private var updateListViewModelsTask: Task<Void, Error>?
     private var updateChecksumsTask: Task<Void, Error>?
 
-    func load(dataPersistence: DataPersistence) {
+    func load(dataPersistence: DataPersistence, isProcessingCommandLine: Bool = false) {
         savableItems = dataPersistence.loadSavableItems()
-        if firstLoad && !promptedForJamfProInstances && settingsViewModel.promptForJamfProInstances {
+        if firstLoad && !promptedForJamfProInstances && settingsViewModel.promptForJamfProInstances && !isProcessingCommandLine {
             shouldPresentServerSelectionSheet = true
             promptedForJamfProInstances = true
         } else {

JamfSync/UI/JamfSyncApp.swift

@@ -83,7 +83,9 @@ struct JamfSyncApp: App {
 
         if argumentParser.someArgumentsPassed {
             let commandLineProcessing = CommandLineProcessing(dataModel: DataModel.shared, dataPersistence: dataPersistence)
-            if commandLineProcessing.process(argumentParser: argumentParser) {
+            let succeeded = commandLineProcessing.process(argumentParser: argumentParser)
+            appDelegate.cleanup()
+            if succeeded {
                 exit(0)
             } else {
                 exit(1)

JamfSync/UI/PackageListView.swift

@@ -105,7 +105,7 @@ struct PackageListView: View {
                     Button {
                         let panel = NSOpenPanel()
                         panel.allowsMultipleSelection = true
-                        panel.allowedFileTypes = ["pkg", "dmg", "mpkg"]
+                        panel.allowedFileTypes = ["pkg", "dmg", "mpkg", "zip"]
                         panel.canChooseDirectories = false
                         panel.canChooseFiles = true
                         if panel.runModal() == .OK {

JamfSync/Utility/CommandLineProcessing.swift

@@ -21,7 +21,7 @@ class CommandLineProcessing {
 
         print("Loading distribution points")
         dataModel.loadingInProgressGroup = DispatchGroup()
-        dataModel.load(dataPersistence: dataPersistence)
+        dataModel.load(dataPersistence: dataPersistence, isProcessingCommandLine: true)
         dataModel.loadingInProgressGroup?.wait()
 
         guard let srcDp = dataModel.findDpByCombinedName(name: srcDpName) else {