Merge pull request #8 from kushalpandya/kp-improve-library-filtering

Improves Library filtering UX by optimizing track metadata parsing

Author: kushalpandya

Managers/Database/DatabaseManager.swift

@@ -270,6 +270,10 @@ class LibraryManager: ObservableObject {
     func getTracksByAlbum(_ album: String) -> [Track] {
         return databaseManager.getTracksByAlbum(album)
     }
+    
+    func getTracksByComposer(_ composer: String) -> [Track] {
+        return databaseManager.getTracksByComposer(composer)
+    }
 
     func getTracksByGenre(_ genre: String) -> [Track] {
         return databaseManager.getTracksByGenre(genre)
@@ -292,6 +296,10 @@ class LibraryManager: ObservableObject {
         return databaseManager.getAllAlbums()
     }
 
+    func getAllComposers() -> [String] {
+        return databaseManager.getAllComposers()
+    }
+    
     func getAllGenres() -> [String] {
         return databaseManager.getAllGenres()
     }

Managers/Database/MetadataExtractor.swift

@@ -3,12 +3,13 @@ import GRDB
 
 class Track: Identifiable, ObservableObject, Equatable, FetchableRecord, PersistableRecord {
     let id = UUID()
-    var trackId: Int64?  // Database ID
+    var trackId: Int64?
     let url: URL
 
     @Published var title: String
     @Published var artist: String
     @Published var album: String
+    @Published var composer: String
     @Published var genre: String
     @Published var year: String
     @Published var duration: Double
@@ -29,6 +30,7 @@ class Track: Identifiable, ObservableObject, Equatable, FetchableRecord, Persist
         self.title = url.deletingPathExtension().lastPathComponent
         self.artist = "Unknown Artist"
         self.album = "Unknown Album"
+        self.composer = "Unknown Composer"
         self.genre = "Unknown Genre"
         self.year = "Unknown Year"
         self.duration = 0
@@ -47,6 +49,7 @@ class Track: Identifiable, ObservableObject, Equatable, FetchableRecord, Persist
         static let title = Column("title")
         static let artist = Column("artist")
         static let album = Column("album")
+        static let composer = Column("composer")
         static let genre = Column("genre")
         static let year = Column("year")
         static let duration = Column("duration")
@@ -73,6 +76,11 @@ class Track: Identifiable, ObservableObject, Equatable, FetchableRecord, Persist
         artist = row[Columns.artist] ?? "Unknown Artist"
         album = row[Columns.album] ?? "Unknown Album"
         genre = row[Columns.genre] ?? "Unknown Genre"
+        
+        // Normalize empty composer strings
+        let composerValue = row[Columns.composer] ?? "Unknown Composer"
+        composer = composerValue.isEmpty ? "Unknown Composer" : composerValue
+        
         year = row[Columns.year] ?? ""
         duration = row[Columns.duration] ?? 0
         format = row[Columns.format] ?? url.pathExtension
@@ -82,7 +90,6 @@ class Track: Identifiable, ObservableObject, Equatable, FetchableRecord, Persist
         lastPlayedDate = row[Columns.lastPlayedDate]
         isMetadataLoaded = true
     }
-    
     // MARK: - PersistableRecord
 
     func encode(to container: inout PersistenceContainer) throws {
@@ -93,6 +100,7 @@ class Track: Identifiable, ObservableObject, Equatable, FetchableRecord, Persist
         container[Columns.title] = title
         container[Columns.artist] = artist
         container[Columns.album] = album
+        container[Columns.composer] = composer
         container[Columns.genre] = genre
         container[Columns.year] = year
         container[Columns.duration] = duration
@@ -123,3 +131,12 @@ class Track: Identifiable, ObservableObject, Equatable, FetchableRecord, Persist
         return lhs.id == rhs.id
     }
 }
+
+// MARK: - Hashable Conformance
+
+extension Track: Hashable {
+    func hash(into hasher: inout Hasher) {
+        // Use the unique ID for hashing
+        hasher.combine(id)
+    }
+}

Managers/LibraryManager.swift

@@ -3,24 +3,27 @@ import Foundation
 enum LibraryFilterType: String, CaseIterable {
     case artists = "Artists"
     case albums = "Albums"
-    case years = "Years"
+    case composers = "Composers"
     case genres = "Genres"
+    case years = "Years"
 
     var icon: String {
         switch self {
         case .artists: return "person.fill"
         case .albums: return "opticaldisc.fill"
-        case .years: return "calendar"
+        case .composers: return "person.fill"
         case .genres: return "music.note"
+        case .years: return "calendar"
         }
     }
 
     var emptyStateMessage: String {
         switch self {
         case .artists: return "No artists found in your library"
         case .albums: return "No albums found in your library"
-        case .years: return "No release years found in your library"
+        case .composers: return "No composers found in your library"
         case .genres: return "No genres found in your library"
+        case .years: return "No release years found in your library"
         }
     }
 }

Models/Core/Track.swift

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		550F4A402DB4786F005F794E /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = 550F4A3F2DB4786F005F794E /* .gitignore */; };
+		5544932E2DE7911600D452AA /* ArtistParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5544932D2DE78EC000D452AA /* ArtistParser.swift */; };
 		55593A422DE019E400640247 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 55593A412DE019E400640247 /* README.md */; };
 		5590877F2DE0C078009E7719 /* PetrichorApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5590877E2DE0C078009E7719 /* PetrichorApp.swift */; };
 		559087A02DE0C078009E7719 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5590877C2DE0C078009E7719 /* Assets.xcassets */; };
