Merge pull request #130 from rsyncOSX/version-3.0.2

rsyncOSX · web-flow · commit 80201020e553 · 2026-06-24T08:11:41.000+02:00
Version 3.0.2
diff --git a/RsyncUI.xcodeproj/project.pbxproj b/RsyncUI.xcodeproj/project.pbxproj
@@ -518,7 +518,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 195;
+				CURRENT_PROJECT_VERSION = 196;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"RsyncUI/Preview Content\"";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -530,7 +530,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = no.blogspot.RsyncUI;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_APPROACHABLE_CONCURRENCY = YES;
@@ -551,7 +551,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 195;
+				CURRENT_PROJECT_VERSION = 196;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"RsyncUI/Preview Content\"";
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -563,7 +563,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = no.blogspot.RsyncUI;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_APPROACHABLE_CONCURRENCY = YES;
@@ -633,7 +633,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 195;
+				CURRENT_PROJECT_VERSION = 196;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -647,7 +647,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = no.blogspot.RsyncUI.WidgetEstimate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -667,7 +667,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 195;
+				CURRENT_PROJECT_VERSION = 196;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -681,7 +681,7 @@
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = no.blogspot.RsyncUI.WidgetEstimate;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
diff --git a/RsyncUI/Model/Execution/EstimateExecute/Estimate.swift b/RsyncUI/Model/Execution/EstimateExecute/Estimate.swift
@@ -48,12 +48,7 @@ final class Estimate {
             let arguments = ArgumentsSynchronize(config: config).argumentsSynchronize(dryRun: true, forDisplay: false)
         else { return }
 
-        // Check if the arguments --itemize-changes and --update are included within the arguments
-        if arguments.contains("--itemize-changes"), arguments.contains("--update") {
-            itemizechanges = true
-        } else {
-            itemizechanges = false
-        }
+        itemizechanges = arguments.contains("--itemize-changes")
         // Used to display details of configuration in estimation
         localprogressdetails?.configurationtobestimated = config.id
 
diff --git a/RsyncUI/Model/Output/ItemizedOutput.swift b/RsyncUI/Model/Output/ItemizedOutput.swift
@@ -0,0 +1,118 @@
+//
+//  ItemizedOutput.swift
+//  RsyncUI
+//
+
+import Foundation
+import SwiftUI
+
+enum ItemizedChangeKind: String {
+    case added = "Added"
+    case updated = "Updated"
+    case deleted = "Deleted"
+    case metadata = "Metadata"
+    case other = "Other"
+
+    var systemImage: String {
+        switch self {
+        case .added: "plus.circle.fill"
+        case .updated: "arrow.triangle.2.circlepath.circle.fill"
+        case .deleted: "minus.circle.fill"
+        case .metadata: "info.circle.fill"
+        case .other: "questionmark.circle.fill"
+        }
+    }
+
+    var color: Color {
+        switch self {
+        case .added: .green
+        case .updated: .blue
+        case .deleted: .red
+        case .metadata: .orange
+        case .other: .secondary
+        }
+    }
+}
+
+struct ItemizedOutputRecord {
+    let kind: ItemizedChangeKind
+    let path: String
+    let code: String
+
+    init?(_ record: String) {
+        let trimmed = record.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard trimmed.isEmpty == false else { return nil }
+
+        if trimmed.hasPrefix("*deleting") {
+            kind = .deleted
+            path = trimmed.replacingOccurrences(of: "*deleting", with: "")
+                .trimmingCharacters(in: .whitespaces)
+            code = "*deleting"
+            return
+        }
+
+        let prefixLength = Self.prefixLength(in: trimmed)
+        guard let prefixLength else { return nil }
+
+        code = String(trimmed.prefix(prefixLength))
+        path = String(trimmed.dropFirst(prefixLength))
+            .trimmingCharacters(in: .whitespaces)
+        guard path.isEmpty == false else { return nil }
+
+        let attributes = code.dropFirst(2)
+        kind = if attributes.isEmpty == false, attributes.allSatisfy({ $0 == "+" }) {
+            .added
+        } else if code.first == "." {
+            .metadata
+        } else if code.first == ">" || code.first == "<" || code.first == "c" {
+            .updated
+        } else {
+            .other
+        }
+    }
+
+    private static func prefixLength(in record: String) -> Int? {
+        let characters = Array(record)
+        if characters.count >= 13, characters[12] == " " {
+            return 12
+        }
+        if characters.count >= 12, characters[11] == " " {
+            return 11
+        }
+        if characters.count >= 10, characters[9] == " " {
+            return 9
+        }
+        return nil
+    }
+}
+
+struct ItemizedOutputRow: View {
+    let record: String
+
+    var body: some View {
+        if let parsed = ItemizedOutputRecord(record) {
+            HStack(spacing: 10) {
+                Label(parsed.kind.rawValue, systemImage: parsed.kind.systemImage)
+                    .foregroundStyle(parsed.kind.color)
+                    .font(.caption.weight(.semibold))
+                    .frame(width: 92, alignment: .leading)
+
+                Text(parsed.path)
+                    .font(.caption.monospaced())
+                    .lineLimit(1)
+                    .textSelection(.enabled)
+
+                Spacer()
+
+                Text(parsed.code)
+                    .font(.caption2.monospaced())
+                    .foregroundStyle(.secondary)
+            }
+            .accessibilityElement(children: .combine)
+        } else {
+            Text(record)
+                .font(.caption.monospaced())
+                .textSelection(.enabled)
+        }
+    }
+}
diff --git a/RsyncUI/Model/ParametersRsync/ArgumentsSynchronize.swift b/RsyncUI/Model/ParametersRsync/ArgumentsSynchronize.swift
@@ -19,7 +19,10 @@ final class ArgumentsSynchronize {
                                                                                            verify: false,
                                                                                            dryrun: dryRun,
                                                                                            keepDelete: keepdelete)
-                return rsyncparameterssynchronize.computedArguments
+                return RuntimeRsyncArguments.addingItemizedChanges(
+                    to: rsyncparameterssynchronize.computedArguments,
+                    forDisplay: forDisplay
+                )
             } catch {
                 return nil
             }
