From 22c28de641010a50de66f8bee82863f144a9713a Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sun, 30 Oct 2022 10:22:44 +0100 Subject: [PATCH] Retain original filename as imported profile name (#240) --- Passepartout/App/Views/AddHostViewModel.swift | 2 +- .../Sources/PassepartoutUtils/Utils/Utils+URL.swift | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Passepartout/App/Views/AddHostViewModel.swift b/Passepartout/App/Views/AddHostViewModel.swift index 86346a97..ff378252 100644 --- a/Passepartout/App/Views/AddHostViewModel.swift +++ b/Passepartout/App/Views/AddHostViewModel.swift @@ -49,7 +49,7 @@ extension AddHostView { return } isNamePreset = true - profileName = url.normalizedFilename + profileName = url.filename } @MainActor diff --git a/PassepartoutLibrary/Sources/PassepartoutUtils/Utils/Utils+URL.swift b/PassepartoutLibrary/Sources/PassepartoutUtils/Utils/Utils+URL.swift index 5b5a88af..fbf05baf 100644 --- a/PassepartoutLibrary/Sources/PassepartoutUtils/Utils/Utils+URL.swift +++ b/PassepartoutLibrary/Sources/PassepartoutUtils/Utils/Utils+URL.swift @@ -32,11 +32,8 @@ import AppKit #endif extension URL { - private static let illegalCharacterFallback = "_" - - public var normalizedFilename: String { - let filename = deletingPathExtension().lastPathComponent - return filename.components(separatedBy: CharacterSet.filename.inverted).joined(separator: URL.illegalCharacterFallback) + public var filename: String { + deletingPathExtension().lastPathComponent } @discardableResult