Remove LyricsNMusicParser

timoloewe · Dec 5, 2016 · c4ef6b6 · c4ef6b6
1 parent 1493c4b
commit c4ef6b6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 106 deletions.
diff --git a/lLyrics/LyricsNMusicParser.py b/lLyrics/LyricsNMusicParser.py
diff --git a/lLyrics/lLyrics.py b/lLyrics/lLyrics.py
@@ -37,7 +37,6 @@
 import LyricsmaniaParser
 import DarklyricsParser
 import GeniusParser
-import LyricsNMusicParser
 import VagalumeParser
 import Util
 
@@ -94,8 +93,8 @@
 LYRICS_TITLE_REPLACE = [("/", "-"), (" & ", " and ")]
 LYRICS_ARTIST_REPLACE = [("/", "-"), (" & ", " and ")]
 
-LYRICS_SOURCES = ["Lyricwiki.org", "Letras.terra.com.br", "Metrolyrics.com", "AZLyrics.com", "Lyricsnmusic.com",
-                  "Lyricsmania.com", "Vagalume.com.br", "Genius.com", "Darklyrics.com", "Chartlyrics.com"]
+LYRICS_SOURCES = ["Lyricwiki.org", "Letras.terra.com.br", "Metrolyrics.com", "AZLyrics.com", "Lyricsmania.com",
+                  "Vagalume.com.br", "Genius.com", "Darklyrics.com", "Chartlyrics.com"]
 
 
 class lLyrics(GObject.Object, Peas.Activatable):
@@ -118,7 +117,7 @@ def do_activate(self):
                           "Metrolyrics.com": MetrolyricsParser, "AZLyrics.com": AZLyricsParser,
                           "Lyricsmania.com": LyricsmaniaParser, "Chartlyrics.com": ChartlyricsParser,
                           "Darklyrics.com": DarklyricsParser, "Genius.com": GeniusParser,
-                          "Lyricsnmusic.com": LyricsNMusicParser, "Vagalume.com.br": VagalumeParser})
+                          "Vagalume.com.br": VagalumeParser})
         self.add_builtin_lyrics_sources()
 
         # Get the user preferences

diff --git a/org.gnome.rhythmbox.plugins.llyrics.gschema.xml b/org.gnome.rhythmbox.plugins.llyrics.gschema.xml
@@ -3,15 +3,15 @@
 	<schema id="org.gnome.rhythmbox.plugins.llyrics" path="/org/gnome/rhythmbox/plugins/llyrics/">
 
 		<key name="active-sources" type="as">
-			<default>['Lyricwiki.org', 'Letras.terra.com.br', 'Vagalume.com.br', 'Metrolyrics.com', 'AZLyrics.com', 'Lyricsnmusic.com', 'Lyricsmania.com', 'Darklyrics.com', 'Chartlyrics.com', 'Genius.com']</default>
+			<default>['Lyricwiki.org', 'Letras.terra.com.br', 'Vagalume.com.br', 'Metrolyrics.com', 'AZLyrics.com', 'Lyricsmania.com', 'Darklyrics.com', 'Chartlyrics.com', 'Genius.com']</default>
 			<summary>List of lyrics sources to be scanned</summary>
-			<description>Possible values are: 'Lyricwiki.org', 'Letras.terra.com.br', 'Metrolyrics.com', 'AZLyrics.com', 'Lyricsnmusic.com', 'Lyricsmania.com', 'Vagalume.com.br', 'Darklyrics.com', 'Chartlyrics.com', 'Genius.com'</description>
+			<description>Possible values are: 'Lyricwiki.org', 'Letras.terra.com.br', 'Metrolyrics.com', 'AZLyrics.com', 'Lyricsmania.com', 'Vagalume.com.br', 'Darklyrics.com', 'Chartlyrics.com', 'Genius.com'</description>
 		</key>
 
 		<key name="scanning-order" type="as">
-			<default>['Lyricwiki.org', 'Letras.terra.com.br', 'Vagalume.com.br', 'Metrolyrics.com', 'AZLyrics.com', 'Lyricsnmusic.com', 'Lyricsmania.com', 'Genius.com', 'Darklyrics.com', 'Chartlyrics.com']</default>
+			<default>['Lyricwiki.org', 'Letras.terra.com.br', 'Vagalume.com.br', 'Metrolyrics.com', 'AZLyrics.com', 'Lyricsmania.com', 'Genius.com', 'Darklyrics.com', 'Chartlyrics.com']</default>
 			<summary>Sources are scanned in this order</summary>
-			<description>Possible values are: 'Lyricwiki.org', 'Letras.terra.com.br', 'Metrolyrics.com', 'AZLyrics.com', 'Lyricsnmusic.com', 'Lyricsmania.com', 'Vagalume.com.br', 'Genius.com', 'Darklyrics.com', 'Chartlyrics.com'</description>
+			<description>Possible values are: 'Lyricwiki.org', 'Letras.terra.com.br', 'Metrolyrics.com', 'AZLyrics.com', 'Lyricsmania.com', 'Vagalume.com.br', 'Genius.com', 'Darklyrics.com', 'Chartlyrics.com'</description>
 		</key>
 
 		<key name="show-first" type="b">