@@ -38,7 +41,10 @@ final class ArgumentsSynchronize {
                     try rsyncparameterssynchronize.argumentsForSynchronize(forDisplay: forDisplay,
                                                                            verify: false,
                                                                            dryrun: dryRun)
-                    return rsyncparameterssynchronize.computedArguments
+                    return RuntimeRsyncArguments.addingItemizedChanges(
+                        to: rsyncparameterssynchronize.computedArguments,
+                        forDisplay: forDisplay
+                    )
                 } catch {
                     return nil
                 }
@@ -47,7 +53,10 @@ final class ArgumentsSynchronize {
                     try rsyncparameterssynchronize.argumentsForSynchronizeSnapshot(forDisplay: forDisplay,
                                                                                    verify: false,
                                                                                    dryrun: dryRun)
-                    return rsyncparameterssynchronize.computedArguments
+                    return RuntimeRsyncArguments.addingItemizedChanges(
+                        to: rsyncparameterssynchronize.computedArguments,
+                        forDisplay: forDisplay
+                    )
                 } catch {
                     return nil
                 }
@@ -56,7 +65,10 @@ final class ArgumentsSynchronize {
                     try rsyncparameterssynchronize.argumentsForSynchronizeRemote(forDisplay: forDisplay,
                                                                                  verify: false,
                                                                                  dryrun: dryRun)
-                    return rsyncparameterssynchronize.computedArguments
+                    return RuntimeRsyncArguments.addingItemizedChanges(
+                        to: rsyncparameterssynchronize.computedArguments,
+                        forDisplay: forDisplay
+                    )
                 } catch {
                     return nil
                 }
diff --git a/RsyncUI/Model/ParametersRsync/ArgumentsVerify.swift b/RsyncUI/Model/ParametersRsync/ArgumentsVerify.swift
@@ -21,7 +21,10 @@ final class ArgumentsVerify {
                     try rsyncparameterssynchronize.argumentsForSynchronize(forDisplay: forDisplay,
                                                                            verify: true,
                                                                            dryrun: true)
-                    return rsyncparameterssynchronize.computedArguments
+                    return RuntimeRsyncArguments.addingItemizedChanges(
+                        to: rsyncparameterssynchronize.computedArguments,
+                        forDisplay: forDisplay
+                    )
                 } catch {
                     return nil
                 }
@@ -30,7 +33,10 @@ final class ArgumentsVerify {
                     try rsyncparameterssynchronize.argumentsForSynchronizeSnapshot(forDisplay: forDisplay,
                                                                                    verify: true,
                                                                                    dryrun: true)
-                    return rsyncparameterssynchronize.computedArguments
+                    return RuntimeRsyncArguments.addingItemizedChanges(
+                        to: rsyncparameterssynchronize.computedArguments,
+                        forDisplay: forDisplay
+                    )
                 } catch {
                     return nil
                 }
@@ -39,7 +45,10 @@ final class ArgumentsVerify {
                     try rsyncparameterssynchronize.argumentsForSynchronizeRemote(forDisplay: forDisplay,
                                                                                  verify: true,
                                                                                  dryrun: true)
-                    return rsyncparameterssynchronize.computedArguments
+                    return RuntimeRsyncArguments.addingItemizedChanges(
+                        to: rsyncparameterssynchronize.computedArguments,
+                        forDisplay: forDisplay
+                    )
                 } catch {
                     return nil
                 }
