From 75c647cac7bf22104d25c09f4c77c91093a785e7 Mon Sep 17 00:00:00 2001 From: coderkun Date: Fri, 24 May 2024 16:45:40 +0200 Subject: [PATCH 01/13] Combine connection panel with server panel (close #102) --- data/ui/connection-panel.ui | 87 ---------------------- data/ui/server-panel.ui | 89 ++++++++++++++++++++++- data/ui/window.ui | 10 +-- data/xyz.suruatoel.mcg.gresource.xml | 1 - po/POTFILES | 2 - po/de.mo | Bin 3448 -> 3486 bytes po/de.po | 98 +++++++++++++------------ po/en.mo | Bin 3284 -> 3322 bytes po/en.po | 98 +++++++++++++------------ po/mcg.pot | 105 ++++++++++++++------------- src/connectionpanel.py | 89 ----------------------- src/meson.build | 1 - src/serverpanel.py | 84 +++++++++++++++++++++ src/window.py | 40 +++++----- 14 files changed, 345 insertions(+), 359 deletions(-) delete mode 100644 data/ui/connection-panel.ui delete mode 100644 src/connectionpanel.py diff --git a/data/ui/connection-panel.ui b/data/ui/connection-panel.ui deleted file mode 100644 index d9e7364..0000000 --- a/data/ui/connection-panel.ui +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - 1024 - 9999 - 6600 - 1 - 100 - - - horizontal - 6 - - - diff --git a/data/ui/server-panel.ui b/data/ui/server-panel.ui index 3907f50..7faef17 100644 --- a/data/ui/server-panel.ui +++ b/data/ui/server-panel.ui @@ -2,6 +2,13 @@ + + 1024 + 9999 + 6600 + 1 + 100 + horizontal end @@ -31,8 +38,84 @@ + connection + Connection + + + network-wired-symbolic + + + false + center + + + true + + + No service found + + + + + + + true + none + + + + Host + true + + + + + + vertical + + + + Port + start + false + + + + + + port_spinner + 6600 + server-port-adjustment + + + + + + + + Password + true + + + + + + + + + + + + status Status + false dialog-information-symbolic @@ -149,9 +232,10 @@ - + stats Statistics + false starred-symbolic @@ -298,9 +382,10 @@ - + devices Audio Devices + false audio-speakers-symbolic diff --git a/data/ui/window.ui b/data/ui/window.ui index aa73ed1..801e6a4 100644 --- a/data/ui/window.ui +++ b/data/ui/window.ui @@ -49,15 +49,9 @@ - - content_stack + true - - - true - - - + diff --git a/data/xyz.suruatoel.mcg.gresource.xml b/data/xyz.suruatoel.mcg.gresource.xml index 02141b3..45476d0 100644 --- a/data/xyz.suruatoel.mcg.gresource.xml +++ b/data/xyz.suruatoel.mcg.gresource.xml @@ -5,7 +5,6 @@ noise-texture.png ui/window.ui ui/shortcuts-dialog.ui - ui/connection-panel.ui ui/album-headerbar.ui ui/server-panel.ui ui/cover-panel.ui diff --git a/po/POTFILES b/po/POTFILES index 0263b63..7245744 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,5 +1,4 @@ data/ui/album-headerbar.ui -data/ui/connection-panel.ui data/ui/cover-panel.ui data/ui/library-panel.ui data/ui/playlist-panel.ui @@ -9,7 +8,6 @@ data/ui/window.ui src/albumheaderbar.py src/application.py src/client.py -src/connectionpanel.py src/coverpanel.py src/librarypanel.py src/main.py diff --git a/po/de.mo b/po/de.mo index 0977fc7f942005a8edfb232bdcba04bee1f0235e..a3e8ff0a625bf7f0d567683606d9c13091c57894 100644 GIT binary patch delta 1343 zcmew%HBY+!o)F7a1_lNOYX$}e83qQ1FN_Qf{tOHZXP7~v3=ABs3=G^13=EvC3=C`x z3=E>I3=HfbwX6&bybKHsDo}AFRt5$R1_lO8Rt5$k1_lNvRt5%91_p*uRt5$x1_p*~ zRt5%E1_p*QsChLIef10-P>Fu1!Bbfo7+4q>80JFxi=Y;*Vr5|9V_;y|0i}<#GB5}* zFfd$WWnd6tU|@I-b-*8p!3?Zy5C`$FLCh0ngQ$~YgE&y14djt}1_mcKh{0ZL3=I4X z3=ENM3=Con3=ElU5Fa-{HMX-cFeoxGFw9|NV31~DVA#h7@zE`)1rOLDK79(+_koRp zL6(7m;X4}xgB&R2*clik85kH$*dhA;*cljP>KPaqve+ROwX;K9+Q$wtcrsLcCOgD| z3!wCRc8E{*u|uNZGCKnU4+8_kLv{uRaRvs4cTja~91IMgSQO=eM4==HM7=5p14B0> z1A{RK14BJ14)=3HEIiA}z`)7Cz;KxpV&Gj)h{IlSLW1%mCj)~N0|Ub^P6h@wkdL?^ zKDOb4=y&IW==0?Q1uX+Z6cf}Fx=*b_=txG;zJ=GND#{MKs0LdFfgbxFfbVK zK;kxx2NJiXP<}rT#JqJp5T9Ry(s!WrGbsI`o(JO7Up$aF7UYG5gaR+bVpCp-0S-`c zFJ4GCjfaZYKeNg zC>Mb8GDu3Dfq}sS#9)A=W>DVO0i|LFNJxOBK-m?PvW-C;P?-QKFBl+c0VJdcN-GQu z3|1fx0|SF510*^u85rupg@P^vBp5*j4O9)7GGc%vG%$yOfx#RUp33@FC1_nb01_liV1_oiMIEVt}5Ktmk0C7M?8>rMXV_;xVocxg`ha)d9 sHMt}+KW}pss|Yi@iGrb-m5J%*QjRr@Tw$q2Ntt;mrFrR_6}Tdp0g!HFi~s-t delta 1311 zcmbOy{X?q$o)F7a1_lNOD+UGz83qQ1H;fDn{tOHZdze9@3=BV57#O%27#M!CFfgz& zFfg#PGBB_+Ffj12GBEHmFffR)Ld2C=85lSi7#K8J85o2Z7#NIL85l$v7#Lhx85md@ z7#N~iA?74P)#pOQ>lsR*23D~$Ft9K%Ff>8=?NAH)Ss57k7#JAlLg_WE3=9Gc3=F$j z85l$u7#Pk#Eq(|!_!X4@5o+EqsJj19hl#L3JfO}7GPjI|Bm`0|Ub`b_ND<1_p-9P<5}_85lsZ_lq4820;b}hFC6$NAkHC>cNSmg$ok& zv!L`wE{Me^xFCt?A{QizorV4?yWtJP?mw;ekZ$>v|qYQ2gS7Sj^80F+hqJBCf&< zNi3F7@h~Wzzzd1PEM5i%Mo3O&V1m-1#0p9mCJYcYpb!8ByD$R-gC0~3D7$MhFfi1s zFhE=a%DW&rQ2d&M7|`+nl-IQx7#NHhAVCO{0%cPWZ3H41AU+4BA5b{~64C{g3k(bl zmLLuT1A_(wB>F5s3=H}VkkkxHfS`O2 zk^>bipcD_vULd{_sNi9MM5Q_dB+Y=tL0Alw^%xi!)H^Cz>hrf;rb Z6=Y^NQZO{JGPc}2fnyEhW_PY|W&nHRU_<}_ diff --git a/po/de.po b/po/de.po index 753eb6b..c169b36 100644 --- a/po/de.po +++ b/po/de.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: CoverGrid (mcg)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-22 14:39+0200\n" -"PO-Revision-Date: 2024-05-22 14:39+0200\n" +"POT-Creation-Date: 2024-05-24 16:44+0200\n" +"PO-Revision-Date: 2024-05-24 16:45+0200\n" "Last-Translator: coderkun \n" "Language-Team: \n" "Language: de_DE\n" @@ -15,22 +15,6 @@ msgstr "" "X-Poedit-Basepath: ../../..\n" "X-Poedit-SourceCharset: UTF-8\n" -#: data/ui/connection-panel.ui:29 -msgid "No service found" -msgstr "Keine Dienste gefunden" - -#: data/ui/connection-panel.ui:43 -msgid "Host" -msgstr "Host" - -#: data/ui/connection-panel.ui:56 -msgid "Port" -msgstr "Port" - -#: data/ui/connection-panel.ui:76 -msgid "Password" -msgstr "Passwort" - #: data/ui/cover-panel.ui:12 data/ui/shortcuts-dialog.ui:88 msgid "Show the cover in fullscreen mode" msgstr "Das Cover im Vollbildmodus anzeigen" @@ -79,15 +63,15 @@ msgstr "Einstellungen und Aktionen" msgid "search library" msgstr "Bibliothek durchsuchen" -#: data/ui/library-panel.ui:263 data/ui/playlist-panel.ui:107 +#: data/ui/library-panel.ui:264 data/ui/playlist-panel.ui:107 msgid "cancel" msgstr "abbrechen" -#: data/ui/library-panel.ui:270 data/ui/library-panel.ui:327 +#: data/ui/library-panel.ui:271 data/ui/library-panel.ui:328 msgid "queue" msgstr "einreihen" -#: data/ui/library-panel.ui:320 data/ui/playlist-panel.ui:163 +#: data/ui/library-panel.ui:321 data/ui/playlist-panel.ui:163 msgid "play" msgstr "abspielen" @@ -99,60 +83,80 @@ msgstr "Die Wiedergabeliste leeren" msgid "remove" msgstr "entfernen" -#: data/ui/server-panel.ui:35 +#: data/ui/server-panel.ui:42 +msgid "Connection" +msgstr "Verbindung" + +#: data/ui/server-panel.ui:55 +msgid "No service found" +msgstr "Keine Dienste gefunden" + +#: data/ui/server-panel.ui:69 +msgid "Host" +msgstr "Host" + +#: data/ui/server-panel.ui:82 +msgid "Port" +msgstr "Port" + +#: data/ui/server-panel.ui:102 +msgid "Password" +msgstr "Passwort" + +#: data/ui/server-panel.ui:117 msgid "Status" msgstr "Status" -#: data/ui/server-panel.ui:49 +#: data/ui/server-panel.ui:132 msgid "File:" msgstr "Datei:" -#: data/ui/server-panel.ui:60 +#: data/ui/server-panel.ui:143 msgid "Audio:" msgstr "Audio:" -#: data/ui/server-panel.ui:71 +#: data/ui/server-panel.ui:154 msgid "Bitrate:" msgstr "Bitrate:" -#: data/ui/server-panel.ui:82 +#: data/ui/server-panel.ui:165 msgid "Error:" msgstr "Fehler:" -#: data/ui/server-panel.ui:92 data/ui/server-panel.ui:106 -#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:134 +#: data/ui/server-panel.ui:175 data/ui/server-panel.ui:189 +#: data/ui/server-panel.ui:203 data/ui/server-panel.ui:217 msgid "none" msgstr "nichts" -#: data/ui/server-panel.ui:154 +#: data/ui/server-panel.ui:237 msgid "Statistics" msgstr "Statistiken" -#: data/ui/server-panel.ui:178 +#: data/ui/server-panel.ui:262 msgid "Artists" msgstr "Künstler" -#: data/ui/server-panel.ui:198 +#: data/ui/server-panel.ui:282 msgid "Albums" msgstr "Alben" -#: data/ui/server-panel.ui:218 +#: data/ui/server-panel.ui:302 msgid "Songs" msgstr "Songs" -#: data/ui/server-panel.ui:238 +#: data/ui/server-panel.ui:322 msgid "Seconds" msgstr "Sekunden" -#: data/ui/server-panel.ui:267 +#: data/ui/server-panel.ui:351 msgid "Seconds played" msgstr "Sekunden gespielt" -#: data/ui/server-panel.ui:287 +#: data/ui/server-panel.ui:371 msgid "Seconds running" msgstr "Sekunden laufend" -#: data/ui/server-panel.ui:303 +#: data/ui/server-panel.ui:387 msgid "Audio Devices" msgstr "Audiogeräte" @@ -208,18 +212,18 @@ msgstr "Cover-Paneel" msgid "Library Panel" msgstr "Bibliothekspaneel" -#: src/connectionpanel.py:51 -msgid "use" -msgstr "verwenden" - #: src/librarypanel.py:291 msgid "Loading albums" msgstr "Alben werden geladen" -#: src/librarypanel.py:379 +#: src/librarypanel.py:370 msgid "Loading images" msgstr "Bilder werden geladen" +#: src/serverpanel.py:77 +msgid "use" +msgstr "verwenden" + #: src/utils.py:50 src/utils.py:67 msgid "{} feat. {}" msgstr "{} mit {}" @@ -228,19 +232,20 @@ msgstr "{} mit {}" msgid "{}:{} minutes" msgstr "{}:{} Minuten" -#: src/window.py:114 +#. Stack +#: src/window.py:106 msgid "Server" msgstr "Server" -#: src/window.py:115 +#: src/window.py:107 msgid "Cover" msgstr "Cover" -#: src/window.py:116 +#: src/window.py:108 msgid "Playlist" msgstr "Wiedergabeliste" -#: src/window.py:117 +#: src/window.py:109 msgid "Library" msgstr "Bibliothek" @@ -275,9 +280,6 @@ msgstr "Bibliothek" #~ msgid "Search Library" #~ msgstr "Bibliothek durchsuchen" -#~ msgid "Connection" -#~ msgstr "Verbindung" - #~ msgid "Keyboard Shortcuts" #~ msgstr "Tastenkombinationen" diff --git a/po/en.mo b/po/en.mo index 96e0ea4d54bdd476340ae5c8a189bcaf9578de95..3edbb64b9e3437e5d6cdcdd67584b3d236809cbf 100644 GIT binary patch delta 1345 zcmca2`Af3?o)F7a1_lNOYX$}e83qQ1FN_Qf{tOHZXP7~v3=ABs3=G^13=EvC3=C`x z3=E>I3=HfbwX6&bybKHsDo}AFRt5$R1_lO8Rt5$k1_lNvRt5%91_p*uRt5$x1_p*~ zRt5%E1_p*QsChLIef10-P>Fu1!Bbfo7+4q>80JFxi=Y;*Vr5|9V_;y|0i}<#GB5}* zFfd$WWnd6tU|@I-b-*8p!3?Zy5C`$FLCh0ngQ$~YgE&y14djt}1_mcKh{0ZL3=I4X z3=ENM3=Con3=ElU5Fa-{HMX-cFeoxGFw9|NV31~DVA#h7@zE`)1rOLDK79(+_koRp zL6(7m;X4}xgB&R2*clik85kH$*dhA;*cljP>KPaqve+ROwX;K9+Q$wtcrsLcCOgD| z3!wCRc8E{*u|uNZGCKnU4+8_kLv{uRaRvs4cTja~91IMgSQO=eM4==HM7=5p1H%$V z1_ome28Mc2+}_}XIN%8UUNbeeuj!OazTQUg9{RLf?SZeRpEm8*oq6{U{@}P zMc!Nx^TMIxaa<5{Q@9`=%z^R?xftrfiKvnb;=^_*J&g+zw@bMoKHUa&z-g$#SD^gc zPy?Sp)xCr|@E_CyL2ih}lH8D}Rpf?5tsytWfgarT5DWadA#t0+&A_0^z`)SP4e`+i zZio-JLFt1~jc2$aaeJ8?61N|@A#p3f1EIBeAi2qf2Vzko55(sgJP>npq2k5$JP@B( z@h~uOGB7Z7@<1FknFkW&D|jG2*vJF%!A>4X6rALN#O)m(NRU6^fkfFG9tH+RNX}(o zg3?M15IIu@h+UxU2+E?MTvM+PRRqfa+6)W~stgc|KzSJ?rOv>>U;$z61apd2E_z`&pY;(&@aP^o9ez`&q5`6EjXM_yiPa!F=>-efthJDbheEST6$6b#L* TOiVYIa;#y5OK+Cr+QtL`iB)F* delta 1315 zcmew*c}24Ro)F7a1_lNOD+UGz83qQ1H;fDn{tOHZdze9@3=BV57#O%27#M!CFfgz& zFfg#PGBB_+Ffj12GBEHmFffR)Ld2C=85lSi7#K8J85o2Z7#NIL85l$v7#Lhx85md@ z7#N~iA?74P)#pOQ>lsR*23D~$Ft9K%Ff>8=?NAH)Ss57k7#JAlLg_WE3=9Gc3=F$j z85l$u7#Pk#Eq(|!_!X4@5o+EqsJj19hl#L3JfO}7GPjI|Bm`0|Ub`b_ND<1_p-9P<5}_85lsZ_lq48cMeazy*oZdM=0$CvZV5UJ5mM9hAQn zYT!Poy2D%$huwf$@ES^g=7L1&Z!Soba&to*sKgC1Uy~aWrFPu)3=EnK3=9d}5Fd4M zL*jA*l%5UMxQrVTr)#+(aeA5?5~r`AGz$+TPUUzY7FqK^eD1^pG1na`?#l!5c?b^! z11AFmLvlS2#6`J05Fa=3K!UED2jYXtJP;o)=7GfNHXcZj@8W?3{48jZy40=#CpzN;2z`#(i!T@m*DDQ&g)EF2T%s~ujc>v1m z+6)W~#taajfuum$6hs?=2nGfQWd?|EK;;BTNEcKtFfcG!f;bEe3>pj&&sc!U4+aJX z9R^5faxpM~(mzxc0|SF00|SF9g3DmWz`&r-0P(pL10;=rq(KD>D8+-a7l^L}DtH(e z7z`K~7}OacAqEl$VNjL^Wj}ckhXIlWO&J&%6u|t+Y^>>\n" "Language-Team: \n" "Language: en\n" @@ -16,22 +16,6 @@ msgstr "" "X-Poedit-SearchPath-0: mcg\n" "X-Poedit-SearchPath-1: data/ui\n" -#: data/ui/connection-panel.ui:29 -msgid "No service found" -msgstr "No service found" - -#: data/ui/connection-panel.ui:43 -msgid "Host" -msgstr "Host" - -#: data/ui/connection-panel.ui:56 -msgid "Port" -msgstr "Port" - -#: data/ui/connection-panel.ui:76 -msgid "Password" -msgstr "Password" - #: data/ui/cover-panel.ui:12 data/ui/shortcuts-dialog.ui:88 msgid "Show the cover in fullscreen mode" msgstr "Show the cover in fullscreen mode" @@ -80,15 +64,15 @@ msgstr "Settings and actions" msgid "search library" msgstr "search library" -#: data/ui/library-panel.ui:263 data/ui/playlist-panel.ui:107 +#: data/ui/library-panel.ui:264 data/ui/playlist-panel.ui:107 msgid "cancel" msgstr "cancel" -#: data/ui/library-panel.ui:270 data/ui/library-panel.ui:327 +#: data/ui/library-panel.ui:271 data/ui/library-panel.ui:328 msgid "queue" msgstr "queue" -#: data/ui/library-panel.ui:320 data/ui/playlist-panel.ui:163 +#: data/ui/library-panel.ui:321 data/ui/playlist-panel.ui:163 msgid "play" msgstr "play" @@ -100,60 +84,80 @@ msgstr "Clear the playlist" msgid "remove" msgstr "remove" -#: data/ui/server-panel.ui:35 +#: data/ui/server-panel.ui:42 +msgid "Connection" +msgstr "Connection" + +#: data/ui/server-panel.ui:55 +msgid "No service found" +msgstr "No service found" + +#: data/ui/server-panel.ui:69 +msgid "Host" +msgstr "Host" + +#: data/ui/server-panel.ui:82 +msgid "Port" +msgstr "Port" + +#: data/ui/server-panel.ui:102 +msgid "Password" +msgstr "Password" + +#: data/ui/server-panel.ui:117 msgid "Status" msgstr "Status" -#: data/ui/server-panel.ui:49 +#: data/ui/server-panel.ui:132 msgid "File:" msgstr "File:" -#: data/ui/server-panel.ui:60 +#: data/ui/server-panel.ui:143 msgid "Audio:" msgstr "Audio:" -#: data/ui/server-panel.ui:71 +#: data/ui/server-panel.ui:154 msgid "Bitrate:" msgstr "Bitrate:" -#: data/ui/server-panel.ui:82 +#: data/ui/server-panel.ui:165 msgid "Error:" msgstr "Error:" -#: data/ui/server-panel.ui:92 data/ui/server-panel.ui:106 -#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:134 +#: data/ui/server-panel.ui:175 data/ui/server-panel.ui:189 +#: data/ui/server-panel.ui:203 data/ui/server-panel.ui:217 msgid "none" msgstr "none" -#: data/ui/server-panel.ui:154 +#: data/ui/server-panel.ui:237 msgid "Statistics" msgstr "Statistics" -#: data/ui/server-panel.ui:178 +#: data/ui/server-panel.ui:262 msgid "Artists" msgstr "Artists" -#: data/ui/server-panel.ui:198 +#: data/ui/server-panel.ui:282 msgid "Albums" msgstr "Albums" -#: data/ui/server-panel.ui:218 +#: data/ui/server-panel.ui:302 msgid "Songs" msgstr "Songs" -#: data/ui/server-panel.ui:238 +#: data/ui/server-panel.ui:322 msgid "Seconds" msgstr "Seconds" -#: data/ui/server-panel.ui:267 +#: data/ui/server-panel.ui:351 msgid "Seconds played" msgstr "Seconds" -#: data/ui/server-panel.ui:287 +#: data/ui/server-panel.ui:371 msgid "Seconds running" msgstr "Seconds running" -#: data/ui/server-panel.ui:303 +#: data/ui/server-panel.ui:387 msgid "Audio Devices" msgstr "Audio Devices" @@ -209,18 +213,18 @@ msgstr "Cover Panel" msgid "Library Panel" msgstr "Library Panel" -#: src/connectionpanel.py:51 -msgid "use" -msgstr "use" - #: src/librarypanel.py:291 msgid "Loading albums" msgstr "Loading albums" -#: src/librarypanel.py:379 +#: src/librarypanel.py:370 msgid "Loading images" msgstr "Loading images" +#: src/serverpanel.py:77 +msgid "use" +msgstr "use" + #: src/utils.py:50 src/utils.py:67 msgid "{} feat. {}" msgstr "{} feat. {}" @@ -229,19 +233,20 @@ msgstr "{} feat. {}" msgid "{}:{} minutes" msgstr "{}:{} minutes" -#: src/window.py:114 +#. Stack +#: src/window.py:106 msgid "Server" msgstr "Server" -#: src/window.py:115 +#: src/window.py:107 msgid "Cover" msgstr "Cover" -#: src/window.py:116 +#: src/window.py:108 msgid "Playlist" msgstr "Playlist" -#: src/window.py:117 +#: src/window.py:109 msgid "Library" msgstr "Library" @@ -276,9 +281,6 @@ msgstr "Library" #~ msgid "Search Library" #~ msgstr "Search Library" -#~ msgid "Connection" -#~ msgstr "Connection" - #~ msgid "Keyboard Shortcuts" #~ msgstr "Keyboard Shortcuts" diff --git a/po/mcg.pot b/po/mcg.pot index 451e0a8..e2cffcb 100644 --- a/po/mcg.pot +++ b/po/mcg.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mcg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-22 14:39+0200\n" +"POT-Creation-Date: 2024-05-24 16:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,22 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: data/ui/connection-panel.ui:29 -msgid "No service found" -msgstr "" - -#: data/ui/connection-panel.ui:43 -msgid "Host" -msgstr "" - -#: data/ui/connection-panel.ui:56 -msgid "Port" -msgstr "" - -#: data/ui/connection-panel.ui:76 -msgid "Password" -msgstr "" - #: data/ui/cover-panel.ui:12 data/ui/shortcuts-dialog.ui:88 msgid "Show the cover in fullscreen mode" msgstr "" @@ -81,15 +65,15 @@ msgstr "" msgid "search library" msgstr "" -#: data/ui/library-panel.ui:263 data/ui/playlist-panel.ui:107 +#: data/ui/library-panel.ui:264 data/ui/playlist-panel.ui:107 msgid "cancel" msgstr "" -#: data/ui/library-panel.ui:270 data/ui/library-panel.ui:327 +#: data/ui/library-panel.ui:271 data/ui/library-panel.ui:328 msgid "queue" msgstr "" -#: data/ui/library-panel.ui:320 data/ui/playlist-panel.ui:163 +#: data/ui/library-panel.ui:321 data/ui/playlist-panel.ui:163 msgid "play" msgstr "" @@ -101,60 +85,80 @@ msgstr "" msgid "remove" msgstr "" -#: data/ui/server-panel.ui:35 -msgid "Status" +#: data/ui/server-panel.ui:42 +msgid "Connection" msgstr "" -#: data/ui/server-panel.ui:49 -msgid "File:" +#: data/ui/server-panel.ui:55 +msgid "No service found" msgstr "" -#: data/ui/server-panel.ui:60 -msgid "Audio:" -msgstr "" - -#: data/ui/server-panel.ui:71 -msgid "Bitrate:" +#: data/ui/server-panel.ui:69 +msgid "Host" msgstr "" #: data/ui/server-panel.ui:82 -msgid "Error:" +msgid "Port" msgstr "" -#: data/ui/server-panel.ui:92 data/ui/server-panel.ui:106 -#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:134 -msgid "none" +#: data/ui/server-panel.ui:102 +msgid "Password" +msgstr "" + +#: data/ui/server-panel.ui:117 +msgid "Status" +msgstr "" + +#: data/ui/server-panel.ui:132 +msgid "File:" +msgstr "" + +#: data/ui/server-panel.ui:143 +msgid "Audio:" msgstr "" #: data/ui/server-panel.ui:154 +msgid "Bitrate:" +msgstr "" + +#: data/ui/server-panel.ui:165 +msgid "Error:" +msgstr "" + +#: data/ui/server-panel.ui:175 data/ui/server-panel.ui:189 +#: data/ui/server-panel.ui:203 data/ui/server-panel.ui:217 +msgid "none" +msgstr "" + +#: data/ui/server-panel.ui:237 msgid "Statistics" msgstr "" -#: data/ui/server-panel.ui:178 +#: data/ui/server-panel.ui:262 msgid "Artists" msgstr "" -#: data/ui/server-panel.ui:198 +#: data/ui/server-panel.ui:282 msgid "Albums" msgstr "" -#: data/ui/server-panel.ui:218 +#: data/ui/server-panel.ui:302 msgid "Songs" msgstr "" -#: data/ui/server-panel.ui:238 +#: data/ui/server-panel.ui:322 msgid "Seconds" msgstr "" -#: data/ui/server-panel.ui:267 +#: data/ui/server-panel.ui:351 msgid "Seconds played" msgstr "" -#: data/ui/server-panel.ui:287 +#: data/ui/server-panel.ui:371 msgid "Seconds running" msgstr "" -#: data/ui/server-panel.ui:303 +#: data/ui/server-panel.ui:387 msgid "Audio Devices" msgstr "" @@ -210,18 +214,18 @@ msgstr "" msgid "Library Panel" msgstr "" -#: src/connectionpanel.py:51 -msgid "use" -msgstr "" - #: src/librarypanel.py:291 msgid "Loading albums" msgstr "" -#: src/librarypanel.py:379 +#: src/librarypanel.py:370 msgid "Loading images" msgstr "" +#: src/serverpanel.py:77 +msgid "use" +msgstr "" + #: src/utils.py:50 src/utils.py:67 msgid "{} feat. {}" msgstr "" @@ -230,18 +234,19 @@ msgstr "" msgid "{}:{} minutes" msgstr "" -#: src/window.py:114 +#. Stack +#: src/window.py:106 msgid "Server" msgstr "" -#: src/window.py:115 +#: src/window.py:107 msgid "Cover" msgstr "" -#: src/window.py:116 +#: src/window.py:108 msgid "Playlist" msgstr "" -#: src/window.py:117 +#: src/window.py:109 msgid "Library" msgstr "" diff --git a/src/connectionpanel.py b/src/connectionpanel.py deleted file mode 100644 index a4060ed..0000000 --- a/src/connectionpanel.py +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env python3 - -import gi -import locale - -gi.require_version('Gtk', '4.0') -gi.require_version('Adw', '1') -from gi.repository import Gtk, GObject, Adw -from mcg.zeroconf import ZeroconfProvider - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/connection-panel.ui') -class ConnectionPanel(Adw.Bin): - __gtype_name__ = 'McgConnectionPanel' - __gsignals__ = { - 'connection-changed': (GObject.SIGNAL_RUN_FIRST, None, (str, int, str)) - } - - # Widgets - toolbar = Gtk.Template.Child() - zeroconf_list = Gtk.Template.Child() - host_row = Gtk.Template.Child() - port_spinner = Gtk.Template.Child() - password_row = Gtk.Template.Child() - - def __init__(self, **kwargs): - super().__init__(**kwargs) - - # Zeroconf provider - self._zeroconf_provider = ZeroconfProvider() - self._zeroconf_provider.connect_signal( - ZeroconfProvider.SIGNAL_SERVICE_NEW, self.on_new_service) - - def on_new_service(self, service): - name, host, port = service - - row_button = Gtk.Button() - row_button.set_label(locale.gettext("use")) - row_button.connect("clicked", self.on_service_selected, host, port) - - row = Adw.ActionRow() - row.set_title(name) - row.set_subtitle("{} ({})".format(host, port)) - row.add_suffix(row_button) - - self.zeroconf_list.insert(row, -1) - - def on_service_selected(self, widget, host, port): - self.set_host(host) - self.set_port(port) - - @Gtk.Template.Callback() - def on_host_entry_apply(self, widget): - self._call_back() - - @Gtk.Template.Callback() - def on_port_spinner_value_changed(self, widget): - self._call_back() - - def set_host(self, host): - self.host_row.set_text(host) - - def get_host(self): - return self.host_row.get_text() - - def set_port(self, port): - self.port_spinner.set_value(port) - - def get_port(self): - return self.port_spinner.get_value_as_int() - - def set_password(self, password): - if password is None: - password = "" - self.password_row.set_text(password) - - def get_password(self): - if self.password_row.get_text() == "": - return None - else: - return self.password_entry.get_text() - - def _call_back(self): - self.emit( - 'connection-changed', - self.get_host(), - self.get_port(), - self.get_password(), - ) diff --git a/src/meson.build b/src/meson.build index d30b1c7..e2db64e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -23,7 +23,6 @@ mcg_sources = [ 'albumheaderbar.py', 'application.py', 'client.py', - 'connectionpanel.py', 'coverpanel.py', 'librarypanel.py', 'playlistpanel.py', diff --git a/src/serverpanel.py b/src/serverpanel.py index f29c7c4..cc765bc 100644 --- a/src/serverpanel.py +++ b/src/serverpanel.py @@ -4,13 +4,19 @@ import gi gi.require_version('Gtk', '4.0') gi.require_version('Adw', '1') +import locale + from gi.repository import Gtk, Adw, GObject +from mcg.zeroconf import ZeroconfProvider + @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/server-panel.ui') class ServerPanel(Adw.Bin): __gtype_name__ = 'McgServerPanel' __gsignals__ = { + 'connection-changed': + (GObject.SIGNAL_RUN_FIRST, None, (str, int, str)), 'change-output-device': (GObject.SIGNAL_RUN_FIRST, None, ( GObject.TYPE_PYOBJECT, bool, @@ -19,6 +25,15 @@ class ServerPanel(Adw.Bin): # Widgets toolbar = Gtk.Template.Child() + connection_status_page = Gtk.Template.Child() + status_page = Gtk.Template.Child() + stats_page = Gtk.Template.Child() + devices_page = Gtk.Template.Child() + # Connection widgets + zeroconf_list = Gtk.Template.Child() + host_row = Gtk.Template.Child() + port_spinner = Gtk.Template.Child() + password_row = Gtk.Template.Child() # Status widgets status_file = Gtk.Template.Child() status_audio = Gtk.Template.Child() @@ -43,12 +58,72 @@ class ServerPanel(Adw.Bin): # Widgets self._none_label = self.status_file.get_label() + # Zeroconf provider + self._zeroconf_provider = ZeroconfProvider() + self._zeroconf_provider.connect_signal( + ZeroconfProvider.SIGNAL_SERVICE_NEW, self.on_new_service) + def set_selected(self, selected): self._is_selected = selected def get_toolbar(self): return self.toolbar + def on_new_service(self, service): + name, host, port = service + + row_button = Gtk.Button() + row_button.set_label(locale.gettext("use")) + row_button.connect("clicked", self.on_service_selected, host, port) + + row = Adw.ActionRow() + row.set_title(name) + row.set_subtitle("{} ({})".format(host, port)) + row.add_suffix(row_button) + + self.zeroconf_list.insert(row, -1) + + def on_service_selected(self, widget, host, port): + self.set_host(host) + self.set_port(port) + + @Gtk.Template.Callback() + def on_host_entry_apply(self, widget): + self._call_back() + + @Gtk.Template.Callback() + def on_port_spinner_value_changed(self, widget): + self._call_back() + + def set_connection_sensitive(self, sensitive): + self.connection_status_page.set_sensitive(sensitive) + self.status_page.set_visible(not sensitive) + self.stats_page.set_visible(not sensitive) + self.devices_page.set_visible(not sensitive) + + def set_host(self, host): + self.host_row.set_text(host) + + def get_host(self): + return self.host_row.get_text() + + def set_port(self, port): + self.port_spinner.set_value(port) + + def get_port(self): + return self.port_spinner.get_value_as_int() + + def set_password(self, password): + if password is None: + password = "" + self.password_row.set_text(password) + + def get_password(self): + if self.password_row.get_text() == "": + return None + else: + return self.password_entry.get_text() + def on_output_device_toggled(self, widget, device): self.emit('change-output-device', device, widget.get_active()) @@ -113,3 +188,12 @@ class ServerPanel(Adw.Bin): if id not in device_ids: self.output_devices.remove( self._output_buttons[id].get_parent()) + + def _call_back(self): + self.emit( + 'connection-changed', + self.get_host(), + self.get_port(), + self.get_password(), + ) + diff --git a/src/window.py b/src/window.py index db10c23..ed00409 100644 --- a/src/window.py +++ b/src/window.py @@ -14,7 +14,6 @@ gi.require_version('Adw', '1') from gi.repository import Gtk, Adw, Gdk, GObject, GLib, Gio from . import client from .shortcutsdialog import ShortcutsDialog -from .connectionpanel import ConnectionPanel from .serverpanel import ServerPanel from .coverpanel import CoverPanel from .playlistpanel import PlaylistPanel @@ -52,7 +51,6 @@ class Window(Adw.ApplicationWindow): # Widgets toolbar_view = Gtk.Template.Child() - content_stack = Gtk.Template.Child() panel_stack = Gtk.Template.Child() toolbar_stack = Gtk.Template.Child() # Headerbar @@ -81,8 +79,6 @@ class Window(Adw.ApplicationWindow): # Help/Shortcuts dialog self.set_help_overlay(ShortcutsDialog()) - # Login screen - self._connection_panel = ConnectionPanel() # Server panel self._server_panel = ServerPanel() self._panels.append(self._server_panel) @@ -104,7 +100,6 @@ class Window(Adw.ApplicationWindow): self.on_panel_close_standalone) self._panels.append(self._library_panel) # Stack - self.content_stack.add_child(self._connection_panel) self.panel_stack.add_titled_with_icon(self._server_panel, 'server-panel', locale.gettext("Server"), @@ -128,12 +123,12 @@ class Window(Adw.ApplicationWindow): # Properties self._set_headerbar_sensitive(False, False) - self._connection_panel.set_host( + self._server_panel.set_host( self._settings.get_string(Window.SETTING_HOST)) - self._connection_panel.set_port( - self._settings.get_int(Window.SETTING_PORT)) + self._server_panel.set_port(self._settings.get_int( + Window.SETTING_PORT)) if use_keyring: - self._connection_panel.set_password( + self._server_panel.set_password( keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM, ZeroconfProvider.KEYRING_USERNAME)) self._playlist_panel.set_item_size( @@ -148,8 +143,9 @@ class Window(Adw.ApplicationWindow): # Signals self.connect("notify::maximized", self.on_maximized) self.connect("notify::fullscreened", self.on_fullscreened) - self._connection_panel.connect( - 'connection-changed', self.on_connection_panel_connection_changed) + self._server_panel.connect('connection-changed', + self.on_server_panel_connection_changed) + self.panel_stack.connect('notify::visible-child', self.on_stack_switched) self._server_panel.connect('change-output-device', @@ -219,7 +215,7 @@ class Window(Adw.ApplicationWindow): self.set_default_size(self._state.width, self._state.height) if self._state.get_property(WindowState.PROP_MAXIMIZED): self.maximize() - self.content_stack.set_visible_child(self._connection_panel) + self.panel_stack.set_visible_child(self._server_panel) if self._settings.get_boolean(Window.SETTING_CONNECTED): self._connect() @@ -344,8 +340,7 @@ class Window(Adw.ApplicationWindow): self.toolbar_view.add_top_bar(self.headerbar) self.toolbar_view.remove(panel.get_headerbar_standalone()) - def on_connection_panel_connection_changed(self, widget, host, port, - password): + def on_server_panel_connection_changed(self, widget, host, port, password): self._settings.set_string(Window.SETTING_HOST, host) self._settings.set_int(Window.SETTING_PORT, port) if use_keyring: @@ -471,7 +466,7 @@ class Window(Adw.ApplicationWindow): self._server_panel.set_output_devices(devices) def on_mcg_load_playlist(self, playlist): - self._playlist_panel.set_playlist(self._connection_panel.get_host(), + self._playlist_panel.set_playlist(self._server_panel.get_host(), playlist) def on_mcg_init_albums(self): @@ -481,7 +476,7 @@ class Window(Adw.ApplicationWindow): GObject.idle_add(self._library_panel.load_albums) def on_mcg_load_albums(self, albums): - self._library_panel.set_albums(self._connection_panel.get_host(), + self._library_panel.set_albums(self._server_panel.get_host(), albums) def on_mcg_load_albumart(self, album, data): @@ -514,22 +509,21 @@ class Window(Adw.ApplicationWindow): # Private methods def _connect(self): - self._connection_panel.set_sensitive(False) + self._server_panel.set_connection_sensitive(False) self._set_headerbar_sensitive(False, True) if self._mcg.is_connected(): self._mcg.disconnect() self._settings.set_boolean(Window.SETTING_CONNECTED, False) else: - host = self._connection_panel.get_host() - port = self._connection_panel.get_port() - password = self._connection_panel.get_password() + host = self._server_panel.get_host() + port = self._server_panel.get_port() + password = self._server_panel.get_password() self._mcg.connect(host, port, password) self._settings.set_boolean(Window.SETTING_CONNECTED, True) def _connect_connected(self): self._headerbar_connected() self._set_headerbar_sensitive(True, False) - self.content_stack.set_visible_child(self.panel_stack) self.panel_stack.set_visible_child(self._panels[self._settings.get_int( Window.SETTING_PANEL)]) @@ -539,8 +533,8 @@ class Window(Adw.ApplicationWindow): self._headerbar_disconnected() self._set_headerbar_sensitive(False, False) self._save_visible_panel() - self.content_stack.set_visible_child(self._connection_panel) - self._connection_panel.set_sensitive(True) + self.panel_stack.set_visible_child(self._server_panel) + self._server_panel.set_connection_sensitive(True) def _fullscreen(self, fullscreened_new): if fullscreened_new != self._state.get_property( From 08cd9dbe6593219820fb93e78e7136d74f867629 Mon Sep 17 00:00:00 2001 From: Olli Date: Sat, 10 Jan 2026 15:26:49 +0100 Subject: [PATCH 02/13] =?UTF-8?q?Set=20pixel=20size=20for=20=E2=80=9Cstand?= =?UTF-8?q?alone=E2=80=9D=20images=20(close=20#109)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/coverpanel.py | 1 + src/librarypanel.py | 1 + src/playlistpanel.py | 1 + 3 files changed, 3 insertions(+) diff --git a/src/coverpanel.py b/src/coverpanel.py index d9c5d31..312d4da 100644 --- a/src/coverpanel.py +++ b/src/coverpanel.py @@ -251,4 +251,5 @@ class CoverPanel(Gtk.Overlay): return self.cover_image.set_from_pixbuf( pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER)) + self.cover_image.set_pixel_size(min(width, height)) self.cover_image.show() diff --git a/src/librarypanel.py b/src/librarypanel.py index e2ae1fb..fd56f9f 100644 --- a/src/librarypanel.py +++ b/src/librarypanel.py @@ -456,6 +456,7 @@ class LibraryPanel(Adw.Bin): # Pixelpuffer auf Oberfläche zeichnen self.standalone_image.set_from_pixbuf( pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER)) + self.standalone_image.set_pixel_size(min(width, height)) self.standalone_image.show() def _get_default_image(self): diff --git a/src/playlistpanel.py b/src/playlistpanel.py index 34abfee..a9b1d8a 100644 --- a/src/playlistpanel.py +++ b/src/playlistpanel.py @@ -263,6 +263,7 @@ class PlaylistPanel(Adw.Bin): # Pixelpuffer auf Oberfläche zeichnen self.standalone_image.set_from_pixbuf( pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER)) + self.standalone_image.set_pixel_size(min(width, height)) self.standalone_image.show() def _get_default_image(self): From 9311f9974a1610c310fd10b9b7e925c1714596c7 Mon Sep 17 00:00:00 2001 From: Olli Date: Sat, 10 Jan 2026 15:42:24 +0100 Subject: [PATCH 03/13] Do not try to convert default icon to GDK pixbuf (close #110) --- src/coverpanel.py | 1 + src/librarypanel.py | 27 +++++++++++++++------------ src/playlistpanel.py | 26 +++++++++++++++----------- src/utils.py | 7 ++++--- 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/coverpanel.py b/src/coverpanel.py index 312d4da..b6f3c67 100644 --- a/src/coverpanel.py +++ b/src/coverpanel.py @@ -236,6 +236,7 @@ class CoverPanel(Gtk.Overlay): pixbuf = self._cover_pixbuf # Check pixelbuffer if pixbuf is None: + self.cover_default.set_pixel_size(min(size_width, size_height)/2) return # Skalierungswert für Breite und Höhe ermitteln diff --git a/src/librarypanel.py b/src/librarypanel.py index fd56f9f..83cafe2 100644 --- a/src/librarypanel.py +++ b/src/librarypanel.py @@ -293,15 +293,13 @@ class LibraryPanel(Adw.Bin): def set_albumart(self, album, data): if album in self._selected_albums: + self._standalone_pixbuf = None if data: # Load image and draw it try: self._standalone_pixbuf = Utils.load_pixbuf(data) except Exception: self._logger.exception("Failed to set albumart") - self._standalone_pixbuf = self._get_default_image() - else: - self._standalone_pixbuf = self._get_default_image() # Show image GObject.idle_add(self._show_image) @@ -335,6 +333,8 @@ class LibraryPanel(Adw.Bin): self._grid_pixbufs.clear() for album_id in albums.keys(): album = albums[album_id] + grid_item = GridItem(album) + pixbuf = None try: pixbuf = Utils.load_thumbnail(cache, self._client, album, size) @@ -344,14 +344,13 @@ class LibraryPanel(Adw.Bin): except Exception as e: self._logger.exception("Failed to load albumart", e) if pixbuf is None: - pixbuf = self._icon_theme.lookup_icon( - Utils.STOCK_ICON_DEFAULT, None, self._item_size, - self._item_size, Gtk.TextDirection.LTR, - Gtk.IconLookupFlags.FORCE_SYMBOLIC) - if pixbuf is not None: + icon = self._get_default_icon(self._item_size, self._item_size) + grid_item.set_icon(icon) + else: self._grid_pixbufs[album.get_id()] = pixbuf - GObject.idle_add(self._library_grid_model.append, - GridItem(album, pixbuf)) + grid_item.set_cover(pixbuf) + + GObject.idle_add(self._library_grid_model.append, grid_item) i += 1 GObject.idle_add(self.progress_bar.set_fraction, i / n) @@ -440,6 +439,9 @@ class LibraryPanel(Adw.Bin): pixbuf = self._standalone_pixbuf # Check pixelbuffer if pixbuf is None: + icon = self._get_default_icon(size_width, size_height) + self.standalone_image.set_from_paintable(icon) + self.standalone_image.set_pixel_size(min(size_width, size_height)/2) return # Skalierungswert für Breite und Höhe ermitteln @@ -459,9 +461,10 @@ class LibraryPanel(Adw.Bin): self.standalone_image.set_pixel_size(min(width, height)) self.standalone_image.show() - def _get_default_image(self): + def _get_default_icon(self, width, height): return self._icon_theme.lookup_icon(Utils.STOCK_ICON_DEFAULT, None, - 512, 512, Gtk.TextDirection.LTR, + width, height, + Gtk.TextDirection.LTR, Gtk.IconLookupFlags.FORCE_SYMBOLIC) def _get_selected_albums(self): diff --git a/src/playlistpanel.py b/src/playlistpanel.py index a9b1d8a..3c18e9c 100644 --- a/src/playlistpanel.py +++ b/src/playlistpanel.py @@ -171,15 +171,13 @@ class PlaylistPanel(Adw.Bin): def set_albumart(self, album, data): if album in self._selected_albums: + self._standalone_pixbuf = None if data: # Load image and draw it try: self._standalone_pixbuf = Utils.load_pixbuf(data) except Exception: self._logger.exception("Failed to set albumart") - self._cover_pixbuf = self._get_default_image() - else: - self._cover_pixbuf = self._get_default_image() # Show image GObject.idle_add(self._show_image) @@ -197,6 +195,8 @@ class PlaylistPanel(Adw.Bin): cache = client.MCGCache(host, size) for album in playlist: + grid_item = GridItem(album) + pixbuf = None # Load albumart thumbnail try: @@ -207,12 +207,12 @@ class PlaylistPanel(Adw.Bin): except Exception: self._logger.exception("Failed to load albumart") if pixbuf is None: - pixbuf = self._icon_theme.lookup_icon( - Utils.STOCK_ICON_DEFAULT, None, self._item_size, - self._item_size, Gtk.TextDirection.LTR, - Gtk.IconLookupFlags.FORCE_SYMBOLIC) - if pixbuf is not None: - self._playlist_grid_model.append(GridItem(album, pixbuf)) + icon = self._get_default_icon(self._item_size, self._item_size) + grid_item.set_icon(icon) + else: + grid_item.set_cover(pixbuf) + + GObject.idle_add(self._playlist_grid_model.append, grid_item) if self._playlist_stop.is_set(): self._playlist_lock.release() @@ -247,6 +247,9 @@ class PlaylistPanel(Adw.Bin): pixbuf = self._standalone_pixbuf # Check pixelbuffer if pixbuf is None: + icon = self._get_default_icon(size_width, size_height) + self.standalone_image.set_from_paintable(icon) + self.standalone_image.set_pixel_size(min(size_width, size_height)/2) return # Skalierungswert für Breite und Höhe ermitteln @@ -266,9 +269,10 @@ class PlaylistPanel(Adw.Bin): self.standalone_image.set_pixel_size(min(width, height)) self.standalone_image.show() - def _get_default_image(self): + def _get_default_icon(self, width, height): return self._icon_theme.lookup_icon(Utils.STOCK_ICON_DEFAULT, None, - 512, 512, Gtk.TextDirection.LTR, + width, height, + Gtk.TextDirection.LTR, Gtk.IconLookupFlags.FORCE_SYMBOLIC) def _get_selected_albums(self): diff --git a/src/utils.py b/src/utils.py index ed8a04f..89b33af 100644 --- a/src/utils.py +++ b/src/utils.py @@ -86,11 +86,9 @@ class GridItem(GObject.GObject): tooltip = GObject.Property(type=str, default=None) cover = GObject.Property(type=Gdk.Paintable, default=None) - def __init__(self, album, cover): + def __init__(self, album): super().__init__() self._album = album - if cover: - self.cover = Gdk.Texture.new_for_pixbuf(cover) self.tooltip = GObject.markup_escape_text("\n".join([ album.get_title(), ', '.join(album.get_dates()), Utils.create_artists_label(album), @@ -103,6 +101,9 @@ class GridItem(GObject.GObject): def set_cover(self, cover): self.cover = Gdk.Texture.new_for_pixbuf(cover) + def set_icon(self, icon): + self.cover = icon + class SearchFilter(Gtk.Filter): From 0a109bc886a0b69824c26ea84358576fbc872d85 Mon Sep 17 00:00:00 2001 From: Olli Date: Sat, 10 Jan 2026 16:04:43 +0100 Subject: [PATCH 04/13] Fix handling and logging of thumbnail save failures --- src/librarypanel.py | 4 ++-- src/utils.py | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/librarypanel.py b/src/librarypanel.py index 83cafe2..22a8b43 100644 --- a/src/librarypanel.py +++ b/src/librarypanel.py @@ -341,8 +341,8 @@ class LibraryPanel(Adw.Bin): except client.CommandException: # Exception is handled by client pass - except Exception as e: - self._logger.exception("Failed to load albumart", e) + except Exception: + self._logger.exception("Failed to load albumart") if pixbuf is None: icon = self._get_default_icon(self._item_size, self._item_size) grid_item.set_icon(icon) diff --git a/src/utils.py b/src/utils.py index 89b33af..4b58fb9 100644 --- a/src/utils.py +++ b/src/utils.py @@ -3,6 +3,7 @@ import gi import hashlib import locale +import logging import os gi.require_version('Gtk', '4.0') @@ -37,7 +38,12 @@ class Utils: if pixbuf is not None: pixbuf = pixbuf.scale_simple(size, size, GdkPixbuf.InterpType.HYPER) - pixbuf.savev(cache_url, 'jpeg', [], []) + try: + pixbuf.savev(cache_url, 'jpeg', [], []) + except Exception as e: + logger = logging.getLogger(__name__) + logger.warning("Failed to save thumbnail for album\"%s\": " + "%s", album.get_title(), e) return pixbuf @staticmethod From 9b29f7b274d8553ade36313b6ff4ed271c35b9b3 Mon Sep 17 00:00:00 2001 From: Olli Date: Sat, 10 Jan 2026 16:22:03 +0100 Subject: [PATCH 05/13] Preserve aspect ratio of album covers in grid views (close #111) --- src/librarypanel.py | 12 +++--------- src/playlistpanel.py | 12 +++--------- src/utils.py | 19 ++++++++++++++++++- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/librarypanel.py b/src/librarypanel.py index 22a8b43..02d8c08 100644 --- a/src/librarypanel.py +++ b/src/librarypanel.py @@ -444,15 +444,9 @@ class LibraryPanel(Adw.Bin): self.standalone_image.set_pixel_size(min(size_width, size_height)/2) return - # Skalierungswert für Breite und Höhe ermitteln - ratio_w = float(size_width) / float(pixbuf.get_width()) - ratio_h = float(size_height) / float(pixbuf.get_height()) - # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren - ratio = min(ratio_w, ratio_h) - ratio = min(ratio, 1) - # Neue Breite und Höhe berechnen - width = int(math.floor(pixbuf.get_width() * ratio)) - height = int(math.floor(pixbuf.get_height() * ratio)) + (width, height) = Utils.calculate_size(pixbuf.get_width(), + pixbuf.get_height(), size_width, + size_height) if width <= 0 or height <= 0: return # Pixelpuffer auf Oberfläche zeichnen diff --git a/src/playlistpanel.py b/src/playlistpanel.py index 3c18e9c..9f59e93 100644 --- a/src/playlistpanel.py +++ b/src/playlistpanel.py @@ -252,15 +252,9 @@ class PlaylistPanel(Adw.Bin): self.standalone_image.set_pixel_size(min(size_width, size_height)/2) return - # Skalierungswert für Breite und Höhe ermitteln - ratio_w = float(size_width) / float(pixbuf.get_width()) - ratio_h = float(size_height) / float(pixbuf.get_height()) - # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren - ratio = min(ratio_w, ratio_h) - ratio = min(ratio, 1) - # Neue Breite und Höhe berechnen - width = int(math.floor(pixbuf.get_width() * ratio)) - height = int(math.floor(pixbuf.get_height() * ratio)) + (width, height) = Utils.calculate_size(pixbuf.get_width(), + pixbuf.get_height(), size_width, + size_height) if width <= 0 or height <= 0: return # Pixelpuffer auf Oberfläche zeichnen diff --git a/src/utils.py b/src/utils.py index 4b58fb9..544e415 100644 --- a/src/utils.py +++ b/src/utils.py @@ -2,6 +2,7 @@ import gi import hashlib +import math import locale import logging import os @@ -36,7 +37,10 @@ class Utils: if albumart: pixbuf = Utils.load_pixbuf(albumart) if pixbuf is not None: - pixbuf = pixbuf.scale_simple(size, size, + (width, height) = Utils.calculate_size(pixbuf.get_width(), + pixbuf.get_height(), + size, size) + pixbuf = pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER) try: pixbuf.savev(cache_url, 'jpeg', [], []) @@ -78,6 +82,19 @@ class Utils: m.update(value.encode('utf-8')) return m.hexdigest() + @staticmethod + def calculate_size(src_width, src_height, dest_width, dest_height): + ratio_w = float(dest_width) / float(src_width) + ratio_h = float(dest_height) / float(src_height) + ratio = min(min(ratio_w, ratio_h), 1) + if ratio == 1: + return (src_width, src_height) + + width = int(math.floor(src_width * ratio)) + height = int(math.floor(src_height * ratio)) + + return (width, height) + class SortOrder: ARTIST = 0 From 7d474598e393e2fb4486c1e70b6b1c57cb507321 Mon Sep 17 00:00:00 2001 From: Olli Date: Sat, 10 Jan 2026 16:34:13 +0100 Subject: [PATCH 06/13] Center non-square album covers on grid views (close #112) --- data/ui/library-panel.ui | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/ui/library-panel.ui b/data/ui/library-panel.ui index b5512e3..b835e3f 100644 --- a/data/ui/library-panel.ui +++ b/data/ui/library-panel.ui @@ -221,10 +221,14 @@ vertical + true + true contain false + true + true GtkListItem From 345e7697ff99192f98790e74344a2dd5b01ca90e Mon Sep 17 00:00:00 2001 From: Olli Date: Sat, 10 Jan 2026 16:35:46 +0100 Subject: [PATCH 07/13] Bump version to 4.0.2 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a8e88cc..67b6caf 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('mcg', - version: '4.0.1', + version: '4.0.2', meson_version: '>= 0.59.0', default_options: [ 'warning_level=2', From 377e57ee43ddb35eb74568f4ea811bc9d3458669 Mon Sep 17 00:00:00 2001 From: Olli Date: Thu, 26 Feb 2026 10:36:41 +0100 Subject: [PATCH 08/13] Add basic go application and remove python code --- .gitignore | 8 +- CONTRIBUTING.md | 26 + CONTRIBUTING.textile | 22 - LICENSE | 2 +- README.md | 49 +- go.mod | 5 + go.sum | 0 main.go | 4 + meson.build | 19 - src/__init__.py | 19 - src/albumheaderbar.py | 28 - src/application.py | 108 ---- src/client.py | 1240 ---------------------------------------- src/connectionpanel.py | 89 --- src/coverpanel.py | 256 --------- src/librarypanel.py | 470 --------------- src/main.py | 8 - src/mcg.in | 25 - src/meson.build | 37 -- src/playlistpanel.py | 278 --------- src/serverpanel.py | 115 ---- src/shortcutsdialog.py | 15 - src/utils.py | 138 ----- src/window.py | 615 -------------------- src/zeroconf.py | 72 --- 25 files changed, 57 insertions(+), 3591 deletions(-) create mode 100644 CONTRIBUTING.md delete mode 100644 CONTRIBUTING.textile create mode 100644 go.mod create mode 100644 go.sum create mode 100644 main.go delete mode 100644 meson.build delete mode 100644 src/__init__.py delete mode 100644 src/albumheaderbar.py delete mode 100644 src/application.py delete mode 100644 src/client.py delete mode 100644 src/connectionpanel.py delete mode 100644 src/coverpanel.py delete mode 100644 src/librarypanel.py delete mode 100644 src/main.py delete mode 100755 src/mcg.in delete mode 100644 src/meson.build delete mode 100644 src/playlistpanel.py delete mode 100644 src/serverpanel.py delete mode 100644 src/shortcutsdialog.py delete mode 100644 src/utils.py delete mode 100644 src/window.py delete mode 100644 src/zeroconf.py diff --git a/.gitignore b/.gitignore index f42fdfe..8a28ddc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -/build/ -/install/ +/mcg* diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..bacb769 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,26 @@ +# Contributing + +There are multiple ways to contribute code to this project: + +* Submit a Pull Request on +[https://git.suruatoel.xyz/coderkun/mcg](git.suruatoel.xyz/coderkun/mcg) or +[https://codeberg.org/suruatoel/mcg](codeberg.org/suruatoel/mcg) +* Send a git pull request via eMail +* Send a patch via eMail + +## Internationalization + +Update `.pot` files: + + $ xgettext --language=Go --keyword=T --from-code=UTF-8 --package-name=mcg --output=po/mcg-go.pot $(git ls-files '*.go') + $ xgettext --language=Glade --from-code=UTF-8 --output=po/mcg-ui.pot $(git ls-files '*.ui') + $ msgcat --use-first -o po/mcg.pot po/mcg-go.pot po/mcg-ui.pot + +Use a tool like [Poedit](https://poedit.net/) to create or update translations +in the `locale/` folder. + +## AI Policy + +This project uses a _No AI policy_. Any code you submit to this project has to +be written by yourself. If you put this project’s code into any AI tool, you +will be banned from this project. diff --git a/CONTRIBUTING.textile b/CONTRIBUTING.textile deleted file mode 100644 index f5b11fb..0000000 --- a/CONTRIBUTING.textile +++ /dev/null @@ -1,22 +0,0 @@ -h1. Contributing - -There are several ways to participate in this project. This guide covers only the contribution of code (i. e. any change to any file in the repository). - -There are basically two ways to contribute code to this project: Either via GitLab or via e‑mail. The first one is probably easier for most people. However -it requires a account at GitLab.com. For people who don’t want to create an account—or have any other reason to not use GitLab—e‑mail is an alternative option. - -h2. Contributing via GitLab - -Create an account on GitLab.com or use your already existing account. Fork this repository inside GitLab, add changes to your fork and finally create a Merge Request to contribute your changes back to this repository. - -h2. Contributing via E‑mail - -To contribute via e‑mail, first clone this repository to your local harddrive. After adding changes to your local copy you have two options to send them back to this repository: as patch or as Pull Request - -h3. E‑mail Patch - -To send a patch with your changes, use git’s @send-email@ option as explained in "Public Project over Email":https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project#_project_over_email of section "5.2 Distributed Git - Contributing to a Project":https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project of the "Git Pro Book":https://git-scm.com/book/en/v2/. You will find the e‑mail address at "suruatoel.xyz":https://www.suruatoel.xyz. - -h3. E‑mail Pull Request - -Sending a Pull Request via e‑mail requires to publish your copy of the repository (that includes your changes) at a publicly available URL (it is your responsibility to choose a trusted host). Then use git’s @request-pull@ command to send an e‑mail with your pull request. The e‑mail will contain a link to the public repository which can be used to pull your changes from. You will find the e‑mail address at "suruatoel.xyz":https://www.suruatoel.xyz. For more details, please take a look at "Forked Public Project":https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project#_public_project of section "5.2 Distributed Git - Contributing to a Project":https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project of the "Git Pro Book":https://git-scm.com/book/en/v2. \ No newline at end of file diff --git a/LICENSE b/LICENSE index bb13eb5..1f5cef4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ CoverGrid (mcg) is a client for the Music Player Daemon, focusing on albums instead of single tracks. -Copyright ® 2013 – 2017 coderkun +Copyright ® 2013 – 2026 Olli This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/README.md b/README.md index f37f2db..c65ad22 100644 --- a/README.md +++ b/README.md @@ -5,60 +5,51 @@ Daemon](http://www.musicpd.org) (MPD), focusing on albums instead of single tracks. It is not intended to be a replacement for your favorite MPD client but an addition to get a better album-experience. -Website: https://www.suruatoel.xyz/codes/mcg +Website: [https://www.suruatoel.xyz/codes/mcg](www.suruatoel.xyz/codes/mcg) License: [GPL](http://www.gnu.org/licenses/gpl.html) v3 Dependencies: -* [Python](http://www.python.org) 3 -* [python-dateutil](https://pypi.org/project/python-dateutil/) -* [GTK](http://www.gtk.org) 4 (>= 4.18) ([python-gobject](https://live.gnome.org/PyGObject)) +* [GTK](http://www.gtk.org) 4 (>= 4.18) * [libadwaita](https://gnome.pages.gitlab.gnome.org/libadwaita/) (>= 1.2) -* [Avahi](http://www.avahi.org) (optional) -* [python-keyring](http://pypi.python.org/pypi/keyring) (optional) -* [meson](https://mesonbuild.com/) and [ninja](https://ninja-build.org/) (building) +* [go](https://go.dev/) (build only) -Additionally a [MPD](http://www.musicpd.org) server (version >= 0.21.0) is +Additionally, an [MPD](http://www.musicpd.org) server (version >= 0.21.0) is required at runtime. ## Building -Build the application with _meson_ and _ninja_: +Build the application with _go_: - $ meson build - $ ninja -C build + $ go build . -## Running/Testing +## Running -For testing the application and running it without (system-wide) installation, -donwload/clone the code, build it with the `--prefix` option and install it -with `ninja`: +Run the application for testing purposes: - $ meson setup --prefix $(pwd)/install build - $ ninja -C build - $ ninja -C build install + $ go run . -After that you can run it with _meson’s_ `devenv` command: +Run the application: - $ meson devenv -C build src/mcg + $ ./mcg -## Installing +## Packaging -Install the application system-wide with _meson_ (after building): +The suggested package name for this project is “mcg”. To build a production +binary, please use the following command: - $ ninja -C build install + $ go build --ldflags="-s -w -X main.Version=$(git describe)" -trimpath ./... -Note: _On Linux using the distribution’s package manager is the preferred way -of installing applications system-wide._ +In the “data/” folder you will find a `.desktop` file and an SVG icon. ## Screenshots -![CoverGrid’s cover panel with album details and track list.](https://suruatoel.xyz/images/mcg-cover-s.png "CoverGrid’s cover panel with album details and track list.") +![CoverGrid’s cover panel with album details and track list.](https://www.suruatoel.xyz/images/mcg-cover-s.png "CoverGrid’s cover panel with album details and track list.") -![CoverGrid’s playlist panel with queued albums.](https://suruatoel.xyz/images/mcg-playlist.png "CoverGrid’s playlist panel with queued albums.") +![CoverGrid’s playlist panel with queued albums.](https://www.suruatoel.xyz/images/mcg-playlist.png "CoverGrid’s playlist panel with queued albums.") -![CoverGrid’s library panel showing the albums middle-sized.](https://suruatoel.xyz/images/mcg-library-m.png "CoverGrid’s library panel showing the albums middle-sized.") +![CoverGrid’s library panel showing the albums middle-sized.](https://www.suruatoel.xyz/images/mcg-library-m.png "CoverGrid’s library panel showing the albums middle-sized.") -![CoverGrid’s library panel showing the albums small-sized.](https://suruatoel.xyz/images/mcg-library-s.png "CoverGrid’s library panel showing the albums small-sized.") +![CoverGrid’s library panel showing the albums small-sized.](https://www.suruatoel.xyz/images/mcg-library-s.png "CoverGrid’s library panel showing the albums small-sized.") diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..7842f03 --- /dev/null +++ b/go.mod @@ -0,0 +1,5 @@ +module suruatoel.xyz/mcg + +go 1.25.0 + +toolchain go1.26.0 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..e69de29 diff --git a/main.go b/main.go new file mode 100644 index 0000000..da29a2c --- /dev/null +++ b/main.go @@ -0,0 +1,4 @@ +package main + +func main() { +} diff --git a/meson.build b/meson.build deleted file mode 100644 index 67b6caf..0000000 --- a/meson.build +++ /dev/null @@ -1,19 +0,0 @@ -project('mcg', - version: '4.0.2', - meson_version: '>= 0.59.0', - default_options: [ - 'warning_level=2', - 'werror=false', - ], -) - -subdir('data') -subdir('src') -subdir('po') - -gnome = import('gnome') -gnome.post_install( - glib_compile_schemas: true, - gtk_update_icon_cache: true, - update_desktop_database: true, -) diff --git a/src/__init__.py b/src/__init__.py deleted file mode 100644 index c498e0f..0000000 --- a/src/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -import os - -# Set environment -srcdir = os.path.abspath(os.path.dirname(__file__)) -datadir = os.path.join(srcdir, 'data') -datadirdev = os.path.join(srcdir, '..', 'data') -if os.path.exists(datadirdev): - datadir = datadirdev -localedir = None -localedirdev = os.path.join(srcdir, '..', 'locale') -if os.path.exists(localedirdev): - localedir = localedirdev - -# Set GSettings schema dir (if not set already) -if not os.environ.get('GSETTINGS_SCHEMA_DIR'): - os.environ['GSETTINGS_SCHEMA_DIR'] = datadirdev diff --git a/src/albumheaderbar.py b/src/albumheaderbar.py deleted file mode 100644 index 2f0b40b..0000000 --- a/src/albumheaderbar.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python3 - -import gi - -gi.require_version('Gtk', '4.0') -gi.require_version('Adw', '1') -from gi.repository import Gtk, GObject, Adw - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/album-headerbar.ui') -class AlbumHeaderbar(Adw.Bin): - __gtype_name__ = 'McgAlbumHeaderbar' - __gsignals__ = {'close': (GObject.SIGNAL_RUN_FIRST, None, ())} - - # Widgets - standalone_title = Gtk.Template.Child() - standalone_artist = Gtk.Template.Child() - - def __init__(self): - super().__init__() - - @Gtk.Template.Callback() - def on_close_clicked(self, widget): - self.emit('close') - - def set_album(self, album): - self.standalone_title.set_text(album.get_title()) - self.standalone_artist.set_text(", ".join(album.get_albumartists())) diff --git a/src/application.py b/src/application.py deleted file mode 100644 index c39b929..0000000 --- a/src/application.py +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/env python3 - -import logging -import gi - -gi.require_version('Gtk', '4.0') -gi.require_version('Adw', '1') -from gi.repository import Gio, Gtk, Gdk, Adw -from .window import Window - - -class Application(Gtk.Application): - TITLE = "CoverGrid" - ID = 'xyz.suruatoel.mcg' - DOMAIN = 'mcg' - - def __init__(self, version): - super().__init__(application_id=Application.ID, - flags=Gio.ApplicationFlags.FLAGS_NONE) - self._window = None - self._info_dialog = None - self._version = version - self._verbosity = logging.WARNING - self.set_accels_for_action('window.close', ['q']) - self.set_accels_for_action('win.show-help-overlay', ['k']) - self.set_accels_for_action('app.info', ['i']) - self.set_accels_for_action('win.connect', ['c']) - self.set_accels_for_action('win.play', ['p']) - self.set_accels_for_action('win.clear-playlist', ['r']) - self.set_accels_for_action('win.toggle-fullscreen', ['F11']) - self.set_accels_for_action('win.search-library', ['f']) - self.set_accels_for_action('win.panel("0")', ['KP_1']) - self.set_accels_for_action('win.panel("1")', ['KP_2']) - self.set_accels_for_action('win.panel("2")', ['KP_3']) - self.set_accels_for_action('win.panel("3")', ['KP_4']) - - def do_startup(self): - Gtk.Application.do_startup(self) - self._setup_logging() - self._load_settings() - self._set_default_settings() - self._load_css() - self._setup_actions() - self._setup_adw() - - def do_activate(self): - Gtk.Application.do_activate(self) - if not self._window: - self._window = Window(self, Application.TITLE, self._settings) - self._window.present() - - def on_menu_info(self, action, value): - self._info_dialog = Adw.AboutDialog() - self._info_dialog.set_application_icon("xyz.suruatoel.mcg") - self._info_dialog.set_application_name("CoverGrid") - self._info_dialog.set_version(self._version) - self._info_dialog.set_comments( - """CoverGrid is a client for the Music Player Daemon, focusing on \ -albums instead of single tracks.""") - self._info_dialog.set_website("https://www.suruatoel.xyz/codes/mcg") - self._info_dialog.set_license_type(Gtk.License.GPL_3_0) - self._info_dialog.set_issue_url( - "https://git.suruatoel.xyz/coderkun/mcg") - self._info_dialog.present() - - def on_menu_quit(self, action, value): - self.quit() - - def _setup_logging(self): - logging.basicConfig(level=self._verbosity, - format="%(asctime)s %(levelname)s: %(message)s") - - def _load_settings(self): - self._settings = Gio.Settings.new(Application.ID) - - def _set_default_settings(self): - style_manager = Adw.StyleManager.get_default() - style_manager.set_color_scheme(Adw.ColorScheme.PREFER_DARK) - - def _load_css(self): - style_provider = Gtk.CssProvider() - style_provider.load_from_resource(self._get_resource_path('gtk.css')) - Gtk.StyleContext.add_provider_for_display( - Gdk.Display.get_default(), style_provider, - Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) - - def _setup_actions(self): - action = Gio.SimpleAction.new("info", None) - action.connect('activate', self.on_menu_info) - self.add_action(action) - action = Gio.SimpleAction.new("quit", None) - action.connect('activate', self.on_menu_quit) - self.add_action(action) - - def _get_resource_path(self, path): - return "/{}/{}".format(Application.ID.replace('.', '/'), path) - - def _setup_adw(self): - Adw.HeaderBar() - Adw.ToolbarView() - Adw.ViewSwitcherTitle() - Adw.ViewSwitcherBar() - Adw.ViewStackPage() - Adw.ToastOverlay() - Adw.StatusPage() - Adw.Flap() - Adw.EntryRow() - Adw.PasswordEntryRow() diff --git a/src/client.py b/src/client.py deleted file mode 100644 index 17b7522..0000000 --- a/src/client.py +++ /dev/null @@ -1,1240 +0,0 @@ -#!/usr/bin/env python3 - -import concurrent.futures -import configparser -import dateutil.parser -import logging -import os -import queue -import re -import socket -import threading - -from mcg.utils import SortOrder -from mcg.utils import Utils - - -class MPDException(Exception): - - def __init__(self, error): - super(MPDException, self).__init__(self._parse_error(error)) - self._error = error - - def _parse_error(self, error): - if error: - parts = re.match(r"\[(\d+)@(\d+)\]\s\{(\w+)\}\s(.*)", error) - if parts: - self._error_number = int(parts.group(1)) - self._command_number = int(parts.group(2)) - self._command_name = parts.group(3) - return parts.group(4) - return error - - def get_error(self): - return self._error - - def get_error_number(self): - return self._error_number - - def get_command_number(self): - return self._command_number - - def get_command_name(self): - return self._command_name - - -class ConnectionException(MPDException): - pass - - -class ProtocolException(MPDException): - pass - - -class CommandException(MPDException): - pass - - -class Future(concurrent.futures.Future): - - def __init__(self, signal): - concurrent.futures.Future.__init__(self) - self._signal = signal - - def get_signal(self): - return self._signal - - -class Base(): - - def __init__(self): - self._callbacks = {} - - def connect_signal(self, signal, callback): - """Connect a callback function to a signal (event).""" - self._callbacks[signal] = callback - - def disconnect_signal(self, signal): - """Disconnect a callback function from a signal (event).""" - if self._has_callback(signal): - del self._callbacks[signal] - - def _has_callback(self, signal): - """Check if there is a registered callback function for a signal.""" - return signal in self._callbacks - - def _callback(self, signal, *data): - if signal in self._callbacks: - callback = self._callbacks[signal] - callback(*data) - - def _callback_future(self, future): - self._callback(future.get_signal(), *future.result()) - - -class Client(Base): - """Client library for handling the connection to the Music Player Daemon. - - This class implements an album-based MPD client. It offers a non-blocking - threaded worker model for use in graphical environments. - """ - # Protocol: greeting mark - PROTOCOL_GREETING = 'OK MPD ' - # Protocol: completion mark - PROTOCOL_COMPLETION = 'OK' - # Protocol: error mark - PROTOCOL_ERROR = 'ACK ' - # Protocol: error: permission - PROTOCOL_ERROR_PERMISSION = 4 - # Protocol: error: no exists - PROTOCOL_ERROR_NOEXISTS = 50 - # Signal: connection status - SIGNAL_CONNECTION = 'connection' - # Signal: status - SIGNAL_STATUS = 'status' - # Signal: stats - SIGNAL_STATS = 'stats' - # Signal: init loading of albums - SIGNAL_INIT_ALBUMS = 'init-albums' - # Signal: pulse loading of albums - SIGNAL_PULSE_ALBUMS = 'pulse-albums' - # Signal: load albums - SIGNAL_LOAD_ALBUMS = 'load-albums' - # Signal: load playlist - SIGNAL_LOAD_PLAYLIST = 'load-playlist' - # Signal: load audio output devices - SIGNAL_LOAD_OUTPUT_DEVICES = 'load-output-devices' - # Signal: load albumart - SIGNAL_LOAD_ALBUMART = 'albumart' - # Signal: error - SIGNAL_ERROR = 'error' - # Buffer size for reading from socket - SOCKET_BUFSIZE = 4096 - - def __init__(self): - """Set class variables and instantiates the Client.""" - Base.__init__(self) - self._logger = logging.getLogger(__name__) - self._sock = None - self._buffer = bytearray() - self._sock_write = None - self._stop = threading.Event() - self._actions = queue.Queue() - self._worker = None - self._idling = False - self._host = None - self._albums = {} - self._playlist = [] - self._state = None - - def get_logger(self): - return self._logger - - # Client commands - - def connect(self, host, port, password=None): - """Connect to MPD with the given host, port and password or with - standard values. - """ - self._logger.info("connect") - self._host = host - self._add_action(self._connect, host, port, password) - self._stop.clear() - self._start_worker() - - def is_connected(self): - """Return the connection status.""" - return self._worker is not None and self._worker.is_alive() - - def disconnect(self): - """Disconnect from the connected MPD.""" - self._logger.info("disconnect") - self._stop.set() - self._add_action(self._disconnect) - - def join(self): - self._actions.join() - - def get_status(self): - """Determine the current status.""" - self._logger.info("get status") - self._add_action_signal(Client.SIGNAL_STATUS, self._get_status) - - def get_stats(self): - """Load statistics.""" - self._logger.info("get stats") - self._add_action_signal(Client.SIGNAL_STATS, self._get_stats) - - def get_output_devices(self): - """Determine the list of audio output devices.""" - self._logger.info("get output devices") - self._add_action_signal(Client.SIGNAL_LOAD_OUTPUT_DEVICES, - self._get_output_devices) - - def enable_output_device(self, device, enabled): - """Enable/disable an audio output device.""" - self._logger.info("enable output device") - self._add_action(self._enable_output_device, device, enabled) - - def load_albums(self): - self._logger.info("load albums") - self._add_action_signal(Client.SIGNAL_LOAD_ALBUMS, self._load_albums) - - def update(self): - self._logger.info("update") - self._add_action(self._update) - - def load_playlist(self): - self._logger.info("load playlist") - self._add_action_signal(Client.SIGNAL_LOAD_PLAYLIST, - self._load_playlist) - - def clear_playlist(self): - """Clear the current playlist""" - self._logger.info("clear playlist") - self._add_action(self._clear_playlist) - - def remove_album_from_playlist(self, album): - """Remove the given album from the playlist.""" - self._logger.info("remove album from playlist") - self._add_action(self._remove_album_from_playlist, album) - - def remove_albums_from_playlist(self, albums): - """Remove multiple albums from the playlist in one step.""" - self._logger.info("remove multiple albums from playlist") - self._add_action(self._remove_albums_from_playlist, albums) - - def play_album_from_playlist(self, album): - """Play the given album from the playlist.""" - self._logger.info("play album from playlist") - self._add_action(self._play_album_from_playlist, album) - - def playpause(self): - """Play or pauses the current state.""" - self._logger.info("playpause") - self._add_action(self._playpause) - - def play_album(self, album): - """Add the given album to the queue and play it immediately.""" - self._logger.info("play album") - self._add_action(self._play_album, album) - - def queue_album(self, album): - """Add the given album to the queue.""" - self._logger.info("play album") - self._add_action(self._queue_album, album) - - def queue_albums(self, albums): - """Add the given albums to the queue.""" - self._logger.info("play albums") - self._add_action(self._queue_albums, albums) - - def seek(self, pos, time): - """Seeks to a song at a position""" - self._logger.info("seek") - self._add_action(self._seek, pos, time) - - def stop(self): - self._logger.info("stop") - self._add_action(self._stop) - - def set_volume(self, volume): - self._logger.info("set volume") - self._add_action(self._set_volume, volume) - - def get_albumart(self, album): - self._logger.info("get albumart") - self._add_action_signal(Client.SIGNAL_LOAD_ALBUMART, - self._get_albumart, album) - - def get_albumart_now(self, album): - self._logger.info("get albumart now") - future = concurrent.futures.Future() - self._add_action_future(future, self._get_albumart, album) - (_, albumart) = future.result() - return albumart - - # Private methods - - def _connect(self, host, port, password): - self._logger.info("connecting to host %r, port %r", host, port) - if self._sock is not None: - return - try: - self._sock = self._connect_socket(host, port) - self._sock_write = self._sock.makefile("w", encoding="utf-8") - self._greet() - self._logger.info("connected") - if password: - self._logger.info("setting password") - self._call("password", password) - self._set_connection_status(True) - except OSError as e: - raise ConnectionException("connection failed: {}".format(e)) - - def _connect_socket(self, host, port): - sock = None - error = None - resources = socket.getaddrinfo(host, port, socket.AF_UNSPEC, - socket.SOCK_STREAM, socket.IPPROTO_TCP) - for res in resources: - af, socktype, proto, _, sa = res - try: - sock = socket.socket(af, socktype, proto) - sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) - sock.connect(sa) - return sock - except Exception as e: - error = e - if sock is not None: - sock.close() - break - if error is not None: - raise ConnectionException("connection failed: {}".format(error)) - else: - raise ConnectionException("no suitable socket") - - def _greet(self): - greeting = self._read_line() - self._logger.debug("greeting: %s", greeting.strip()) - if not greeting.startswith(Client.PROTOCOL_GREETING): - self._disconnect_socket() - raise ProtocolException("invalid greeting: {}".format(greeting)) - self._protocol_version = greeting[len(Client.PROTOCOL_GREETING - ):].strip() - self._logger.debug("protocol version: %s", self._protocol_version) - - def _disconnect(self): - self._logger.info("disconnecting") - self._disconnect_socket() - - def _disconnect_socket(self): - if self._sock_write is not None: - self._sock_write.close() - self._sock_write = None - if self._sock is not None: - self._sock.close() - self._sock = None - self._logger.info("disconnected") - self._set_connection_status(False) - - def _idle(self): - """React to idle events from MPD.""" - self._logger.info("idle") - self._idling = True - subsystems = self._parse_dict(self._call("idle")) - self._idling = False - self._logger.info("idle subsystems: %r", subsystems) - if subsystems: - if subsystems['changed'] == 'player': - self.load_playlist() - self.get_status() - if subsystems['changed'] == 'mixer': - self.get_status() - if subsystems['changed'] == 'playlist': - self.load_playlist() - if subsystems['changed'] == 'database': - self.load_albums() - self.load_playlist() - self.get_status() - if subsystems['changed'] == 'update': - self.load_albums() - self.load_playlist() - self.get_status() - if subsystems['changed'] == 'output': - self.get_output_devices() - self.get_status() - - def _noidle(self): - if self._idling: - self._logger.debug("noidle") - self._write("noidle") - - def _get_status(self): - """Action: Perform the real status determination.""" - self._logger.info("getting status") - status = self._parse_dict(self._call("status")) - self._logger.debug("status: %r", status) - - # State - state = None - if 'state' in status: - state = status['state'] - self._state = state - # Time - time = 0 - if 'time' in status: - time = int(status['time'].split(':')[0]) - # Volume - volume = -1 - if 'volume' in status: - volume = int(status['volume']) - # Error - error = None - if 'error' in status: - error = status['error'] - # Album - file = None - album = None - pos = 0 - song = self._parse_dict(self._call("currentsong")) - if song: - # File - if 'file' in song: - file = song['file'] - # Track - track = self._extract_playlist_track(song) - if track: - # Album - album = self._extract_album(song) - # Position - pos = track.get_pos() - for palbum in self._playlist: - if palbum == album and len(palbum.get_tracks()) >= pos: - album = palbum - break - pos = pos - len(palbum.get_tracks()) - # Audio - audio = None - if 'audio' in status: - audio = status['audio'] - # Bitrate - bitrate = None - if 'bitrate' in status: - bitrate = status['bitrate'] - return (state, album, pos, time, volume, file, audio, bitrate, error) - - def _get_stats(self): - """Action: Perform the real statistics gathering.""" - self._logger.info("getting statistics") - stats = self._parse_dict(self._call("stats")) - self._logger.debug("stats: %r", stats) - - # Artists - artists = 0 - if 'artists' in stats: - artists = int(stats['artists']) - # Albums - albums = 0 - if 'albums' in stats: - albums = int(stats['albums']) - # Songs - songs = 0 - if 'songs' in stats: - songs = int(stats['songs']) - # Database playtime - dbplaytime = 0 - if 'db_playtime' in stats: - dbplaytime = stats['db_playtime'] - # Playtime - playtime = 0 - if 'playtime' in stats: - playtime = stats['playtime'] - # Uptime - uptime = 0 - if 'uptime' in stats: - uptime = stats['uptime'] - return (artists, albums, songs, dbplaytime, playtime, uptime) - - def _get_output_devices(self): - """Action: Perform the real loading of output devices.""" - devices = [] - for output in self._parse_list(self._call('outputs'), ['outputid']): - device = OutputDevice(output['outputid'], output['outputname']) - device.set_enabled(int(output['outputenabled']) == 1) - devices.append(device) - return (devices, ) - - def _enable_output_device(self, device, enabled): - """Action: Perform the real enabling/disabling of an output device.""" - if enabled: - self._call('enableoutput ', device.get_id()) - else: - self._call('disableoutput ', device.get_id()) - - def _load_albums(self): - """Action: Perform the real update.""" - self._callback(Client.SIGNAL_INIT_ALBUMS) - self._albums = {} - # Albums - for album in self._parse_list(self._call('list album'), ['album']): - self._callback(Client.SIGNAL_PULSE_ALBUMS) - - # Album - album = self._extract_album(album) - self._logger.debug("album: %r", album) - # Tracks - songs = self._parse_list( - self._call('find album ', album.get_title()), ['file']) - for song in songs: - track = self._extract_track(song) - if track: - self._logger.debug("track: %r", track) - album.add_track(track) - return (self._albums, ) - - def _update(self): - self._call('update') - - def _load_playlist(self): - self._playlist = [] - songs = self._parse_list(self._call('playlistinfo'), - ['file', 'playlist']) - for song in songs: - self._logger.debug("song: %r", song) - # Track - track = self._extract_playlist_track(song) - self._logger.debug("track: %r", track) - # Album - album = self._extract_album(song, lookup=False) - if ( - len(self._playlist) == 0 - or self._playlist[len(self._playlist) - 1] != album - ): - self._playlist.append(album) - else: - album = self._playlist[len(self._playlist) - 1] - self._logger.debug("album: %r", album) - if track: - album.add_track(track) - return (self._playlist, ) - - def _clear_playlist(self): - """Action: Perform the real clearing of the current playlist.""" - self._call('clear') - - def _remove_album_from_playlist(self, album): - self._call_list('command_list_begin') - for track in album.get_tracks(): - self._call_list('deleteid', track.get_id()) - self._call('command_list_end') - - def _remove_albums_from_playlist(self, albums): - self._call_list('command_list_begin') - for album in albums: - for track in album.get_tracks(): - self._call_list('deleteid', track.get_id()) - self._call('command_list_end') - - def _play_album_from_playlist(self, album): - if album.get_tracks(): - self._call('playid', album.get_tracks()[0].get_id()) - - def _playpause(self): - """Action: Perform the real play/pause command.""" - if self._state == 'play': - self._call('pause') - else: - self._call('play') - - def _play_album(self, album): - track_ids = self._queue_album(album) - if track_ids: - self._logger.info("play track %d", track_ids[0]) - self._call('playid', track_ids[0]) - - def _queue_album(self, album): - track_ids = [] - if album in self._albums: - self._logger.info("add album %s", album) - for track in self._albums[album].get_tracks(): - self._logger.info("addid: %r", track.get_file()) - track_id = None - track_id_response = self._parse_dict( - self._call('addid', track.get_file())) - if 'id' in track_id_response: - track_id = track_id_response['id'] - self._logger.debug("track id: %r", track_id) - if track_id is not None: - track_ids.append(track_id) - return track_ids - - def _queue_albums(self, albums): - track_ids = [] - for album in albums: - track_ids.extend(self._queue_album(album)) - - def _seek(self, pos, time): - self._call('seek', pos, time) - - def _stop(self): - self._call('stop') - - def _set_volume(self, volume): - self._call('setvol', volume) - - def _get_albumart(self, album): - if album in self._albums: - album = self._albums[album] - self._logger.debug("get albumart for album \"%s\"", - album.get_title()) - - # Use "albumart" command - if album.get_tracks(): - try: - return (album, - self._read_binary('albumart', - album.get_tracks()[0].get_file(), - False)) - except CommandException as e: - # The "albumart" command throws an exception if not found - if e.get_error_number() != Client.PROTOCOL_ERROR_NOEXISTS: - raise e - # If no albumart can be found, use "readpicture" command - for track in album.get_tracks(): - data = self._read_binary('readpicture', - track.get_file(), True) - if data: - return (album, data) - - return (album, None) - - def _start_worker(self): - """Start the worker thread which waits for action to be performed.""" - self._logger.debug("start worker") - self._worker = threading.Thread(target=self._run, - name='mcg-worker', - args=()) - self._worker.setDaemon(True) - self._worker.start() - self._logger.debug("worker started") - - def _run(self): - while not self._stop.is_set() or not self._actions.empty(): - if self._sock is not None and self._actions.empty(): - self._add_action(self._idle) - action = self._actions.get() - self._logger.debug("next action: %r", action) - self._work(action) - self._actions.task_done() - self._logger.debug("action done") - self._logger.debug("worker finished") - - def _add_action(self, method, *args): - """Add an action to the action list.""" - self._logger.debug("add action %r (%r)", method.__name__, args) - future = concurrent.futures.Future() - action = (future, method, args) - self._actions.put(action) - self._noidle() - - return future - - def _add_action_signal(self, signal, method, *args): - """Add an action to the action list that triggers a callback.""" - self._logger.debug("add action signal %r: %r (%r)", signal, - method.__name__, args) - future = Future(signal) - future.add_done_callback(self._callback_future) - self._add_action_future(future, method, *args) - - return future - - def _add_action_future(self, future, method, *args): - """Add an action to the action list based on a future.""" - self._logger.debug("add action future %r (%r)", method.__name__, args) - action = (future, method, args) - self._actions.put(action) - self._noidle() - - def _work(self, action): - (future, method, args) = action - self._logger.debug("work: %r", method.__name__) - try: - result = method(*args) - future.set_result(result) - except ConnectionException as e: - self._logger.exception(e) - future.set_exception(e) - self._callback(Client.SIGNAL_ERROR, e) - self._disconnect_socket() - except Exception as e: - self._logger.exception(e) - future.set_exception(e) - self._callback(Client.SIGNAL_ERROR, e) - - def _call(self, command, *args): - try: - self._write(command, args) - return self._read() - except MPDException as e: - if ( - command == 'idle' - and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION - ): - self.disconnect() - self._callback(Client.SIGNAL_ERROR, e) - - def _call_list(self, command, *args): - try: - self._write(command, args) - except MPDException as e: - if ( - command == 'idle' - and e.get_error_number() == Client.PROTOCOL_ERROR_PERMISSION - ): - self.disconnect() - self._callback(Client.SIGNAL_ERROR, e) - - def _write(self, command, args=None): - if args is not None and len(args) > 0: - line = '{} "{}"\n'.format( - command, '" "'.join(str(x).replace('"', '\\\"') for x in args)) - else: - line = '{}\n'.format(command) - self._logger.debug("write: %r", line) - self._sock_write.write(line) - self._sock_write.flush() - - def _read(self): - self._logger.debug("reading response") - response = [] - line = self._read_line() - while ( - not line.startswith(Client.PROTOCOL_COMPLETION) - and not line.startswith(Client.PROTOCOL_ERROR) - ): - response.append(line.strip()) - line = self._read_line() - if line.startswith(Client.PROTOCOL_COMPLETION): - self._logger.debug("response complete") - if line.startswith(Client.PROTOCOL_ERROR): - error = line[len(Client.PROTOCOL_ERROR):].strip() - self._logger.debug("command failed: %r", error) - raise CommandException(error) - self._logger.debug("response: %r", response) - return response - - def _read_line(self): - self._logger.debug("reading line") - - # Read from the buffer - data = self._buffer_get_char(b'\x0A') - if not data.endswith(b'\x0A'): - # Read more from socket until next line break - while b'\x0A' not in data: - buf = self._sock.recv(Client.SOCKET_BUFSIZE) - if buf: - data += buf - else: - break - - # Get first line from data, add rest to buffer - if data: - lines = data.split(b'\x0A', 1) - data = lines[0] - self._buffer_set(lines[1]) - if data: - return data.decode('utf-8') - return None - - def _read_binary(self, command, filename, has_mimetype): - data = None - size = 1 - offset = 0 - - # Read data until size is reached - while offset < size: - self._write(command, args=[filename, offset]) - - # Read first line - line = self._read_line() - # Check first line for error - if line.startswith(Client.PROTOCOL_ERROR): - error = line[len(Client.PROTOCOL_ERROR):].strip() - self._logger.debug("command failed: %r", error) - raise CommandException(error) - # Check first line for completion - if line.startswith(Client.PROTOCOL_COMPLETION): - break - # First line is the file size - size = int(self._parse_dict([line])['size']) - self._logger.debug("size: %d", size) - # For some commands the second line is the mimetype - if has_mimetype: - self._parse_dict([self._read_line()])['type'] - # Next line is the count of bytes read - binary = int(self._parse_dict([self._read_line()])['binary']) - self._logger.debug("binary: %d", binary) - - # Create new data array on the first iteration - if not data: - data = bytearray(size) - # Create a view for the current chunk of data - data_view = memoryview(data)[offset:offset + binary] - # Read actual bytes - self._read_bytes(data_view, binary) - offset += binary - # Read line break to complete previous response - self._read_line() - # Read command completion - end = self._read_line() - if not end.startswith(Client.PROTOCOL_COMPLETION): - self._logger.debug("albumart not completed") - data = None - break - return data - - def _read_bytes(self, buf, nbytes): - self._logger.debug("reading bytes") - # Use already buffered data - buf_read = self._buffer_get_size(nbytes) - nbytes_read = len(buf_read) - buf[0:nbytes_read] = buf_read - # Read additional data from socket - nbytes = nbytes - nbytes_read - if nbytes > 0: - buf_view = memoryview(buf)[nbytes_read:] - nbytes_read += self._sock.recv_into(buf_view, nbytes) - return nbytes_read - - def _buffer_get_char(self, char): - pos = self._buffer.find(char) - if pos < 0: - pos = len(self._buffer) - 1 - buf = self._buffer[0:pos + 1] - self._buffer = self._buffer[pos + 1:] - return buf - - def _buffer_get_size(self, size): - buf = self._buffer[0:size] - self._logger.debug("get %d bytes from buffer", len(buf)) - self._buffer = self._buffer[size:] - self._logger.debug("leaving %d in the buffer", len(self._buffer)) - return buf - - def _buffer_set(self, buf): - self._logger.debug("set %d %s as buffer", len(buf), type(buf)) - self._buffer = buf - - def _parse_dict(self, response): - dictionary = {} - if response: - for line in response: - key, value = self._split_line(line) - dictionary[key] = value - return dictionary - - def _parse_list(self, response, delimiters): - entry = {} - if response: - for line in response: - key, value = self._split_line(line) - if entry and key in delimiters: - yield entry - entry = {} - entry[key] = value - if entry: - yield entry - - def _split_line(self, line): - parts = line.split(':') - return parts[0].lower(), ':'.join(parts[1:]).lstrip() - - def _extract_album(self, song, lookup=True): - album = None - if 'album' not in song: - song['album'] = MCGAlbum.DEFAULT_ALBUM - album_id = Utils.generate_id(song['album']) - if lookup and album_id in self._albums.keys(): - album = self._albums[album_id] - else: - album = MCGAlbum(song['album'], self._host) - if lookup: - self._albums[album_id] = album - return album - - def _extract_track(self, song): - track = None - if 'artist' in song and 'title' in song and 'file' in song: - track = MCGTrack(song['artist'], song['title'], song['file']) - if 'track' in song: - track.set_track(song['track']) - if 'time' in song: - track.set_length(song['time']) - if 'date' in song: - track.set_date(song['date']) - if 'albumartist' in song: - track.set_albumartists(song['albumartist']) - if 'last-modified' in song: - track.set_last_modified(song['last-modified']) - return track - - def _extract_playlist_track(self, song): - track = self._extract_track(song) - if track and 'id' in song and 'pos' in song: - track = MCGPlaylistTrack(track, song['id'], song['pos']) - return track - - def _set_connection_status(self, status): - self._callback(Client.SIGNAL_CONNECTION, status) - - -class OutputDevice: - - def __init__(self, id, name): - self._id = id - self._name = name - self._enabled = None - - def get_id(self): - return self._id - - def get_name(self): - return self._name - - def set_enabled(self, enabled): - self._enabled = enabled - - def is_enabled(self): - return self._enabled - - -class MCGAlbum: - DEFAULT_ALBUM = 'Various' - _FILE_NAMES = ['cover', 'folder'] - _FILE_EXTS = ['jpg', 'png', 'jpeg'] - _FILTER_DELIMITER = ' ' - - def __init__(self, title, host): - self._artists = [] - self._albumartists = [] - self._paths = [] - if type(title) is list: - title = title[0] - self._title = title - self._dates = [] - self._host = host - self._tracks = [] - self._length = 0 - self._last_modified = None - self._id = Utils.generate_id(title) - - def __eq__(self, other): - return (other and self.get_id() == other.get_id()) - - def __hash__(self): - return hash(self._title) - - def get_id(self): - return self._id - - def get_artists(self): - if self._albumartists: - return [ - artist for artist in self._artists - if artist not in self._albumartists - ] - return self._artists - - def get_albumartists(self): - if self._albumartists: - return self._albumartists - return self._artists - - def get_title(self): - return self._title - - def get_dates(self): - return self._dates - - def get_date(self): - if len(self._dates) == 0: - return None - return self._dates[0] - - def get_path(self): - return self._path - - def add_track(self, track): - self._tracks.append(track) - self._length = self._length + track.get_length() - for artist in track.get_artists(): - if artist not in self._artists: - self._artists.append(artist) - for artist in track.get_albumartists(): - if artist not in self._albumartists: - self._albumartists.append(artist) - if ( - track.get_date() is not None - and track.get_date() not in self._dates - ): - self._dates.append(track.get_date()) - path = os.path.dirname(track.get_file()) - if path not in self._paths: - self._paths.append(path) - if track.get_last_modified(): - if ( - not self._last_modified - or track.get_last_modified() > self._last_modified - ): - self._last_modified = track.get_last_modified() - - def get_tracks(self): - return self._tracks - - def get_length(self): - return self._length - - def get_last_modified(self): - return self._last_modified - - def filter(self, filter_string): - if len(filter_string) == 0: - return True - keywords = filter_string.split(MCGAlbum._FILTER_DELIMITER) - for keyword in keywords: - if len(keyword) == 0: - continue - result = False - keyword = keyword.lower() - # Search in album data - for value in self._artists + [self._title] + self._dates: - if keyword in value.lower(): - result = True - break - if result: - continue - # Search in track data - for track in self._tracks: - if ( - keyword in track.get_title().lower() - or keyword in track.get_file().lower() - ): - result = True - break - if not result: - return False - return True - - @staticmethod - def compare(album1, album2, criterion=None, reverse=False): - if criterion is None: - criterion = SortOrder.TITLE - if criterion == SortOrder.ARTIST: - value_function = "get_artists" - elif criterion == SortOrder.TITLE: - value_function = "get_title" - elif criterion == SortOrder.YEAR: - value_function = "get_date" - elif criterion == SortOrder.MODIFIED: - value_function = "get_last_modified" - - reverse_multiplier = -1 if reverse else 1 - - value1 = getattr(album1, value_function)() - value2 = getattr(album2, value_function)() - if value1 is None and value2 is None: - return 0 - elif value1 is None: - return -1 * reverse_multiplier - elif value2 is None: - return 1 * reverse_multiplier - if value1 < value2: - return -1 * reverse_multiplier - elif value1 == value2: - return 0 - else: - return 1 * reverse_multiplier - - -class MCGTrack: - - def __init__(self, artists, title, file): - if type(artists) is not list: - artists = [artists] - self._artists = artists - if type(title) is list: - title = title[0] - self._title = title - if type(file) is list: - file = file[0] - self._file = file - - self._albumartists = [] - self._track = None - self._length = 0 - self._date = None - self._last_modified = None - - def __eq__(self, other): - return self._file == other.get_file() - - def __hash__(self): - return hash(self._file) - - def get_artists(self): - if self._albumartists: - return [ - artist for artist in self._artists - if artist not in self._albumartists - ] - return self._artists - - def set_albumartists(self, artists): - if type(artists) is not list: - artists = [artists] - self._albumartists = artists - - def get_albumartists(self): - if self._albumartists: - return self._albumartists - return self._artists - - def get_title(self): - return self._title - - def get_track(self): - return self._track - - def set_track(self, track): - if type(track) is list: - track = track[0] - if type(track) is str and '/' in track: - track = track[0:track.index('/')] - if track is not None: - try: - track = int(track) - except ValueError: - track = 0 - self._track = track - - def get_length(self): - return self._length - - def set_length(self, length): - self._length = int(length) - - def get_date(self): - return self._date - - def set_date(self, date): - if type(date) is list: - date = date[0] - self._date = date - - def get_file(self): - return self._file - - def set_last_modified(self, date_string): - if date_string: - try: - self._last_modified = dateutil.parser.isoparse(date_string) - except ValueError: - self._logger.debug("Invalid date format: %s", date_string) - - def get_last_modified(self): - return self._last_modified - - -class MCGPlaylistTrack(MCGTrack): - - def __init__(self, track, id, pos): - MCGTrack.__init__(self, track.get_artists(), track.get_title(), - track.get_file()) - self.set_albumartists(track.get_albumartists()) - self.set_track(track.get_track()) - self.set_length(track.get_length()) - self.set_date(track.get_date()) - self._id = int(id) - self._pos = int(pos) - - def get_id(self): - return self._id - - def get_pos(self): - return self._pos - - -class MCGConfig(configparser.ConfigParser): - CONFIG_DIR = '~/.config/mcg/' - - def __init__(self, filename): - configparser.ConfigParser.__init__(self) - self._filename = os.path.expanduser( - os.path.join(MCGConfig.CONFIG_DIR, filename)) - self._create_dir() - - def load(self): - if os.path.isfile(self._filename): - self.read(self._filename) - - def save(self): - with open(self._filename, 'w') as configfile: - self.write(configfile) - - def _create_dir(self): - dirname = os.path.dirname(self._filename) - if not os.path.exists(dirname): - os.makedirs(dirname) - - -class MCGCache(): - DIRNAME = '~/.cache/mcg/' - SIZE_FILENAME = 'size' - _lock = threading.Lock() - - def __init__(self, host, size): - self._logger = logging.getLogger(__name__) - self._host = host - self._size = size - self._dirname = os.path.expanduser(os.path.join( - MCGCache.DIRNAME, host)) - if not os.path.exists(self._dirname): - os.makedirs(self._dirname) - self._read_size() - - def create_filename(self, album): - return os.path.join(self._dirname, '-'.join([album.get_id()])) - - def _read_size(self): - size = 100 - MCGCache._lock.acquire() - # Read old size - filename = os.path.join(self._dirname, MCGCache.SIZE_FILENAME) - if os.path.exists(filename): - with open(filename, 'r') as f: - try: - size = int(f.readline()) - except: - self._logger.warning( - "invalid cache file: %s, deleting file", - filename, - exc_info=True) - size = None - # Clear cache if size has changed - if size != self._size: - self._clear() - # Write new size - with open(filename, 'w') as f: - f.write(str(self._size)) - MCGCache._lock.release() - - def _clear(self): - for filename in os.listdir(self._dirname): - path = os.path.join(self._dirname, filename) - if os.path.isfile(path): - try: - os.unlink(path) - except Exception as e: - print("clear:", e) diff --git a/src/connectionpanel.py b/src/connectionpanel.py deleted file mode 100644 index a4060ed..0000000 --- a/src/connectionpanel.py +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env python3 - -import gi -import locale - -gi.require_version('Gtk', '4.0') -gi.require_version('Adw', '1') -from gi.repository import Gtk, GObject, Adw -from mcg.zeroconf import ZeroconfProvider - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/connection-panel.ui') -class ConnectionPanel(Adw.Bin): - __gtype_name__ = 'McgConnectionPanel' - __gsignals__ = { - 'connection-changed': (GObject.SIGNAL_RUN_FIRST, None, (str, int, str)) - } - - # Widgets - toolbar = Gtk.Template.Child() - zeroconf_list = Gtk.Template.Child() - host_row = Gtk.Template.Child() - port_spinner = Gtk.Template.Child() - password_row = Gtk.Template.Child() - - def __init__(self, **kwargs): - super().__init__(**kwargs) - - # Zeroconf provider - self._zeroconf_provider = ZeroconfProvider() - self._zeroconf_provider.connect_signal( - ZeroconfProvider.SIGNAL_SERVICE_NEW, self.on_new_service) - - def on_new_service(self, service): - name, host, port = service - - row_button = Gtk.Button() - row_button.set_label(locale.gettext("use")) - row_button.connect("clicked", self.on_service_selected, host, port) - - row = Adw.ActionRow() - row.set_title(name) - row.set_subtitle("{} ({})".format(host, port)) - row.add_suffix(row_button) - - self.zeroconf_list.insert(row, -1) - - def on_service_selected(self, widget, host, port): - self.set_host(host) - self.set_port(port) - - @Gtk.Template.Callback() - def on_host_entry_apply(self, widget): - self._call_back() - - @Gtk.Template.Callback() - def on_port_spinner_value_changed(self, widget): - self._call_back() - - def set_host(self, host): - self.host_row.set_text(host) - - def get_host(self): - return self.host_row.get_text() - - def set_port(self, port): - self.port_spinner.set_value(port) - - def get_port(self): - return self.port_spinner.get_value_as_int() - - def set_password(self, password): - if password is None: - password = "" - self.password_row.set_text(password) - - def get_password(self): - if self.password_row.get_text() == "": - return None - else: - return self.password_entry.get_text() - - def _call_back(self): - self.emit( - 'connection-changed', - self.get_host(), - self.get_port(), - self.get_password(), - ) diff --git a/src/coverpanel.py b/src/coverpanel.py deleted file mode 100644 index b6f3c67..0000000 --- a/src/coverpanel.py +++ /dev/null @@ -1,256 +0,0 @@ -#!/usr/bin/env python3 - -import gi -import math - -gi.require_version('Gtk', '4.0') -from gi.repository import Gtk, Gdk, GObject, GdkPixbuf -from mcg.utils import Utils - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/cover-panel.ui') -class CoverPanel(Gtk.Overlay): - __gtype_name__ = 'McgCoverPanel' - __gsignals__ = { - 'toggle-fullscreen': (GObject.SIGNAL_RUN_FIRST, None, ()), - 'set-song': (GObject.SIGNAL_RUN_FIRST, None, (int, int, )), - 'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str, )) - } - - # Widgets - # Toolbar - toolbar = Gtk.Template.Child() - fullscreen_button = Gtk.Template.Child() - # Cover - cover_stack = Gtk.Template.Child() - cover_spinner = Gtk.Template.Child() - cover_default = Gtk.Template.Child() - cover_scroll = Gtk.Template.Child() - cover_box = Gtk.Template.Child() - cover_image = Gtk.Template.Child() - # Album Infos - cover_info_scroll = Gtk.Template.Child() - info_revealer = Gtk.Template.Child() - album_title_label = Gtk.Template.Child() - album_date_label = Gtk.Template.Child() - album_artist_label = Gtk.Template.Child() - # Songs - songs_scale = Gtk.Template.Child() - - def __init__(self, **kwargs): - super().__init__(**kwargs) - - self._current_album = None - self._current_cover_album = None - self._cover_pixbuf = None - self._timer = None - self._properties = {} - self._icon_theme = Gtk.IconTheme.get_for_display( - Gdk.Display.get_default()) - self._fullscreened = False - self._current_size = None - - # Initial actions - GObject.idle_add(self._enable_tracklist) - - # Click handler for image - click_controller = Gtk.GestureClick() - click_controller.connect('pressed', self.on_cover_box_pressed) - self.cover_box.add_controller(click_controller) - - # Button controller for songs scale - button_controller = Gtk.GestureClick() - button_controller.connect('pressed', self.on_songs_scale_pressed) - button_controller.connect('unpaired-release', - self.on_songs_scale_released) - self.songs_scale.add_controller(button_controller) - - def get_toolbar(self): - return self.toolbar - - def set_selected(self, selected): - """The cover panel does not use selections""" - pass - - def on_cover_box_pressed(self, widget, npress, x, y): - if self._current_album and npress == 2: - self.emit('toggle-fullscreen') - - def set_width(self, width): - GObject.idle_add(self._resize_image) - self.cover_info_scroll.set_max_content_width(width // 2) - - def on_songs_scale_pressed(self, widget, npress, x, y): - if self._timer: - GObject.source_remove(self._timer) - self._timer = None - - def on_songs_scale_released(self, widget, x, y, npress, sequence): - value = int(self.songs_scale.get_value()) - time = self._current_album.get_length() - tracks = self._current_album.get_tracks() - pos = 0 - for index in range(len(tracks) - 1, -1, -1): - time = time - tracks[index].get_length() - pos = tracks[index].get_pos() - if time < value: - break - time = max(value - time - 1, 0) - self.emit('set-song', pos, time) - - def set_album(self, album): - if album: - # Set labels - self.album_title_label.set_label(album.get_title()) - self.album_date_label.set_label(', '.join(album.get_dates())) - self.album_artist_label.set_label(', '.join( - album.get_albumartists())) - - # Set tracks - self._set_tracks(album) - - # Load cover - if album != self._current_cover_album: - self.cover_stack.set_visible_child(self.cover_spinner) - self.cover_spinner.start() - self.emit('albumart', album.get_id() if album else None) - - # Set current album - self._current_album = album - self._enable_tracklist() - self.fullscreen_button.set_sensitive(self._current_album is not None) - - def set_play(self, pos, time): - if self._timer is not None: - GObject.source_remove(self._timer) - self._timer = None - tracks = self._current_album.get_tracks() - for index in range(0, pos): - time = time + tracks[index].get_length() - - self.songs_scale.set_value(time + 1) - self._timer = GObject.timeout_add(1000, self._playing) - - def set_pause(self): - if self._timer is not None: - GObject.source_remove(self._timer) - self._timer = None - - def set_fullscreen(self, active): - if active: - self.info_revealer.set_reveal_child(False) - GObject.idle_add(self._resize_image) - self._fullscreened = True - else: - self._fullscreened = False - if self._current_album: - self.info_revealer.set_reveal_child(True) - GObject.idle_add(self._resize_image) - - def set_albumart(self, album, data): - if album == self._current_album: - if data: - # Load image and draw it - try: - self._cover_pixbuf = Utils.load_pixbuf(data) - except Exception: - self._logger.exception("Failed to set albumart") - self._cover_pixbuf = None - else: - # Reset image - self._cover_pixbuf = None - self._current_size = None - self._current_cover_album = album - # Show image - GObject.idle_add(self._show_image) - - def _set_tracks(self, album): - self.songs_scale.clear_marks() - self.songs_scale.set_range(0, album.get_length()) - length = 0 - for track in album.get_tracks(): - cur_length = length - if length > 0 and length < album.get_length(): - cur_length = cur_length + 1 - self.songs_scale.add_mark( - cur_length, Gtk.PositionType.RIGHT, - GObject.markup_escape_text(Utils.create_track_title(track))) - length = length + track.get_length() - self.songs_scale.add_mark( - length, Gtk.PositionType.RIGHT, - "{0[0]:02d}:{0[1]:02d} minutes".format(divmod(length, 60))) - - # Align marks - self._align_songs_scale_marks() - - def _align_songs_scale_marks(self): - self._align_songs_scale_mark(self.songs_scale) - - def _align_songs_scale_mark(self, widget): - child = widget.get_first_child() - while child: - if type(child) is Gtk.Label: - child.set_halign(Gtk.Align.START) - else: - self._align_songs_scale_mark(child) - child = child.get_next_sibling() - - def _enable_tracklist(self): - if self._current_album: - # enable - if not self._fullscreened: - self.info_revealer.set_reveal_child(True) - else: - # disable - self.info_revealer.set_reveal_child(False) - - def _playing(self): - value = self.songs_scale.get_value() + 1 - self.songs_scale.set_value(value) - - return True - - def _show_image(self): - if self._cover_pixbuf: - self._resize_image() - self.cover_stack.set_visible_child(self.cover_scroll) - else: - self.cover_stack.set_visible_child(self.cover_default) - self.cover_spinner.stop() - - def _resize_image(self): - # Get size - size_width = self.cover_stack.get_size(Gtk.Orientation.HORIZONTAL) - size_height = self.cover_stack.get_size(Gtk.Orientation.HORIZONTAL) - # Abort if size is the same - if self._current_size: - current_width, current_height = self._current_size - if size_width == current_width and size_height == current_height: - return - self._current_size = ( - size_width, - size_height, - ) - - # Get pixelbuffer - pixbuf = self._cover_pixbuf - # Check pixelbuffer - if pixbuf is None: - self.cover_default.set_pixel_size(min(size_width, size_height)/2) - return - - # Skalierungswert für Breite und Höhe ermitteln - ratio_w = float(size_width) / float(pixbuf.get_width()) - ratio_h = float(size_height) / float(pixbuf.get_height()) - # Kleineren beider Skalierungswerte nehmen, nicht Hochskalieren - ratio = min(ratio_w, ratio_h) - ratio = min(ratio, 1) - # Neue Breite und Höhe berechnen - width = int(math.floor(pixbuf.get_width() * ratio)) - height = int(math.floor(pixbuf.get_height() * ratio)) - if width <= 0 or height <= 0: - return - self.cover_image.set_from_pixbuf( - pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER)) - self.cover_image.set_pixel_size(min(width, height)) - self.cover_image.show() diff --git a/src/librarypanel.py b/src/librarypanel.py deleted file mode 100644 index 02d8c08..0000000 --- a/src/librarypanel.py +++ /dev/null @@ -1,470 +0,0 @@ -#!/usr/bin/env python3 - -import gi -import locale -import logging -import math -import threading - -gi.require_version('Gtk', '4.0') -gi.require_version('Adw', '1') -from gi.repository import Gtk, Gdk, GObject, GdkPixbuf, Gio, Adw -from mcg import client -from mcg.albumheaderbar import AlbumHeaderbar -from mcg.utils import SortOrder -from mcg.utils import Utils -from mcg.utils import GridItem -from mcg.utils import SearchFilter - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/library-panel.ui') -class LibraryPanel(Adw.Bin): - __gtype_name__ = 'McgLibraryPanel' - __gsignals__ = { - 'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()), - 'close-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()), - 'update': (GObject.SIGNAL_RUN_FIRST, None, ()), - 'play': (GObject.SIGNAL_RUN_FIRST, None, (str, )), - 'queue': (GObject.SIGNAL_RUN_FIRST, None, (str, )), - 'queue-multiple': - (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )), - 'item-size-changed': (GObject.SIGNAL_RUN_FIRST, None, (int, )), - 'sort-order-changed': (GObject.SIGNAL_RUN_FIRST, None, (int, )), - 'sort-type-changed': (GObject.SIGNAL_RUN_FIRST, None, (bool, )), - 'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str, )), - } - - # Widgets - library_stack = Gtk.Template.Child() - panel_normal = Gtk.Template.Child() - panel_standalone = Gtk.Template.Child() - actionbar_revealer = Gtk.Template.Child() - # Toolbar - toolbar = Gtk.Template.Child() - select_button = Gtk.Template.Child() - toolbar_search_bar = Gtk.Template.Child() - toolbar_popover = Gtk.Template.Child() - toolbar_sort_order_button = Gtk.Template.Child() - sort_artist = Gtk.Template.Child() - sort_title = Gtk.Template.Child() - sort_year = Gtk.Template.Child() - sort_modified = Gtk.Template.Child() - grid_scale = Gtk.Template.Child() - # Filter/search bar - filter_bar = Gtk.Template.Child() - filter_entry = Gtk.Template.Child() - # Progress Bar - stack = Gtk.Template.Child() - progress_box = Gtk.Template.Child() - progress_image = Gtk.Template.Child() - progress_bar = Gtk.Template.Child() - scroll = Gtk.Template.Child() - # Library Grid - library_grid = Gtk.Template.Child() - # Action bar (normal) - actionbar = Gtk.Template.Child() - actionbar_standalone = Gtk.Template.Child() - # Standalone Image - standalone_stack = Gtk.Template.Child() - standalone_spinner = Gtk.Template.Child() - standalone_scroll = Gtk.Template.Child() - standalone_image = Gtk.Template.Child() - - def __init__(self, client, **kwargs): - super().__init__(**kwargs) - self._logger = logging.getLogger(__name__) - self._client = client - self._buttons = {} - self._albums = None - self._host = "localhost" - self._item_size = 150 - self._sort_order = SortOrder.YEAR - self._sort_type = Gtk.SortType.DESCENDING - self._grid_pixbufs = {} - self._grid_width = 0 - self._old_ranges = {} - self._library_lock = threading.Lock() - self._library_stop = threading.Event() - self._icon_theme = Gtk.IconTheme.get_for_display( - Gdk.Display.get_default()) - self._standalone_pixbuf = None - self._selected_albums = [] - self._is_selected = False - - # Widgets - # Header bar - self._headerbar_standalone = AlbumHeaderbar() - self._headerbar_standalone.connect('close', - self.on_standalone_close_clicked) - # Library Grid: Model - self._library_grid_model = Gio.ListStore() - self._library_grid_filter = Gtk.FilterListModel() - self._library_grid_filter.set_model(self._library_grid_model) - self._library_grid_selection_multi = Gtk.MultiSelection.new( - self._library_grid_filter) - self._library_grid_selection_single = Gtk.SingleSelection.new( - self._library_grid_filter) - # Library Grid - self.library_grid.set_model(self._library_grid_selection_single) - # Toolbar menu - self.grid_scale.set_value(self._item_size) - self._toolbar_sort_buttons = { - SortOrder.ARTIST: self.sort_artist, - SortOrder.TITLE: self.sort_title, - SortOrder.YEAR: self.sort_year, - SortOrder.MODIFIED: self.sort_modified - } - - # Button controller for grid scale - button_controller = Gtk.GestureClick() - button_controller.connect('unpaired-release', - self.on_grid_scale_released) - self.grid_scale.add_controller(button_controller) - - def get_headerbar_standalone(self): - return self._headerbar_standalone - - def get_toolbar(self): - return self.toolbar - - def set_selected(self, selected): - self._is_selected = selected - - @Gtk.Template.Callback() - def on_select_toggled(self, widget): - if self.select_button.get_active(): - self.actionbar_revealer.set_reveal_child(True) - self.library_grid.set_model(self._library_grid_selection_multi) - self.library_grid.set_single_click_activate(False) - self.library_grid.get_style_context().add_class( - Utils.CSS_SELECTION) - else: - self.actionbar_revealer.set_reveal_child(False) - self.library_grid.set_model(self._library_grid_selection_single) - self.library_grid.set_single_click_activate(True) - self.library_grid.get_style_context().remove_class( - Utils.CSS_SELECTION) - - @Gtk.Template.Callback() - def on_update_clicked(self, widget): - self.emit('update') - - def on_grid_scale_released(self, widget, x, y, npress, sequence): - size = math.floor(self.grid_scale.get_value()) - grid_range = self.grid_scale.get_adjustment() - if size < grid_range.get_lower() or size > grid_range.get_upper(): - return - self._item_size = size - self.emit('item-size-changed', size) - self._redraw() - GObject.idle_add(self.toolbar_popover.popdown) - - @Gtk.Template.Callback() - def on_grid_scale_changed(self, widget): - size = math.floor(self.grid_scale.get_value()) - grid_range = widget.get_adjustment() - if size < grid_range.get_lower() or size > grid_range.get_upper(): - return - self._set_widget_grid_size(self.library_grid, size, True) - - @Gtk.Template.Callback() - def on_sort_toggled(self, widget): - if widget.get_active(): - self._sort_order = [ - key for key, value in self._toolbar_sort_buttons.items() - if value is widget - ][0] - self._sort_grid_model() - self.emit('sort-order-changed', self._sort_order) - - @Gtk.Template.Callback() - def on_sort_order_toggled(self, button): - if button.get_active(): - self._sort_type = Gtk.SortType.DESCENDING - else: - self._sort_type = Gtk.SortType.ASCENDING - self._sort_grid_model() - self.emit('sort-type-changed', button.get_active()) - - def set_size(self, width, height): - self._set_marks() - self._resize_standalone_image() - - @Gtk.Template.Callback() - def on_filter_entry_changed(self, widget): - self._library_grid_filter.set_filter( - SearchFilter(self.filter_entry.get_text())) - - @Gtk.Template.Callback() - def on_library_grid_clicked(self, widget, position): - # Get selected album - item = self._library_grid_filter.get_item(position) - album = item.get_album() - album_id = album.get_id() - self._selected_albums = [album] - self.emit('albumart', album_id) - - # Show standalone album - if widget.get_model() == self._library_grid_selection_single: - # Set labels - self._headerbar_standalone.set_album(album) - - # Show panel - self._open_standalone() - - # Set cover loading indicator - self.standalone_stack.set_visible_child(self.standalone_spinner) - self.standalone_spinner.start() - - @Gtk.Template.Callback() - def on_selection_cancel_clicked(self, widget): - self.select_button.set_active(False) - - @Gtk.Template.Callback() - def on_selection_add_clicked(self, widget): - self.emit('queue-multiple', self._get_selected_albums()) - self.select_button.set_active(False) - - @Gtk.Template.Callback() - def on_standalone_play_clicked(self, widget): - self.emit('play', self._selected_albums[0].get_id()) - self._close_standalone() - - @Gtk.Template.Callback() - def on_standalone_queue_clicked(self, widget): - self.emit('queue', self._selected_albums[0].get_id()) - self._close_standalone() - - def on_standalone_close_clicked(self, widget): - self._close_standalone() - - def show_search(self): - self.filter_bar.set_search_mode(True) - - def set_item_size(self, item_size): - if self._item_size != item_size: - self._item_size = item_size - self.grid_scale.set_value(item_size) - self._redraw() - - def get_item_size(self): - return self._item_size - - def set_sort_order(self, sort): - button = self._toolbar_sort_buttons[sort] - if button: - self._sort_order = [ - key for key, value in self._toolbar_sort_buttons.items() - if value is button - ][0] - if not button.get_active(): - button.set_active(True) - self._sort_grid_model() - - def set_sort_type(self, sort_type): - if sort_type: - sort_type_gtk = Gtk.SortType.DESCENDING - else: - sort_type_gtk = Gtk.SortType.ASCENDING - - if sort_type_gtk != self._sort_type: - self._sort_type = sort_type_gtk - self.toolbar_sort_order_button.set_active(sort_type) - self._sort_grid_model() - - def get_sort_type(self): - return (self._sort_type != Gtk.SortType.ASCENDING) - - def init_albums(self): - self.progress_bar.set_text(locale.gettext("Loading albums")) - - def load_albums(self): - self.progress_bar.pulse() - - def set_albums(self, host, albums): - self._host = host - self._library_stop.set() - threading.Thread(target=self._set_albums, - args=( - host, - albums, - self._item_size, - )).start() - - def set_albumart(self, album, data): - if album in self._selected_albums: - self._standalone_pixbuf = None - if data: - # Load image and draw it - try: - self._standalone_pixbuf = Utils.load_pixbuf(data) - except Exception: - self._logger.exception("Failed to set albumart") - # Show image - GObject.idle_add(self._show_image) - - def _sort_grid_model(self): - GObject.idle_add(self._library_grid_model.sort, - self._grid_model_compare_func, self._sort_order, - self._sort_type) - - def _grid_model_compare_func(self, item1, item2, criterion, order): - return client.MCGAlbum.compare(item1.get_album(), item2.get_album(), - criterion, - (order == Gtk.SortType.DESCENDING)) - - def stop_threads(self): - self._library_stop.set() - - def _set_albums(self, host, albums, size): - self._library_lock.acquire() - self._albums = albums - stack_transition_type = self.stack.get_transition_type() - GObject.idle_add(self.stack.set_transition_type, - Gtk.StackTransitionType.NONE) - GObject.idle_add(self.stack.set_visible_child, self.progress_box) - GObject.idle_add(self.progress_bar.set_fraction, 0.0) - GObject.idle_add(self.stack.set_transition_type, stack_transition_type) - GObject.idle_add(self._library_grid_model.remove_all) - - i = 0 - n = len(albums) - cache = client.MCGCache(host, size) - self._grid_pixbufs.clear() - for album_id in albums.keys(): - album = albums[album_id] - grid_item = GridItem(album) - - pixbuf = None - try: - pixbuf = Utils.load_thumbnail(cache, self._client, album, size) - except client.CommandException: - # Exception is handled by client - pass - except Exception: - self._logger.exception("Failed to load albumart") - if pixbuf is None: - icon = self._get_default_icon(self._item_size, self._item_size) - grid_item.set_icon(icon) - else: - self._grid_pixbufs[album.get_id()] = pixbuf - grid_item.set_cover(pixbuf) - - GObject.idle_add(self._library_grid_model.append, grid_item) - - i += 1 - GObject.idle_add(self.progress_bar.set_fraction, i / n) - GObject.idle_add(self.progress_bar.set_text, - locale.gettext("Loading images")) - - self._library_lock.release() - GObject.idle_add(self.stack.set_visible_child, self.scroll) - self._sort_grid_model() - GObject.idle_add(self.library_grid.scroll_to, 0, Gtk.ListScrollFlags.NONE, None) - - def _set_widget_grid_size(self, grid_widget, size, vertical): - self._library_stop.set() - threading.Thread(target=self._set_widget_grid_size_thread, - args=( - grid_widget, - size, - vertical, - )).start() - - def _set_widget_grid_size_thread(self, grid_widget, size, vertical): - self._library_lock.acquire() - self._library_stop.clear() - if size == self._item_size: - self._library_lock.release() - return - for i in range(self._library_grid_model.get_n_items()): - grid_item = self._library_grid_model.get_item(i) - album_id = grid_item.get_album().get_id() - - pixbuf = self._grid_pixbufs[album_id] - if pixbuf is not None: - pixbuf = pixbuf.scale_simple(size, size, - GdkPixbuf.InterpType.NEAREST) - else: - pixbuf = self._icon_theme.lookup_icon( - Utils.STOCK_ICON_DEFAULT, None, size, size, - Gtk.TextDirection.LTR, Gtk.IconLookupFlags.FORCE_SYMBOLIC) - GObject.idle_add(grid_item.set_cover, pixbuf) - - if self._library_stop.is_set(): - self._library_lock.release() - return - - self._library_lock.release() - - def _show_image(self): - self._resize_standalone_image() - self.standalone_stack.set_visible_child(self.standalone_scroll) - self.standalone_spinner.stop() - - def _redraw(self): - if self._albums is not None: - self.set_albums(self._host, self._albums) - - def _set_marks(self): - width = self.scroll.get_width() - if width == self._grid_width: - return - self._grid_width = width - self.grid_scale.clear_marks() - - lower = int(self.grid_scale.get_adjustment().get_lower()) - upper = int(self.grid_scale.get_adjustment().get_upper()) - count_min = max(int(width / upper), 1) - count_max = max(int(width / lower), 1) - for index in range(count_min, count_max): - pixel = int(width / index) - pixel = pixel - (2 * int(pixel / 100)) - self.grid_scale.add_mark(pixel, Gtk.PositionType.BOTTOM, None) - - def _open_standalone(self): - self.library_stack.set_visible_child(self.panel_standalone) - self.emit('open-standalone') - - def _close_standalone(self): - self.library_stack.set_visible_child(self.panel_normal) - self.emit('close-standalone') - - def _resize_standalone_image(self): - # Get size - size_width = self.standalone_stack.get_width() - size_height = self.standalone_stack.get_height() - - # Get pixelbuffer - pixbuf = self._standalone_pixbuf - # Check pixelbuffer - if pixbuf is None: - icon = self._get_default_icon(size_width, size_height) - self.standalone_image.set_from_paintable(icon) - self.standalone_image.set_pixel_size(min(size_width, size_height)/2) - return - - (width, height) = Utils.calculate_size(pixbuf.get_width(), - pixbuf.get_height(), size_width, - size_height) - if width <= 0 or height <= 0: - return - # Pixelpuffer auf Oberfläche zeichnen - self.standalone_image.set_from_pixbuf( - pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER)) - self.standalone_image.set_pixel_size(min(width, height)) - self.standalone_image.show() - - def _get_default_icon(self, width, height): - return self._icon_theme.lookup_icon(Utils.STOCK_ICON_DEFAULT, None, - width, height, - Gtk.TextDirection.LTR, - Gtk.IconLookupFlags.FORCE_SYMBOLIC) - - def _get_selected_albums(self): - albums = [] - for i in range(self.library_grid.get_model().get_n_items()): - if self.library_grid.get_model().is_selected(i): - albums.append(self.library_grid.get_model().get_item( - i).get_album().get_id()) - return albums diff --git a/src/main.py b/src/main.py deleted file mode 100644 index 319beff..0000000 --- a/src/main.py +++ /dev/null @@ -1,8 +0,0 @@ -import sys - -from .application import Application - - -def main(version): - app = Application(version) - return app.run(sys.argv) diff --git a/src/mcg.in b/src/mcg.in deleted file mode 100755 index 5166fe0..0000000 --- a/src/mcg.in +++ /dev/null @@ -1,25 +0,0 @@ -#!@PYTHON@ - -import os -import sys -import signal -import locale - -VERSION = '@VERSION@' -pkgdatadir = '@pkgdatadir@' -localedir = '@localedir@' - -sys.path.insert(1, pkgdatadir) -signal.signal(signal.SIGINT, signal.SIG_DFL) -locale.bindtextdomain('mcg', localedir) -locale.textdomain('mcg') - -if __name__ == '__main__': - import gi - - from gi.repository import Gio - resource = Gio.Resource.load(os.path.join(pkgdatadir, 'mcg.gresource')) - resource._register() - - from mcg import main - sys.exit(main.main(VERSION)) diff --git a/src/meson.build b/src/meson.build deleted file mode 100644 index d30b1c7..0000000 --- a/src/meson.build +++ /dev/null @@ -1,37 +0,0 @@ -pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -moduledir = join_paths(pkgdatadir, 'mcg') - -python = import('python') - -conf = configuration_data() -conf.set('PYTHON', python.find_installation('python3').full_path()) -conf.set('VERSION', meson.project_version()) -conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir'))) -conf.set('pkgdatadir', pkgdatadir) - -configure_file( - input: 'mcg.in', - output: 'mcg', - configuration: conf, - install: true, - install_dir: get_option('bindir') -) - -mcg_sources = [ - '__init__.py', - 'main.py', - 'albumheaderbar.py', - 'application.py', - 'client.py', - 'connectionpanel.py', - 'coverpanel.py', - 'librarypanel.py', - 'playlistpanel.py', - 'serverpanel.py', - 'shortcutsdialog.py', - 'utils.py', - 'window.py', - 'zeroconf.py', -] - -install_data(mcg_sources, install_dir: moduledir) diff --git a/src/playlistpanel.py b/src/playlistpanel.py deleted file mode 100644 index 9f59e93..0000000 --- a/src/playlistpanel.py +++ /dev/null @@ -1,278 +0,0 @@ -#!/usr/bin/env python3 - -import gi -import math -import threading - -gi.require_version('Gtk', '4.0') -gi.require_version('Adw', '1') -from gi.repository import Gtk, Gdk, Gio, GObject, GdkPixbuf, Adw -from mcg import client -from mcg.albumheaderbar import AlbumHeaderbar -from mcg.utils import Utils -from mcg.utils import GridItem - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/playlist-panel.ui') -class PlaylistPanel(Adw.Bin): - __gtype_name__ = 'McgPlaylistPanel' - __gsignals__ = { - 'open-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()), - 'close-standalone': (GObject.SIGNAL_RUN_FIRST, None, ()), - 'clear-playlist': (GObject.SIGNAL_RUN_FIRST, None, ()), - 'remove-album': - (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )), - 'remove-multiple-albums': - (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )), - 'play': (GObject.SIGNAL_RUN_FIRST, None, (GObject.TYPE_PYOBJECT, )), - 'albumart': (GObject.SIGNAL_RUN_FIRST, None, (str, )), - } - - # Widgets - playlist_stack = Gtk.Template.Child() - panel_normal = Gtk.Template.Child() - panel_standalone = Gtk.Template.Child() - actionbar_revealer = Gtk.Template.Child() - # Toolbar - toolbar = Gtk.Template.Child() - playlist_clear_button = Gtk.Template.Child() - select_button = Gtk.Template.Child() - # Playlist Grid - playlist_grid = Gtk.Template.Child() - # Action bar (normal) - actionbar = Gtk.Template.Child() - actionbar_standalone = Gtk.Template.Child() - # Standalone Image - standalone_stack = Gtk.Template.Child() - standalone_spinner = Gtk.Template.Child() - standalone_scroll = Gtk.Template.Child() - standalone_image = Gtk.Template.Child() - - def __init__(self, client, **kwargs): - super().__init__(**kwargs) - self._client = client - self._host = None - self._item_size = 150 - self._playlist = None - self._playlist_albums = None - self._playlist_lock = threading.Lock() - self._playlist_stop = threading.Event() - self._icon_theme = Gtk.IconTheme.get_for_display( - Gdk.Display.get_default()) - self._standalone_pixbuf = None - self._selected_albums = [] - self._is_selected = False - - # Widgets - # Header bar - self._headerbar_standalone = AlbumHeaderbar() - self._headerbar_standalone.connect('close', - self.on_headerbar_close_clicked) - # Playlist Grid: Model - self._playlist_grid_model = Gio.ListStore() - self._playlist_grid_selection_multi = Gtk.MultiSelection.new( - self._playlist_grid_model) - self._playlist_grid_selection_single = Gtk.SingleSelection.new( - self._playlist_grid_model) - # Playlist Grid - self.playlist_grid.set_model(self._playlist_grid_selection_single) - - def get_headerbar_standalone(self): - return self._headerbar_standalone - - def get_toolbar(self): - return self.toolbar - - def set_selected(self, selected): - self._is_selected = selected - - @Gtk.Template.Callback() - def on_select_toggled(self, widget): - if self.select_button.get_active(): - self.actionbar_revealer.set_reveal_child(True) - self.playlist_grid.set_model(self._playlist_grid_selection_multi) - self.playlist_grid.set_single_click_activate(False) - self.playlist_grid.get_style_context().add_class( - Utils.CSS_SELECTION) - else: - self.actionbar_revealer.set_reveal_child(False) - self.playlist_grid.set_model(self._playlist_grid_selection_single) - self.playlist_grid.set_single_click_activate(True) - self.playlist_grid.get_style_context().remove_class( - Utils.CSS_SELECTION) - - @Gtk.Template.Callback() - def on_clear_clicked(self, widget): - self.emit('clear-playlist') - - @Gtk.Template.Callback() - def on_playlist_grid_clicked(self, widget, position): - # Get selected album - item = self._playlist_grid_model.get_item(position) - album = item.get_album() - album_id = album.get_id() - self._selected_albums = [album] - self.emit('albumart', album_id) - - # Show standalone album - if widget.get_model() == self._playlist_grid_selection_single: - # Set labels - self._headerbar_standalone.set_album(album) - - # Show panel - self._open_standalone() - - # Set cover loading indicator - self.standalone_stack.set_visible_child(self.standalone_spinner) - self.standalone_spinner.start() - - @Gtk.Template.Callback() - def on_selection_cancel_clicked(self, widget): - self.select_button.set_active(False) - - @Gtk.Template.Callback() - def on_selection_remove_clicked(self, widget): - self.emit('remove-multiple-albums', self._get_selected_albums()) - self.select_button.set_active(False) - - def on_headerbar_close_clicked(self, widget): - self._close_standalone() - - @Gtk.Template.Callback() - def on_standalone_remove_clicked(self, widget): - self.emit('remove-album', self._get_selected_albums()[0]) - self._close_standalone() - - @Gtk.Template.Callback() - def on_standalone_play_clicked(self, widget): - self.emit('play', self._get_selected_albums()[0]) - self._close_standalone() - - def set_size(self, width, height): - self._resize_standalone_image() - - def set_item_size(self, item_size): - if self._item_size != item_size: - self._item_size = item_size - self._redraw() - - def get_item_size(self): - return self._item_size - - def set_playlist(self, host, playlist): - self._host = host - self._playlist_stop.set() - threading.Thread(target=self._set_playlist, - args=( - host, - playlist, - self._item_size, - )).start() - - def set_albumart(self, album, data): - if album in self._selected_albums: - self._standalone_pixbuf = None - if data: - # Load image and draw it - try: - self._standalone_pixbuf = Utils.load_pixbuf(data) - except Exception: - self._logger.exception("Failed to set albumart") - # Show image - GObject.idle_add(self._show_image) - - def stop_threads(self): - self._playlist_stop.set() - - def _set_playlist(self, host, playlist, size): - self._playlist_lock.acquire() - self._playlist_stop.clear() - self._playlist = playlist - self._playlist_albums = {} - for album in playlist: - self._playlist_albums[album.get_id()] = album - self._playlist_grid_model.remove_all() - - cache = client.MCGCache(host, size) - for album in playlist: - grid_item = GridItem(album) - - pixbuf = None - # Load albumart thumbnail - try: - pixbuf = Utils.load_thumbnail(cache, self._client, album, size) - except client.CommandException: - # Exception is handled by client - pass - except Exception: - self._logger.exception("Failed to load albumart") - if pixbuf is None: - icon = self._get_default_icon(self._item_size, self._item_size) - grid_item.set_icon(icon) - else: - grid_item.set_cover(pixbuf) - - GObject.idle_add(self._playlist_grid_model.append, grid_item) - - if self._playlist_stop.is_set(): - self._playlist_lock.release() - return - - self.playlist_grid.set_model(self._playlist_grid_selection_single) - self._playlist_lock.release() - - def _show_image(self): - self._resize_standalone_image() - self.standalone_stack.set_visible_child(self.standalone_scroll) - self.standalone_spinner.stop() - - def _redraw(self): - if self._playlist is not None: - self.set_playlist(self._host, self._playlist) - - def _open_standalone(self): - self.playlist_stack.set_visible_child(self.panel_standalone) - self.emit('open-standalone') - - def _close_standalone(self): - self.playlist_stack.set_visible_child(self.panel_normal) - self.emit('close-standalone') - - def _resize_standalone_image(self): - # Get size - size_width = self.standalone_stack.get_width() - size_height = self.standalone_stack.get_height() - - # Get pixelbuffer - pixbuf = self._standalone_pixbuf - # Check pixelbuffer - if pixbuf is None: - icon = self._get_default_icon(size_width, size_height) - self.standalone_image.set_from_paintable(icon) - self.standalone_image.set_pixel_size(min(size_width, size_height)/2) - return - - (width, height) = Utils.calculate_size(pixbuf.get_width(), - pixbuf.get_height(), size_width, - size_height) - if width <= 0 or height <= 0: - return - # Pixelpuffer auf Oberfläche zeichnen - self.standalone_image.set_from_pixbuf( - pixbuf.scale_simple(width, height, GdkPixbuf.InterpType.HYPER)) - self.standalone_image.set_pixel_size(min(width, height)) - self.standalone_image.show() - - def _get_default_icon(self, width, height): - return self._icon_theme.lookup_icon(Utils.STOCK_ICON_DEFAULT, None, - width, height, - Gtk.TextDirection.LTR, - Gtk.IconLookupFlags.FORCE_SYMBOLIC) - - def _get_selected_albums(self): - albums = [] - for i in range(self.playlist_grid.get_model().get_n_items()): - if self.playlist_grid.get_model().is_selected(i): - albums.append( - self.playlist_grid.get_model().get_item(i).get_album()) - return albums diff --git a/src/serverpanel.py b/src/serverpanel.py deleted file mode 100644 index f29c7c4..0000000 --- a/src/serverpanel.py +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/env python3 - -import gi - -gi.require_version('Gtk', '4.0') -gi.require_version('Adw', '1') -from gi.repository import Gtk, Adw, GObject - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/server-panel.ui') -class ServerPanel(Adw.Bin): - __gtype_name__ = 'McgServerPanel' - __gsignals__ = { - 'change-output-device': (GObject.SIGNAL_RUN_FIRST, None, ( - GObject.TYPE_PYOBJECT, - bool, - )), - } - - # Widgets - toolbar = Gtk.Template.Child() - # Status widgets - status_file = Gtk.Template.Child() - status_audio = Gtk.Template.Child() - status_bitrate = Gtk.Template.Child() - status_error = Gtk.Template.Child() - # Stats widgets - stats_artists = Gtk.Template.Child() - stats_albums = Gtk.Template.Child() - stats_songs = Gtk.Template.Child() - stats_dbplaytime = Gtk.Template.Child() - stats_playtime = Gtk.Template.Child() - stats_uptime = Gtk.Template.Child() - # Audio output devices widgets - output_devices = Gtk.Template.Child() - - def __init__(self, **kwargs): - super().__init__(**kwargs) - self._none_label = "" - self._output_buttons = {} - self._is_selected = False - - # Widgets - self._none_label = self.status_file.get_label() - - def set_selected(self, selected): - self._is_selected = selected - - def get_toolbar(self): - return self.toolbar - - def on_output_device_toggled(self, widget, device): - self.emit('change-output-device', device, widget.get_active()) - - def set_status(self, file, audio, bitrate, error): - if file: - file = GObject.markup_escape_text(file) - else: - file = self._none_label - self.status_file.set_markup(file) - # Audio information - if audio: - parts = audio.split(":") - if len(parts) == 3: - audio = "{} Hz, {} bit, {} channels".format( - parts[0], parts[1], parts[2]) - else: - audio = self._none_label - self.status_audio.set_markup(audio) - # Bitrate - if bitrate: - bitrate = bitrate + " kb/s" - else: - bitrate = self._none_label - self.status_bitrate.set_markup(bitrate) - # Error - if error: - error = GObject.markup_escape_text(error) - else: - error = self._none_label - self.status_error.set_markup(error) - - def set_stats(self, artists, albums, songs, dbplaytime, playtime, uptime): - self.stats_artists.set_text(str(artists)) - self.stats_albums.set_text(str(albums)) - self.stats_songs.set_text(str(songs)) - self.stats_dbplaytime.set_text(str(dbplaytime)) - self.stats_playtime.set_text(str(playtime)) - self.stats_uptime.set_text(str(uptime)) - - def set_output_devices(self, devices): - device_ids = [] - - # Add devices - for device in devices: - device_ids.append(device.get_id()) - if device.get_id() in self._output_buttons.keys(): - self._output_buttons[device.get_id()].freeze_notify() - self._output_buttons[device.get_id()].set_active( - device.is_enabled()) - self._output_buttons[device.get_id()].thaw_notify() - else: - button = Gtk.CheckButton.new_with_label(device.get_name()) - if device.is_enabled(): - button.set_active(True) - button.connect('toggled', self.on_output_device_toggled, - device) - self.output_devices.insert(button, -1) - self._output_buttons[device.get_id()] = button - - # Remove devices - for id in self._output_buttons.keys(): - if id not in device_ids: - self.output_devices.remove( - self._output_buttons[id].get_parent()) diff --git a/src/shortcutsdialog.py b/src/shortcutsdialog.py deleted file mode 100644 index 2db83e3..0000000 --- a/src/shortcutsdialog.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python3 - -import gi - -gi.require_version('Gtk', '4.0') -gi.require_version('Adw', '1') -from gi.repository import Gtk - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/shortcuts-dialog.ui') -class ShortcutsDialog(Gtk.ShortcutsWindow): - __gtype_name__ = 'McgShortcutsDialog' - - def __init__(self): - super().__init__() diff --git a/src/utils.py b/src/utils.py deleted file mode 100644 index 544e415..0000000 --- a/src/utils.py +++ /dev/null @@ -1,138 +0,0 @@ -#!/usr/bin/env python3 - -import gi -import hashlib -import math -import locale -import logging -import os - -gi.require_version('Gtk', '4.0') -from gi.repository import Gdk, GdkPixbuf, GObject, Gtk - - -class Utils: - CSS_SELECTION = 'selection' - STOCK_ICON_DEFAULT = 'image-x-generic-symbolic' - - @staticmethod - def load_pixbuf(data): - loader = GdkPixbuf.PixbufLoader() - try: - loader.write(data) - finally: - loader.close() - return loader.get_pixbuf() - - @staticmethod - def load_thumbnail(cache, client, album, size): - cache_url = cache.create_filename(album) - pixbuf = None - - if os.path.isfile(cache_url): - pixbuf = GdkPixbuf.Pixbuf.new_from_file(cache_url) - else: - # Load cover from server - albumart = client.get_albumart_now(album.get_id()) - if albumart: - pixbuf = Utils.load_pixbuf(albumart) - if pixbuf is not None: - (width, height) = Utils.calculate_size(pixbuf.get_width(), - pixbuf.get_height(), - size, size) - pixbuf = pixbuf.scale_simple(width, height, - GdkPixbuf.InterpType.HYPER) - try: - pixbuf.savev(cache_url, 'jpeg', [], []) - except Exception as e: - logger = logging.getLogger(__name__) - logger.warning("Failed to save thumbnail for album\"%s\": " - "%s", album.get_title(), e) - return pixbuf - - @staticmethod - def create_artists_label(album): - label = ', '.join(album.get_albumartists()) - if album.get_artists(): - label = locale.gettext("{} feat. {}").format( - label, ", ".join(album.get_artists())) - return label - - @staticmethod - def create_length_label(album): - minutes = album.get_length() // 60 - seconds = album.get_length() - minutes * 60 - - return locale.gettext("{}:{} minutes").format(minutes, seconds) - - @staticmethod - def create_track_title(track): - title = track.get_title() - if track.get_artists(): - title = locale.gettext("{} feat. {}").format( - title, ", ".join(track.get_artists())) - return title - - @staticmethod - def generate_id(values): - if type(values) is not list: - values = [values] - m = hashlib.md5() - for value in values: - m.update(value.encode('utf-8')) - return m.hexdigest() - - @staticmethod - def calculate_size(src_width, src_height, dest_width, dest_height): - ratio_w = float(dest_width) / float(src_width) - ratio_h = float(dest_height) / float(src_height) - ratio = min(min(ratio_w, ratio_h), 1) - if ratio == 1: - return (src_width, src_height) - - width = int(math.floor(src_width * ratio)) - height = int(math.floor(src_height * ratio)) - - return (width, height) - - -class SortOrder: - ARTIST = 0 - TITLE = 1 - YEAR = 2 - MODIFIED = 3 - - -class GridItem(GObject.GObject): - __gtype_name__ = "GridItem" - - tooltip = GObject.Property(type=str, default=None) - cover = GObject.Property(type=Gdk.Paintable, default=None) - - def __init__(self, album): - super().__init__() - self._album = album - self.tooltip = GObject.markup_escape_text("\n".join([ - album.get_title(), ', '.join(album.get_dates()), - Utils.create_artists_label(album), - Utils.create_length_label(album) - ])) - - def get_album(self): - return self._album - - def set_cover(self, cover): - self.cover = Gdk.Texture.new_for_pixbuf(cover) - - def set_icon(self, icon): - self.cover = icon - - -class SearchFilter(Gtk.Filter): - - def __init__(self, search_string): - super().__init__() - self._search_string = search_string - - def do_match(self, grid_item): - return grid_item.get_album().filter(self._search_string) diff --git a/src/window.py b/src/window.py deleted file mode 100644 index db10c23..0000000 --- a/src/window.py +++ /dev/null @@ -1,615 +0,0 @@ -#!/usr/bin/env python3 - -import gi -try: - import keyring - use_keyring = True -except ImportError: - use_keyring = False -use_keyring = False -import locale - -gi.require_version('Gtk', '4.0') -gi.require_version('Adw', '1') -from gi.repository import Gtk, Adw, Gdk, GObject, GLib, Gio -from . import client -from .shortcutsdialog import ShortcutsDialog -from .connectionpanel import ConnectionPanel -from .serverpanel import ServerPanel -from .coverpanel import CoverPanel -from .playlistpanel import PlaylistPanel -from .librarypanel import LibraryPanel -from .zeroconf import ZeroconfProvider - - -class WindowState(GObject.Object): - PROP_WIDTH = 'width' - PROP_HEIGHT = 'height' - PROP_MAXIMIZED = 'is_maximized' - PROP_FULLSCREENED = 'is_fullscreened' - width = GObject.Property(type=int, default=800) - height = GObject.Property(type=int, default=600) - is_maximized = GObject.Property(type=bool, default=False) - is_fullscreened = GObject.Property(type=bool, default=False) - - def __init__(self): - super().__init__() - - -@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/window.ui') -class Window(Adw.ApplicationWindow): - __gtype_name__ = 'McgAppWindow' - SETTING_HOST = 'host' - SETTING_PORT = 'port' - SETTING_CONNECTED = 'connected' - SETTING_WINDOW_WIDTH = 'width' - SETTING_WINDOW_HEIGHT = 'height' - SETTING_WINDOW_MAXIMIZED = 'is-maximized' - SETTING_PANEL = 'panel' - SETTING_ITEM_SIZE = 'item-size' - SETTING_SORT_ORDER = 'sort-order' - SETTING_SORT_TYPE = 'sort-type' - - # Widgets - toolbar_view = Gtk.Template.Child() - content_stack = Gtk.Template.Child() - panel_stack = Gtk.Template.Child() - toolbar_stack = Gtk.Template.Child() - # Headerbar - headerbar = Gtk.Template.Child() - headerbar_panel_switcher = Gtk.Template.Child() - headerbar_button_connect = Gtk.Template.Child() - headerbar_button_playpause = Gtk.Template.Child() - headerbar_button_volume = Gtk.Template.Child() - # Infobar - info_toast = Gtk.Template.Child() - - def __init__(self, app, title, settings, **kwargs): - super().__init__(**kwargs) - self.set_application(app) - self.set_title(title) - self._settings = settings - self._panels = [] - self._mcg = client.Client() - self._state = WindowState() - self._setting_volume = False - self._headerbar_connection_button_active = True - self._headerbar_playpause_button_active = True - self._width = 0 - self._height = 0 - - # Help/Shortcuts dialog - self.set_help_overlay(ShortcutsDialog()) - - # Login screen - self._connection_panel = ConnectionPanel() - # Server panel - self._server_panel = ServerPanel() - self._panels.append(self._server_panel) - # Cover panel - self._cover_panel = CoverPanel() - self._panels.append(self._cover_panel) - # Playlist panel - self._playlist_panel = PlaylistPanel(self._mcg) - self._playlist_panel.connect('open-standalone', - self.on_panel_open_standalone) - self._playlist_panel.connect('close-standalone', - self.on_panel_close_standalone) - self._panels.append(self._playlist_panel) - # Library panel - self._library_panel = LibraryPanel(self._mcg) - self._library_panel.connect('open-standalone', - self.on_panel_open_standalone) - self._library_panel.connect('close-standalone', - self.on_panel_close_standalone) - self._panels.append(self._library_panel) - # Stack - self.content_stack.add_child(self._connection_panel) - self.panel_stack.add_titled_with_icon(self._server_panel, - 'server-panel', - locale.gettext("Server"), - "network-wired-symbolic") - self.panel_stack.add_titled_with_icon(self._cover_panel, 'cover-panel', - locale.gettext("Cover"), - "image-x-generic-symbolic") - self.panel_stack.add_titled_with_icon(self._playlist_panel, - 'playlist-panel', - locale.gettext("Playlist"), - "view-list-symbolic") - self.panel_stack.add_titled_with_icon(self._library_panel, - 'library-panel', - locale.gettext("Library"), - "emblem-music-symbolic") - # Toolbar stack - self.toolbar_stack.add_child(self._server_panel.get_toolbar()) - self.toolbar_stack.add_child(self._cover_panel.get_toolbar()) - self.toolbar_stack.add_child(self._playlist_panel.get_toolbar()) - self.toolbar_stack.add_child(self._library_panel.get_toolbar()) - - # Properties - self._set_headerbar_sensitive(False, False) - self._connection_panel.set_host( - self._settings.get_string(Window.SETTING_HOST)) - self._connection_panel.set_port( - self._settings.get_int(Window.SETTING_PORT)) - if use_keyring: - self._connection_panel.set_password( - keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM, - ZeroconfProvider.KEYRING_USERNAME)) - self._playlist_panel.set_item_size( - self._settings.get_int(Window.SETTING_ITEM_SIZE)) - self._library_panel.set_item_size( - self._settings.get_int(Window.SETTING_ITEM_SIZE)) - self._library_panel.set_sort_order( - self._settings.get_enum(Window.SETTING_SORT_ORDER)) - self._library_panel.set_sort_type( - self._settings.get_boolean(Window.SETTING_SORT_TYPE)) - - # Signals - self.connect("notify::maximized", self.on_maximized) - self.connect("notify::fullscreened", self.on_fullscreened) - self._connection_panel.connect( - 'connection-changed', self.on_connection_panel_connection_changed) - self.panel_stack.connect('notify::visible-child', - self.on_stack_switched) - self._server_panel.connect('change-output-device', - self.on_server_panel_output_device_changed) - self._cover_panel.connect('toggle-fullscreen', - self.on_cover_panel_toggle_fullscreen) - self._cover_panel.connect('set-song', self.on_cover_panel_set_song) - self._cover_panel.connect('albumart', self.on_cover_panel_albumart) - self._playlist_panel.connect('clear-playlist', - self.on_playlist_panel_clear_playlist) - self._playlist_panel.connect('remove-album', - self.on_playlist_panel_remove) - self._playlist_panel.connect('remove-multiple-albums', - self.on_playlist_panel_remove_multiple) - self._playlist_panel.connect('play', self.on_playlist_panel_play) - self._playlist_panel.connect('albumart', - self.on_playlist_panel_albumart) - self._library_panel.connect('update', self.on_library_panel_update) - self._library_panel.connect('play', self.on_library_panel_play) - self._library_panel.connect('queue', self.on_library_panel_queue) - self._library_panel.connect('queue-multiple', - self.on_library_panel_queue_multiple) - self._library_panel.connect('item-size-changed', - self.on_library_panel_item_size_changed) - self._library_panel.connect('sort-order-changed', - self.on_library_panel_sort_order_changed) - self._library_panel.connect('sort-type-changed', - self.on_library_panel_sort_type_changed) - self._library_panel.connect('albumart', self.on_library_panel_albumart) - self._mcg.connect_signal(client.Client.SIGNAL_CONNECTION, - self.on_mcg_connect) - self._mcg.connect_signal(client.Client.SIGNAL_STATUS, - self.on_mcg_status) - self._mcg.connect_signal(client.Client.SIGNAL_STATS, self.on_mcg_stats) - self._mcg.connect_signal(client.Client.SIGNAL_LOAD_OUTPUT_DEVICES, - self.on_mcg_load_output_devices) - self._mcg.connect_signal(client.Client.SIGNAL_LOAD_PLAYLIST, - self.on_mcg_load_playlist) - self._mcg.connect_signal(client.Client.SIGNAL_PULSE_ALBUMS, - self.on_mcg_pulse_albums) - self._mcg.connect_signal(client.Client.SIGNAL_INIT_ALBUMS, - self.on_mcg_init_albums) - self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMS, - self.on_mcg_load_albums) - self._mcg.connect_signal(client.Client.SIGNAL_LOAD_ALBUMART, - self.on_mcg_load_albumart) - self._mcg.connect_signal(client.Client.SIGNAL_ERROR, self.on_mcg_error) - self._settings.connect('changed::' + Window.SETTING_PANEL, - self.on_settings_panel_changed) - self._settings.connect('changed::' + Window.SETTING_ITEM_SIZE, - self.on_settings_item_size_changed) - self._settings.connect('changed::' + Window.SETTING_SORT_ORDER, - self.on_settings_sort_order_changed) - self._settings.connect('changed::' + Window.SETTING_SORT_TYPE, - self.on_settings_sort_type_changed) - self._settings.bind(Window.SETTING_WINDOW_WIDTH, self._state, - WindowState.PROP_WIDTH, - Gio.SettingsBindFlags.DEFAULT) - self._settings.bind(Window.SETTING_WINDOW_HEIGHT, self._state, - WindowState.PROP_HEIGHT, - Gio.SettingsBindFlags.DEFAULT) - self._settings.bind(Window.SETTING_WINDOW_MAXIMIZED, self._state, - WindowState.PROP_MAXIMIZED, - Gio.SettingsBindFlags.DEFAULT) - - # Actions - self.set_default_size(self._state.width, self._state.height) - if self._state.get_property(WindowState.PROP_MAXIMIZED): - self.maximize() - self.content_stack.set_visible_child(self._connection_panel) - if self._settings.get_boolean(Window.SETTING_CONNECTED): - self._connect() - - # Menu actions - self._connect_action = Gio.SimpleAction.new_stateful( - "connect", None, GLib.Variant.new_boolean(False)) - self._connect_action.connect('change-state', self.on_menu_connect) - self.add_action(self._connect_action) - self._play_action = Gio.SimpleAction.new_stateful( - "play", None, GLib.Variant.new_boolean(False)) - self._play_action.set_enabled(False) - self._play_action.connect('change-state', self.on_menu_play) - self.add_action(self._play_action) - self._clear_playlist_action = Gio.SimpleAction.new( - "clear-playlist", None) - self._clear_playlist_action.set_enabled(False) - self._clear_playlist_action.connect('activate', - self.on_menu_clear_playlist) - self.add_action(self._clear_playlist_action) - panel_variant = GLib.Variant.new_string("0") - self._panel_action = Gio.SimpleAction.new_stateful( - "panel", panel_variant.get_type(), panel_variant) - self._panel_action.set_enabled(False) - self._panel_action.connect('change-state', self.on_menu_panel) - self.add_action(self._panel_action) - self._toggle_fullscreen_action = Gio.SimpleAction.new( - "toggle-fullscreen", None) - self._toggle_fullscreen_action.set_enabled(True) - self._toggle_fullscreen_action.connect('activate', - self.on_menu_toggle_fullscreen) - self.add_action(self._toggle_fullscreen_action) - self._search_library_action = Gio.SimpleAction.new( - "search-library", None) - self._search_library_action.set_enabled(True) - self._search_library_action.connect('activate', - self.on_menu_search_library) - self.add_action(self._search_library_action) - - def do_size_allocate(self, width, height, baseline): - Gtk.ApplicationWindow().do_size_allocate(self, width, height, baseline) - - if self._width == width and self._height == height: - return - self._width = width - self._height = height - - if width > 0: - self._cover_panel.set_width(width) - if not self._state.get_property(WindowState.PROP_MAXIMIZED): - self._state.set_property(WindowState.PROP_WIDTH, width) - self._state.set_property(WindowState.PROP_HEIGHT, height) - GObject.idle_add(self._playlist_panel.set_size, width, height) - GObject.idle_add(self._library_panel.set_size, width, height) - - # Menu callbacks - - def on_menu_connect(self, action, value): - self._connect() - - def on_menu_play(self, action, value): - self._mcg.playpause() - - def on_menu_clear_playlist(self, action, value): - self._mcg.clear_playlist() - - def on_menu_panel(self, action, value): - action.set_state(value) - self.panel_stack.set_visible_child(self._panels[int( - value.get_string())]) - - def on_menu_toggle_fullscreen(self, action, value): - self.panel_stack.set_visible_child(self._cover_panel) - if not self._state.get_property(WindowState.PROP_FULLSCREENED): - self.fullscreen() - else: - self.unfullscreen() - - def on_menu_search_library(self, action, value): - self.panel_stack.set_visible_child(self.library_panel_page) - self._library_panel.show_search() - - # Window callbacks - - def on_maximized(self, widget, maximized): - self._state.set_property(WindowState.PROP_MAXIMIZED, maximized is True) - - def on_fullscreened(self, widget, fullscreened): - self._fullscreen(self.is_fullscreen()) - - # HeaderBar callbacks - - @Gtk.Template.Callback() - def on_headerbar_connection_state_set(self, widget, state): - if self._headerbar_connection_button_active: - self._connect() - - @Gtk.Template.Callback() - def on_headerbar_volume_changed(self, widget, value): - if not self._setting_volume: - self._mcg.set_volume(int(value * 100)) - - @Gtk.Template.Callback() - def on_headerbar_playpause_toggled(self, widget): - if self._headerbar_playpause_button_active: - self._mcg.playpause() - self._mcg.get_status() - - # Panel callbacks - - def on_stack_switched(self, widget, prop): - self._set_visible_toolbar() - self._save_visible_panel() - self._set_menu_visible_panel() - for panel in self._panels: - panel.set_selected(panel == self.panel_stack.get_visible_child()) - - def on_panel_open_standalone(self, panel): - self.toolbar_view.add_top_bar(panel.get_headerbar_standalone()) - self.toolbar_view.remove(self.headerbar) - - def on_panel_close_standalone(self, panel): - self.toolbar_view.add_top_bar(self.headerbar) - self.toolbar_view.remove(panel.get_headerbar_standalone()) - - def on_connection_panel_connection_changed(self, widget, host, port, - password): - self._settings.set_string(Window.SETTING_HOST, host) - self._settings.set_int(Window.SETTING_PORT, port) - if use_keyring: - if password: - keyring.set_password(ZeroconfProvider.KEYRING_SYSTEM, - ZeroconfProvider.KEYRING_USERNAME, - password) - else: - if keyring.get_password(ZeroconfProvider.KEYRING_SYSTEM, - ZeroconfProvider.KEYRING_USERNAME): - keyring.delete_password(ZeroconfProvider.KEYRING_SYSTEM, - ZeroconfProvider.KEYRING_USERNAME) - - def on_playlist_panel_clear_playlist(self, widget): - self._mcg.clear_playlist() - - def on_playlist_panel_remove(self, widget, album): - self._mcg.remove_album_from_playlist(album) - - def on_playlist_panel_remove_multiple(self, widget, albums): - self._mcg.remove_albums_from_playlist(albums) - - def on_playlist_panel_play(self, widget, album): - self._mcg.play_album_from_playlist(album) - - def on_playlist_panel_albumart(self, widget, album): - self._mcg.get_albumart(album) - - def on_server_panel_output_device_changed(self, widget, device, enabled): - self._mcg.enable_output_device(device, enabled) - - def on_cover_panel_toggle_fullscreen(self, widget): - if not self._state.get_property(WindowState.PROP_FULLSCREENED): - self.fullscreen() - else: - self.unfullscreen() - - def on_cover_panel_set_song(self, widget, pos, time): - self._mcg.seek(pos, time) - - def on_cover_panel_albumart(self, widget, album): - self._mcg.get_albumart(album) - - def on_library_panel_update(self, widget): - self._mcg.update() - - def on_library_panel_play(self, widget, album): - self._mcg.play_album(album) - - def on_library_panel_queue(self, widget, album): - self._mcg.queue_album(album) - - def on_library_panel_queue_multiple(self, widget, albums): - self._mcg.queue_albums(albums) - - def on_library_panel_item_size_changed(self, widget, size): - self._playlist_panel.set_item_size(size) - self._settings.set_int(Window.SETTING_ITEM_SIZE, - self._library_panel.get_item_size()) - - def on_library_panel_sort_order_changed(self, widget, sort_order): - self._settings.set_enum(Window.SETTING_SORT_ORDER, sort_order) - - def on_library_panel_sort_type_changed(self, widget, sort_type): - self._settings.set_boolean(Window.SETTING_SORT_TYPE, sort_type) - - def on_library_panel_albumart(self, widget, album): - self._mcg.get_albumart(album) - - # MCG callbacks - - def on_mcg_connect(self, connected): - if connected: - GObject.idle_add(self._connect_connected) - self._mcg.load_playlist() - self._mcg.load_albums() - self._mcg.get_status() - self._mcg.get_stats() - self._mcg.get_output_devices() - self._connect_action.set_state(GLib.Variant.new_boolean(True)) - self._play_action.set_enabled(True) - self._clear_playlist_action.set_enabled(True) - self._panel_action.set_enabled(True) - else: - GObject.idle_add(self._connect_disconnected) - self._connect_action.set_state(GLib.Variant.new_boolean(False)) - self._play_action.set_enabled(False) - self._clear_playlist_action.set_enabled(False) - self._panel_action.set_enabled(False) - - def on_mcg_status(self, state, album, pos, time, volume, file, audio, - bitrate, error): - # Album - GObject.idle_add(self._cover_panel.set_album, album) - if ( - not album - and self._state.get_property(WindowState.PROP_FULLSCREENED) - ): - self._fullscreen(False) - # State - if state == 'play': - GObject.idle_add(self._set_play) - GObject.idle_add(self._cover_panel.set_play, pos, time) - self._play_action.set_state(GLib.Variant.new_boolean(True)) - elif state == 'pause' or state == 'stop': - GObject.idle_add(self._set_pause) - GObject.idle_add(self._cover_panel.set_pause) - self._play_action.set_state(GLib.Variant.new_boolean(False)) - # Volume - GObject.idle_add(self._set_volume, volume) - # Status - self._server_panel.set_status(file, audio, bitrate, error) - # Error - if error: - self._show_error(error) - - def on_mcg_stats(self, artists, albums, songs, dbplaytime, playtime, - uptime): - self._server_panel.set_stats(artists, albums, songs, dbplaytime, - playtime, uptime) - - def on_mcg_load_output_devices(self, devices): - self._server_panel.set_output_devices(devices) - - def on_mcg_load_playlist(self, playlist): - self._playlist_panel.set_playlist(self._connection_panel.get_host(), - playlist) - - def on_mcg_init_albums(self): - GObject.idle_add(self._library_panel.init_albums) - - def on_mcg_pulse_albums(self): - GObject.idle_add(self._library_panel.load_albums) - - def on_mcg_load_albums(self, albums): - self._library_panel.set_albums(self._connection_panel.get_host(), - albums) - - def on_mcg_load_albumart(self, album, data): - self._cover_panel.set_albumart(album, data) - self._playlist_panel.set_albumart(album, data) - self._library_panel.set_albumart(album, data) - - def on_mcg_error(self, error): - GObject.idle_add(self._show_error, str(error)) - - # Settings callbacks - - def on_settings_panel_changed(self, settings, key): - panel_index = settings.get_int(key) - self.panel_stack.set_visible_child(self._panels[panel_index]) - - def on_settings_item_size_changed(self, settings, key): - size = settings.get_int(key) - self._playlist_panel.set_item_size(size) - self._library_panel.set_item_size(size) - - def on_settings_sort_order_changed(self, settings, key): - sort_order = settings.get_enum(key) - self._library_panel.set_sort_order(sort_order) - - def on_settings_sort_type_changed(self, settings, key): - sort_type = settings.get_boolean(key) - self._library_panel.set_sort_type(sort_type) - - # Private methods - - def _connect(self): - self._connection_panel.set_sensitive(False) - self._set_headerbar_sensitive(False, True) - if self._mcg.is_connected(): - self._mcg.disconnect() - self._settings.set_boolean(Window.SETTING_CONNECTED, False) - else: - host = self._connection_panel.get_host() - port = self._connection_panel.get_port() - password = self._connection_panel.get_password() - self._mcg.connect(host, port, password) - self._settings.set_boolean(Window.SETTING_CONNECTED, True) - - def _connect_connected(self): - self._headerbar_connected() - self._set_headerbar_sensitive(True, False) - self.content_stack.set_visible_child(self.panel_stack) - self.panel_stack.set_visible_child(self._panels[self._settings.get_int( - Window.SETTING_PANEL)]) - - def _connect_disconnected(self): - self._playlist_panel.stop_threads() - self._library_panel.stop_threads() - self._headerbar_disconnected() - self._set_headerbar_sensitive(False, False) - self._save_visible_panel() - self.content_stack.set_visible_child(self._connection_panel) - self._connection_panel.set_sensitive(True) - - def _fullscreen(self, fullscreened_new): - if fullscreened_new != self._state.get_property( - WindowState.PROP_FULLSCREENED - ): - self._state.set_property(WindowState.PROP_FULLSCREENED, - fullscreened_new) - if self._state.get_property(WindowState.PROP_FULLSCREENED): - self.headerbar.hide() - self._cover_panel.set_fullscreen(True) - self.set_cursor(Gdk.Cursor.new_from_name("none", None)) - else: - self.headerbar.show() - self._cover_panel.set_fullscreen(False) - self.set_cursor(Gdk.Cursor.new_from_name("default", None)) - - def _save_visible_panel(self): - panel_index_selected = self._panels.index( - self.panel_stack.get_visible_child()) - self._settings.set_int(Window.SETTING_PANEL, panel_index_selected) - - def _set_menu_visible_panel(self): - panel_index_selected = self._panels.index( - self.panel_stack.get_visible_child()) - self._panel_action.set_state( - GLib.Variant.new_string(str(panel_index_selected))) - - def _set_visible_toolbar(self): - panel_index_selected = self._panels.index( - self.panel_stack.get_visible_child()) - toolbar = self._panels[panel_index_selected].get_toolbar() - self.toolbar_stack.set_visible_child(toolbar) - - def _set_play(self): - self._headerbar_playpause_button_active = False - self.headerbar_button_playpause.set_active(True) - self._headerbar_playpause_button_active = True - - def _set_pause(self): - self._headerbar_playpause_button_active = False - self.headerbar_button_playpause.set_active(False) - self._headerbar_playpause_button_active = True - - def _set_volume(self, volume): - if volume >= 0: - self.headerbar_button_volume.set_visible(True) - self._setting_volume = True - self.headerbar_button_volume.set_value(volume / 100) - self._setting_volume = False - else: - self.headerbar_button_volume.set_visible(False) - - def _headerbar_connected(self): - self._headerbar_connection_button_active = False - self.headerbar_button_connect.set_active(True) - self.headerbar_button_connect.set_state(True) - self._headerbar_connection_button_active = True - - def _headerbar_disconnected(self): - self._headerbar_connection_button_active = False - self.headerbar_button_connect.set_active(False) - self.headerbar_button_connect.set_state(False) - self._headerbar_connection_button_active = True - - def _set_headerbar_sensitive(self, sensitive, connecting): - self.headerbar_button_playpause.set_sensitive(sensitive) - self.headerbar_button_volume.set_sensitive(sensitive) - self.headerbar_panel_switcher.set_sensitive(sensitive) - self.headerbar_button_connect.set_sensitive(not connecting) - - def _show_error(self, message): - self.info_toast.add_toast(Adw.Toast.new(message)) diff --git a/src/zeroconf.py b/src/zeroconf.py deleted file mode 100644 index 6dc1f00..0000000 --- a/src/zeroconf.py +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python3 - -import gi -try: - gi.require_version('Avahi', '0.6') - from gi.repository import Avahi - use_avahi = True -except ValueError | ImportError: - use_avahi = False -import logging - -from mcg import client - - -class ZeroconfProvider(client.Base): - KEYRING_SYSTEM = 'mcg' - KEYRING_USERNAME = 'mpd' - SIGNAL_SERVICE_NEW = 'service-new' - TYPE = '_mpd._tcp' - - def __init__(self): - client.Base.__init__(self) - self._service_resolvers = [] - self._services = {} - self._logger = logging.getLogger(__name__) - # Client - if use_avahi: - self._start_client() - - def on_new_service(self, browser, interface, protocol, name, type, domain, - flags): - service_resolver = Avahi.ServiceResolver( - interface=interface, - protocol=protocol, - name=name, - type=type, - domain=domain, - aprotocol=Avahi.Protocol.GA_PROTOCOL_UNSPEC, - flags=0, - ) - service_resolver.connect('found', self.on_found) - service_resolver.connect('failure', self.on_failure) - service_resolver.attach(self._client) - self._service_resolvers.append(service_resolver) - - def on_found(self, resolver, interface, protocol, name, type, domain, host, - date, port, *args): - if (host, port) not in self._services.keys(): - service = (name, host, port) - self._services[(host, port)] = service - self._callback(ZeroconfProvider.SIGNAL_SERVICE_NEW, service) - - def on_failure(self, resolver, date): - if resolver in self._service_resolvers: - self._service_resolvers.remove(resolver) - - def _start_client(self): - self._logger.info("Starting Avahi client") - self._client = Avahi.Client(flags=0, ) - try: - self._client.start() - # Browser - self._service_browser = Avahi.ServiceBrowser( - domain='local', - flags=0, - interface=-1, - protocol=Avahi.Protocol.GA_PROTOCOL_UNSPEC, - type=ZeroconfProvider.TYPE) - self._service_browser.connect('new_service', self.on_new_service) - self._service_browser.attach(self._client) - except Exception as e: - self._logger.info(e) From af4fc2fb64e186f9eb7ebeaa67b9ca0e3f795372 Mon Sep 17 00:00:00 2001 From: Olli Date: Thu, 26 Feb 2026 10:38:28 +0100 Subject: [PATCH 09/13] Add common go types --- internal/common/album.go | 189 ++++++++++++++++++++++++++++++++ internal/common/outputdevice.go | 14 +++ internal/common/song.go | 122 +++++++++++++++++++++ internal/common/sort.go | 89 +++++++++++++++ 4 files changed, 414 insertions(+) create mode 100644 internal/common/album.go create mode 100644 internal/common/outputdevice.go create mode 100644 internal/common/song.go create mode 100644 internal/common/sort.go diff --git a/internal/common/album.go b/internal/common/album.go new file mode 100644 index 0000000..1ce2ea7 --- /dev/null +++ b/internal/common/album.go @@ -0,0 +1,189 @@ +package common + +import ( + "crypto/md5" + "fmt" + "io" + "path/filepath" + "slices" + "strings" + "time" + + "suruatoel.xyz/mcg/internal/i18n" +) + +type Album struct { + title string + songs []*Song + artists []string + pathes []string + dates []string + length uint64 + lastModified time.Time +} + +func NewAlbum(title string) *Album { + album := Album{ + title: title, + } + + return &album +} + +func (a *Album) Title() string { + return a.title +} + +func (a *Album) AddSong(song *Song) { + a.songs = append(a.songs, song) + a.length += song.Length() + + for _, artist := range song.AlbumArtists() { + if !slices.Contains(a.artists, artist) { + a.artists = append(a.artists, artist) + } + } + + if !slices.Contains(a.dates, song.Date()) { + a.dates = append(a.dates, song.Date()) + } + + path := filepath.Base(song.File()) + if !slices.Contains(a.pathes, path) { + a.pathes = append(a.pathes, path) + } + + if !song.LastModified().After(a.lastModified) { + a.lastModified = song.LastModified() + } +} + +func (a *Album) Songs() []*Song { + return a.songs +} + +func (a *Album) Artists() []string { + return a.artists +} + +func (a *Album) Dates() []string { + return a.dates +} + +func (a *Album) Length() uint64 { + return a.length +} + +func (a *Album) LastModified() time.Time { + return a.lastModified +} + +func (a *Album) ID() string { + return generateAlbumId(a.title) +} + +func (a *Album) Tooltip() string { + artists := strings.Join(a.Artists(), ", ") + dates := strings.Join(a.dates, ", ") + minutes := a.length / 60 + seconds := a.length - minutes*60 + length := fmt.Sprintf(i18n.T("%d:%d minutes"), minutes, seconds) + + return strings.Join( + []string{ + a.title, + dates, + artists, + length, + }, + "\n", + ) +} + +type PlaylistAlbum struct { + *Album + songs []*PlaylistSong + length uint64 +} + +func NewPlaylistAlbum(album *Album) *PlaylistAlbum { + playlistAlbum := PlaylistAlbum{ + Album: album, + } + + return &playlistAlbum +} + +func (a *PlaylistAlbum) AddSong(playlistSong *PlaylistSong) { + a.songs = append(a.songs, playlistSong) + + song := playlistSong.Song + a.length += song.Length() + + for _, artist := range song.AlbumArtists() { + if !slices.Contains(a.artists, artist) { + a.artists = append(a.artists, artist) + } + } + + if !slices.Contains(a.dates, song.Date()) { + a.dates = append(a.dates, song.Date()) + } + + path := filepath.Base(song.File()) + if !slices.Contains(a.pathes, path) { + a.pathes = append(a.pathes, path) + } +} + +func (a *PlaylistAlbum) Songs() []*PlaylistSong { + return a.songs +} + +func (a *PlaylistAlbum) Length() uint64 { + return a.length +} + +func (a *Album) IsMatch(query string) bool { + if query == "" { + return true + } + + for keyword := range strings.SplitSeq(query, " ") { + if !a.isKeywordMatch(keyword) { + return false + } + } + + return true +} + +func (a *Album) isKeywordMatch(keyword string) bool { + if strings.Contains(strings.ToLower(a.title), keyword) { + return true + } + for _, artist := range a.artists { + if strings.Contains(strings.ToLower(artist), keyword) { + return true + } + } + for _, song := range a.songs { + if strings.Contains(strings.ToLower(song.Title()), keyword) { + return true + } + if strings.Contains(strings.ToLower(song.File()), keyword) { + return true + } + } + + return false +} + +func generateAlbumId(values ...string) string { + h := md5.New() + for _, value := range values { + io.WriteString(h, value) + } + + return fmt.Sprintf("%x", h.Sum(nil)) +} diff --git a/internal/common/outputdevice.go b/internal/common/outputdevice.go new file mode 100644 index 0000000..df6aa49 --- /dev/null +++ b/internal/common/outputdevice.go @@ -0,0 +1,14 @@ +package common + +type OutputDevice struct { + ID string + Name string + Enabled bool +} + +func NewOutputDevice(id string, name string) *OutputDevice { + return &OutputDevice{ + ID: id, + Name: name, + } +} diff --git a/internal/common/song.go b/internal/common/song.go new file mode 100644 index 0000000..1b81806 --- /dev/null +++ b/internal/common/song.go @@ -0,0 +1,122 @@ +package common + +import ( + "slices" + "time" +) + +type Song struct { + artists []string + title string + file string + albumartists []string + track string + length uint64 + date string + lastModified time.Time +} + +func NewSong(artist string, title string, file string) *Song { + song := Song{ + artists: []string{artist}, + title: title, + file: file, + } + + return &song +} + +func (s *Song) AddArtist(artist string) { + s.artists = append(s.artists, artist) +} + +func (s *Song) AddAlbumartist(artist string) { + s.albumartists = append(s.albumartists, artist) +} + +func (s *Song) SongArtists() []string { + if len(s.albumartists) > 0 { + songArtists := []string{} + for _, artist := range s.artists { + if !slices.Contains(s.albumartists, artist) { + songArtists = append(songArtists, artist) + } + } + + return songArtists + } + + return []string{} +} + +func (s *Song) AlbumArtists() []string { + if len(s.albumartists) > 0 { + return s.albumartists + } + + return s.artists +} + +func (s *Song) Title() string { + return s.title +} + +func (s *Song) File() string { + return s.file +} + +func (s *Song) SetTrack(track string) { + s.track = track +} + +func (s *Song) Track() string { + return s.track +} + +func (s *Song) SetLength(length uint64) { + s.length = length +} + +func (s *Song) Length() uint64 { + return s.length +} + +func (s *Song) SetDate(date string) { + s.date = date +} + +func (s *Song) Date() string { + return s.date +} + +func (s *Song) SetLastModified(lastModified time.Time) { + s.lastModified = lastModified +} + +func (s *Song) LastModified() time.Time { + return s.lastModified +} + +type PlaylistSong struct { + *Song + id string + pos uint64 +} + +func NewPlaylistSong(song *Song, id string, pos uint64) *PlaylistSong { + playlistSong := &PlaylistSong{ + Song: song, + id: id, + pos: pos, + } + + return playlistSong +} + +func (t *PlaylistSong) ID() string { + return t.id +} + +func (t *PlaylistSong) Pos() uint64 { + return t.pos +} diff --git a/internal/common/sort.go b/internal/common/sort.go new file mode 100644 index 0000000..7c62117 --- /dev/null +++ b/internal/common/sort.go @@ -0,0 +1,89 @@ +package common + +import "sort" + +type albumLessFunc func(p1, p2 *Album) bool + +type albumSorter struct { + albums []*Album + less []albumLessFunc +} + +func (s *albumSorter) Len() int { + return len(s.albums) +} + +func (s *albumSorter) Swap(i, j int) { + s.albums[i], s.albums[j] = s.albums[j], s.albums[i] +} + +func (s *albumSorter) Less(i, j int) bool { + p, q := s.albums[i], s.albums[j] + + var k int + for k = 0; k < len(s.less)-1; k++ { + less := s.less[k] + switch { + case less(p, q): + return true + case less(q, p): + return false + } + } + + return s.less[k](p, q) +} + +func (s *albumSorter) Sort(albums []*Album) { + s.albums = albums + sort.Sort(s) +} + +func OrderAlbumBy(less ...albumLessFunc) *albumSorter { + return &albumSorter{ + less: less, + } +} + +func SortAlbums(album []*Album, field string) { + title := orderAlbumByTitle + artists := orderAlbumByArtists + years := orderAlbumByYears + modified := orderAlbumByModified + + var sorter *albumSorter + switch field { + case "artist": + sorter = OrderAlbumBy(artists, title, years, modified) + case "year": + sorter = OrderAlbumBy(years, title, artists, modified) + case "modified": + sorter = OrderAlbumBy(modified, title, artists, years) + default: + sorter = OrderAlbumBy(title, artists, years, modified) + } + + sorter.Sort(album) +} + +func orderAlbumByTitle(c1, c2 *Album) bool { + return c1.Title() < c2.Title() +} + +func orderAlbumByArtists(left, right *Album) bool { + if len(left.Artists()) > 0 && len(right.Artists()) > 0 { + return left.Artists()[0] < right.Artists()[0] + } + return false +} + +func orderAlbumByYears(c1, c2 *Album) bool { + if len(c1.Dates()) > 0 && len(c2.Dates()) > 0 { + return c1.Dates()[0] < c2.Dates()[0] + } + return false +} + +func orderAlbumByModified(c1, c2 *Album) bool { + return c1.LastModified().Before(c2.LastModified()) +} From 4a11ea5ad0d8a62c071f66c9df2cb1eff7adfc9d Mon Sep 17 00:00:00 2001 From: Olli Date: Thu, 26 Feb 2026 10:38:04 +0100 Subject: [PATCH 10/13] Add MPD client implementation --- internal/client/client.go | 947 +++++++++++++++++++++++++++++++++++++ internal/client/command.go | 10 + internal/client/errors.go | 19 + internal/client/reader.go | 236 +++++++++ 4 files changed, 1212 insertions(+) create mode 100644 internal/client/client.go create mode 100644 internal/client/command.go create mode 100644 internal/client/errors.go create mode 100644 internal/client/reader.go diff --git a/internal/client/client.go b/internal/client/client.go new file mode 100644 index 0000000..26fb49b --- /dev/null +++ b/internal/client/client.go @@ -0,0 +1,947 @@ +package client + +import ( + "fmt" + "io" + "log" + "net/textproto" + "strconv" + "strings" + "sync" + "time" + + "suruatoel.xyz/mcg/internal/common" +) + +type QueueItem struct { + Command func(*Client) error +} + +type Client struct { + Host string + con *textproto.Conn + runGroup sync.WaitGroup + queue chan QueueItem + idling bool + version string + state string + playlist []*common.PlaylistAlbum + albums map[string]*common.Album + errorCB ErrorCB + connectionCB ConnectionCB + playlistCB PlaylistCB + albumsCB AlbumsCB + statusCB StatusCB + statisticsCB StatisticsCB + outputDevicesCB OutputDevicesCB + albumartCB AlbumartCB + albumartChan chan []byte +} + +type ErrorCB func(string) + +type ConnectionCB func(bool) + +type PlaylistCB func([]*common.PlaylistAlbum) + +type AlbumsCB func(map[string]*common.Album) + +type StatusCB func(string, *common.PlaylistAlbum, uint64, uint64, int64, string, string, string, string) + +type StatisticsCB func(string, string, string, string, string, string) + +type OutputDevicesCB func(devices []*common.OutputDevice) + +type AlbumartCB func(*common.Album, []byte) + +var ( + clientInstance *Client + clientInit sync.Once +) + +func Instance() *Client { + clientInit.Do(func() { + clientInstance = &Client{} + }) + + return clientInstance +} + +func (c *Client) IsConnected() bool { + return (c.con != nil) +} + +func (c *Client) Connect(host string, port int, password string) { + c.Host = host + c.queue = make(chan QueueItem, 300) + c.albumartChan = make(chan []byte) + // Add connect action + c.addAction( + func(client *Client) error { + return client.connect(host, port, password) + }, + ) + + go c.run() +} + +func (c *Client) connect(host string, port int, password string) error { + // Notify listeners + defer func() { + if c.connectionCB != nil { + c.connectionCB(c.con != nil) + } + }() + + // Create socket + con, err := textproto.Dial("tcp", fmt.Sprintf("%s:%d", host, port)) + c.con = con + if err != nil { + return err + } + + // Greeting + greeting, err := c.readLine() + if err != nil { + return err + } + if greeting[0:6] != "OK MPD" { + return textproto.ProtocolError(fmt.Sprintf("Unexpected greeting: %s", greeting)) + } + + // Parse and store server version + c.version = greeting[7:] + + // Add post-connect actions + c.addPostConnectActions(password) + + return nil +} + +func (c *Client) addPostConnectActions(password string) { + c.addAction( + func(client *Client) error { + return client.password(password) + }, + func(client *Client) error { + return client.loadAlbums() + }, + func(client *Client) error { + return client.loadPlaylist() + }, + func(client *Client) error { + return client.getStatus() + }, + func(client *Client) error { + return client.getStatistics() + }, + func(client *Client) error { + return client.getOutputDevices() + }, + ) +} + +func (c *Client) password(password string) error { + if password != "" { + reader := &emptyReader{} + return c.cmd(reader, "password", password) + } + + return nil +} + +func (c *Client) Disconnect() { + c.addDisconnectActions() + + close(c.queue) + close(c.albumartChan) + c.runGroup.Wait() +} + +func (c *Client) addDisconnectActions() { + c.addAction( + func(client *Client) error { + return client.disconnect() + }, + ) +} + +func (c *Client) disconnect() error { + // Stop current idle process + c.noIdle() + + // Close connection + err := c.con.Close() + if err != nil { + return err + } + c.con = nil + + // Notify callback + if c.connectionCB != nil { + c.connectionCB(false) + } + + return nil +} + +func (c *Client) run() { + c.runGroup.Add(1) + defer func() { + c.runGroup.Done() + }() + + for action := range c.queue { + err := action.Command(c) + if err != nil && c.errorCB != nil { + c.errorCB(fmt.Sprintf("Error running action: %s\n", err)) + } + } +} + +func (c *Client) Version() string { + return c.version +} + +func (c *Client) ReceiveError(callback ErrorCB) { + c.errorCB = callback +} + +func (c *Client) RegisterConnection(callback ConnectionCB) { + c.connectionCB = callback +} + +func (c *Client) ReceivePlaylist(callback PlaylistCB) { + c.playlistCB = callback +} + +func (c *Client) ReceiveAlbums(callback AlbumsCB) { + c.albumsCB = callback +} + +func (c *Client) ReceiveStatus(callback StatusCB) { + c.statusCB = callback +} + +func (c *Client) ReceiveStatistics(callback StatisticsCB) { + c.statisticsCB = callback +} + +func (c *Client) ReceiveOutputDevices(callback OutputDevicesCB) { + c.outputDevicesCB = callback +} + +func (c *Client) ReceiveAlbumart(callback AlbumartCB) { + c.albumartCB = callback +} + +func (c *Client) loadPlaylist() error { + c.playlist = []*common.PlaylistAlbum{} + + playlistReader := &listMapReader{Delimiter: "file"} + playlistErr := c.cmd(playlistReader, "playlistinfo") + if playlistErr != nil { + return playlistErr + } + + for _, songData := range playlistReader.DictList() { + song := c.extractPlaylistSong(songData) + album := c.extractPlaylistAlbum(songData) + if len(c.playlist) == 0 || c.playlist[len(c.playlist)-1].ID() != album.ID() { + c.playlist = append(c.playlist, album) + } else { + album = c.playlist[len(c.playlist)-1] + } + if song != nil { + album.AddSong(song) + } + } + + if c.playlistCB != nil { + c.playlistCB(c.playlist) + } + + return nil +} + +func (c *Client) loadAlbums() error { + // self._callback(Client.SIGNAL_INIT_ALBUMS) + c.albums = make(map[string]*common.Album) + + albumReader := &listMapReader{Delimiter: "Album"} + albumErr := c.cmd(albumReader, "list album") + if albumErr != nil { + return albumErr + } + for _, entry := range albumReader.DictList() { + // self._callback(Client.SIGNAL_PULSE_ALBUMS) + + // Album + album := c.extractAlbum(entry) + if album != nil { + // Songs + songReader := &listMapReader{Delimiter: "file"} + songErr := c.cmd(songReader, "find album", album.Title()) + if songErr != nil { + return songErr + } + for _, songData := range songReader.DictList() { + song := c.extractSong(songData) + if song != nil { + album.AddSong(song) + } + } + + c.albums[album.ID()] = album + } + } + + if c.albumsCB != nil { + c.albumsCB(c.albums) + } + + return nil +} + +func (c *Client) getStatus() error { + statusReader := &mapReader{} + statusErr := c.cmd(statusReader, "status") + if statusErr != nil { + return statusErr + } + + status := statusReader.Dict() + // State + c.state = status["state"] + // Time + var parseErr error + time := uint64(0) + if timeStr, timeSet := status["time"]; timeSet { + time, parseErr = strconv.ParseUint(strings.Split(timeStr, ":")[0], 10, 64) + if parseErr != nil { + return newValueParseError("time", timeStr) + } + } + // Volume + volume := int64(-1) + if volumeStr, volumeSet := status["volume"]; volumeSet { + volume, parseErr = strconv.ParseInt(volumeStr, 10, 64) + if parseErr != nil { + return newValueParseError("volume", volumeStr) + } + } + // Error + errorMessage := status["error"] + + // Album information + file := "" + var album *common.PlaylistAlbum + pos := uint64(0) + songReader := &mapReader{} + songErr := c.cmd(songReader, "currentsong") + if songErr != nil { + return songErr + } + songData := songReader.Dict() + if len(songData) > 0 { + // File + file = songData["file"] + // Song + song := c.extractPlaylistSong(songData) + if song != nil { + // Album + album = c.extractPlaylistAlbum(songData) + pos = song.Pos() + for _, palbum := range c.playlist { + if palbum.ID() == album.ID() && uint64(len(palbum.Songs())) >= pos { + album = palbum + break + } + pos -= uint64(len(palbum.Songs())) + } + } + } + // Audio + audio := status["audio"] + // Bitrate + bitrate := status["bitrate"] + + if c.statusCB != nil { + c.statusCB(c.state, album, pos, time, volume, file, audio, bitrate, errorMessage) + } + + return nil +} + +func (c *Client) getStatistics() error { + statisticsReader := &mapReader{} + statisticsErr := c.cmd(statisticsReader, "stats") + if statisticsErr != nil { + return statisticsErr + } + + stats := statisticsReader.Dict() + artists := stats["artists"] + albums := stats["albums"] + songs := stats["songs"] + dbPlaytime := stats["db_playtime"] + playtime := stats["playtime"] + uptime := stats["uptime"] + + if c.statisticsCB != nil { + c.statisticsCB(artists, albums, songs, dbPlaytime, playtime, uptime) + } + + return nil +} + +func (c *Client) getOutputDevices() error { + devicesReader := &listMapReader{Delimiter: "outputid"} + devicesErr := c.cmd(devicesReader, "outputs") + if devicesErr != nil { + return devicesErr + } + + devices := []*common.OutputDevice{} + for _, deviceMap := range devicesReader.DictList() { + device := common.NewOutputDevice( + deviceMap["outputid"], + deviceMap["outputname"], + ) + + enabledString := deviceMap["outputenabled"] + if enabledString != "" { + enabled, enabledErr := strconv.ParseBool(enabledString) + if enabledErr == nil { + device.Enabled = enabled + } else { + log.Println("failed to parse status of output device", device.ID, device.Name) + } + } + + devices = append(devices, device) + } + + if c.outputDevicesCB != nil { + c.outputDevicesCB(devices) + } + + return nil +} + +func (c *Client) SetOutputDeviceState(device *common.OutputDevice, enable bool) { + c.addAction(func(client *Client) error { + return client.setOutputDeviceState(device, enable) + }) +} + +func (c *Client) setOutputDeviceState(device *common.OutputDevice, enable bool) error { + reader := &emptyReader{} + if enable { + return c.cmd(reader, "enableoutput", device.ID) + } + return c.cmd(reader, "disableoutput", device.ID) +} + +func (c *Client) PlayPause() { + c.addAction(func(client *Client) error { + return client.playPause() + }) +} + +func (c *Client) playPause() error { + reader := &emptyReader{} + switch c.state { + case "play": + return c.cmd(reader, "pause") + default: + return c.cmd(reader, "play") + } +} + +func (c *Client) PlayAlbum(album *common.Album) { + c.addAction(func(client *Client) error { + return client.playAlbum(album) + }) +} + +func (c *Client) playAlbum(album *common.Album) error { + songIDs, err := c.queueAlbum(album) + if err != nil { + return err + } + + if len(songIDs) > 0 { + reader := &emptyReader{} + return c.cmd(reader, "playid", songIDs[0]) + } + + return nil +} + +func (c *Client) QueueAlbum(album *common.Album) { + c.addAction(func(client *Client) error { + _, err := client.queueAlbum(album) + return err + }) +} + +func (c *Client) queueAlbum(album *common.Album) ([]string, error) { + songIDs := []string{} + for _, song := range album.Songs() { + reader := &mapReader{} + addErr := c.cmd(reader, "addid", song.File()) + if addErr != nil { + return songIDs, addErr + } + + addData := reader.Dict() + songID, found := addData["Id"] + if found { + songIDs = append(songIDs, songID) + } + } + + return songIDs, nil +} + +func (c *Client) QueueAlbums(albums []*common.Album) { + c.addAction(func(client *Client) error { + return client.queueAlbums(albums) + }) +} + +func (c *Client) queueAlbums(albums []*common.Album) error { + for _, album := range albums { + _, queueErr := c.queueAlbum(album) + if queueErr != nil { + return queueErr + } + } + + return nil +} + +func (c *Client) PlayQueuedAlbum(album *common.PlaylistAlbum) { + c.addAction(func(client *Client) error { + return client.playQueuedAlbum(album) + }) +} + +func (c *Client) playQueuedAlbum(album *common.PlaylistAlbum) error { + if len(album.Songs()) <= 0 { + return nil + } + + reader := &emptyReader{} + return c.cmd(reader, "playid", album.Songs()[0].ID()) +} + +func (c *Client) UnqueueAlbum(album *common.PlaylistAlbum) { + c.addAction(func(client *Client) error { + return client.unqueueAlbum(album) + }) +} + +func (c *Client) unqueueAlbum(album *common.PlaylistAlbum) error { + commands := []listCommand{} + for _, song := range album.Songs() { + command := newListCommand("deleteid", song.ID()) + commands = append(commands, command) + } + + return c.cmdList(commands) +} + +func (c *Client) UnqueueAlbums(albums []*common.PlaylistAlbum) { + c.addAction(func(client *Client) error { + return client.unqueueAlbums(albums) + }) +} + +func (c *Client) unqueueAlbums(albums []*common.PlaylistAlbum) error { + commands := []listCommand{} + for _, album := range albums { + for _, song := range album.Songs() { + command := newListCommand("deleteid", song.ID()) + commands = append(commands, command) + } + } + + return c.cmdList(commands) +} + +func (c *Client) Seek(pos int, time uint64) { + c.addAction(func(client *Client) error { + return client.seek(pos, time) + }) +} + +func (c *Client) seek(pos int, time uint64) error { + reader := &emptyReader{} + return c.cmd(reader, "seek", strconv.Itoa(pos), strconv.FormatUint(time, 10)) +} + +func (c *Client) SetVolume(volume int) { + c.addAction(func(client *Client) error { + return client.setVolume(volume) + }) +} + +func (c *Client) setVolume(volume int) error { + reader := &emptyReader{} + return c.cmd(reader, "setvol", strconv.Itoa(volume)) +} + +func (c *Client) LoadAlbumart(album *common.Album) { + c.addAction(func(client *Client) error { + return client.loadAlbumart(album) + }) +} + +func (c *Client) LoadAlbumartNow(album *common.Album) []byte { + c.addAction(func(client *Client) error { + return client.loadAlbumartNow(album) + }) + + return <-c.albumartChan +} + +func (c *Client) loadAlbumart(album *common.Album) error { + reader := &binaryReader{} + reader.size = 1 + reader.offset = 0 + + if c.albumartCB != nil { + // We need to wrap this in an anonymous function to make sure the call to reader.Binary() is deferred as well + defer func() { + c.albumartCB(album, reader.Binary()) + }() + } + + if len(album.Songs()) > 0 { + return c.cmd(reader, "albumart", album.Songs()[0].File(), "0") + } + + return nil +} + +func (c *Client) loadAlbumartNow(album *common.Album) error { + reader := &binaryReader{} + reader.size = 1 + reader.offset = 0 + + defer func() { + c.albumartChan <- reader.Binary() + }() + + if len(album.Songs()) > 0 { + return c.cmd(reader, "albumart", album.Songs()[0].File(), "0") + } + + return nil +} + +func (c *Client) ClearPlaylist() { + c.addAction(func(client *Client) error { + return client.clearPlaylist() + }) +} + +func (c *Client) clearPlaylist() error { + reader := &emptyReader{} + return c.cmd(reader, "clear") +} + +func (c *Client) idle() error { + reader := &listReader{ + key: "changed", + } + + c.idling = true + err := c.cmd(reader, "idle") + c.idling = false + if err != nil { + return err + } + + for _, subsystem := range reader.List() { + switch subsystem { + case "player": + c.addAction( + func(client *Client) error { + return client.loadPlaylist() + }, + func(client *Client) error { + return client.getStatus() + }, + ) + case "mixer": + fallthrough + case "output": + c.addAction(func(client *Client) error { + return client.getStatus() + }) + case "playlist": + c.addAction(func(client *Client) error { + return client.loadPlaylist() + }) + case "database": + fallthrough + case "update": + c.addAction( + func(client *Client) error { + return client.loadAlbums() + }, + func(client *Client) error { + return client.loadPlaylist() + }, + func(client *Client) error { + return client.getStatus() + }, + ) + } + } + + return nil +} + +func (c *Client) noIdle() error { + id, err := c.write("noidle") + if err != nil { + return err + } + + c.con.StartResponse(id) + defer c.con.EndResponse(id) + + return nil +} + +func (c *Client) addAction(commands ...func(*Client) error) { + for _, command := range commands { + c.queue <- QueueItem{ + command, + } + } + c.queue <- QueueItem{ + func(client *Client) error { + if client.con != nil && len(client.queue) == 0 { + return client.idle() + } + return nil + }, + } + if c.idling { + c.noIdle() + } +} + +func (c *Client) cmd(reader reader, action string, args ...string) error { + readingComplete := false + for !readingComplete { + command := c.constructCommand(action, args...) + id, err := c.write(command) + if err != nil { + return textproto.ProtocolError(fmt.Sprintf("failed to write command \"%s\": %s", action, err)) + } + + complete, newArgs, err := c.readData(id, reader, args) + if err != nil { + return textproto.ProtocolError(fmt.Sprintf("failed to read response for command \"%s\": %s", action, err)) + } + readingComplete = complete + args = newArgs + } + + return nil +} + +func (c *Client) cmdList(commands []listCommand) error { + beginReader := &noopReader{} + beginErr := c.cmd(beginReader, "command_list_begin") + if beginErr != nil { + return beginErr + } + + commandReader := &noopReader{} + for _, command := range commands { + commandErr := c.cmd(commandReader, command.Action, command.Args...) + if commandErr != nil { + return commandErr + } + } + + endReader := &emptyReader{} + return c.cmd(endReader, "command_list_end") +} + +func (c *Client) constructCommand(command string, args ...string) string { + if len(args) == 0 { + return command + } + + cleanArgs := c.escapeCommandArguments(args...) + joinedArgs := strings.Join(cleanArgs, "\" \"") + + return fmt.Sprintf("%s \"%s\"", command, joinedArgs) +} + +func (c *Client) escapeCommandArguments(args ...string) []string { + for i, arg := range args { + args[i] = strings.ReplaceAll(arg, "\"", "\\\"") + } + + return args +} + +func (c *Client) write(command string) (uint, error) { + id := c.con.Next() + c.con.StartRequest(id) + defer c.con.EndRequest(id) + + fmt.Fprintf(c.con.W, "%s", command) + c.con.W.WriteByte('\n') + err := c.con.W.Flush() + if err != nil { + return id, err + } + + return id, nil +} + +func (c *Client) readData(id uint, reader reader, args []string) (bool, []string, error) { + c.con.StartResponse(id) + defer c.con.EndResponse(id) + + return reader.ReadData(c, args) +} + +func (c *Client) read() ([]string, error) { + response := []string{} + + for { + line, err := c.readLine() + if err != nil { + return nil, err + } + if line == "OK" { + break + } + response = append(response, line) + } + + return response, nil +} + +func (c *Client) readLine() (string, error) { + line, err := c.con.ReadLine() + if err != nil { + return "", err + } + if strings.HasPrefix(line, "ACK ") { + return "", textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line[4:])) + } + + return line, nil +} + +func (c *Client) readBytes(bytes []byte) error { + n, err := io.ReadFull(c.con.R, bytes) + if err != nil { + return err + } + if n != len(bytes) { + return textproto.ProtocolError(fmt.Sprintf("Wrong byte count: %d instead of %d", n, len(bytes))) + } + + return nil +} + +func (c *Client) extractAlbum(song map[string]string) *common.Album { + albumTitle := "Various" + if title, titleSet := song["Album"]; titleSet { + albumTitle = title + } + album := common.NewAlbum(albumTitle) + + if albumLookup, albumExists := c.albums[album.ID()]; albumExists { + return albumLookup + } + + return album +} + +func (c *Client) extractPlaylistAlbum(song map[string]string) *common.PlaylistAlbum { + albumTitle := "Various" + if title, titleSet := song["Album"]; titleSet { + albumTitle = title + } + album := common.NewAlbum(albumTitle) + + if albumLookup, albumExists := c.albums[album.ID()]; albumExists { + album = albumLookup + } + + playlistAlbum := common.NewPlaylistAlbum(album) + + return playlistAlbum +} + +func (c *Client) extractSong(data map[string]string) *common.Song { + if artist, artistSet := data["Artist"]; artistSet { + if title, titleSet := data["Title"]; titleSet { + if file, fileSet := data["file"]; fileSet { + song := common.NewSong(artist, title, file) + + if track, isSet := data["Track"]; isSet { + song.SetTrack(track) + } + if timeString, isSet := data["Time"]; isSet { + time, timeErr := strconv.ParseUint(timeString, 10, 64) + if timeErr == nil { + song.SetLength(time) + } else { + log.Println("failed to parse \"Time\" field of song file", file) + } + } + if date, isSet := data["Date"]; isSet { + song.SetDate(date) + } + if albumartist, isSet := data["Albumartist"]; isSet { + song.AddAlbumartist(albumartist) + } + if lastModifiedString, isSet := data["last-modified"]; isSet { + lastModified, dateErr := time.Parse("2006-01-02T15:04:05-0700", lastModifiedString) + if dateErr == nil { + song.SetLastModified(lastModified) + } else { + log.Println("failed to parse \"last-modified\" field of song file", file) + } + } + + return song + } + } + } + + return nil +} + +func (c *Client) extractPlaylistSong(data map[string]string) *common.PlaylistSong { + song := c.extractSong(data) + if song != nil { + if id, idSet := data["Id"]; idSet { + if posString, posSet := data["Pos"]; posSet { + pos, posErr := strconv.ParseUint(posString, 10, 64) + if posErr != nil { + log.Println("failed to parse \"Pos\" field of playlist song") + } + + return common.NewPlaylistSong(song, id, pos) + } + } + } + + return nil +} diff --git a/internal/client/command.go b/internal/client/command.go new file mode 100644 index 0000000..a584e9f --- /dev/null +++ b/internal/client/command.go @@ -0,0 +1,10 @@ +package client + +type listCommand struct { + Action string + Args []string +} + +func newListCommand(action string, args ...string) listCommand { + return listCommand{action, args} +} diff --git a/internal/client/errors.go b/internal/client/errors.go new file mode 100644 index 0000000..345dc11 --- /dev/null +++ b/internal/client/errors.go @@ -0,0 +1,19 @@ +package client + +import "fmt" + +type ValueParseErr struct { + field string + value string +} + +func newValueParseError(field string, value string) ValueParseErr { + return ValueParseErr{ + field: field, + value: value, + } +} + +func (e ValueParseErr) Error() string { + return fmt.Sprintf("failed to parse %s value: %s", e.field, e.value) +} diff --git a/internal/client/reader.go b/internal/client/reader.go new file mode 100644 index 0000000..27fa821 --- /dev/null +++ b/internal/client/reader.go @@ -0,0 +1,236 @@ +package client + +import ( + "fmt" + "net/textproto" + "strconv" + "strings" +) + +type reader interface { + ReadData(client *Client, args []string) (bool, []string, error) +} + +type noopReader struct{} + +func (r *noopReader) ReadData(client *Client, args []string) (bool, []string, error) { + return true, args, nil +} + +type emptyReader struct{} + +func (r *emptyReader) ReadData(client *Client, args []string) (bool, []string, error) { + _, err := client.read() + + return true, args, err +} + +type listReader struct { + key string + data []string +} + +func (r *listReader) ReadData(client *Client, args []string) (bool, []string, error) { + data, err := client.read() + if err != nil { + return true, args, err + } + + r.data = []string{} + for _, line := range data { + if !strings.HasPrefix(line, r.key+": ") { + return true, args, textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line)) + } + + r.data = append(r.data, line[len(r.key)+2:]) + } + + return true, args, nil +} + +func (r *listReader) List() []string { + return r.data +} + +type mapReader struct { + data map[string]string +} + +func (r *mapReader) ReadData(client *Client, args []string) (bool, []string, error) { + data, err := client.read() + if err != nil { + return true, args, err + } + + r.data = make(map[string]string) + for _, line := range data { + parts := strings.Split(line, ": ") + if len(parts) < 2 { + return true, args, textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line)) + } + r.data[parts[0]] = strings.Join(parts[1:], ": ") + } + + return true, args, nil +} + +func (r *mapReader) Dict() map[string]string { + return r.data +} + +type listMapReader struct { + Delimiter string + data []map[string]string +} + +func (r *listMapReader) ReadData(client *Client, args []string) (bool, []string, error) { + data, err := client.read() + if err != nil { + return true, args, err + } + + r.data = nil + var entry map[string]string + for _, line := range data { + parts := strings.Split(line, ": ") + if len(parts) < 2 { + return true, args, textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line)) + } + + if parts[0] == r.Delimiter { + if entry != nil { + r.data = append(r.data, entry) + } + entry = make(map[string]string) + } + entry[parts[0]] = strings.Join(parts[1:], ": ") + } + if entry != nil { + r.data = append(r.data, entry) + } + + return true, args, nil +} + +func (r *listMapReader) DictList() []map[string]string { + return r.data +} + +type binaryReader struct { + data []byte + size int + offset int +} + +func (r *binaryReader) ReadData(client *Client, args []string) (bool, []string, error) { + firstLine, dataComplete, firstLineErr := r.readFirstLine(client) + if firstLineErr != nil { + return true, args, firstLineErr + } + if dataComplete { + return true, args, nil + } + + totalSize, sizeErr := r.readSize(firstLine) + if sizeErr != nil { + return true, args, sizeErr + } + r.size = totalSize + + currentSize, bytesCountErr := r.readBytesCount(client) + if bytesCountErr != nil { + return true, args, bytesCountErr + } + + r.initData(totalSize) + bytesErr := r.readBytes(client, currentSize) + if bytesErr != nil { + return true, args, bytesErr + } + + _, lineBreakErr := client.readLine() + if lineBreakErr != nil { + return true, args, lineBreakErr + } + _, lineCompletionErr := client.readLine() + if lineCompletionErr != nil { + return true, args, lineCompletionErr + } + + complete := (r.offset >= r.size) + newArgs := r.updateOffsetArgument(args) + + return complete, newArgs, nil +} + +func (r *binaryReader) readFirstLine(client *Client) (line string, complete bool, err error) { + line, lineErr := client.readLine() + if lineErr != nil { + return "", true, lineErr + } + + // OK here means the binary data is complete + if line == "OK" { + return "", true, nil + } + + return line, false, nil +} + +func (r *binaryReader) readSize(line string) (int, error) { + if !strings.HasPrefix(line, "size: ") { + return 0, textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line)) + } + + parsedSize, err := strconv.Atoi(line[6:]) + if err != nil { + return 0, textproto.ProtocolError(fmt.Sprintf("Invalid size: %s", line[6:])) + } + + return parsedSize, nil +} + +func (r *binaryReader) readBytesCount(client *Client) (int, error) { + line, lineErr := client.readLine() + if lineErr != nil { + return 0, lineErr + } + + if !strings.HasPrefix(line, "binary: ") { + return 0, textproto.ProtocolError(fmt.Sprintf("Unexpected line: %s", line)) + } + + count, countErr := strconv.Atoi(line[8:]) + if countErr != nil { + return 0, textproto.ProtocolError(fmt.Sprintf("Invalid binary: %s", line[8:])) + } + + return count, nil +} + +func (r *binaryReader) initData(size int) { + if r.data == nil { + r.data = make([]byte, size) + } +} + +func (r *binaryReader) readBytes(client *Client, size int) error { + bytesError := client.readBytes(r.data[r.offset : r.offset+size]) + if bytesError != nil { + return bytesError + } + + r.offset += size + + return nil +} + +func (r *binaryReader) updateOffsetArgument(args []string) []string { + args[len(args)-1] = strconv.Itoa(r.offset) + + return args +} + +func (r *binaryReader) Binary() []byte { + return r.data +} From d1bb505e0afb6e48d46783203ea8c5f1b69949e1 Mon Sep 17 00:00:00 2001 From: Olli Date: Thu, 26 Feb 2026 10:39:52 +0100 Subject: [PATCH 11/13] Add c-based localization support --- internal/i18n/i18n.go | 38 ++++ locale/de/LC_MESSAGES/mcg.mo | Bin 0 -> 3463 bytes locale/de/LC_MESSAGES/mcg.po | 333 +++++++++++++++++++++++++++++++++++ main.go | 5 + po/LINGUAS | 2 +- po/mcg.pot | 110 ++++++------ 6 files changed, 428 insertions(+), 60 deletions(-) create mode 100644 internal/i18n/i18n.go create mode 100644 locale/de/LC_MESSAGES/mcg.mo create mode 100644 locale/de/LC_MESSAGES/mcg.po diff --git a/internal/i18n/i18n.go b/internal/i18n/i18n.go new file mode 100644 index 0000000..40183e1 --- /dev/null +++ b/internal/i18n/i18n.go @@ -0,0 +1,38 @@ +package i18n + +/* +#include +#include +#include + +static void init_i18n(const char* domain, const char* localedir) { + setlocale(LC_ALL, ""); + bindtextdomain(domain, localedir); + bind_textdomain_codeset(domain, "UTF-8"); + textdomain(domain); +} +*/ +import "C" + +import ( + "log" + "unsafe" +) + +func Init(domain, localeDir string) { + cDomain := C.CString(domain) + defer C.free(unsafe.Pointer(cDomain)) + + cDir := C.CString(localeDir) + defer C.free(unsafe.Pointer(cDir)) + + log.Println("initialize localization for domain", domain, "with directory", localeDir) + C.init_i18n(cDomain, cDir) +} + +func T(msgid string) string { + c := C.CString(msgid) + defer C.free(unsafe.Pointer(c)) + + return C.GoString(C.gettext(c)) +} diff --git a/locale/de/LC_MESSAGES/mcg.mo b/locale/de/LC_MESSAGES/mcg.mo new file mode 100644 index 0000000000000000000000000000000000000000..79cb7795dd4fe89ae644322a346df451d0ad0046 GIT binary patch literal 3463 zcmca7#4?qEfq}uCfq_AWfq~%)BLjmc0|P@3Gf0$yVFL>T11|#u!$uYc25trhhW$|b zGz$X*8v_HwbruE&b_NE9dr)=HpyFRx7#KJh7#M!DFfa%)Ffg#NGBAiTFffR-GBB_* zFfiz{Ld-K}WnhSBU|_Ikg_t)VD!+^sV(uDN1_l-e28JzA{!Uhidk(TPFo-ZPFq~(F z*z*Lc|1FgN1*-2aR2>r=#2w;n5OcNI7#R2%7#NJ$7#R2&7#JMc7#PGD7#ITCAnwRu zgP5Ps#=xM+z`)SL#=s!Wz`(GK4dVVoY!G*yU}Iq5Vqjo63)Odnje$Xyfq~&Z8v}zJ z0|UcfHUaYDlLA}0fb6axdpElvgoH3kNTuTXt5ToCn2Tnr553=9nVT#)cw&IQrGo(p2% zHZF+24sb!j=O`BggCGL~!v!u#I6vZo*z=PM5-&{Lka!T~hUin}hNKrQZiqV^xFPDJ zxgqAHa5FFnFfcHbaWgPTFfcH*b3^Q309C)7n}I=@fq~%=Hv@wK0|Ub|Ziv6dc_8kQ z<$4IYR-6CMTzRR#tIYaU3vCGtSxtpUoP#RD;KClADbccJuiDE$#i|K@@CkChh^ ze=@v~c+=*E*z3Rx(eDiv59NiVhb&$O21W*mA3-@!7!n)Wo9X46twx)S}?j1w*QVa5nN_2gT z(=$_aol4V-bwl#46u1KXb%RpNGC_KDT|l`=!N|bKOxM6d*U&`4z|zXtMBBi~z<|pq zvA9Gxq$n}3I47|rzsO1{)8FTFG| zJyka(H8Iyp0nWElNJ))%apm&$^mRqJ)lkoX%Q-)9#4)k>ixwW377ASW?1 z&srflBeAGBwZt|w#7)-%p$_DhwA3P9*SzF>P@q^TSR`eZa0TR)7A5BBy5$$;7F#Lg z6@an0o`RySf}y50SA;GkCxZPGke`~8S)yR9XUP?z3*qQGB^IX^B$i}Y zDd_3xgAqb5IKQ+gIn^2BHY){)?9$@m z%+#V1JqEYbjGWXWD+W+f%d}!}%*jbl%}veBgOr6%nMpaB`6U^t*$fC~F(?zK<}kRV z<|%mQrR75kLxscJ($YYlgBFS<42Uo)D9TSSO3ckg5&{Ps1Gt<71)5`Cc`78#l2TLi zQlLSJuu~zWv?w{FxHLH<6;y_1mx9#8Zs9nW;G?3~-U0#L~3Xyc7oC)QqCk zqEuM8loppCUXqamHUwO5x`L~SoSf3U^wd0s(!3M}$81pH335SVF(lI}WacV_<>%xi zW#**h=BJc`3fZdE%yf{N%v6Pt#Nv|FyzKnkq|7{UArFoKhyn$Tl+4s(P$dPfF*K11 z)y&kQQc$rDEn2fdZYoJEDJ^D*D$gtic~rqM3G6MX!va7>t3r8daz=4#P98&4X|4hy ztwAFNRT^C6KvNj13?gK)YD7dGIG*w#F^(`IF)67i734&QM3@s9QZw_4QZqsElbTnO zmRbZ#3kYjaA}}v8IYR-F+rZqzEqN*65GhVcEGf-p01Jj>mZauDm|lq)MIhTszyY74 a04k(2;h7G}qQvZy(!`uhQ2I{IV*mg+UUtF& literal 0 HcmV?d00001 diff --git a/locale/de/LC_MESSAGES/mcg.po b/locale/de/LC_MESSAGES/mcg.po new file mode 100644 index 0000000..8819521 --- /dev/null +++ b/locale/de/LC_MESSAGES/mcg.po @@ -0,0 +1,333 @@ +msgid "" +msgstr "" +"Project-Id-Version: CoverGrid (mcg)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2026-08-09 19:13+0200\n" +"PO-Revision-Date: 2026-08-14 09:34+0200\n" +"Last-Translator: coderkun \n" +"Language-Team: \n" +"Language: de_DE\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.9\n" +"X-Poedit-Basepath: ../../..\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: internal/common/album.go:93 internal/gui/coverpanel.go:290 +#, go-format +msgid "%d:%d minutes" +msgstr "%d:%d Minuten" + +#: internal/gui/application.go:108 +msgid "" +"CoverGrid is a client for the Music Player Daemon, focusing on albums " +"instead of single tracks." +msgstr "" +"CoverGrid ist ein ein Client für den Music Player Daemon, der sich auf Alben " +"anstellen von einzelnen Songs fokussiert." + +#: internal/gui/coverpanel.go:277 +#, go-format +msgid "%s feat. %s" +msgstr "%s mit %s" + +#: internal/gui/window.go:117 +msgid "Server" +msgstr "Server" + +#: internal/gui/window.go:118 +msgid "Cover" +msgstr "Cover" + +#: internal/gui/window.go:119 +msgid "Playlist" +msgstr "Wiedergabeliste" + +#: internal/gui/window.go:120 +msgid "Library" +msgstr "Bibliothek" + +#: data/ui/connection-panel.ui:26 +msgid "Host" +msgstr "Host" + +#: data/ui/connection-panel.ui:38 +msgid "Port" +msgstr "Port" + +#: data/ui/connection-panel.ui:57 +msgid "Password" +msgstr "Passwort" + +#: data/ui/cover-panel.ui:12 data/ui/shortcuts-dialog.ui:88 +msgid "Show the cover in fullscreen mode" +msgstr "Das Cover im Vollbildmodus anzeigen" + +#: data/ui/library-panel.ui:33 +msgid "update library" +msgstr "Die Bibliothek aktualisieren" + +#: data/ui/library-panel.ui:46 +msgid "Sort" +msgstr "Sortierung" + +#: data/ui/library-panel.ui:51 +msgid "sort by artist" +msgstr "nach Künstler" + +#: data/ui/library-panel.ui:58 +msgid "sort by title" +msgstr "nach Titel" + +#: data/ui/library-panel.ui:65 +msgid "sort by year" +msgstr "nach Jahr" + +#: data/ui/library-panel.ui:71 +msgid "sort by modification" +msgstr "nach Änderungsdatum" + +#: data/ui/library-panel.ui:78 +msgid "sort library descending" +msgstr "absteigend sortieren" + +#: data/ui/library-panel.ui:98 data/ui/shortcuts-dialog.ui:99 +msgid "Search the library" +msgstr "Die Bibliothek durchsuchen" + +#: data/ui/library-panel.ui:111 data/ui/playlist-panel.ui:14 +msgid "Select multiple albums" +msgstr "Mehrere Alben auswählen" + +#: data/ui/library-panel.ui:124 +msgid "Settings and actions" +msgstr "Einstellungen und Aktionen" + +#: data/ui/library-panel.ui:149 +msgid "search library" +msgstr "Bibliothek durchsuchen" + +#: data/ui/library-panel.ui:216 data/ui/playlist-panel.ui:69 +msgid "cancel" +msgstr "abbrechen" + +#: data/ui/library-panel.ui:222 data/ui/library-panel.ui:277 +msgid "queue" +msgstr "einreihen" + +#: data/ui/library-panel.ui:271 data/ui/playlist-panel.ui:123 +msgid "play" +msgstr "abspielen" + +#: data/ui/playlist-panel.ui:27 data/ui/shortcuts-dialog.ui:77 +msgid "Clear the playlist" +msgstr "Die Wiedergabeliste leeren" + +#: data/ui/playlist-panel.ui:75 data/ui/playlist-panel.ui:129 +msgid "remove" +msgstr "entfernen" + +#: data/ui/server-panel.ui:35 +msgid "Status" +msgstr "Status" + +#: data/ui/server-panel.ui:49 +msgid "File:" +msgstr "Datei:" + +#: data/ui/server-panel.ui:60 +msgid "Audio:" +msgstr "Audio:" + +#: data/ui/server-panel.ui:71 +msgid "Bitrate:" +msgstr "Bitrate:" + +#: data/ui/server-panel.ui:82 +msgid "Error:" +msgstr "Fehler:" + +#: data/ui/server-panel.ui:92 data/ui/server-panel.ui:106 +#: data/ui/server-panel.ui:120 data/ui/server-panel.ui:134 +msgid "none" +msgstr "nichts" + +#: data/ui/server-panel.ui:154 +msgid "Statistics" +msgstr "Statistiken" + +#: data/ui/server-panel.ui:178 +msgid "Artists" +msgstr "Künstler" + +#: data/ui/server-panel.ui:198 +msgid "Albums" +msgstr "Alben" + +#: data/ui/server-panel.ui:218 +msgid "Songs" +msgstr "Songs" + +#: data/ui/server-panel.ui:238 +msgid "Seconds" +msgstr "Sekunden" + +#: data/ui/server-panel.ui:267 +msgid "Seconds played" +msgstr "Sekunden gespielt" + +#: data/ui/server-panel.ui:287 +msgid "Seconds running" +msgstr "Sekunden laufend" + +#: data/ui/server-panel.ui:303 +msgid "Audio Devices" +msgstr "Audiogeräte" + +#: data/ui/shortcuts-dialog.ui:14 +msgid "General" +msgstr "Allgemein" + +#: data/ui/shortcuts-dialog.ui:18 +msgid "Switch to the Connection panel" +msgstr "Zum Verbindungspaneel wechseln" + +#: data/ui/shortcuts-dialog.ui:24 +msgid "Switch to the Cover panel" +msgstr "Zum Cover-Paneel wechseln" + +#: data/ui/shortcuts-dialog.ui:30 +msgid "Switch to the Playlist panel" +msgstr "Zum Wiedergabelistenpaneel wechseln" + +#: data/ui/shortcuts-dialog.ui:36 +msgid "Switch to the Library panel" +msgstr "Zum Bibliothekspaneel wechseln" + +#: data/ui/shortcuts-dialog.ui:42 +msgid "Show the keyboard shortcuts" +msgstr "Die Tastenkombinationen anzeigen (dieser Dialog)" + +#: data/ui/shortcuts-dialog.ui:48 +msgid "Open the info dialog" +msgstr "Den Infodialog öffnen" + +#: data/ui/shortcuts-dialog.ui:54 +msgid "Quit the application" +msgstr "Die Anwendung beenden" + +#: data/ui/shortcuts-dialog.ui:61 +msgid "Player" +msgstr "Wiedergabeprogramm" + +#: data/ui/shortcuts-dialog.ui:65 +msgid "Connect or disconnect" +msgstr "Die Verbindung herstellen oder trennen" + +#: data/ui/shortcuts-dialog.ui:71 data/ui/window.ui:26 +msgid "Switch between play and pause" +msgstr "Zwischen Abspielen und Pause wechseln" + +#: data/ui/shortcuts-dialog.ui:84 +msgid "Cover Panel" +msgstr "Cover-Paneel" + +#: data/ui/shortcuts-dialog.ui:95 +msgid "Library Panel" +msgstr "Bibliothekspaneel" + +#~ msgid "No service found" +#~ msgstr "Keine Dienste gefunden" + +#~ msgid "use" +#~ msgstr "verwenden" + +#~ msgid "Loading albums" +#~ msgstr "Alben werden geladen" + +#~ msgid "Loading images" +#~ msgstr "Bilder werden geladen" + +#, fuzzy +#~ msgid "Connection state" +#~ msgstr "Verbindung" + +#~ msgid "Title" +#~ msgstr "Titel" + +#~ msgid "Artist" +#~ msgstr "Künstler" + +#~ msgid "Enter hostname or IP address" +#~ msgstr "Hostnamen oder IP-Adresse eingeben" + +#~ msgid "Enter password or leave blank" +#~ msgstr "Passwort eingeben oder leer lassen" + +#~ msgid "Connect" +#~ msgstr "Verbinden" + +#~ msgid "Play" +#~ msgstr "Abspielen" + +#~ msgid "Clear Playlist" +#~ msgstr "Playlist leeren" + +#~ msgid "Toggle Fullscreen" +#~ msgstr "Vollbild wechseln" + +#~ msgid "Search Library" +#~ msgstr "Bibliothek durchsuchen" + +#~ msgid "Connection" +#~ msgstr "Verbindung" + +#~ msgid "Keyboard Shortcuts" +#~ msgstr "Tastenkombinationen" + +#~ msgid "Info" +#~ msgstr "Info" + +#~ msgid "Quit" +#~ msgstr "Beenden" + +#~ msgid "Connect to MPD" +#~ msgstr "Zu MPD verbinden" + +#~ msgid "Adjust the volume" +#~ msgstr "Die Lautstärke anpassen" + +#~ msgid "Enter URL or local path" +#~ msgstr "URL oder lokalen Pfad eingeben" + +#~ msgid "Image Directory:" +#~ msgstr "Bildordner:" + +#~ msgid "{} of {} images loaded" +#~ msgstr "{} von {} Bildern geladen" + +#~ msgid "Tracklist" +#~ msgstr "Titelliste" + +#~ msgid "large tracklist" +#~ msgstr "große Titelliste" + +#~ msgid "small tracklist" +#~ msgstr "kleine Titelliste" + +#~ msgid "hide tracklist" +#~ msgstr "gar keine Titelliste" + +#~ msgid "_Play" +#~ msgstr "_Abspielen" + +#~ msgid "_Keyboard Shortcuts" +#~ msgstr "Tastenkombinationen" + +#~ msgid "_Quit" +#~ msgstr "_Beenden" + +#~ msgid "Show the keyboard shortcuts (this dialog)" +#~ msgstr "Die Tastenkombinationen anzeigen (dieser Dialog)" diff --git a/main.go b/main.go index da29a2c..b5aa37f 100644 --- a/main.go +++ b/main.go @@ -1,4 +1,9 @@ package main +import ( + "suruatoel.xyz/mcg/internal/i18n" +) + func main() { + i18n.Init("mcg", "locale") } diff --git a/po/LINGUAS b/po/LINGUAS index 3ae2b72..7673daa 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -en de +de diff --git a/po/mcg.pot b/po/mcg.pot index 451e0a8..f813837 100644 --- a/po/mcg.pot +++ b/po/mcg.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mcg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-22 14:39+0200\n" +"POT-Creation-Date: 2026-08-09 19:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,19 +17,47 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: data/ui/connection-panel.ui:29 -msgid "No service found" +#: internal/common/album.go:93 internal/gui/coverpanel.go:290 +#, go-format +msgid "%d:%d minutes" msgstr "" -#: data/ui/connection-panel.ui:43 +#: internal/gui/application.go:108 +msgid "" +"CoverGrid is a client for the Music Player Daemon, focusing on albums " +"instead of single tracks." +msgstr "" + +#: internal/gui/coverpanel.go:277 +#, go-format +msgid "%s feat. %s" +msgstr "" + +#: internal/gui/window.go:117 +msgid "Server" +msgstr "" + +#: internal/gui/window.go:118 +msgid "Cover" +msgstr "" + +#: internal/gui/window.go:119 +msgid "Playlist" +msgstr "" + +#: internal/gui/window.go:120 +msgid "Library" +msgstr "" + +#: data/ui/connection-panel.ui:26 msgid "Host" msgstr "" -#: data/ui/connection-panel.ui:56 +#: data/ui/connection-panel.ui:38 msgid "Port" msgstr "" -#: data/ui/connection-panel.ui:76 +#: data/ui/connection-panel.ui:57 msgid "Password" msgstr "" @@ -37,67 +65,67 @@ msgstr "" msgid "Show the cover in fullscreen mode" msgstr "" -#: data/ui/library-panel.ui:34 +#: data/ui/library-panel.ui:33 msgid "update library" msgstr "" -#: data/ui/library-panel.ui:48 +#: data/ui/library-panel.ui:46 msgid "Sort" msgstr "" -#: data/ui/library-panel.ui:53 +#: data/ui/library-panel.ui:51 msgid "sort by artist" msgstr "" -#: data/ui/library-panel.ui:61 +#: data/ui/library-panel.ui:58 msgid "sort by title" msgstr "" -#: data/ui/library-panel.ui:69 +#: data/ui/library-panel.ui:65 msgid "sort by year" msgstr "" -#: data/ui/library-panel.ui:76 +#: data/ui/library-panel.ui:71 msgid "sort by modification" msgstr "" -#: data/ui/library-panel.ui:84 +#: data/ui/library-panel.ui:78 msgid "sort library descending" msgstr "" -#: data/ui/library-panel.ui:105 data/ui/shortcuts-dialog.ui:99 +#: data/ui/library-panel.ui:98 data/ui/shortcuts-dialog.ui:99 msgid "Search the library" msgstr "" -#: data/ui/library-panel.ui:121 data/ui/playlist-panel.ui:14 +#: data/ui/library-panel.ui:111 data/ui/playlist-panel.ui:14 msgid "Select multiple albums" msgstr "" -#: data/ui/library-panel.ui:135 +#: data/ui/library-panel.ui:124 msgid "Settings and actions" msgstr "" -#: data/ui/library-panel.ui:160 +#: data/ui/library-panel.ui:149 msgid "search library" msgstr "" -#: data/ui/library-panel.ui:263 data/ui/playlist-panel.ui:107 +#: data/ui/library-panel.ui:216 data/ui/playlist-panel.ui:69 msgid "cancel" msgstr "" -#: data/ui/library-panel.ui:270 data/ui/library-panel.ui:327 +#: data/ui/library-panel.ui:222 data/ui/library-panel.ui:277 msgid "queue" msgstr "" -#: data/ui/library-panel.ui:320 data/ui/playlist-panel.ui:163 +#: data/ui/library-panel.ui:271 data/ui/playlist-panel.ui:123 msgid "play" msgstr "" -#: data/ui/playlist-panel.ui:28 data/ui/shortcuts-dialog.ui:77 +#: data/ui/playlist-panel.ui:27 data/ui/shortcuts-dialog.ui:77 msgid "Clear the playlist" msgstr "" -#: data/ui/playlist-panel.ui:114 data/ui/playlist-panel.ui:170 +#: data/ui/playlist-panel.ui:75 data/ui/playlist-panel.ui:129 msgid "remove" msgstr "" @@ -198,7 +226,7 @@ msgstr "" msgid "Connect or disconnect" msgstr "" -#: data/ui/shortcuts-dialog.ui:71 data/ui/window.ui:25 +#: data/ui/shortcuts-dialog.ui:71 data/ui/window.ui:26 msgid "Switch between play and pause" msgstr "" @@ -209,39 +237,3 @@ msgstr "" #: data/ui/shortcuts-dialog.ui:95 msgid "Library Panel" msgstr "" - -#: src/connectionpanel.py:51 -msgid "use" -msgstr "" - -#: src/librarypanel.py:291 -msgid "Loading albums" -msgstr "" - -#: src/librarypanel.py:379 -msgid "Loading images" -msgstr "" - -#: src/utils.py:50 src/utils.py:67 -msgid "{} feat. {}" -msgstr "" - -#: src/utils.py:61 -msgid "{}:{} minutes" -msgstr "" - -#: src/window.py:114 -msgid "Server" -msgstr "" - -#: src/window.py:115 -msgid "Cover" -msgstr "" - -#: src/window.py:116 -msgid "Playlist" -msgstr "" - -#: src/window.py:117 -msgid "Library" -msgstr "" From b7c0307f6b6b27163098b10a60c797caec7a6803 Mon Sep 17 00:00:00 2001 From: Olli Date: Thu, 26 Feb 2026 10:41:33 +0100 Subject: [PATCH 12/13] Add GTK application implementation --- data/data.go | 32 + data/gtk.css | 5 - data/icons/meson.build | 7 - data/ui/album-headerbar.ui | 7 +- data/ui/connection-panel.ui | 91 ++- data/ui/cover-panel.ui | 4 +- data/ui/library-panel.ui | 68 +-- data/ui/playlist-panel.ui | 54 +- data/ui/server-panel.ui | 4 +- data/ui/shortcuts-dialog.ui | 4 +- data/ui/window.ui | 17 +- data/xyz.suruatoel.mcg.gresource.xml | 15 - data/xyz.suruatoel.mcg.gschema.xml | 63 -- .../scalable/apps => }/xyz.suruatoel.mcg.svg | 0 go.mod | 7 + go.sum | 6 + internal/gui/albumheaderbar.go | 42 ++ internal/gui/application.go | 151 +++++ internal/gui/config.go | 78 +++ internal/gui/connectionpanel.go | 58 ++ internal/gui/coverloader.go | 188 ++++++ internal/gui/coverpanel.go | 343 +++++++++++ internal/gui/librarypanel.go | 563 ++++++++++++++++++ internal/gui/pictureitemfactory.go | 78 +++ internal/gui/playlistpanel.go | 358 +++++++++++ internal/gui/serverpanel.go | 115 ++++ internal/gui/shortcutsdialog.go | 23 + internal/gui/window.go | 454 ++++++++++++++ main.go | 9 + 29 files changed, 2571 insertions(+), 273 deletions(-) create mode 100644 data/data.go delete mode 100644 data/icons/meson.build delete mode 100644 data/xyz.suruatoel.mcg.gresource.xml delete mode 100644 data/xyz.suruatoel.mcg.gschema.xml rename data/{icons/hicolor/scalable/apps => }/xyz.suruatoel.mcg.svg (100%) create mode 100644 internal/gui/albumheaderbar.go create mode 100644 internal/gui/application.go create mode 100644 internal/gui/config.go create mode 100644 internal/gui/connectionpanel.go create mode 100644 internal/gui/coverloader.go create mode 100644 internal/gui/coverpanel.go create mode 100644 internal/gui/librarypanel.go create mode 100644 internal/gui/pictureitemfactory.go create mode 100644 internal/gui/playlistpanel.go create mode 100644 internal/gui/serverpanel.go create mode 100644 internal/gui/shortcutsdialog.go create mode 100644 internal/gui/window.go diff --git a/data/data.go b/data/data.go new file mode 100644 index 0000000..5076620 --- /dev/null +++ b/data/data.go @@ -0,0 +1,32 @@ +package data + +import ( + _ "embed" +) + +//go:embed ui/window.ui +var WindowXML string + +//go:embed ui/shortcuts-dialog.ui +var ShortcutsDialogXML string + +//go:embed ui/connection-panel.ui +var ConnectionPanelXML string + +//go:embed ui/server-panel.ui +var ServerPanelXML string + +//go:embed ui/cover-panel.ui +var CoverPanelXML string + +//go:embed ui/playlist-panel.ui +var PlaylistPanelXML string + +//go:embed ui/album-headerbar.ui +var AlbumHeaderbarXML string + +//go:embed ui/library-panel.ui +var LibraryPanelXML string + +//go:embed gtk.css +var MainCSS string diff --git a/data/gtk.css b/data/gtk.css index 1b361de..aa3357b 100644 --- a/data/gtk.css +++ b/data/gtk.css @@ -1,6 +1,5 @@ #content_stack { box-shadow:inset 4px 4px 10px rgba(0,0,0,0.3); - background-image:url('noise-texture.png'); } #port_spinner { @@ -30,10 +29,6 @@ font-weight:bold; } -window.fullscreen #cover_box { - background: black; -} - #cover_info_revealer { background-color:alpha(@theme_bg_color, 0.8); box-shadow:0 0 10px @theme_bg_color; diff --git a/data/icons/meson.build b/data/icons/meson.build deleted file mode 100644 index 20bdb7c..0000000 --- a/data/icons/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -application_id = 'xyz.suruatoel.mcg' - -scalable_dir = join_paths('hicolor', 'scalable', 'apps') -install_data( - join_paths(scalable_dir, ('@0@.svg').format(application_id)), - install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir) -) diff --git a/data/ui/album-headerbar.ui b/data/ui/album-headerbar.ui index bda26a8..8a1be95 100644 --- a/data/ui/album-headerbar.ui +++ b/data/ui/album-headerbar.ui @@ -2,7 +2,7 @@ - + diff --git a/data/ui/connection-panel.ui b/data/ui/connection-panel.ui index d9e7364..42a280c 100644 --- a/data/ui/connection-panel.ui +++ b/data/ui/connection-panel.ui @@ -9,79 +9,58 @@ 1 100 - - horizontal - 6 - - + diff --git a/data/ui/cover-panel.ui b/data/ui/cover-panel.ui index d869e76..f42cfe7 100644 --- a/data/ui/cover-panel.ui +++ b/data/ui/cover-panel.ui @@ -19,7 +19,7 @@ - + diff --git a/data/ui/library-panel.ui b/data/ui/library-panel.ui index b835e3f..2ef262d 100644 --- a/data/ui/library-panel.ui +++ b/data/ui/library-panel.ui @@ -26,13 +26,11 @@ 0 0 False - update library - @@ -53,7 +51,6 @@ sort by artist False sort_year - @@ -61,14 +58,12 @@ sort by title False sort_year - sort by year False - @@ -76,7 +71,6 @@ sort by modification False sort_year - @@ -86,7 +80,6 @@ True False True - @@ -108,9 +101,6 @@ system-search-symbolic - @@ -119,7 +109,6 @@ True True Select multiple albums - object-select-symbolic @@ -145,7 +134,7 @@ -