Merge pull request #23 from GuardKenzie/dev

Moved from using ffmpeg for album art to MPD's native method

bin/miniplayer

@@ -1,10 +1,7 @@
 #!/bin/python
 import curses
 import os
-import posixpath
+from mpd import MPDClient, CommandError
-import requests
-from mpd import MPDClient
-import ffmpeg
 import pixcat
 import time
 import configparser
@@ -29,9 +26,7 @@ if "player" not in config.sections():
                         }
 
 if "art" not in config.sections():
-    config["art"] = {"music_directory":  "~/Music",
+    config["art"] = {"image_method": "pixcat"}
-                     "image_method":     "pixcat",
-                    }
 
 if "mpd" not in config.sections():
     config["mpd"] = {"host": "localhost",
@@ -68,24 +63,6 @@ default_bindings = {">":      "next_track",
 if "keybindings" not in config.sections():
     config["keybindings"] = default_bindings
 
-# Ensure compatibility with older configs
-deprecated_field_notice = ("The config option `{field}` under the `player` "
-                           "section is deprecated and will be removed in the "
-                           "future. Use the config option `{field}` under the "
-                           "`art` section instead.")
-
-deprecated_fields_present = False
-for field in ["music_directory", "image_method"]:
-    if config.has_option("player", field):
-        deprecated_fields_present = True
-        print(deprecated_field_notice.format(field=field))
-        
-        if not config.has_option("art", field):
-            config["art"][field] = config["player"][field]
-
-if deprecated_fields_present:
-    input("(Press <Enter> to continue) ...")
-
 # Load configured keybindings
 keybindings = config["keybindings"]
 
@@ -227,9 +204,9 @@ class Player:
             i += 1
 
         # Init pairs
-        curses.init_pair(1, color_array[0],     -1) # accent color
+        curses.init_pair(1, color_array[0], -1) # accent color
-        curses.init_pair(2, color_array[1],     -1) # time color
+        curses.init_pair(2, color_array[1], -1) # time color
-        curses.init_pair(3, color_array[2],     -1) # bar color
+        curses.init_pair(3, color_array[2], -1) # bar color
 
         # Get progress bar characters
         self.bar_body = theme_config.get("bar_body", "─")
@@ -259,11 +236,6 @@ class Player:
         else:
             self.repeat = 0
 
-        # Album art HTTP server
-        
-        if art_config.get("http_base_url"):
-            self.art_http_session = requests.Session()
-
         # Album art only flag
         self.album_art_only = player_config.getboolean("album_art_only", False)
 
@@ -530,67 +502,19 @@ class Player:
 
             self.screen_height, self.screen_width = window_height, window_width
 
+
     def getAlbumArt(self, song_file):
         """
         A function that fetches the album art and saves
         it to self.album_art_loc
         """
-        http_base_url = art_config.get("http_base_url")
-
-        if http_base_url:
-            self._getAlbumArtFromHttpServer(http_base_url, song_file)
-        else:
-            self._getAlbumArtFromFile(song_file)
-
-
-
-    def _getAlbumArtFromHttpServer(self, base_url, song_file):
-        """
-        A function that fetches the album art from the configured
-        HTTP server, and saves it to self.album_art_loc
-        """
-
-        album = os.path.dirname(song_file)
-
-        for cover_filename in art_config.get("http_cover_filenames", "cover.jpg").split():
-            album_art_url = posixpath.join(base_url, album, cover_filename)
-
-            try:
-                album_art_resp = self.art_http_session.get(album_art_url)
-            except requests.RequestException:
-                # If any exception occurs, simply give up and show default art.
-                self.drawDefaultAlbumArt()
-                break
-
-            if album_art_resp.ok:
-                with open(self.album_art_loc, "wb") as f:
-                    f.write(album_art_resp.content)
-                break
-            elif album_art_resp.status_code == 404:
-                continue
-        else:
-            self.drawDefaultAlbumArt()
-
-
-    def _getAlbumArtFromFile(self, song_file):
-        """
-        A function that extracts the album art from song_file and
-        saves it to self.album_art_loc
-        """
-        music_dir = os.path.expanduser(
-                art_config.get("music_directory", "~/Music"))
-
-        song_file_abs = os.path.join(music_dir, song_file)
-
-        process = (
-            ffmpeg
-            .input(song_file_abs)
-            .output(self.album_art_loc)
-        )
-
         try:
-            process.run(quiet=True, overwrite_output=True)
+            albumart_data = self.client.albumart(song_file)
-        except ffmpeg._run.Error:
+
+            with open(self.album_art_loc, "wb") as f:
+                f.write(albumart_data["binary"])
+
+        except CommandError:
             self.drawDefaultAlbumArt()
 
 

config.example

@@ -8,9 +8,6 @@ show_playlist   = true
 
 [art]
 image_method    = pixcat
-music_directory = ~/Music
-# http_base_url = http://localhost:6667/cover-art
-# http_cover_filenames = cover.jpg cover.png folder.jpg folder.png art.jpg art.png artwork.jpg artwork.png
 
 [mpd]
 host   = localhost