Resolving symlinks in path (#679)

mssun · web-flow · commit 3292bd3652a6 · 2025-02-15T23:38:23.000-08:00
diff --git a/passKit/Models/PasswordEntity.swift b/passKit/Models/PasswordEntity.swift
@@ -153,6 +153,7 @@ public final class PasswordEntity: NSManagedObject, Identifiable {
 
     public static func initPasswordEntityCoreData(url: URL, in context: NSManagedObjectContext) {
         let localFileManager = FileManager.default
+        let url = url.resolvingSymlinksInPath()
 
         let root = {
             let entity = PasswordEntity(context: context)
@@ -190,8 +191,7 @@ public final class PasswordEntity: NSManagedObject, Identifiable {
                     }
                 }
                 passwordEntity.parent = current
-                let path = String(fileURL.path.replacingOccurrences(of: url.path, with: "").drop(while: { $0 == "/" }))
-                passwordEntity.path = path
+                passwordEntity.path = String(fileURL.path.dropFirst(url.path.count + 1))
             }
         }
         context.delete(root)

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ public final class PasswordEntity: NSManagedObject, Identifiable {`
`153`	`153`
`154`	`154`	`public static func initPasswordEntityCoreData(url: URL, in context: NSManagedObjectContext) {`
`155`	`155`	`let localFileManager = FileManager.default`
	`156`	`+ let url = url.resolvingSymlinksInPath()`
`156`	`157`
`157`	`158`	`let root = {`
`158`	`159`	`let entity = PasswordEntity(context: context)`
`@@ -190,8 +191,7 @@ public final class PasswordEntity: NSManagedObject, Identifiable {`
`190`	`191`	`}`
`191`	`192`	`}`
`192`	`193`	`passwordEntity.parent = current`
`193`		`- let path = String(fileURL.path.replacingOccurrences(of: url.path, with: "").drop(while: { $0 == "/" }))`
`194`		`- passwordEntity.path = path`
	`194`	`+ passwordEntity.path = String(fileURL.path.dropFirst(url.path.count + 1))`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`	`context.delete(root)`