diff options
Diffstat (limited to 'Sora/Data')
| -rw-r--r-- | Sora/Data/CollectionPickerOption.swift | 7 | ||||
| -rw-r--r-- | Sora/Data/Settings/SettingsFolder.swift | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/Sora/Data/CollectionPickerOption.swift b/Sora/Data/CollectionPickerOption.swift index 442ebdc..008d559 100644 --- a/Sora/Data/CollectionPickerOption.swift +++ b/Sora/Data/CollectionPickerOption.swift @@ -3,7 +3,6 @@ import Foundation enum CollectionPickerOption: Identifiable, Hashable { case all case folder(UUID) - case topLevel(String) case uncategorized var id: String { @@ -14,9 +13,6 @@ enum CollectionPickerOption: Identifiable, Hashable { case .folder(let id): return id.uuidString - case .topLevel(let name): - return name - case .uncategorized: return "uncategorized" } @@ -30,9 +26,6 @@ enum CollectionPickerOption: Identifiable, Hashable { case .folder(let id): return { settings in settings.folderName(forID: id) ?? "Unknown Folder" } - case .topLevel(let name): - return { _ in name } - case .uncategorized: return { _ in "Uncategorised" } } diff --git a/Sora/Data/Settings/SettingsFolder.swift b/Sora/Data/Settings/SettingsFolder.swift index 2464770..2f6830d 100644 --- a/Sora/Data/Settings/SettingsFolder.swift +++ b/Sora/Data/Settings/SettingsFolder.swift @@ -13,6 +13,18 @@ struct SettingsFolder: Codable, Identifiable, Hashable { return nil } + var shortName: String { + if name.contains("|") { + let components = name.split(separator: "|") + + if components.count > 1 { + return String(components[1]).trimmingCharacters(in: .whitespacesAndNewlines) + } + } + + return name + } + init(name: String, id: UUID = UUID()) { createdAt = Date() self.id = id |