Compare commits
No commits in common. "96374f2fc9d293d38235312a57c8fc3ef2cb2d07" and "15d3fd93927769eaae44229f40d9a767f0bbdc5f" have entirely different histories.
96374f2fc9
...
15d3fd9392
@ -86,9 +86,6 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# enable gvfs service
|
|
||||||
services.gvfs.enable = true;
|
|
||||||
|
|
||||||
# Hyprland
|
# Hyprland
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
programs.hyprland = {
|
programs.hyprland = {
|
||||||
|
|||||||
@ -49,10 +49,6 @@ in
|
|||||||
#sweet # gtk theme
|
#sweet # gtk theme
|
||||||
waybar # status bar
|
waybar # status bar
|
||||||
playerctl # mpris
|
playerctl # mpris
|
||||||
xfce.thunar # file manager
|
|
||||||
xfce.thunar-archive-plugin # manage archives in thunar
|
|
||||||
#xfce.xfce4-settings # xfce settings manager
|
|
||||||
xfce.xfconf # xfce config storage
|
|
||||||
];
|
];
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
@ -112,29 +108,20 @@ in
|
|||||||
style = (builtins.readFile ./home-manager/config/waybar/style.css);
|
style = (builtins.readFile ./home-manager/config/waybar/style.css);
|
||||||
};
|
};
|
||||||
|
|
||||||
home.file = {
|
# gtk theming
|
||||||
# Scripts
|
#gtk = {
|
||||||
".scripts/waybar/player-mpris-tail.py" = {
|
# enable = true;
|
||||||
source = ./home-manager/scripts/waybar/player-mpris-tail.py;
|
# theme = {
|
||||||
executable = true;
|
# name = "Sweet-Dark";
|
||||||
};
|
# };
|
||||||
# Thunar configuration
|
# iconTheme = {
|
||||||
".config/Thunar" = {
|
# name = "Sweet-Rainbow";
|
||||||
source = ./home-manager/config/Thunar;
|
# };
|
||||||
#recursive = true;
|
# font = {
|
||||||
};
|
# name = "Fira Sans";
|
||||||
# templates
|
# size = 12;
|
||||||
".config/Vorlagen" = {
|
# };
|
||||||
source = ./home-manager/config/Vorlagen;
|
#};
|
||||||
#recursive = true;
|
|
||||||
};
|
|
||||||
# xfce4 settings
|
|
||||||
".config/xfce4".source = ./home-manager/config/xfce4;
|
|
||||||
# xdg user dirs
|
|
||||||
".config/user-dirs.dirs".source = ./home-manager/config/user-dirs.dirs;
|
|
||||||
# xdg user locales
|
|
||||||
".config/user-dirs.locale".source = ./home-manager/config/user-dirs.locale;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.mako.enable = true;
|
services.mako.enable = true;
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,132 +0,0 @@
|
|||||||
; thunar GtkAccelMap rc-file -*- scheme -*-
|
|
||||||
; this file is an automated accelerator map dump
|
|
||||||
;
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/fab0a703c3165b9ea6d4a2e40b570272" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-type" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/134cf305a61c72f784680835c93c28fd" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStatusBar/toggle-last-modified" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/cut" "<Primary>x")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-size" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/file-menu" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/close-tab" "<Primary>q")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStatusBar/toggle-size" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/new-window" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/clear-directory-specific-settings" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/close-window" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/ac3bbb1429c4180d34b90e935eaeaa7b" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/open-parent" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-menu" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStatusBar/toggle-size-in-bytes" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/switch-previous-tab" "<Primary>Page_Up")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/3cb76eced52269e016bf542f6d20d431" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarActionManager/open" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/sort-ascending" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/toggle-split-view" "F3")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/copy-2" "<Primary>Insert")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/trash-delete" "Delete")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/open-recent" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/view-configure-toolbar" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/forward" "<Alt>Right")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/9f9804d3a8acb92d2796c0e9ee791891" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/restore" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/open-location-alt" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/0d63283611773acfd219c84ae028d009" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarStandardView/select-by-pattern" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/zoom-out-alt" "<Primary>minus")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/open-file-menu" "F10")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/contents" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/show-highlight" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/sort-descending" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-name" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/select-all-files" "<Primary>a")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/execute" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarStandardView/properties" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/cut-2" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-dtime" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/switch-next-tab" "<Primary>Page_Down")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/paste-2" "<Shift>Insert")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/open-templates" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStatusBar/toggle-filetype" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/close-all-windows" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/create-document" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/detach-tab" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/310a68ed4e8d7e3153dbac6fd6f8509e" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/cancel-search" "Escape")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/zoom-in-alt2" "<Primary>equal")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarShortcutsPane/sendto-shortcuts" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/undo" "<Primary>z")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/reload-alt" "F5")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarActions/uca-action-1666515885637912-1" "<Primary>Return")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/toggle-sort-order" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-entry" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/paste" "<Primary>v")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/zoom-in-alt1" "<Primary>plus")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/view-menubar" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/back" "<Alt>Left")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/open-desktop" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/view-as-detailed-list" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/restore-show" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStatusBar/toggle-display-name" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/zoom-out" "<Primary>KP_Subtract")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/d560a9adc56f1eaa2739d7e989051c36" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/sendto-menu" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/go-menu" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/remove-from-recent" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/open-with-other" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarStandardView/invert-selection" "<Primary>i")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-shortcuts" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-menu" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-mtime" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/edit-menu" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/reload" "<Primary>r")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/copy" "<Primary>c")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/move-to-trash" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/unselect-all-files" "Escape")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/delete-3" "<Shift>KP_Delete")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/toggle-side-pane" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/bd09eece7395e751859c8153dca05324" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/arrange-items-menu" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/ef49cad9a2b186bac59b8de045e0f5d4" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/open-computer" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/bookmarks-menu" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/toggle-image-preview" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/view-as-icons" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/delete-2" "<Shift>Delete")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/zoom-in" "<Primary>KP_Add")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/configure-columns" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/rename" "F2")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/open-location" "<Primary>l")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/view-as-compact-list" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/view-menu" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/search" "<Primary>f")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/new-tab" "<Primary>t")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/zoom-reset" "<Primary>KP_0")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/contents/help-menu" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarActionManager/open-in-new-tab" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/view-location-selector-buttons" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/redo" "<Primary><Shift>z")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/open-trash" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/7d2c0d8f2cb46dda0c77c334948613d9" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarActionManager/open-in-new-window" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/view-statusbar" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/356c14bf86880b16a82a896aac1ea75d" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/open-location" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/duplicate" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/trash-delete-2" "KP_Delete")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarBookmarks/efbd1f6870be1a5a9ee9ba157935b388" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarActions/uca-action-1666516933235505-2" "<Primary>f")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/create-folder" "<Primary><Shift>n")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/open-home" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/show-hidden" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/set-default-app" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/empty-trash" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/back-alt" "BackSpace")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/preferences" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/delete" "")
|
|
||||||
(gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-tree" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/open-file-system" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/open-network" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarActionManager/sendto-desktop" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarStandardView/make-link" "")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/zoom-reset-alt" "<Primary>0")
|
|
||||||
; (gtk_accel_path "<Actions>/ThunarWindow/about" "")
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<actions>
|
|
||||||
<action>
|
|
||||||
<icon>folder</icon>
|
|
||||||
<name>Als root öffnen</name>
|
|
||||||
<submenu></submenu>
|
|
||||||
<unique-id>1673031093097554-1</unique-id>
|
|
||||||
<command>gksu thunar %f</command>
|
|
||||||
<description>Verzeichnis als root-Nutzer öffnen</description>
|
|
||||||
<range>*</range>
|
|
||||||
<patterns>*</patterns>
|
|
||||||
<directories/>
|
|
||||||
</action>
|
|
||||||
<action>
|
|
||||||
<icon>utilities-terminal</icon>
|
|
||||||
<name>Terminal öffnen</name>
|
|
||||||
<submenu></submenu>
|
|
||||||
<unique-id>1666515885637912-1</unique-id>
|
|
||||||
<command>for f in %F; do if [ -d "$f" ]; then kitty "$f"; elif [ -z "$default" ]; then default=1; kitty; fi done</command>
|
|
||||||
<description>Terminal im gewählten Ordner öffnen</description>
|
|
||||||
<range></range>
|
|
||||||
<patterns>*</patterns>
|
|
||||||
<startup-notify/>
|
|
||||||
<directories/>
|
|
||||||
<audio-files/>
|
|
||||||
<image-files/>
|
|
||||||
<other-files/>
|
|
||||||
<text-files/>
|
|
||||||
<video-files/>
|
|
||||||
</action>
|
|
||||||
<action>
|
|
||||||
<icon>preferences-system-search</icon>
|
|
||||||
<name>Suchen</name>
|
|
||||||
<submenu></submenu>
|
|
||||||
<unique-id>1666516933235505-2</unique-id>
|
|
||||||
<command>catfish --path=%f</command>
|
|
||||||
<description>Dateien und Ordner suchen</description>
|
|
||||||
<range></range>
|
|
||||||
<patterns>*</patterns>
|
|
||||||
<startup-notify/>
|
|
||||||
<directories/>
|
|
||||||
</action>
|
|
||||||
<action>
|
|
||||||
<icon>link</icon>
|
|
||||||
<name>Symlink erstellen</name>
|
|
||||||
<submenu></submenu>
|
|
||||||
<unique-id>1676990164646243-1</unique-id>
|
|
||||||
<command>ln -Ts %f %n" (symlink)"</command>
|
|
||||||
<description>Symbolischen Link erstellen</description>
|
|
||||||
<range>*</range>
|
|
||||||
<patterns>*</patterns>
|
|
||||||
<directories/>
|
|
||||||
<audio-files/>
|
|
||||||
<image-files/>
|
|
||||||
<other-files/>
|
|
||||||
<text-files/>
|
|
||||||
<video-files/>
|
|
||||||
</action>
|
|
||||||
</actions>
|
|
||||||
@ -1 +0,0 @@
|
|||||||
<mxfile host="Electron" modified="2022-09-16T06:39:11.723Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.3.0 Chrome/104.0.5112.114 Electron/20.1.3 Safari/537.36" etag="3qCqwMKNhbMENT5RahAg" version="20.3.0" type="device"><diagram id="sNatUqG7UvmBRNr3f2vi" name="Seite-1">dZFND8IgDIZ/DfcBRvE8vy6edvBMRh0kbF0YZtNf7xaYk0xPlOd9S2lLeF4PZydbfUUFlrBMDYQfCGN0Q8V4TOQZiBA0gMoZFU0LKMwLIswifRgFXWL0iNabNoUlNg2UPmHSOexT2x1tWrWVFaxAUUq7pjejvI6UbveLcAFT6VhasF0QajmbYyedlgr7L8SPhOcO0YeoHnKw0/DmuYS80x/18zEHjf+RMAbL2+Ml2RA/vgE=</diagram></mxfile>
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +0,0 @@
|
|||||||
<link href="/home/marc/GitProjects/markdown-css/markdown.css" rel="stylesheet"></link>
|
|
||||||
|
|
||||||
# Document Title
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,15 +0,0 @@
|
|||||||
# This file is written by xdg-user-dirs-update
|
|
||||||
# If you want to change or add directories, just edit the line you're
|
|
||||||
# interested in. All local changes will be retained on the next run.
|
|
||||||
# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
|
|
||||||
# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
|
|
||||||
# absolute path. No other format is supported.
|
|
||||||
#
|
|
||||||
XDG_DESKTOP_DIR="$HOME/Schreibtisch"
|
|
||||||
XDG_DOWNLOAD_DIR="$HOME/Downloads"
|
|
||||||
XDG_TEMPLATES_DIR="$HOME/.config/Vorlagen"
|
|
||||||
XDG_PUBLICSHARE_DIR="$HOME/Öffentlich"
|
|
||||||
XDG_DOCUMENTS_DIR="$HOME/Dokumente"
|
|
||||||
XDG_MUSIC_DIR="$HOME/Musik"
|
|
||||||
XDG_PICTURES_DIR="$HOME/Bilder"
|
|
||||||
XDG_VIDEOS_DIR="$HOME/Videos"
|
|
||||||
@ -1 +0,0 @@
|
|||||||
de_CH
|
|
||||||
@ -60,11 +60,5 @@
|
|||||||
"tray": {
|
"tray": {
|
||||||
"icon-size": 21,
|
"icon-size": 21,
|
||||||
"spacing": 10
|
"spacing": 10
|
||||||
},
|
|
||||||
"custom/mpris": {
|
|
||||||
"exec": "~/.scripts/polybar/player-mpris-tail.py -f '{icon} {:artist:t10:{artist}:}{:artist: - :}{:t25:{title}:}'",
|
|
||||||
"on-click": "~/.scripts/polybar/player-mpris-tail.py play-pause &",
|
|
||||||
"on-click-middle": "~/.scripts/polybar/player-mpris-tail.py next &",
|
|
||||||
"on-click-right": "~/.scripts/polybar/player-mpris-tail.py previous &"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,57 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<channel name="thunar" version="1.0">
|
|
||||||
<property name="last-view" type="string"
|
|
||||||
value="ThunarDetailsView" />
|
|
||||||
<property name="last-icon-view-zoom-level" type="string"
|
|
||||||
value="THUNAR_ZOOM_LEVEL_400_PERCENT" />
|
|
||||||
<property name="last-separator-position" type="int"
|
|
||||||
value="189" />
|
|
||||||
<property name="last-show-hidden" type="bool" value="true" />
|
|
||||||
<property name="last-window-width" type="int" value="956" />
|
|
||||||
<property name="last-window-height" type="int" value="1056" />
|
|
||||||
<property name="last-window-maximized" type="bool"
|
|
||||||
value="false" />
|
|
||||||
<property name="last-details-view-zoom-level" type="string"
|
|
||||||
value="THUNAR_ZOOM_LEVEL_38_PERCENT" />
|
|
||||||
<property name="last-details-view-column-widths" type="string"
|
|
||||||
value="50,155,155,148,150,237,50,79,370,379,50,92,50,775" />
|
|
||||||
<property name="misc-date-style" type="string"
|
|
||||||
value="THUNAR_DATE_STYLE_ISO" />
|
|
||||||
<property name="misc-single-click" type="bool" value="false" />
|
|
||||||
<property name="misc-show-delete-action" type="bool"
|
|
||||||
value="true" />
|
|
||||||
<property name="misc-full-path-in-title" type="bool"
|
|
||||||
value="true" />
|
|
||||||
<property name="last-location-bar" type="string"
|
|
||||||
value="ThunarLocationEntry" />
|
|
||||||
<property name="last-sort-column" type="string"
|
|
||||||
value="THUNAR_COLUMN_NAME" />
|
|
||||||
<property name="last-sort-order" type="string"
|
|
||||||
value="GTK_SORT_ASCENDING" />
|
|
||||||
<property name="misc-recursive-permissions" type="string"
|
|
||||||
value="THUNAR_RECURSIVE_PERMISSIONS_ALWAYS" />
|
|
||||||
<property name="last-details-view-visible-columns" type="string"
|
|
||||||
value="THUNAR_COLUMN_DATE_MODIFIED,THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_TYPE" />
|
|
||||||
<property name="misc-folders-first" type="bool" value="true" />
|
|
||||||
<property name="last-side-pane" type="string"
|
|
||||||
value="ThunarShortcutsPane" />
|
|
||||||
<property name="last-menubar-visible" type="bool" value="true" />
|
|
||||||
<property name="misc-confirm-close-multiple-tabs" type="bool"
|
|
||||||
value="false" />
|
|
||||||
<property name="default-view" type="string"
|
|
||||||
value="ThunarDetailsView" />
|
|
||||||
<property name="misc-middle-click-in-tab" type="bool"
|
|
||||||
value="true" />
|
|
||||||
<property name="misc-volume-management" type="bool"
|
|
||||||
value="false" />
|
|
||||||
<property name="misc-parallel-copy-mode" type="string"
|
|
||||||
value="THUNAR_PARALLEL_COPY_MODE_ONLY_LOCAL" />
|
|
||||||
<property name="misc-transfer-verify-file" type="string"
|
|
||||||
value="THUNAR_VERIFY_FILE_MODE_REMOTE" />
|
|
||||||
<property name="last-splitview-separator-position" type="int"
|
|
||||||
value="717" />
|
|
||||||
<property name="misc-folder-item-count" type="string"
|
|
||||||
value="THUNAR_FOLDER_ITEM_COUNT_ALWAYS" />
|
|
||||||
<property name="misc-transfer-use-partial" type="string"
|
|
||||||
value="THUNAR_USE_PARTIAL_MODE_REMOTE" />
|
|
||||||
</channel>
|
|
||||||
@ -1,530 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import dbus
|
|
||||||
import os
|
|
||||||
from operator import itemgetter
|
|
||||||
import argparse
|
|
||||||
import re
|
|
||||||
from urllib.parse import unquote
|
|
||||||
import time
|
|
||||||
from dbus.mainloop.glib import DBusGMainLoop
|
|
||||||
from gi.repository import GLib
|
|
||||||
DBusGMainLoop(set_as_default=True)
|
|
||||||
|
|
||||||
|
|
||||||
FORMAT_STRING = '{icon} {artist} - {title}'
|
|
||||||
FORMAT_REGEX = re.compile(r'(\{:(?P<tag>.*?)(:(?P<format>[wt])(?P<formatlen>\d+))?:(?P<text>.*?):\})', re.I)
|
|
||||||
FORMAT_TAG_REGEX = re.compile(r'(?P<format>[wt])(?P<formatlen>\d+)')
|
|
||||||
SAFE_TAG_REGEX = re.compile(r'[{}]')
|
|
||||||
|
|
||||||
class PlayerManager:
|
|
||||||
def __init__(self, blacklist = [], connect = True):
|
|
||||||
self.blacklist = blacklist
|
|
||||||
self._connect = connect
|
|
||||||
self._session_bus = dbus.SessionBus()
|
|
||||||
self.players = {}
|
|
||||||
|
|
||||||
self.print_queue = []
|
|
||||||
self.connected = False
|
|
||||||
self.player_states = {}
|
|
||||||
|
|
||||||
self.refreshPlayerList()
|
|
||||||
|
|
||||||
if self._connect:
|
|
||||||
self.connect()
|
|
||||||
loop = GLib.MainLoop()
|
|
||||||
try:
|
|
||||||
loop.run()
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
print("interrupt received, stopping…")
|
|
||||||
|
|
||||||
def connect(self):
|
|
||||||
self._session_bus.add_signal_receiver(self.onOwnerChangedName, 'NameOwnerChanged')
|
|
||||||
self._session_bus.add_signal_receiver(self.onChangedProperties, 'PropertiesChanged',
|
|
||||||
path = '/org/mpris/MediaPlayer2',
|
|
||||||
sender_keyword='sender')
|
|
||||||
|
|
||||||
def onChangedProperties(self, interface, properties, signature, sender = None):
|
|
||||||
if sender in self.players:
|
|
||||||
player = self.players[sender]
|
|
||||||
# If we know this player, but haven't been able to set up a signal handler
|
|
||||||
if 'properties_changed' not in player._signals:
|
|
||||||
# Then trigger the signal handler manually
|
|
||||||
player.onPropertiesChanged(interface, properties, signature)
|
|
||||||
else:
|
|
||||||
# If we don't know this player, get its name and add it
|
|
||||||
bus_name = self.getBusNameFromOwner(sender)
|
|
||||||
if bus_name is None:
|
|
||||||
return
|
|
||||||
self.addPlayer(bus_name, sender)
|
|
||||||
player = self.players[sender]
|
|
||||||
player.onPropertiesChanged(interface, properties, signature)
|
|
||||||
|
|
||||||
def onOwnerChangedName(self, bus_name, old_owner, new_owner):
|
|
||||||
if self.busNameIsAPlayer(bus_name):
|
|
||||||
if new_owner and not old_owner:
|
|
||||||
self.addPlayer(bus_name, new_owner)
|
|
||||||
elif old_owner and not new_owner:
|
|
||||||
self.removePlayer(old_owner)
|
|
||||||
else:
|
|
||||||
self.changePlayerOwner(bus_name, old_owner, new_owner)
|
|
||||||
|
|
||||||
def getBusNameFromOwner(self, owner):
|
|
||||||
player_bus_names = [ bus_name for bus_name in self._session_bus.list_names() if self.busNameIsAPlayer(bus_name) ]
|
|
||||||
for player_bus_name in player_bus_names:
|
|
||||||
player_bus_owner = self._session_bus.get_name_owner(player_bus_name)
|
|
||||||
if owner == player_bus_owner:
|
|
||||||
return player_bus_name
|
|
||||||
|
|
||||||
def busNameIsAPlayer(self, bus_name):
|
|
||||||
return bus_name.startswith('org.mpris.MediaPlayer2') and bus_name.split('.')[3] not in self.blacklist
|
|
||||||
|
|
||||||
def refreshPlayerList(self):
|
|
||||||
player_bus_names = [ bus_name for bus_name in self._session_bus.list_names() if self.busNameIsAPlayer(bus_name) ]
|
|
||||||
for player_bus_name in player_bus_names:
|
|
||||||
self.addPlayer(player_bus_name)
|
|
||||||
if self.connected != True:
|
|
||||||
self.connected = True
|
|
||||||
self.printQueue()
|
|
||||||
|
|
||||||
def addPlayer(self, bus_name, owner = None):
|
|
||||||
player = Player(self._session_bus, bus_name, owner = owner, connect = self._connect, _print = self.print)
|
|
||||||
self.players[player.owner] = player
|
|
||||||
|
|
||||||
def removePlayer(self, owner):
|
|
||||||
if owner in self.players:
|
|
||||||
self.players[owner].disconnect()
|
|
||||||
del self.players[owner]
|
|
||||||
# If there are no more players, clear the output
|
|
||||||
if len(self.players) == 0:
|
|
||||||
_printFlush(ICON_NONE)
|
|
||||||
# Else, print the output of the next active player
|
|
||||||
else:
|
|
||||||
players = self.getSortedPlayerOwnerList()
|
|
||||||
if len(players) > 0:
|
|
||||||
self.players[players[0]].printStatus()
|
|
||||||
|
|
||||||
def changePlayerOwner(self, bus_name, old_owner, new_owner):
|
|
||||||
player = Player(self._session_bus, bus_name, owner = new_owner, connect = self._connect, _print = self.print)
|
|
||||||
self.players[new_owner] = player
|
|
||||||
del self.players[old_owner]
|
|
||||||
|
|
||||||
# Get a list of player owners sorted by current status and age
|
|
||||||
def getSortedPlayerOwnerList(self):
|
|
||||||
players = [
|
|
||||||
{
|
|
||||||
'number': int(owner.split('.')[-1]),
|
|
||||||
'status': 2 if player.status == 'playing' else 1 if player.status == 'paused' else 0,
|
|
||||||
'owner': owner
|
|
||||||
}
|
|
||||||
for owner, player in self.players.items()
|
|
||||||
]
|
|
||||||
return [ info['owner'] for info in reversed(sorted(players, key=itemgetter('status', 'number'))) ]
|
|
||||||
|
|
||||||
# Get latest player that's currently playing
|
|
||||||
def getCurrentPlayer(self):
|
|
||||||
playing_players = [
|
|
||||||
player_owner for player_owner in self.getSortedPlayerOwnerList()
|
|
||||||
if
|
|
||||||
self.players[player_owner].status == 'playing' or
|
|
||||||
self.players[player_owner].status == 'paused'
|
|
||||||
]
|
|
||||||
return self.players[playing_players[0]] if playing_players else None
|
|
||||||
|
|
||||||
def print(self, status, player):
|
|
||||||
self.player_states[player.bus_name] = status
|
|
||||||
|
|
||||||
if self.connected:
|
|
||||||
current_player = self.getCurrentPlayer()
|
|
||||||
if current_player != None:
|
|
||||||
_printFlush(self.player_states[current_player.bus_name])
|
|
||||||
else:
|
|
||||||
_printFlush(ICON_STOPPED)
|
|
||||||
else:
|
|
||||||
self.print_queue.append([status, player])
|
|
||||||
|
|
||||||
def printQueue(self):
|
|
||||||
for args in self.print_queue:
|
|
||||||
self.print(args[0], args[1])
|
|
||||||
self.print_queue.clear()
|
|
||||||
|
|
||||||
|
|
||||||
class Player:
|
|
||||||
def __init__(self, session_bus, bus_name, owner = None, connect = True, _print = None):
|
|
||||||
self._session_bus = session_bus
|
|
||||||
self.bus_name = bus_name
|
|
||||||
self._disconnecting = False
|
|
||||||
self.__print = _print
|
|
||||||
|
|
||||||
self.metadata = {
|
|
||||||
'artist' : '',
|
|
||||||
'album' : '',
|
|
||||||
'title' : '',
|
|
||||||
'track' : 0
|
|
||||||
}
|
|
||||||
|
|
||||||
self._rate = 1.
|
|
||||||
self._positionAtLastUpdate = 0.
|
|
||||||
self._timeAtLastUpdate = time.time()
|
|
||||||
self._positionTimerRunning = False
|
|
||||||
|
|
||||||
self._metadata = None
|
|
||||||
self.status = 'stopped'
|
|
||||||
self.icon = ICON_NONE
|
|
||||||
self.icon_reversed = ICON_PLAYING
|
|
||||||
if owner is not None:
|
|
||||||
self.owner = owner
|
|
||||||
else:
|
|
||||||
self.owner = self._session_bus.get_name_owner(bus_name)
|
|
||||||
self._obj = self._session_bus.get_object(self.bus_name, '/org/mpris/MediaPlayer2')
|
|
||||||
self._properties_interface = dbus.Interface(self._obj, dbus_interface='org.freedesktop.DBus.Properties')
|
|
||||||
self._introspect_interface = dbus.Interface(self._obj, dbus_interface='org.freedesktop.DBus.Introspectable')
|
|
||||||
self._media_interface = dbus.Interface(self._obj, dbus_interface='org.mpris.MediaPlayer2')
|
|
||||||
self._player_interface = dbus.Interface(self._obj, dbus_interface='org.mpris.MediaPlayer2.Player')
|
|
||||||
self._introspect = self._introspect_interface.get_dbus_method('Introspect', dbus_interface=None)
|
|
||||||
self._getProperty = self._properties_interface.get_dbus_method('Get', dbus_interface=None)
|
|
||||||
self._playerPlay = self._player_interface.get_dbus_method('Play', dbus_interface=None)
|
|
||||||
self._playerPause = self._player_interface.get_dbus_method('Pause', dbus_interface=None)
|
|
||||||
self._playerPlayPause = self._player_interface.get_dbus_method('PlayPause', dbus_interface=None)
|
|
||||||
self._playerStop = self._player_interface.get_dbus_method('Stop', dbus_interface=None)
|
|
||||||
self._playerPrevious = self._player_interface.get_dbus_method('Previous', dbus_interface=None)
|
|
||||||
self._playerNext = self._player_interface.get_dbus_method('Next', dbus_interface=None)
|
|
||||||
self._playerRaise = self._media_interface.get_dbus_method('Raise', dbus_interface=None)
|
|
||||||
self._signals = {}
|
|
||||||
|
|
||||||
self.refreshPosition()
|
|
||||||
self.refreshStatus()
|
|
||||||
self.refreshMetadata()
|
|
||||||
|
|
||||||
if connect:
|
|
||||||
self.printStatus()
|
|
||||||
self.connect()
|
|
||||||
|
|
||||||
def play(self):
|
|
||||||
self._playerPlay()
|
|
||||||
def pause(self):
|
|
||||||
self._playerPause()
|
|
||||||
def playpause(self):
|
|
||||||
self._playerPlayPause()
|
|
||||||
def stop(self):
|
|
||||||
self._playerStop()
|
|
||||||
def previous(self):
|
|
||||||
self._playerPrevious()
|
|
||||||
def next(self):
|
|
||||||
self._playerNext()
|
|
||||||
def raisePlayer(self):
|
|
||||||
self._playerRaise()
|
|
||||||
|
|
||||||
def connect(self):
|
|
||||||
if self._disconnecting is not True:
|
|
||||||
introspect_xml = self._introspect(self.bus_name, '/')
|
|
||||||
if 'TrackMetadataChanged' in introspect_xml:
|
|
||||||
self._signals['track_metadata_changed'] = self._session_bus.add_signal_receiver(self.onMetadataChanged, 'TrackMetadataChanged', self.bus_name)
|
|
||||||
self._signals['seeked'] = self._player_interface.connect_to_signal('Seeked', self.onSeeked)
|
|
||||||
self._signals['properties_changed'] = self._properties_interface.connect_to_signal('PropertiesChanged', self.onPropertiesChanged)
|
|
||||||
|
|
||||||
def disconnect(self):
|
|
||||||
self._disconnecting = True
|
|
||||||
for signal_name, signal_handler in list(self._signals.items()):
|
|
||||||
signal_handler.remove()
|
|
||||||
del self._signals[signal_name]
|
|
||||||
|
|
||||||
def refreshStatus(self):
|
|
||||||
# Some clients (VLC) will momentarily create a new player before removing it again
|
|
||||||
# so we can't be sure the interface still exists
|
|
||||||
try:
|
|
||||||
self.status = str(self._getProperty('org.mpris.MediaPlayer2.Player', 'PlaybackStatus')).lower()
|
|
||||||
self.updateIcon()
|
|
||||||
self.checkPositionTimer()
|
|
||||||
except dbus.exceptions.DBusException:
|
|
||||||
self.disconnect()
|
|
||||||
|
|
||||||
def refreshMetadata(self):
|
|
||||||
# Some clients (VLC) will momentarily create a new player before removing it again
|
|
||||||
# so we can't be sure the interface still exists
|
|
||||||
try:
|
|
||||||
self._metadata = self._getProperty('org.mpris.MediaPlayer2.Player', 'Metadata')
|
|
||||||
self._parseMetadata()
|
|
||||||
except dbus.exceptions.DBusException:
|
|
||||||
self.disconnect()
|
|
||||||
|
|
||||||
def updateIcon(self):
|
|
||||||
self.icon = (
|
|
||||||
ICON_PLAYING if self.status == 'playing' else
|
|
||||||
ICON_PAUSED if self.status == 'paused' else
|
|
||||||
ICON_STOPPED if self.status == 'stopped' else
|
|
||||||
ICON_NONE
|
|
||||||
)
|
|
||||||
self.icon_reversed = (
|
|
||||||
ICON_PAUSED if self.status == 'playing' else
|
|
||||||
ICON_PLAYING
|
|
||||||
)
|
|
||||||
|
|
||||||
def _print(self, status):
|
|
||||||
self.__print(status, self)
|
|
||||||
|
|
||||||
def _parseMetadata(self):
|
|
||||||
if self._metadata != None:
|
|
||||||
# Obtain properties from _metadata
|
|
||||||
_artist = _getProperty(self._metadata, 'xesam:artist', [''])
|
|
||||||
_album = _getProperty(self._metadata, 'xesam:album', '')
|
|
||||||
_title = _getProperty(self._metadata, 'xesam:title', '')
|
|
||||||
_track = _getProperty(self._metadata, 'xesam:trackNumber', '')
|
|
||||||
_genre = _getProperty(self._metadata, 'xesam:genre', [''])
|
|
||||||
_disc = _getProperty(self._metadata, 'xesam:discNumber', '')
|
|
||||||
_length = _getProperty(self._metadata, 'xesam:length', 0) or _getProperty(self._metadata, 'mpris:length', 0)
|
|
||||||
_length_int = _length if type(_length) is int else int(float(_length))
|
|
||||||
_date = _getProperty(self._metadata, 'xesam:contentCreated', '')
|
|
||||||
_year = _date[0:4] if len(_date) else ''
|
|
||||||
_url = _getProperty(self._metadata, 'xesam:url', '')
|
|
||||||
_cover = _getProperty(self._metadata, 'xesam:artUrl', '') or _getProperty(self._metadata, 'mpris:artUrl', '')
|
|
||||||
_duration = _getDuration(_length_int)
|
|
||||||
# Update metadata
|
|
||||||
self.metadata['artist'] = re.sub(SAFE_TAG_REGEX, """\1\1""", _firstIfList(_artist))
|
|
||||||
self.metadata['album'] = re.sub(SAFE_TAG_REGEX, """\1\1""", _firstIfList(_album))
|
|
||||||
self.metadata['title'] = re.sub(SAFE_TAG_REGEX, """\1\1""", _firstIfList(_title))
|
|
||||||
self.metadata['track'] = _track
|
|
||||||
self.metadata['genre'] = re.sub(SAFE_TAG_REGEX, """\1\1""", _firstIfList(_genre))
|
|
||||||
self.metadata['disc'] = _disc
|
|
||||||
self.metadata['date'] = re.sub(SAFE_TAG_REGEX, """\1\1""", _date)
|
|
||||||
self.metadata['year'] = re.sub(SAFE_TAG_REGEX, """\1\1""", _year)
|
|
||||||
self.metadata['url'] = _url
|
|
||||||
self.metadata['filename'] = os.path.basename(_url)
|
|
||||||
self.metadata['length'] = _length_int
|
|
||||||
self.metadata['cover'] = re.sub(SAFE_TAG_REGEX, """\1\1""", _firstIfList(_cover))
|
|
||||||
self.metadata['duration'] = _duration
|
|
||||||
|
|
||||||
def onMetadataChanged(self, track_id, metadata):
|
|
||||||
self.refreshMetadata()
|
|
||||||
self.printStatus()
|
|
||||||
|
|
||||||
def onPropertiesChanged(self, interface, properties, signature):
|
|
||||||
updated = False
|
|
||||||
if dbus.String('Metadata') in properties:
|
|
||||||
_metadata = properties[dbus.String('Metadata')]
|
|
||||||
if _metadata != self._metadata:
|
|
||||||
self._metadata = _metadata
|
|
||||||
self._parseMetadata()
|
|
||||||
updated = True
|
|
||||||
if dbus.String('PlaybackStatus') in properties:
|
|
||||||
status = str(properties[dbus.String('PlaybackStatus')]).lower()
|
|
||||||
if status != self.status:
|
|
||||||
self.status = status
|
|
||||||
self.checkPositionTimer()
|
|
||||||
self.updateIcon()
|
|
||||||
updated = True
|
|
||||||
if dbus.String('Rate') in properties and dbus.String('PlaybackStatus') not in properties:
|
|
||||||
self.refreshStatus()
|
|
||||||
if NEEDS_POSITION and dbus.String('Rate') in properties:
|
|
||||||
rate = properties[dbus.String('Rate')]
|
|
||||||
if rate != self._rate:
|
|
||||||
self._rate = rate
|
|
||||||
self.refreshPosition()
|
|
||||||
|
|
||||||
if updated:
|
|
||||||
self.refreshPosition()
|
|
||||||
self.printStatus()
|
|
||||||
|
|
||||||
def checkPositionTimer(self):
|
|
||||||
if NEEDS_POSITION and self.status == 'playing' and not self._positionTimerRunning:
|
|
||||||
self._positionTimerRunning = True
|
|
||||||
GLib.timeout_add_seconds(1, self._positionTimer)
|
|
||||||
|
|
||||||
def onSeeked(self, position):
|
|
||||||
self.refreshPosition()
|
|
||||||
self.printStatus()
|
|
||||||
|
|
||||||
def _positionTimer(self):
|
|
||||||
self.printStatus()
|
|
||||||
self._positionTimerRunning = self.status == 'playing'
|
|
||||||
return self._positionTimerRunning
|
|
||||||
|
|
||||||
def refreshPosition(self):
|
|
||||||
try:
|
|
||||||
time_us = self._getProperty('org.mpris.MediaPlayer2.Player', 'Position')
|
|
||||||
except dbus.exceptions.DBusException:
|
|
||||||
time_us = 0
|
|
||||||
|
|
||||||
self._timeAtLastUpdate = time.time()
|
|
||||||
self._positionAtLastUpdate = time_us / 1000000
|
|
||||||
|
|
||||||
def _getPosition(self):
|
|
||||||
if self.status == 'playing':
|
|
||||||
return self._positionAtLastUpdate + self._rate * (time.time() - self._timeAtLastUpdate)
|
|
||||||
else:
|
|
||||||
return self._positionAtLastUpdate
|
|
||||||
|
|
||||||
def _statusReplace(self, match, metadata):
|
|
||||||
tag = match.group('tag')
|
|
||||||
format = match.group('format')
|
|
||||||
formatlen = match.group('formatlen')
|
|
||||||
text = match.group('text')
|
|
||||||
tag_found = False
|
|
||||||
reversed_tag = False
|
|
||||||
|
|
||||||
if tag.startswith('-'):
|
|
||||||
tag = tag[1:]
|
|
||||||
reversed_tag = True
|
|
||||||
|
|
||||||
if format is None:
|
|
||||||
tag_is_format_match = re.match(FORMAT_TAG_REGEX, tag)
|
|
||||||
if tag_is_format_match:
|
|
||||||
format = tag_is_format_match.group('format')
|
|
||||||
formatlen = tag_is_format_match.group('formatlen')
|
|
||||||
tag_found = True
|
|
||||||
if format is not None:
|
|
||||||
text = text.format_map(CleanSafeDict(**metadata))
|
|
||||||
if format == 'w':
|
|
||||||
formatlen = int(formatlen)
|
|
||||||
text = text[:formatlen]
|
|
||||||
elif format == 't':
|
|
||||||
formatlen = int(formatlen)
|
|
||||||
if len(text) > formatlen:
|
|
||||||
text = text[:max(formatlen - len(TRUNCATE_STRING), 0)] + TRUNCATE_STRING
|
|
||||||
if tag_found is False and tag in metadata and len(metadata[tag]):
|
|
||||||
tag_found = True
|
|
||||||
|
|
||||||
if reversed_tag:
|
|
||||||
tag_found = not tag_found
|
|
||||||
|
|
||||||
if tag_found:
|
|
||||||
return text
|
|
||||||
else:
|
|
||||||
return ''
|
|
||||||
|
|
||||||
def printStatus(self):
|
|
||||||
if self.status in [ 'playing', 'paused' ]:
|
|
||||||
metadata = { **self.metadata, 'icon': self.icon, 'icon-reversed': self.icon_reversed }
|
|
||||||
if NEEDS_POSITION:
|
|
||||||
metadata['position'] = time.strftime("%M:%S", time.gmtime(self._getPosition()))
|
|
||||||
# replace metadata tags in text
|
|
||||||
text = re.sub(FORMAT_REGEX, lambda match: self._statusReplace(match, metadata), FORMAT_STRING)
|
|
||||||
# restore polybar tag formatting and replace any remaining metadata tags after that
|
|
||||||
try:
|
|
||||||
text = re.sub(r'p(.*?)p(.*?)p(.*?)p', r'%{\1}\2%{\3}', text.format_map(CleanSafeDict(**metadata)))
|
|
||||||
except:
|
|
||||||
print("Invalid format string")
|
|
||||||
self._print(text)
|
|
||||||
else:
|
|
||||||
self._print(ICON_STOPPED)
|
|
||||||
|
|
||||||
|
|
||||||
def _dbusValueToPython(value):
|
|
||||||
if isinstance(value, dbus.Dictionary):
|
|
||||||
return {_dbusValueToPython(key): _dbusValueToPython(value) for key, value in value.items()}
|
|
||||||
elif isinstance(value, dbus.Array):
|
|
||||||
return [ _dbusValueToPython(item) for item in value ]
|
|
||||||
elif isinstance(value, dbus.Boolean):
|
|
||||||
return int(value) == 1
|
|
||||||
elif (
|
|
||||||
isinstance(value, dbus.Byte) or
|
|
||||||
isinstance(value, dbus.Int16) or
|
|
||||||
isinstance(value, dbus.UInt16) or
|
|
||||||
isinstance(value, dbus.Int32) or
|
|
||||||
isinstance(value, dbus.UInt32) or
|
|
||||||
isinstance(value, dbus.Int64) or
|
|
||||||
isinstance(value, dbus.UInt64)
|
|
||||||
):
|
|
||||||
return int(value)
|
|
||||||
elif isinstance(value, dbus.Double):
|
|
||||||
return float(value)
|
|
||||||
elif (
|
|
||||||
isinstance(value, dbus.ObjectPath) or
|
|
||||||
isinstance(value, dbus.Signature) or
|
|
||||||
isinstance(value, dbus.String)
|
|
||||||
):
|
|
||||||
return unquote(str(value))
|
|
||||||
|
|
||||||
def _getProperty(properties, property, default = None):
|
|
||||||
value = default
|
|
||||||
if not isinstance(property, dbus.String):
|
|
||||||
property = dbus.String(property)
|
|
||||||
if property in properties:
|
|
||||||
value = properties[property]
|
|
||||||
return _dbusValueToPython(value)
|
|
||||||
else:
|
|
||||||
return value
|
|
||||||
|
|
||||||
def _getDuration(t: int):
|
|
||||||
seconds = t / 1000000
|
|
||||||
return time.strftime("%M:%S", time.gmtime(seconds))
|
|
||||||
|
|
||||||
def _firstIfList(_value):
|
|
||||||
return _value[0] if type(_value) is list and len(_value) else _value
|
|
||||||
|
|
||||||
class CleanSafeDict(dict):
|
|
||||||
def __missing__(self, key):
|
|
||||||
return '{{{}}}'.format(key)
|
|
||||||
|
|
||||||
|
|
||||||
"""
|
|
||||||
Seems to assure print() actually prints when no terminal is connected
|
|
||||||
"""
|
|
||||||
|
|
||||||
_last_status = ''
|
|
||||||
def _printFlush(status, **kwargs):
|
|
||||||
global _last_status
|
|
||||||
if status != _last_status:
|
|
||||||
print(status, **kwargs)
|
|
||||||
sys.stdout.flush()
|
|
||||||
_last_status = status
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser()
|
|
||||||
parser.add_argument('command', help="send the given command to the active player",
|
|
||||||
choices=[ 'play', 'pause', 'play-pause', 'stop', 'previous', 'next', 'status', 'list', 'current', 'metadata', 'raise' ],
|
|
||||||
default=None,
|
|
||||||
nargs='?')
|
|
||||||
parser.add_argument('-b', '--blacklist', help="ignore a player by it's bus name. Can be be given multiple times (e.g. -b vlc -b audacious)",
|
|
||||||
action='append',
|
|
||||||
metavar="BUS_NAME",
|
|
||||||
default=[])
|
|
||||||
parser.add_argument('-f', '--format', default='{icon} {:artist:{artist} - :}{:title:{title}:}{:-title:{filename}:}')
|
|
||||||
parser.add_argument('--truncate-text', default='…')
|
|
||||||
parser.add_argument('--icon-playing', default='⏵')
|
|
||||||
parser.add_argument('--icon-paused', default='⏸')
|
|
||||||
#parser.add_argument('--icon-stopped', default='⏹')
|
|
||||||
parser.add_argument('--icon-stopped', default='') # show no icon if stopped
|
|
||||||
parser.add_argument('--icon-none', default='')
|
|
||||||
args = parser.parse_args()
|
|
||||||
|
|
||||||
FORMAT_STRING = re.sub(r'%\{(.*?)\}(.*?)%\{(.*?)\}', r'p\1p\2p\3p', args.format)
|
|
||||||
NEEDS_POSITION = "{position}" in FORMAT_STRING
|
|
||||||
|
|
||||||
TRUNCATE_STRING = args.truncate_text
|
|
||||||
ICON_PLAYING = args.icon_playing
|
|
||||||
ICON_PAUSED = args.icon_paused
|
|
||||||
ICON_STOPPED = args.icon_stopped
|
|
||||||
ICON_NONE = args.icon_none
|
|
||||||
|
|
||||||
if args.command is None:
|
|
||||||
PlayerManager(blacklist = args.blacklist)
|
|
||||||
else:
|
|
||||||
player_manager = PlayerManager(blacklist = args.blacklist, connect = False)
|
|
||||||
current_player = player_manager.getCurrentPlayer()
|
|
||||||
if args.command == 'play' and current_player:
|
|
||||||
current_player.play()
|
|
||||||
elif args.command == 'pause' and current_player:
|
|
||||||
current_player.pause()
|
|
||||||
elif args.command == 'play-pause' and current_player:
|
|
||||||
current_player.playpause()
|
|
||||||
elif args.command == 'stop' and current_player:
|
|
||||||
current_player.stop()
|
|
||||||
elif args.command == 'previous' and current_player:
|
|
||||||
current_player.previous()
|
|
||||||
elif args.command == 'next' and current_player:
|
|
||||||
current_player.next()
|
|
||||||
elif args.command == 'status' and current_player:
|
|
||||||
current_player.printStatus()
|
|
||||||
elif args.command == 'list':
|
|
||||||
print("\n".join(sorted([
|
|
||||||
"{} : {}".format(player.bus_name.split('.')[3], player.status)
|
|
||||||
for player in player_manager.players.values() ])))
|
|
||||||
elif args.command == 'current' and current_player:
|
|
||||||
print("{} : {}".format(current_player.bus_name.split('.')[3], current_player.status))
|
|
||||||
elif args.command == 'metadata' and current_player:
|
|
||||||
print(_dbusValueToPython(current_player._metadata))
|
|
||||||
elif args.command == 'raise' and current_player:
|
|
||||||
current_player.raisePlayer()
|
|
||||||
@ -9,11 +9,9 @@
|
|||||||
fwupd # firmware updates
|
fwupd # firmware updates
|
||||||
fwupd-efi # firmware updates additional EFI stuff
|
fwupd-efi # firmware updates additional EFI stuff
|
||||||
wget # get stuff from the net
|
wget # get stuff from the net
|
||||||
gvfs # virtual file system support
|
|
||||||
#hyprland # window manager
|
#hyprland # window manager
|
||||||
wayland # wayland server
|
wayland # wayland server
|
||||||
xdg-utils # xdg directories, open, etc
|
xdg-utils # xdg directories, open, etc
|
||||||
xdg-user-dirs # directories
|
|
||||||
sweet # gtk theme
|
sweet # gtk theme
|
||||||
capitaine-cursors # cursor theme
|
capitaine-cursors # cursor theme
|
||||||
xfce.tumbler # image files thumbnail generator (+ base requirement)
|
xfce.tumbler # image files thumbnail generator (+ base requirement)
|
||||||
|
|||||||
Reference in New Issue
Block a user