10
10
// swiftlint:disable nesting - Seriously, why do we even Swift then.
11
11
// swiftlint:disable function_parameter_count - Some problems are hard.
12
12
13
- import CryptoKit
14
13
import Etcetera
15
14
import Combine
16
15
@@ -48,13 +47,6 @@ import AppKit
48
47
didSet { trimStaleFiles ( ) }
49
48
}
50
49
51
- /// Your app can provide something stronger than the default implementation
52
- /// (a string representation of a SHA1 hash) if so desired.
53
- public nonisolated var uniqueFilenameFromUrl : ( URL ) -> String {
54
- get { _uniqueFilenameFromUrl. current }
55
- set { _uniqueFilenameFromUrl. current = newValue }
56
- }
57
-
58
50
/// When `true` this will empty the in-memory cache when the app enters the
59
51
/// background. This can help reduce the likelihood that your app will be
60
52
/// terminated in order to reclaim memory for foregrounded applications.
@@ -75,7 +67,6 @@ import AppKit
75
67
private let formattingQueue : OperationQueue
76
68
private let diskWritingQueue : OperationQueue
77
69
private let workQueue : OperationQueue
78
- private nonisolated let _uniqueFilenameFromUrl : Protected < ( URL ) -> String >
79
70
private var cancellables = Set < AnyCancellable > ( )
80
71
81
72
// MARK: Init / Deinit
@@ -94,7 +85,6 @@ import AppKit
94
85
directory: URL = ImageCache . defaultDirectory,
95
86
byteLimitForFileStorage: Bytes ? = . fromMegabytes( 500 )
96
87
) {
97
- self . _uniqueFilenameFromUrl = Protected ( Insecure . SHA1. filename ( for: ) )
98
88
self . directory = directory
99
89
self . byteLimitForFileStorage = byteLimitForFileStorage
100
90
self . urlSession = {
@@ -543,7 +533,7 @@ import AppKit
543
533
switch key. source {
544
534
case . url( let url) :
545
535
let originalKey = ImageKey ( source: . url( url) , format: . original)
546
- filename = uniqueFilenameFromUrl ( url) + originalKey. filenameSuffix
536
+ filename = FileNameHashes . uniqueFilename ( from : url) + originalKey. filenameSuffix
547
537
case . manuallySeeded( let id) :
548
538
filename = " \( id) .MANUALLY_SEEDED_ORIGINAL "
549
539
case . custom( let id, let namespace, _) :
@@ -558,7 +548,7 @@ import AppKit
558
548
let filename : String
559
549
switch key. source {
560
550
case . url( let url) :
561
- filename = uniqueFilenameFromUrl ( url) + key. filenameSuffix
551
+ filename = FileNameHashes . uniqueFilename ( from : url) + key. filenameSuffix
562
552
case . manuallySeeded( let id) :
563
553
filename = " \( id) . \( key. filenameSuffix) "
564
554
case . custom( let identifier, let namespace, _) :
0 commit comments