change(SabyAppleStorage, SabyApplePreference): add Version1 to name o…

…f file
ab180 · May 24, 2024 · c624f1f · c624f1f
1 parent 4caff72
commit c624f1f
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/Source/ApplePreference/Implement/FileValuePreference.swift b/Source/ApplePreference/Implement/FileValuePreference.swift
@@ -110,7 +110,7 @@ struct FileValuePreferenceContext<Value: Codable> {
             )
         }
 
-        let url = directoryURL.appendingPathComponent(storageName).appendingPathExtension(STORAGE_VERSION)
+        let url = directoryURL.appendingPathComponent("\(storageName)_\(STORAGE_VERSION)")
         if !fileManager.fileExists(atPath: url.path) {
             return FileValuePreferenceContext(
                 url: url,

diff --git a/Source/ApplePreference/Preference.swift b/Source/ApplePreference/Preference.swift
@@ -10,13 +10,13 @@ import Foundation
 public protocol Preference {
     /// ``init(directoryURL:storageName:migration:)``
     /// execute migration and then create or load preference from
-    /// `{Directory url}/{Storage name}/{Version name}` path.
+    /// `{Directory url}/{Storage name}_{Version name}` path.
     init(directoryURL: URL, storageName: String, migration: @escaping () throws -> Void)
 }
 
 extension Preference {
     /// ``init(directoryName:storageName:)`` create or load storage from
-    /// `{Directory url}/{Storage name}/{Version name}` path.
+    /// `{Directory url}/{Storage name}_{Version name}` path.
     public init(directoryURL: URL, storageName: String) {
         self.init(directoryURL: directoryURL, storageName: storageName, migration: {})
     }

diff --git a/Source/AppleStorage/Implement/CoreDataArrayStorage.swift b/Source/AppleStorage/Implement/CoreDataArrayStorage.swift
@@ -355,7 +355,7 @@ extension NSManagedObjectContext {
                 )
             }
 
-            let url = directoryURL.appendingPathComponent(storageName).appendingPathExtension(STORAGE_VERSION)
+            let url = directoryURL.appendingPathComponent("\(storageName)_\(STORAGE_VERSION)")
 
             let container = NSPersistentContainer(
                 name: storageName,

diff --git a/Source/AppleStorage/Implement/FileArrayStorage.swift b/Source/AppleStorage/Implement/FileArrayStorage.swift
@@ -223,7 +223,7 @@ struct FileArrayStorageContext<Value: Codable> {
                 )
             }
 
-            let url = directoryURL.appendingPathComponent(storageName).appendingPathExtension(STORAGE_VERSION)
+            let url = directoryURL.appendingPathComponent("\(storageName)_\(STORAGE_VERSION)")
             if !fileManager.fileExists(atPath: url.path) {
                 return FileArrayStorageContext(
                     url: url,

diff --git a/Source/AppleStorage/Implement/FileDictionaryStorage.swift b/Source/AppleStorage/Implement/FileDictionaryStorage.swift
@@ -136,7 +136,7 @@ struct FileDictionaryStorageContext<Key: Hashable & Codable, Value: Codable> {
                 )
             }
 
-            let url = directoryURL.appendingPathComponent(storageName).appendingPathExtension(STORAGE_VERSION)
+            let url = directoryURL.appendingPathComponent("\(storageName)_\(STORAGE_VERSION)")
             if !fileManager.fileExists(atPath: url.path) {
                 return FileDictionaryStorageContext(
                     url: url,

diff --git a/Source/AppleStorage/Implement/FileValueStorage.swift b/Source/AppleStorage/Implement/FileValueStorage.swift
@@ -120,7 +120,7 @@ struct FileValueStorageContext<Value: Codable> {
                 )
             }
 
-            let url = directoryURL.appendingPathComponent(storageName).appendingPathExtension(STORAGE_VERSION)
+            let url = directoryURL.appendingPathComponent("\(storageName)_\(STORAGE_VERSION)")
             if !fileManager.fileExists(atPath: url.path) {
                 return FileValueStorageContext(
                     url: url,

diff --git a/Source/AppleStorage/Storage.swift b/Source/AppleStorage/Storage.swift
@@ -11,13 +11,13 @@ import SabyConcurrency
 public protocol Storage {
     /// ``init(directoryURL:storageName:migration:)``
     /// execute migration and then create or load preference from
-    /// `{Directory url}/{Storage name}/{Version name}` path.
+    /// `{Directory url}/{Storage name}_{Version name}` path.
     init(directoryURL: URL, storageName: String, migration: @escaping () -> Promise<Void, Error>)
 }
 
 extension Storage {
     /// ``init(directoryName:storageName:)`` create or load storage from
-    /// `{Directory url}/{Storage name}/{Version name}` path.
+    /// `{Directory url}/{Storage name}_{Version name}` path.
     public init(directoryURL: URL, storageName: String) {
         self.init(directoryURL: directoryURL, storageName: storageName, migration: { .resolved(()) })
     }

diff --git a/Test/ApplePreference/FileValuePreferenceTest.swift b/Test/ApplePreference/FileValuePreferenceTest.swift
@@ -37,7 +37,7 @@ final class FileValuePreferenceTest: XCTestCase {
     }
 
     override func tearDownWithError() throws {
-        let fileURL = directoryURL.appendingPathComponent(storageName)
+        let fileURL = directoryURL
 
         if FileManager.default.fileExists(atPath: fileURL.absoluteString) {
             try FileManager.default.removeItem(at: fileURL)

diff --git a/Test/AppleStorage/Implement/FileArrayStorageTest.swift b/Test/AppleStorage/Implement/FileArrayStorageTest.swift
@@ -46,7 +46,7 @@ final class FileArrayStorageTest: XCTestCase {
     }
 
     override func tearDownWithError() throws {
-        let fileURL = directoryURL.appendingPathComponent(storageName)
+        let fileURL = directoryURL
 
         if FileManager.default.fileExists(atPath: fileURL.absoluteString) {
             try FileManager.default.removeItem(at: fileURL)

diff --git a/Test/AppleStorage/Implement/FileDictionaryStorageTest.swift b/Test/AppleStorage/Implement/FileDictionaryStorageTest.swift
@@ -37,7 +37,7 @@ final class FileDictionaryStorageTest: XCTestCase {
     }
 
     override func tearDownWithError() throws {
-        let fileURL = directoryURL.appendingPathComponent(storageName)
+        let fileURL = directoryURL
 
         if FileManager.default.fileExists(atPath: fileURL.absoluteString) {
             try FileManager.default.removeItem(at: fileURL)

diff --git a/Test/AppleStorage/Implement/FileValueStorageTest.swift b/Test/AppleStorage/Implement/FileValueStorageTest.swift
@@ -37,7 +37,7 @@ final class FileValueStorageTest: XCTestCase {
     }
 
     override func tearDownWithError() throws {
-        let fileURL = directoryURL.appendingPathComponent(storageName)
+        let fileURL = directoryURL
 
         if FileManager.default.fileExists(atPath: fileURL.absoluteString) {
             try FileManager.default.removeItem(at: fileURL)