@@ -17,6 +18,7 @@
 /* Begin PBXFileReference section */
 		550F4A0E2DB45B1A005F794E /* Petrichor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Petrichor.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		550F4A3F2DB4786F005F794E /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
+		5544932D2DE78EC000D452AA /* ArtistParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtistParser.swift; sourceTree = "<group>"; };
 		55593A412DE019E400640247 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		5590877C2DE0C078009E7719 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		5590877D2DE0C078009E7719 /* Petrichor.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Petrichor.entitlements; sourceTree = "<group>"; };
@@ -66,6 +68,7 @@
 				559087AA2DE0C0A2009E7719 /* Managers */,
 				559087B72DE0C0A5009E7719 /* Models */,
 				559087D82DE0C0A6009E7719 /* Views */,
+				5544932C2DE78EB300D452AA /* Utilities */,
 				558BF80D2DE0C2040059A014 /* Configuration */,
 				559087ED2DE0C0DC009E7719 /* Resources */,
 				550F4A3F2DB4786F005F794E /* .gitignore */,
@@ -82,6 +85,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		5544932C2DE78EB300D452AA /* Utilities */ = {
+			isa = PBXGroup;
+			children = (
+				5544932D2DE78EC000D452AA /* ArtistParser.swift */,
+			);
+			path = Utilities;
+			sourceTree = "<group>";
+		};
 		558BF80D2DE0C2040059A014 /* Configuration */ = {
 			isa = PBXGroup;
 			children = (
@@ -182,6 +193,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5544932E2DE7911600D452AA /* ArtistParser.swift in Sources */,
 				5590877F2DE0C078009E7719 /* PetrichorApp.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Models/Enums/LibraryFilterType.swift

@@ -0,0 +1,84 @@
+import Foundation
+
+struct ArtistParser {
+    // Common separators used in artist fields
+    private static let separators = [
+        " feat. ", " feat ", " featuring ", " ft. ", " ft ",
+        " & ", " and ", " x ", " X ", " vs. ", " vs ",
+        ", ", " with ", " / ", "／", "、", ";"
+    ]
+    
+    /// Parses a multi-artist string into individual artist names
+    static func parse(_ artistString: String) -> [String] {
+        var artists: [String] = [artistString]
+        
+        // Process each separator
+        for separator in separators {
+            var newArtists: [String] = []
+            
+            for artist in artists {
+                if artist.localizedCaseInsensitiveContains(separator) {
+                    // Split by this separator (case-insensitive)
+                    let components = artist.components(separatedBy: separator, options: .caseInsensitive)
+                    newArtists.append(contentsOf: components)
+                } else {
+                    newArtists.append(artist)
+                }
+            }
+            
+            artists = newArtists
+        }
+        
+        // Clean up and remove duplicates
+        let cleanedArtists = artists
+            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+            .filter { !$0.isEmpty && $0 != "Unknown Artist" }
+        
+        // Remove duplicates while preserving order
+        var seen = Set<String>()
+        var uniqueArtists: [String] = []
+        
+        for artist in cleanedArtists {
+            let lowercased = artist.lowercased()
+            if !seen.contains(lowercased) {
+                seen.insert(lowercased)
+                uniqueArtists.append(artist)
+            }
+        }
+        
+        // If no valid artists found, return the original or "Unknown Artist"
+        if uniqueArtists.isEmpty {
+            return [artistString.isEmpty ? "Unknown Artist" : artistString]
+        }
+        
+        return uniqueArtists
+    }
+    
+    /// Checks if a specific artist appears in a track's artist field
+    static func trackContainsArtist(_ track: Track, artistName: String) -> Bool {
+        let artists = parse(track.artist)
+        return artists.contains { artist in
+            artist.localizedCaseInsensitiveCompare(artistName) == .orderedSame
+        }
+    }
+}
+
+// Extension to String for case-insensitive split
+extension String {
+    func components(separatedBy separator: String, options: String.CompareOptions) -> [String] {
+        var result: [String] = []
+        var currentIndex = self.startIndex
+        
+        while currentIndex < self.endIndex {
+            if let range = self.range(of: separator, options: options, range: currentIndex..<self.endIndex) {
+                result.append(String(self[currentIndex..<range.lowerBound]))
+                currentIndex = range.upperBound
+            } else {
+                result.append(String(self[currentIndex..<self.endIndex]))
+                break
+            }
+        }
+        
+        return result
+    }
+}

Petrichor.xcodeproj/project.pbxproj

@@ -341,7 +341,8 @@ struct LibrarySidebarItem: SidebarItem {
         self.id = filterItem.id  // Use the stable ID from filterItem
         self.title = filterItem.name
         self.subtitle = nil
-        self.icon = "person.fill"
+        // Use the appropriate icon based on filter type
+        self.icon = Self.getIcon(for: filterItem.filterType, isAllItem: false)
         self.count = filterItem.count
         self.filterType = filterItem.filterType
         self.filterName = filterItem.name
@@ -353,11 +354,27 @@ struct LibrarySidebarItem: SidebarItem {
         self.id = UUID(uuidString: "00000000-0000-0000-0000-\(String(format: "%012d", filterType.hashValue))") ?? UUID()
         self.title = "All \(filterType.rawValue)"
         self.subtitle = nil
-        self.icon = "person.2.fill"
+        // Use a different icon for "All" items
+        self.icon = Self.getIcon(for: filterType, isAllItem: true)
         self.count = count
         self.filterType = filterType
         self.filterName = ""
     }
+    
+    private static func getIcon(for filterType: LibraryFilterType, isAllItem: Bool) -> String {
+        switch filterType {
+        case .artists:
+            return isAllItem ? "person.2.fill" : "person.fill"
+        case .albums:
+            return isAllItem ? "opticaldisc.fill" : "opticaldisc"
+        case .composers:
+            return isAllItem ? "person.2.fill" : "person.fill"
+        case .years:
+            return isAllItem ? "calendar.circle.fill" : "calendar"
+        case .genres:
+            return isAllItem ? "music.note.list" : "music.note"
+        }
+    }
 }
 
 // Folder Item
@@ -441,14 +458,14 @@ extension SidebarView where Item == LibrarySidebarItem {
         selectedItem: Binding<LibrarySidebarItem?>,
         onItemTap: @escaping (LibrarySidebarItem) -> Void
     ) {
-        // Create items including "All" item
+        // Create items list
         var items: [LibrarySidebarItem] = []
 
-        // Add "All" item
+        // Add "All" item first
         let allItem = LibrarySidebarItem(allItemFor: filterType, count: totalTracksCount)
         items.append(allItem)
 
-        // Add filter items
+        // Add filter items (which should already be sorted with Unknown first)
         items.append(contentsOf: filterItems.map { LibrarySidebarItem(filterItem: $0) })
 
         self.init(