Update configure.ac

added dependency tests

README

@@ -1 +1 @@
-README.rst
+README.md

README.md

@@ -1,23 +1,25 @@
 README for mpdevil
 ==================
-mpdevil is focused on playing your local music directly instead of managing playlists or playing network streams. So it neither supports saving playlists nor restoring them. Therefore mpdevil is mainly a music browser which aims to be easy to use. mpdevil dosen't store any client side database of your music library. Instead all tags and covers get presented to you in real time. So you'll never see any outdated information in your browser.
+mpdevil is focused on playing your local music directly instead of managing playlists or playing network streams. So it neither supports saving playlists nor restoring them. Therefore mpdevil is mainly a music browser which aims to be easy to use. mpdevil dosen't store any client side database of your music library. Instead all tags and covers get presented to you in real time. So you'll never see any outdated information in your browser. mpdevil strongly relies on tags especially on the AlbumArtist tag.
+
+![ScreenShot](screenshots/mainwindow.png)
 
 Features
 --------
 
--playing songs without doubleclicking
+1. playing songs without doubleclicking
+2. displaying covers
+3. fetching lyrics form the web (based on PyLyrics 1.1.0)
+4. searching songs in your music library
+5. removing single tracks form playlist by hovering and pressing del
+6. appending albums by middleclick
+7. query albums by rightclick 
+8. sending notifications on title change
+9. managing multiple mpd servers
 
--displaying covers
+TODO
-
+----
--fetching lyrics form the web (based on PyLyrics 1.1.0)
+1. MPRIS interface
-
--searching songs in your music library
-
--removing single tracks form playlist by hovering and pressing del
-
--sending notifications on title change
-
--managing multiple mpd servers
 
 Building and installation
 -------------------------

configure.ac

@@ -1,7 +1,7 @@
 dnl -*- Mode: autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.68])
-AC_INIT([mpdevil], [0.3])
+AC_INIT([mpdevil], [0.4.4])
 AC_CONFIG_SRCDIR([bin/mpdevil.py])
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
@@ -50,7 +50,7 @@ if $PYTHON -c "$prog" 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
     AC_MSG_RESULT(found)
 else
     AC_MSG_RESULT(not found)
-    AC_MSG_ERROR(MPDClient not found)
+    AC_MSG_ERROR(python module mpd not found)
 fi
 
 dnl Check for beautifulsoup
@@ -62,7 +62,19 @@ if $PYTHON -c "$prog" 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
     AC_MSG_RESULT(found)
 else
     AC_MSG_RESULT(not found)
