updated lyrics architecture

Sources/EeveeSpotify/Lyrics/CustomLyrics.x.swift

@@ -119,18 +119,28 @@ func getCurrentTrackLyricsData(originalLyrics: Lyrics? = nil) throws -> Data {
         throw LyricsError.NoCurrentTrack
     }
 
+    //
+
+    let searchQuery = LyricsSearchQuery(
+        title: track.trackTitle(),
+        primaryArtist: track.artistTitle(),
+        spotifyTrackId: track.URI().spt_trackIdentifier()
+    )
+
     var source = UserDefaults.lyricsSource
 
-    let plainLyrics: PlainLyrics?
+    var repository: LyricsRepository = switch source {
+        case .genius: GeniusLyricsRepository()
+        case .lrclib: LrcLibLyricsRepository()
+        case .musixmatch: MusixmatchLyricsRepository()
+    }
+
+    let lyricsDto: LyricsDto
+
+    //
 
     do {
-        plainLyrics = try LyricsRepository.getLyrics(
-            title: track.trackTitle(),
-            artist: track.artistTitle(),
-            spotifyTrackId: track.URI().spt_trackIdentifier(),
-            source: source
-        )
-
+        lyricsDto = try repository.getLyrics(searchQuery)
         lastLyricsError = nil
     }
 
@@ -175,25 +185,21 @@ func getCurrentTrackLyricsData(originalLyrics: Lyrics? = nil) throws -> Data {
         }
 
         NSLog("[EeveeSpotify] Unable to load lyrics from \(source): \(error), trying Genius as fallback")
+
         source = .genius
+        repository = GeniusLyricsRepository()
 
-        plainLyrics = try LyricsRepository.getLyrics(
-            title: track.trackTitle(),
-            artist: track.artistTitle(),
-            spotifyTrackId: track.URI().spt_trackIdentifier(),
-            source: source
-        )
+        lyricsDto = try repository.getLyrics(searchQuery)
     }
 
-    let lyrics = try Lyrics.with {
+    let lyrics = Lyrics.with {
         $0.colors = getLyricsColors()
-        $0.data = try LyricsHelper.composeLyricsData(plainLyrics!, source: source)
+        $0.data = lyricsDto.toLyricsData(source: source.description)
     }
 
     return try lyrics.serializedData()
 
     func getLyricsColors() -> LyricsColors {
-
         let lyricsColorsSettings = UserDefaults.lyricsColors
 
         if lyricsColorsSettings.displayOriginalColors, let originalLyrics = originalLyrics {

Sources/EeveeSpotify/Lyrics/Models/LyricsDto.swift

@@ -0,0 +1,20 @@
+import Foundation
+
+struct LyricsDto {
+    var lines: [LyricsLineDto]
+    var timeSynced: Bool
+
+    func toLyricsData(source: String) -> LyricsData {
+        return LyricsData.with {
+            $0.timeSynchronized = timeSynced
+            $0.restriction = .unrestricted
+            $0.providedBy = "\(source) (EeveeSpotify)"
+            $0.lines = lines.map { line in
+                LyricsLine.with {
+                    $0.content = line.content
+                    $0.offsetMs = Int32(line.offsetMs ?? 0)
+                }
+            }
+        }
+    }
+}

Sources/EeveeSpotify/Lyrics/Models/LyricsLineDto.swift

@@ -0,0 +1,6 @@
+import Foundation
+
+struct LyricsLineDto {
+    var content: String
+    var offsetMs: Int?
+}

Sources/EeveeSpotify/Lyrics/Models/LyricsSearchQuery.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+struct LyricsSearchQuery {
+    var title: String
+    var primaryArtist: String
+    var spotifyTrackId: String
+}

Sources/EeveeSpotify/Lyrics/Protocols/LyricsRepository.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+protocol LyricsRepository {
+    func getLyrics(_ query: LyricsSearchQuery) throws -> LyricsDto
+}