diff --git a/RsyncUI/Model/ParametersRsync/RuntimeRsyncArguments.swift b/RsyncUI/Model/ParametersRsync/RuntimeRsyncArguments.swift
@@ -0,0 +1,28 @@
+//
+//  RuntimeRsyncArguments.swift
+//  RsyncUI
+//
+
+enum RuntimeRsyncArguments {
+    static func addingItemizedChanges(
+        to arguments: [String],
+        forDisplay: Bool
+    ) -> [String] {
+        guard arguments.contains("--itemize-changes") == false else {
+            return arguments
+        }
+
+        let meaningfulIndices = arguments.indices.filter { arguments[$0] != " " }
+        guard meaningfulIndices.count >= 2 else {
+            return arguments
+        }
+
+        let sourceIndex = meaningfulIndices[meaningfulIndices.count - 2]
+        var updatedArguments = arguments
+        updatedArguments.insert("--itemize-changes", at: sourceIndex)
+        if forDisplay {
+            updatedArguments.insert(" ", at: sourceIndex + 1)
+        }
+        return updatedArguments
+    }
+}
diff --git a/RsyncUI/Views/Detailsview/OneTaskDetailsView.swift b/RsyncUI/Views/Detailsview/OneTaskDetailsView.swift
@@ -87,12 +87,7 @@ struct OneTaskDetailsView: View {
                 useFileHandler: false
             )
 
-            // Check if the arguments --itemize-changes and --update are included within the arguments
-            if arguments.contains("--itemize-changes"), arguments.contains("--update") {
-                itemizechanges = true
-            } else {
-                itemizechanges = false
-            }
+            itemizechanges = arguments.contains("--itemize-changes")
 
             do {
                 try process.executeProcess()
diff --git a/RsyncUI/Views/InspectorViews/VerifyTask/VerifyTaskTabView.swift b/RsyncUI/Views/InspectorViews/VerifyTask/VerifyTaskTabView.swift
@@ -137,7 +137,7 @@ struct VerifyTaskTabView: View {
         guard let streamingHandlers else { return }
         guard let arguments else { return }
 
-        itemizechanges = arguments.contains("--itemize-changes") && arguments.contains("--update")
+        itemizechanges = arguments.contains("--itemize-changes")
 
         let process = RsyncProcessStreaming.RsyncProcess(
             arguments: arguments,
diff --git a/RsyncUI/Views/OutputViews/DetailsView.swift b/RsyncUI/Views/OutputViews/DetailsView.swift
@@ -5,7 +5,6 @@
 //  Created by Thomas Evensen on 07/06/2024.
 //
 
-import RsyncAnalyse
 import SwiftUI
 
 struct DetailsView: View {
@@ -61,11 +60,7 @@ struct DetailsView: View {
                 if itemizechanges {
                     Table(records) {
                         TableColumn("Output from rsync (\(records.count) rows)") { data in
-                            if SharedReference.shared.rsyncversion3 {
-                                RsyncOutputRowView(record: data.record)
-                            } else {
-                                OpenRsyncOutputRowView(record: data.record)
-                            }
+                            ItemizedOutputRow(record: data.record)
                         }
                     }
                 } else {
diff --git a/RsyncUI/Views/OutputViews/OutputRsyncView.swift b/RsyncUI/Views/OutputViews/OutputRsyncView.swift
@@ -13,7 +13,7 @@ struct OutputRsyncView: View {
     var body: some View {
         Table(output) {
             TableColumn("Output from rsync" + ": \(output.count) rows") { data in
-                Text(data.record)
+                ItemizedOutputRow(record: data.record)
             }
         }
         .padding()
diff --git a/RsyncUI/Views/Tasks/LogStatsChartView.swift b/RsyncUI/Views/Tasks/LogStatsChartView.swift
diff --git a/RsyncUITests/ArgumentsSynchronizeTests.swift b/RsyncUITests/ArgumentsSynchronizeTests.swift
diff --git a/RsyncUITests/ItemizedOutputTests.swift b/RsyncUITests/ItemizedOutputTests.swift

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ struct OutputRsyncView: View {`
`13`	`13`	`var body: some View {`
`14`	`14`	`Table(output) {`
`15`	`15`	`TableColumn("Output from rsync" + ": \(output.count) rows") { data in`
`16`		`- Text(data.record)`
	`16`	`+ ItemizedOutputRow(record: data.record)`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`.padding()`