search lyrics for track without album or artist, resolve #49

ddddxxx · Jun 9, 2017 · 6b3c9ce · 6b3c9ce
1 parent fd882d4
commit 6b3c9ce
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/LyricsX/AppController.swift b/LyricsX/AppController.swift
@@ -93,7 +93,8 @@ class AppController: NSObject, MusicPlayerDelegate, LyricsConsuming {
             return
         }
         let title = track.name
-        let artist = track.artist
+        // FIXME: deal with optional value
+        let artist = track.artist ?? ""
 
         guard !WrongLyricsUtil.shared.isNoMatching(title: title, artist: artist) else {
             return

diff --git a/LyricsX/MediaPlayer/MusicPlayerProtocol.swift b/LyricsX/MediaPlayer/MusicPlayerProtocol.swift
@@ -31,8 +31,8 @@ enum MusicPlayerState {
 struct MusicTrack {
     var id:     String
     var name:   String
-    var album:  String
-    var artist: String
+    var album:  String?
+    var artist: String?
     var duration: TimeInterval?
 }
 

diff --git a/LyricsX/MediaPlayer/Spotify.swift b/LyricsX/MediaPlayer/Spotify.swift
@@ -79,12 +79,10 @@ extension SpotifyEPlS {
 extension SpotifyTrack {
     var track: MusicTrack? {
         guard let id = id?() as? String,
-            let name = name as? String,
-            let album = album as? String,
-            let artist = artist as? String else {
+            let name = name as? String else {
             return nil
         }
 
-        return MusicTrack(id: id, name: name, album: album, artist: artist, duration: duration.map({TimeInterval($0)}))
+        return MusicTrack(id: id, name: name, album: album as? String, artist: artist as? String, duration: duration.map({TimeInterval($0)}))
     }
 }
diff --git a/LyricsX/MediaPlayer/Vox.swift b/LyricsX/MediaPlayer/Vox.swift
@@ -73,11 +73,9 @@ extension VoxApplication {
     }
     var track: MusicTrack? {
         guard let id = uniqueID as? String,
-            let name = track as? String,
-            let album = album as? String,
-            let artist = artist as? String else {
+            let name = track as? String else {
             return nil
         }
-        return MusicTrack(id: id, name: name, album: album, artist: artist, duration: totalTime as TimeInterval?)
+        return MusicTrack(id: id, name: name, album: album as? String, artist: artist as? String, duration: totalTime as TimeInterval?)
     }
 }
diff --git a/LyricsX/MediaPlayer/iTunes.swift b/LyricsX/MediaPlayer/iTunes.swift
@@ -96,12 +96,10 @@ extension iTunesTrack {
 
     var track: MusicTrack? {
         guard let id = stringID,
-            let name = name as? String,
-            let album = album as? String,
-            let artist = artist as? String else {
+            let name = name as? String else {
             return nil
         }
 
-        return MusicTrack(id: id, name: name, album: album, artist: artist, duration: duration as TimeInterval?)
+        return MusicTrack(id: id, name: name, album: album as? String, artist: artist as? String, duration: duration as TimeInterval?)
     }
 }
diff --git a/LyricsX/Support Files/Info.plist b/LyricsX/Support Files/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.1.3</string>
 	<key>CFBundleVersion</key>
-	<string>1150</string>
+	<string>1151</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>