From cbfca4f6221ff1900babaddb42e50667f71a57f3 Mon Sep 17 00:00:00 2001 From: Dom Kiva Meyer Date: Sat, 8 Jun 2024 12:58:52 -0700 Subject: [PATCH] Change `localizedCaseInsensitiveCompare` to `localizedStandardCompare` to make sorting the same as Finder and Files --- Sources/Shared/Toolkit/Archive/ExplodedArchive.swift | 2 +- Sources/Streamer/Parser/Audio/AudioParser.swift | 2 +- Sources/Streamer/Parser/Image/ImageParser.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/Shared/Toolkit/Archive/ExplodedArchive.swift b/Sources/Shared/Toolkit/Archive/ExplodedArchive.swift index c9f25bb44..c1d05da45 100644 --- a/Sources/Shared/Toolkit/Archive/ExplodedArchive.swift +++ b/Sources/Shared/Toolkit/Archive/ExplodedArchive.swift @@ -35,7 +35,7 @@ final class ExplodedArchive: Archive, Loggable { } } } - return entries.sorted { $0.path.localizedCaseInsensitiveCompare($1.path) == .orderedAscending } + return entries.sorted { $0.path.localizedStandardCompare($1.path) == .orderedAscending } }() func readEntry(at path: ArchivePath) -> ArchiveEntryReader? { diff --git a/Sources/Streamer/Parser/Audio/AudioParser.swift b/Sources/Streamer/Parser/Audio/AudioParser.swift index c0d7dd89c..7e7573763 100644 --- a/Sources/Streamer/Parser/Audio/AudioParser.swift +++ b/Sources/Streamer/Parser/Audio/AudioParser.swift @@ -25,7 +25,7 @@ public final class AudioParser: PublicationParser { let defaultReadingOrder = fetcher.links .filter { !ignores($0) && $0.mediaType.isAudio } - .sorted { $0.href.localizedCaseInsensitiveCompare($1.href) == .orderedAscending } + .sorted { $0.href.localizedStandardCompare($1.href) == .orderedAscending } guard !defaultReadingOrder.isEmpty else { return nil diff --git a/Sources/Streamer/Parser/Image/ImageParser.swift b/Sources/Streamer/Parser/Image/ImageParser.swift index f9b46fa7a..f98e6d2bc 100644 --- a/Sources/Streamer/Parser/Image/ImageParser.swift +++ b/Sources/Streamer/Parser/Image/ImageParser.swift @@ -21,7 +21,7 @@ public final class ImageParser: PublicationParser { var readingOrder = fetcher.links .filter { !ignores($0) && $0.mediaType.isBitmap } - .sorted { $0.href.localizedCaseInsensitiveCompare($1.href) == .orderedAscending } + .sorted { $0.href.localizedStandardCompare($1.href) == .orderedAscending } guard !readingOrder.isEmpty else { return nil