add: mark wrong lyrics for album

icestraw · Jan 21, 2019 · ff623c1 · ff623c1
1 parent 5f7f483
commit ff623c1
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/LyricsX/Base.lproj/Main.storyboard b/LyricsX/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -329,6 +329,9 @@
                                             <action selector="wrongLyrics:" target="Ady-hI-5gd" id="PSJ-f3-tnK"/>
                                         </connections>
                                     </menuItem>
+                                    <menuItem title="Wrong Lyrics for Album" id="hgd-IJ-u14">
+                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                    </menuItem>
                                     <menuItem title="Write to iTunes" tag="202" identifier="MainMenu.WriteToiTunes" id="kNl-ZO-aX6">
                                         <modifierMask key="keyEquivalentModifierMask"/>
                                         <connections>
@@ -1177,7 +1180,7 @@ IA
         </scene>
     </scenes>
     <resources>
-        <image name="NSApplicationIcon" width="128" height="128"/>
+        <image name="NSApplicationIcon" width="32" height="32"/>
         <image name="donate_alipay" width="200" height="200"/>
         <image name="hud_button_lock_off" width="11" height="11"/>
         <image name="hud_button_lock_on" width="11" height="11"/>

diff --git a/LyricsX/Component/AppController.swift b/LyricsX/Component/AppController.swift
@@ -138,7 +138,8 @@ class AppController: NSObject, MusicPlayerManagerDelegate {
         let title = track.title ?? ""
         let artist = track.artist ?? ""
 
-        guard !defaults[.NoSearchingTrackIds].contains(track.id) else {
+        guard !defaults[.NoSearchingTrackIds].contains(track.id),
+            !defaults[.NoSearchingAlbumNames].contains(track.album ?? "") else {
             return
         }
 
@@ -281,5 +282,8 @@ extension AppController {
         if let index = defaults[.NoSearchingTrackIds].firstIndex(of: track.id) {
             defaults[.NoSearchingTrackIds].remove(at: index)
         }
+        if let index = defaults[.NoSearchingAlbumNames].firstIndex(of: track.album ?? "") {
+            defaults[.NoSearchingAlbumNames].remove(at: index)
+        }
     }
 }
diff --git a/LyricsX/Component/AppDelegate.swift b/LyricsX/Component/AppDelegate.swift
@@ -208,6 +208,21 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate, NSTouchBarPr
         AppController.shared.currentLyrics = nil
     }
 
+    @IBAction func doNotSearchLyricsForThisAlbum(_ sender: Any?) {
+        guard let track = AppController.shared.playerManager.player?.currentTrack,
+            let album = track.album else {
+            return
+        }
+        defaults[.NoSearchingAlbumNames].append(album)
+        if defaults[.WriteToiTunesAutomatically] {
+            track.setLyrics("")
+        }
+        if let url = AppController.shared.currentLyrics?.metadata.localURL {
+            try? FileManager.default.removeItem(at: url)
+        }
+        AppController.shared.currentLyrics = nil
+    }
+
     func registerUserDefaults() {
         let currentLang = NSLocale.preferredLanguages.first!
         let isZh = currentLang.hasPrefix("zh") || currentLang.hasPrefix("yue")

diff --git a/LyricsX/Controller/SearchLyricsViewController.swift b/LyricsX/Controller/SearchLyricsViewController.swift
@@ -121,9 +121,13 @@ class SearchLyricsViewController: NSViewController, NSTableViewDelegate, NSTable
             return
         }
 
-        if let id = AppController.shared.playerManager.player?.currentTrack?.id,
-            let index = defaults[.NoSearchingTrackIds].firstIndex(of: id) {
-            defaults[.NoSearchingTrackIds].remove(at: index)
+        if let track = AppController.shared.playerManager.player?.currentTrack {
+            if let index = defaults[.NoSearchingTrackIds].firstIndex(of: track.id) {
+                defaults[.NoSearchingTrackIds].remove(at: index)
+            }
+            if let index = defaults[.NoSearchingAlbumNames].firstIndex(of: track.album ?? "") {
+                defaults[.NoSearchingAlbumNames].remove(at: index)
+            }
         }
 
         let lrc = searchResult[index]

diff --git a/LyricsX/Utility/Global.swift b/LyricsX/Utility/Global.swift
@@ -32,6 +32,7 @@ let lyricsXErrorDomain = "ddddxxx.LyricsX"
 
 let defaults = UserDefaults.standard
 let groupDefaults = UserDefaults(suiteName: lyricsXGroupIdentifier)!
+let defaultNC = NotificationCenter.default
 let workspaceNC = NSWorkspace.shared.notificationCenter
 
 let isInSandbox = ProcessInfo.processInfo.environment["APP_SANDBOX_CONTAINER_ID"] != nil
@@ -78,6 +79,7 @@ extension UserDefaults.DefaultsKeys {
 
     static let NotifiedUpdateVersion = Key<String?>("NotifiedUpdateVersion")
     static let NoSearchingTrackIds = Key<[String]>("NoSearchingTrackIds")
+    static let NoSearchingAlbumNames = Key<[String]>("NoSearchingAlbumNames")
 
     // Menu
     static let DesktopLyricsEnabled = Key<Bool>("DesktopLyricsEnabled")