diff --git a/apple/OmnivoreKit/Sources/Services/AudioSession/AudioController.swift b/apple/OmnivoreKit/Sources/Services/AudioSession/AudioController.swift index 44403ccdf..74d5a8af6 100644 --- a/apple/OmnivoreKit/Sources/Services/AudioSession/AudioController.swift +++ b/apple/OmnivoreKit/Sources/Services/AudioSession/AudioController.swift @@ -543,8 +543,7 @@ } public static func pathForAudioDirectory(itemID: String) -> URL { - FileManager.default - .urls(for: .documentDirectory, in: .userDomainMask)[0] + URL.om_documentsDirectory .appendingPathComponent("audio-\(itemID)/") } diff --git a/apple/OmnivoreKit/Sources/Services/AudioSession/SpeechSynthesizer.swift b/apple/OmnivoreKit/Sources/Services/AudioSession/SpeechSynthesizer.swift index 8df38fb02..5af60dece 100644 --- a/apple/OmnivoreKit/Sources/Services/AudioSession/SpeechSynthesizer.swift +++ b/apple/OmnivoreKit/Sources/Services/AudioSession/SpeechSynthesizer.swift @@ -56,8 +56,7 @@ struct SpeechDocument: Decodable { } static func audioDirectory(pageId: String) -> URL { - FileManager.default - .urls(for: .documentDirectory, in: .userDomainMask)[0] + URL.om_documentsDirectory .appendingPathComponent("audio-\(pageId)") } } @@ -213,12 +212,10 @@ struct SpeechSynthesizer { let data = try await downloadData(session: session, request: speechItem.urlRequest) - let tempPath = FileManager.default - .urls(for: .cachesDirectory, in: .userDomainMask)[0] + let tempPath = URL.om_cachesDirectory .appendingPathComponent(UUID().uuidString + ".mp3") - let tempSMPath = FileManager.default - .urls(for: .cachesDirectory, in: .userDomainMask)[0] + let tempSMPath = URL.om_cachesDirectory .appendingPathComponent(UUID().uuidString + ".speechMarks") do { diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Public/PDFLoading.swift b/apple/OmnivoreKit/Sources/Services/DataService/Public/PDFLoading.swift index c22e01542..0f4315844 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Public/PDFLoading.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Public/PDFLoading.swift @@ -21,8 +21,7 @@ public extension DataService { var localPdfURL: URL? - let tempPath = FileManager.default - .urls(for: .cachesDirectory, in: .userDomainMask)[0] + let tempPath = URL.om_cachesDirectory .appendingPathComponent(UUID().uuidString + ".pdf") try await backgroundContext.perform { [weak self] in diff --git a/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift b/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift index b722edc3f..3a058ef6b 100644 --- a/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift +++ b/apple/OmnivoreKit/Sources/Utils/PDFUtils.swift @@ -10,8 +10,7 @@ import QuickLookThumbnailing public enum PDFUtils { public static func copyToLocal(url: URL) throws -> String { let subPath = UUID().uuidString + ".pdf" - let dest = FileManager.default - .urls(for: .documentDirectory, in: .userDomainMask)[0] + let dest = URL.om_documentsDirectory .appendingPathComponent(subPath) try FileManager.default.copyItem(at: url, to: dest) @@ -20,8 +19,7 @@ public enum PDFUtils { public static func moveToLocal(url: URL) throws -> String { let subPath = UUID().uuidString + ".pdf" - let dest = FileManager.default - .urls(for: .documentDirectory, in: .userDomainMask)[0] + let dest = URL.om_documentsDirectory .appendingPathComponent(subPath) try FileManager.default.moveItem(at: url, to: dest) @@ -29,8 +27,7 @@ public enum PDFUtils { } public static func localPdfURL(filename: String) -> URL? { - let url = FileManager.default - .urls(for: .documentDirectory, in: .userDomainMask)[0] + let url = URL.om_documentsDirectory .appendingPathComponent(filename) return url