-    AC_MSG_ERROR(beautifulsoup not found)
+    AC_MSG_ERROR(python module bs4 not found)
+fi
+
+dnl Check for requests
+AC_MSG_CHECKING(for requests installed)
+prog="
+import requests
+"
+if $PYTHON -c "$prog" 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
+    AC_MSG_RESULT(found)
+else
+    AC_MSG_RESULT(not found)
+    AC_MSG_ERROR(python module requests not found)
 fi
 
 AC_CONFIG_FILES([Makefile

data/org.mpdevil.gschema.xml

@@ -31,6 +31,11 @@
       <summary>Size of main cover</summary>
       <description></description>
     </key>
+    <key type="i" name="icon-size">
+      <default>24</default>
+      <summary>Size of button icons in control bar</summary>
+      <description></description>
+    </key>
     <key type="b" name="show-stop">
       <default>false</default>
       <summary>Show stop button</summary>
@@ -76,6 +81,11 @@
       <summary>List of ports</summary>
       <description></description>
     </key>
+    <key type="as" name="passwords">
+      <default>[""]</default>
+      <summary>List of passwords</summary>
+      <description></description>
+    </key>
     <key type="as" name="paths">
       <default>[""]</default>
       <summary>List of library paths</summary>

po/de.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-06 00:53+0100\n"
+"POT-Creation-Date: 2020-02-02 18:07+0100\n"
-"PO-Revision-Date: 2020-01-06 00:55+0100\n"
+"PO-Revision-Date: 2020-02-02 18:08+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -18,136 +18,148 @@ msgstr ""
 "X-Generator: Poedit 2.2.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mpdevil.py:116 mpdevil.py:250 mpdevil.py:1215
+#: mpdevil.py:199 mpdevil.py:522 mpdevil.py:1474
-msgid "Artist"
-msgstr "Künstler"
-
-#: mpdevil.py:173 mpdevil.py:346 mpdevil.py:1260
-msgid "Unknown Title"
-msgstr "Unbekannter Titel"
-
-#: mpdevil.py:184
-#, python-format
-msgid "%(album)s%(year)s (tracks: %(total_tracks)i) (%(total_length)s):"
-msgstr "%(album)s%(year)s (Titel: %(total_tracks)i) (%(total_length)s):"
-
-#: mpdevil.py:240 mpdevil.py:1205
 msgid "No"
 msgstr "Nr."
 
-#: mpdevil.py:245 mpdevil.py:1210
+#: mpdevil.py:204 mpdevil.py:527 mpdevil.py:1480
 msgid "Title"
 msgstr "Titel"
 
-#: mpdevil.py:255 mpdevil.py:1225
+#: mpdevil.py:209 mpdevil.py:532 mpdevil.py:1486
+msgid "Artist"
+msgstr "Interpret"
+
+#: mpdevil.py:214 mpdevil.py:537 mpdevil.py:1498
 msgid "Length"
 msgstr "Länge"
 
-#: mpdevil.py:354 mpdevil.py:1268
+#: mpdevil.py:254 mpdevil.py:633 mpdevil.py:1535
+msgid "Unknown Title"
+msgstr "Unbekannter Titel"
+
+#: mpdevil.py:258 mpdevil.py:641 mpdevil.py:1543
 msgid "Unknown Artist"
 msgstr "Unbekannter Künstler"
 
-#: mpdevil.py:358 mpdevil.py:1272
+#: mpdevil.py:294
+msgid "Album Artist"
+msgstr "Albuminterpret"
+
+#: mpdevil.py:381 mpdevil.py:608
+#, python-format
+msgid "%(total_tracks)i titles (%(total_length)s)"
+msgstr "%(total_tracks)i Titel (%(total_length)s)"
+
+#: mpdevil.py:645 mpdevil.py:1547
 msgid "Unknown Album"
 msgstr "Unbekanntes Album"
 
-#: mpdevil.py:567
+#: mpdevil.py:814
 msgid "Select"
 msgstr "Auswählen"
 
-#: mpdevil.py:569
+#: mpdevil.py:816
 msgid "Profile:"
 msgstr "Profil:"
 
-#: mpdevil.py:571
+#: mpdevil.py:818
 msgid "Name:"
 msgstr "Name:"
 
-#: mpdevil.py:573
+#: mpdevil.py:820
 msgid "Host:"
 msgstr "Host:"
 
-#: mpdevil.py:575
+#: mpdevil.py:822
 msgid "Port:"
 msgstr "Port:"
 
-#: mpdevil.py:577
+#: mpdevil.py:824
+msgid "Password:"
+msgstr "Passwort:"
+
+#: mpdevil.py:826
 msgid "Music lib:"
 msgstr "Musikverzeichnis:"
 
-#: mpdevil.py:667
+#: mpdevil.py:912
 msgid "Choose directory"
 msgstr "Verzeichnis Wählen"
 
-#: mpdevil.py:703
+#: mpdevil.py:952
 msgid "Main cover size:"
 msgstr "Größe des Haupt-Covers:"
 
-#: mpdevil.py:705
+#: mpdevil.py:954
 msgid "Album-view cover size:"
 msgstr "Covergröße in Albumansicht:"
 
-#: mpdevil.py:711
+#: mpdevil.py:960
+msgid "Button icon size (restart required):"
+msgstr "Symbolgröße der Knöpfe (Neustart erforderlich):"
+
+#: mpdevil.py:969
 msgid "Show stop button"
 msgstr "Zeige Stopp-Knopf"
 
-#: mpdevil.py:714
+#: mpdevil.py:972
-msgid "Show title list as tooltip in album view"
+msgid "Show tooltips in album view"
-msgstr "Zeige Titellisten als Tooltips in Albumansicht"
+msgstr "Zeige Tooltips in Albumansicht"
 
-#: mpdevil.py:717
+#: mpdevil.py:975
 msgid "Send notification on title change"
 msgstr "Sende Benachrichtigung bei Titelwechsel"
 
-#: mpdevil.py:720
+#: mpdevil.py:978
 msgid "Stop playback on quit"
 msgstr "Wiedergabe beim Beenden stoppen"
 
-#: mpdevil.py:723
+#: mpdevil.py:981
 msgid "Play selected album after current title"
 msgstr "Ausgewähltes Album hinter aktuellem Titel einreihen"
 
-#: mpdevil.py:754 mpdevil.py:1432
+#: mpdevil.py:1019 mpdevil.py:1704
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: mpdevil.py:767
+#: mpdevil.py:1032
 msgid "General"
 msgstr "Allgemein"
 
-#: mpdevil.py:768
+#: mpdevil.py:1033
 msgid "Profiles"
 msgstr "Profile"
 
-#: mpdevil.py:919
+#: mpdevil.py:1188
 msgid "Random mode"
 msgstr "Zufallsmodus"
 
-#: mpdevil.py:921
+#: mpdevil.py:1190
 msgid "Repeat mode"
 msgstr "Dauerschleife"
 
-#: mpdevil.py:923
+#: mpdevil.py:1192
 msgid "Single mode"
 msgstr "Einzelstückmodus"
 
-#: mpdevil.py:925
+#: mpdevil.py:1194
 msgid "Consume mode"
 msgstr "Playliste verbrauchen"
 
-#: mpdevil.py:1019
+#: mpdevil.py:1289
-msgid "Right click to show additional information"
+msgid "Click to show additional information"
-msgstr "Rechtsclick für weitere Informationen"
+msgstr "Klicken für weitere Informationen"
 
-#: mpdevil.py:1042
+#: mpdevil.py:1313
 msgid "MPD-Tag"
 msgstr "MPD-Tag"
 
-#: mpdevil.py:1045 mpdevil.py:1153
+#: mpdevil.py:1316 mpdevil.py:1424
 msgid "Value"
 msgstr "Wert"
 
-#: mpdevil.py:1066
+#: mpdevil.py:1337
 #, python-format
 msgid ""
 "%(bitrate)s kb/s, %(frequency)s kHz, %(resolution)s bit, %(channels)s "
@@ -156,88 +168,88 @@ msgstr ""
 "%(bitrate)s kb/s, %(frequency)s kHz, %(resolution)s bit, %(channels)s "
 "Kanäle, %(file_type)s"
 
-#: mpdevil.py:1132
+#: mpdevil.py:1403
 msgid "Stats"
 msgstr "Statistik"
 
-#: mpdevil.py:1150
+#: mpdevil.py:1421
 msgid "Tag"
 msgstr "Tag"
 
-#: mpdevil.py:1170
+#: mpdevil.py:1441
 msgid "Search"
 msgstr "Suche"
 
-#: mpdevil.py:1220
+#: mpdevil.py:1492
 msgid "Album"
 msgstr "Album"
 
-#: mpdevil.py:1275
+#: mpdevil.py:1554
 #, python-format
 msgid "Hits: %i"
 msgstr "Treffer: %i"
 
-#: mpdevil.py:1279
+#: mpdevil.py:1558
 msgid "Lyrics"
 msgstr "Liedtext"
 
-#: mpdevil.py:1323
+#: mpdevil.py:1598
 msgid "searching..."
 msgstr "suche..."
 
-#: mpdevil.py:1327
+#: mpdevil.py:1602
 msgid "not found"
 msgstr "nicht gefunden"
 
-#: mpdevil.py:1332
+#: mpdevil.py:1607
 msgid "not connected"
 msgstr "nicht verbunden"
 
-#: mpdevil.py:1412
+#: mpdevil.py:1684
 msgid "Select profile"
 msgstr "Profil auswählen"
 
-#: mpdevil.py:1416
+#: mpdevil.py:1688
 msgid "Return to album of current title"
 msgstr "Zu Album des aktuellen Titels zurückkehren"
 
-#: mpdevil.py:1418
+#: mpdevil.py:1690
 msgid "Title search"
 msgstr "Titelsuche"
 
-#: mpdevil.py:1420
+#: mpdevil.py:1692
 msgid "Show lyrics"
 msgstr "Zeige Liedtext"
 
-#: mpdevil.py:1427
+#: mpdevil.py:1699
 msgid "Not connected to MPD-server. Reconnect?"
 msgstr "Nicht mit MPD-Server verbunden. Verbindung wiederherstellen?"
 
-#: mpdevil.py:1431
+#: mpdevil.py:1703
 msgid "Save window size"
 msgstr "Fenstergröße speichern"
 
-#: mpdevil.py:1433
+#: mpdevil.py:1705
 msgid "Update database"
 msgstr "Datenbank aktualisieren"
 
-#: mpdevil.py:1434
+#: mpdevil.py:1706
 msgid "Server stats"
 msgstr "Serverstatistik"
 
-#: mpdevil.py:1435
+#: mpdevil.py:1707
 msgid "About"
 msgstr "Über"
 
-#: mpdevil.py:1436
+#: mpdevil.py:1708
 msgid "Quit"
 msgstr "Beenden"
 
-#: mpdevil.py:1441
+#: mpdevil.py:1713
 msgid "Main menu"
 msgstr "Hauptmenu"
 
-#: mpdevil.py:1593
+#: mpdevil.py:1869
 msgid "A small MPD client written in python"
 msgstr ""
 

po/mpdevil.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-06 00:53+0100\n"
+"POT-Creation-Date: 2020-02-02 18:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,223 +17,235 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mpdevil.py:116 mpdevil.py:250 mpdevil.py:1215
+#: mpdevil.py:199 mpdevil.py:522 mpdevil.py:1474
-msgid "Artist"
-msgstr ""
-
-#: mpdevil.py:173 mpdevil.py:346 mpdevil.py:1260
-msgid "Unknown Title"
-msgstr ""
-
-#: mpdevil.py:184
-#, python-format
-msgid "%(album)s%(year)s (tracks: %(total_tracks)i) (%(total_length)s):"
-msgstr ""
-
-#: mpdevil.py:240 mpdevil.py:1205
 msgid "No"
 msgstr ""
 
-#: mpdevil.py:245 mpdevil.py:1210
+#: mpdevil.py:204 mpdevil.py:527 mpdevil.py:1480
 msgid "Title"
 msgstr ""
 
-#: mpdevil.py:255 mpdevil.py:1225
+#: mpdevil.py:209 mpdevil.py:532 mpdevil.py:1486
+msgid "Artist"
+msgstr ""
+
+#: mpdevil.py:214 mpdevil.py:537 mpdevil.py:1498
 msgid "Length"
 msgstr ""
 
-#: mpdevil.py:354 mpdevil.py:1268
+#: mpdevil.py:254 mpdevil.py:633 mpdevil.py:1535
+msgid "Unknown Title"
+msgstr ""
+
+#: mpdevil.py:258 mpdevil.py:641 mpdevil.py:1543
 msgid "Unknown Artist"
 msgstr ""
 
-#: mpdevil.py:358 mpdevil.py:1272
+#: mpdevil.py:294
+msgid "Album Artist"
+msgstr ""
+
+#: mpdevil.py:381 mpdevil.py:608
+#, python-format
+msgid "%(total_tracks)i titles (%(total_length)s)"
+msgstr ""
+
+#: mpdevil.py:645 mpdevil.py:1547
 msgid "Unknown Album"
 msgstr ""
 
-#: mpdevil.py:567
+#: mpdevil.py:814
 msgid "Select"
 msgstr ""
 
-#: mpdevil.py:569
+#: mpdevil.py:816
 msgid "Profile:"
 msgstr ""
 
-#: mpdevil.py:571
+#: mpdevil.py:818
 msgid "Name:"
 msgstr ""
 
-#: mpdevil.py:573
+#: mpdevil.py:820
 msgid "Host:"
 msgstr ""
 
-#: mpdevil.py:575
+#: mpdevil.py:822
 msgid "Port:"
 msgstr ""
 
-#: mpdevil.py:577
+#: mpdevil.py:824
+msgid "Password:"
+msgstr ""
+
+#: mpdevil.py:826
 msgid "Music lib:"
 msgstr ""
 
-#: mpdevil.py:667
+#: mpdevil.py:912
 msgid "Choose directory"
 msgstr ""
 
-#: mpdevil.py:703
+#: mpdevil.py:952
 msgid "Main cover size:"
 msgstr ""
 
-#: mpdevil.py:705
+#: mpdevil.py:954
 msgid "Album-view cover size:"
 msgstr ""
 
-#: mpdevil.py:711
+#: mpdevil.py:960
+msgid "Button icon size (restart required):"
+msgstr ""
+
+#: mpdevil.py:969
 msgid "Show stop button"
 msgstr ""
 
-#: mpdevil.py:714
+#: mpdevil.py:972
-msgid "Show title list as tooltip in album view"
+msgid "Show tooltips in album view"
 msgstr ""
 
-#: mpdevil.py:717
+#: mpdevil.py:975
 msgid "Send notification on title change"
 msgstr ""
 
-#: mpdevil.py:720
+#: mpdevil.py:978
 msgid "Stop playback on quit"
 msgstr ""
 
-#: mpdevil.py:723
+#: mpdevil.py:981
 msgid "Play selected album after current title"
 msgstr ""
 
-#: mpdevil.py:754 mpdevil.py:1432
+#: mpdevil.py:1019 mpdevil.py:1704
 msgid "Settings"
 msgstr ""
 
-#: mpdevil.py:767
+#: mpdevil.py:1032
 msgid "General"
 msgstr ""
 
-#: mpdevil.py:768
+#: mpdevil.py:1033
 msgid "Profiles"
 msgstr ""
 
-#: mpdevil.py:919
+#: mpdevil.py:1188
 msgid "Random mode"
 msgstr ""
 
-#: mpdevil.py:921
+#: mpdevil.py:1190
 msgid "Repeat mode"
 msgstr ""
 
-#: mpdevil.py:923
+#: mpdevil.py:1192
 msgid "Single mode"
 msgstr ""
 
-#: mpdevil.py:925
+#: mpdevil.py:1194
 msgid "Consume mode"
 msgstr ""
 
-#: mpdevil.py:1019
+#: mpdevil.py:1289
-msgid "Right click to show additional information"
+msgid "Click to show additional information"
 msgstr ""
 
-#: mpdevil.py:1042
+#: mpdevil.py:1313
 msgid "MPD-Tag"
 msgstr ""
 
-#: mpdevil.py:1045 mpdevil.py:1153
+#: mpdevil.py:1316 mpdevil.py:1424
 msgid "Value"
 msgstr ""
 
-#: mpdevil.py:1066
+#: mpdevil.py:1337
 #, python-format
 msgid ""
 "%(bitrate)s kb/s, %(frequency)s kHz, %(resolution)s bit, %(channels)s "
 "channels, %(file_type)s"
 msgstr ""
 
-#: mpdevil.py:1132
+#: mpdevil.py:1403
 msgid "Stats"
 msgstr ""
 
-#: mpdevil.py:1150
+#: mpdevil.py:1421
 msgid "Tag"
 msgstr ""
 
-#: mpdevil.py:1170
+#: mpdevil.py:1441
 msgid "Search"
 msgstr ""
 
-#: mpdevil.py:1220
+#: mpdevil.py:1492
 msgid "Album"
 msgstr ""
 
-#: mpdevil.py:1275
+#: mpdevil.py:1554
 #, python-format
 msgid "Hits: %i"
 msgstr ""
 
-#: mpdevil.py:1279
+#: mpdevil.py:1558
 msgid "Lyrics"
 msgstr ""
 
-#: mpdevil.py:1323
+#: mpdevil.py:1598
 msgid "searching..."
 msgstr ""
 
-#: mpdevil.py:1327
+#: mpdevil.py:1602
 msgid "not found"
 msgstr ""
 
-#: mpdevil.py:1332
+#: mpdevil.py:1607
 msgid "not connected"
 msgstr ""
 
-#: mpdevil.py:1412
+#: mpdevil.py:1684
 msgid "Select profile"
 msgstr ""
 
-#: mpdevil.py:1416
+#: mpdevil.py:1688
 msgid "Return to album of current title"
 msgstr ""
 
-#: mpdevil.py:1418
+#: mpdevil.py:1690
 msgid "Title search"
 msgstr ""
 
-#: mpdevil.py:1420
+#: mpdevil.py:1692
 msgid "Show lyrics"
 msgstr ""
 
-#: mpdevil.py:1427
+#: mpdevil.py:1699
 msgid "Not connected to MPD-server. Reconnect?"
 msgstr ""
 
-#: mpdevil.py:1431
+#: mpdevil.py:1703
 msgid "Save window size"
 msgstr ""
 
-#: mpdevil.py:1433
+#: mpdevil.py:1705
 msgid "Update database"
 msgstr ""
 
-#: mpdevil.py:1434
+#: mpdevil.py:1706
 msgid "Server stats"
 msgstr ""
 
-#: mpdevil.py:1435
+#: mpdevil.py:1707
 msgid "About"
 msgstr ""
 
-#: mpdevil.py:1436
+#: mpdevil.py:1708
 msgid "Quit"
 msgstr ""
 
-#: mpdevil.py:1441
+#: mpdevil.py:1713
 msgid "Main menu"
 msgstr ""
 
-#: mpdevil.py:1593
+#: mpdevil.py:1869
 msgid "A small MPD client written in python"
 msgstr ""