From 8daa39ff0214964e59b1645e4f9426f28aa2350c Mon Sep 17 00:00:00 2001
From: Allen <63997543+aaw3@users.noreply.github.com>
Date: Sun, 13 Nov 2022 15:00:00 -0600
Subject: [PATCH] Revert changes
---
README.md | 10 ++++------
bin/miniplayer | 14 +++-----------
config.example | 1 -
3 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
index 8645534..9c57405 100644
--- a/README.md
+++ b/README.md
@@ -43,10 +43,9 @@ The `font_width` and `font_height` options are used to center the album art prop
### art
Why listen to music if you can't look at the pretty album art?
-| Option | Description |
-| -------------------- | ------------------------------------------------------------------------------------------------------- |
-| image_method | The method to use for drawing album art. Available values are `pixcat` and `ueberzug`. |
-| mpd_method | The method mpd should use to retrieve the album art. Available values are `albumart` and `readpicture`.
`albumart` - image is contained in the album folder along with the songs
`readpicture` - image is directly embedded in the audio files |
+| Option | Description |
+| -------------------- | --------------------------------------------------------------------------------------------- |
+| image_method | The method to use for drawing album art. Available values are `pixcat` and `ueberzug`. |
### mpd
Tell me your mpd address please!
@@ -133,8 +132,7 @@ These keybinds can be changed by editing the config file. See the [`config.examp
## F.A.Q.
- **Q:** Album art is not showing up.
- **A1:** Try changing `image_method` from `pixcat` to `ueberzug` or vice versa.
- **A2:** Try changing `mpd_method` from `albumart` to `readpicture` or vice versa.
+ **A:** Try changing `image_method` from `pixcat` to `ueberzug` or vice versa.
- **Q:** Album art is too big/too small.
**A:** You need to configure `font_height` and `font_width`. Their values should be the actual pixel height and width of a character in your terminal.
diff --git a/bin/miniplayer b/bin/miniplayer
index 42aec62..db52c1e 100755
--- a/bin/miniplayer
+++ b/bin/miniplayer
@@ -22,13 +22,11 @@ if "player" not in config.sections():
"album_art_only": False,
"volume_step": 5,
"auto_close": False,
- "show_playlist": True
+ "show_playlist": True,
}
if "art" not in config.sections():
- config["art"] = {"image_method": "pixcat",
- "mpd_method": "albumart"
- }
+ config["art"] = {"image_method": "pixcat"}
if "mpd" not in config.sections():
config["mpd"] = {"host": "localhost",
@@ -99,7 +97,6 @@ MPDPASS = mpd_config.get("pass", False)
# What to use to draw images
IMAGEMETHOD = art_config.get("image_method", "pixcat")
-MPDMETHOD = art_config.get("mpd_method", "albumart")
# Volume step
VOLUMESTEP = player_config.getint("volume_step", 5)
@@ -502,13 +499,8 @@ class Player:
A function that fetches the album art and saves
it to self.album_art_loc
"""
-
try:
- if MPDMETHOD == "albumart":
- albumart_data = self.client.albumart(song_file)
-
- elif MPDMETHOD == "readpicture":
- albumart_data = self.client.readpicture(song_file)
+ albumart_data = self.client.albumart(song_file)
with open(self.album_art_loc, "wb") as f:
f.write(albumart_data["binary"])
diff --git a/config.example b/config.example
index 5d3abb5..ee23878 100644
--- a/config.example
+++ b/config.example
@@ -8,7 +8,6 @@ show_playlist = true
[art]
image_method = pixcat
-mpd_method = albumart
[mpd]
host = localhost