From 4a3004cdd14c63a2350abd832f80c8953a42ce42 Mon Sep 17 00:00:00 2001
From: Feuerfuchs <git@feuerfuchs.eu>
Date: Fri, 9 Nov 2018 12:05:50 +0100
Subject: Cleanup, readme update
---
README.md | 13 ++-
mpris_to_text.py | 301 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
music_update.py | 302 -------------------------------------------------------
3 files changed, 312 insertions(+), 304 deletions(-)
create mode 100755 mpris_to_text.py
delete mode 100755 music_update.py
diff --git a/README.md b/README.md
index 0af062f..90251b7 100644
--- a/README.md
+++ b/README.md
@@ -6,5 +6,14 @@ A Python script that fetches media data from MPRIS-compliant media players and s
## Required packages
-- [blessed](https://github.com/jquast/blessed)
-- [dbussy](https://github.com/ldo/dbussy)
+- [blessed](https://github.com/jquast/blessed): Terminal UI
+- [dbussy](https://github.com/ldo/dbussy): DBus client
+
+## Parameters
+
+- `-h`: Display help
+- `--file`: Full path to the file the data is written into
+- `--format-artist`: Format string for the artist part
+- `--format-title`: Format string for the title part
+- `--format-album`: Format string for the album part
+- `--format`: Format string that puts all parts together
diff --git a/mpris_to_text.py b/mpris_to_text.py
new file mode 100755
index 0000000..1284300
--- /dev/null
+++ b/mpris_to_text.py
@@ -0,0 +1,301 @@
+#!/usr/bin/python
+
+import sys
+import asyncio
+import re
+import threading
+import argparse
+import signal
+
+from blessed import Terminal
+
+import ravel
+
+
+loop = asyncio.get_event_loop()
+name_regex = re.compile("^org\.mpris\.MediaPlayer2\.")
+bus = None
+term = Terminal()
+
+refresh_cond = threading.Condition()
+refresh_flag = True
+exit_flag = False
+exit_task = asyncio.Future()
+
+players = []
+player_id_to_index = {}
+active_player = ""
+current_output = ""
+
+filename = ""
+meta_format = ""
+meta_format_artist = ""
+meta_format_title = ""
+meta_format_album = ""
+
+
+def track_string(metadata):
+ artist = metadata["xesam:artist"][1][0] if "xesam:artist" in metadata else ""
+ title = metadata["xesam:title"][1] if "xesam:title" in metadata else ""
+ album = metadata["xesam:album"][1] if "xesam:album" in metadata else ""
+
+ return meta_format.format(
+ artist = meta_format_artist.format(artist) if artist != "" else "",
+ title = meta_format_title.format(title) if title != "" else "",
+ album = meta_format_album.format(album) if title != "" else ""
+ )
+
+
+def write_track(track):
+ global filename
+ global current_output
+
+ current_output = track
+ f = open(filename, "w")
+ f.write(track)
+ f.close()
+
+
+@ravel.signal(name = "PropertiesChanged", in_signature = "sa{sv}as", args_keyword = "args")
+def playing_song_changed(args):
+ global refresh_cond
+ global refresh_flag
+
+ [ player, changed_properties, invalidated_properties ] = args
+ if "Metadata" in changed_properties:
+ write_track(track_string(changed_properties["Metadata"][1]))
+ with refresh_cond:
+ refresh_flag = True
+ refresh_cond.notify()
+
+
+@ravel.signal(name = "NameOwnerChanged", in_signature = "sss", args_keyword = "args")
+def dbus_name_owner_changed(args):
+ global refresh_cond
+ global refresh_flag
+
+ [ name, old_owner, new_owner ] = args
+ if name_regex.match(name):
+ get_players()
+ with refresh_cond:
+ refresh_flag = True
+ refresh_cond.notify()
+
+
+def set_active_player(player_id):
+ global bus
+ global active_player
+
+ if player_id in player_id_to_index:
+ active_player = player_id
+ elif len(player_id_to_index) != 0:
+ active_player = next(iter(player_id_to_index))
+ else:
+ active_player = ""
+
+ for (name, player_id) in players:
+ bus.unlisten_propchanged(
+ path = "/org/mpris/MediaPlayer2",
+ interface = name,
+ func = playing_song_changed,
+ fallback = True
+ )
+
+ if active_player != "":
+ bus.listen_propchanged(
+ path = "/org/mpris/MediaPlayer2",
+ interface = active_player,
+ func = playing_song_changed,
+ fallback = True
+ )
+
+ player_path = bus[active_player]["/org/mpris/MediaPlayer2"]
+ player_props = player_path.get_interface("org.freedesktop.DBus.Properties")
+
+ write_track(track_string(player_props.Get("org.mpris.MediaPlayer2.Player", "Metadata")[0][1]))
+ else:
+ write_track("")
+
+
+def get_players():
+ global players
+ global player_id_to_index
+
+ players = []
+ player_id_to_index = {}
+ bus_proxy = bus["org.freedesktop.DBus"]["/org/freedesktop/DBus"].get_interface("org.freedesktop.DBus")
+ names = bus_proxy.ListNames()
+
+ for name in names[0]:
+ if name_regex.match(name):
+ split_name = name.split(".")
+ id_start_index = len(split_name[0]) + len(split_name[1]) + len(split_name[2]) + 3
+
+ player_path = bus[name]["/org/mpris/MediaPlayer2"]
+ player_proxy = player_path.get_interface("org.mpris.MediaPlayer2")
+ player_id = name[id_start_index:]
+ try:
+ player_id = player_proxy.Identity
+ except AttributeError:
+ pass
+
+ players.append((name, player_id))
+ player_id_to_index[name] = len(players) - 1
+
+ set_active_player(active_player)
+
+
+def draw_menu():
+ global term
+ global players
+ global refresh_cond
+ global refresh_flag
+ global exit_flag
+ global current_output
+ global filename
+
+ while not exit_flag:
+ with refresh_cond:
+ while not refresh_flag and not exit_flag:
+ refresh_cond.wait()
+
+ refresh_flag = False
+
+ with term.fullscreen():
+ print(term.move(0, 0) + term.bold_bright_white_on_bright_black(("{0:<{width}}").format("MPRIS To Text", width=term.width)) + "\n")
+ print(term.move_x(2) + term.bold("Player: ") + term.move_up())
+
+ for i in range(len(players)):
+ player = players[i]
+ output = "%d: %s" % (i, player[1])
+
+ if players[player_id_to_index[active_player]][0] == player[0]:
+ print(term.move_x(10) + term.standout(output))
+ else:
+ print(term.move_x(10) + output)
+
+ print(term.move_x(2) + term.bold("File: ") + filename)
+ print(term.move_x(2) + term.bold("Output: ") + "\n".join(term.wrap(current_output, width=term.width - 10, subsequent_indent=" " * 10)))
+
+ print(term.move_x(0) + "\nEnter number to select player or q to exit." + term.move_up())
+
+ with term.fullscreen():
+ print(term.move(0, 0) + "Exiting...")
+
+
+def on_resize(*args):
+ global refresh_cond
+ global refresh_flag
+
+ with refresh_cond:
+ refresh_flag = True
+ refresh_cond.notify()
+
+
+def init_dbus():
+ global bus
+ global loop
+
+ bus = ravel.session_bus()
+ bus.attach_asyncio(loop)
+ bus.listen_signal(
+ path = "/org/freedesktop/DBus",
+ interface = "org.freedesktop.DBus",
+ name = "NameOwnerChanged",
+ func = dbus_name_owner_changed,
+ fallback = True
+ )
+
+ get_players()
+
+
+def init_blessed():
+ global bus
+ global term
+ global refresh_cond
+ global refresh_flag
+ global exit_flag
+
+ with term.cbreak():
+ val = None
+
+ while val not in (u'q', u'Q',):
+ val = term.inkey(timeout=5)
+
+ if not val or val.is_sequence or not val.isnumeric():
+ continue
+
+ if int(val) < len(players):
+ set_active_player(players[int(val)][0])
+ with refresh_cond:
+ refresh_flag = True
+ refresh_cond.notify()
+
+ with refresh_cond:
+ exit_flag = True
+ refresh_cond.notify()
+
+ exit_task.set_result(True)
+
+
+def read_args():
+ global filename
+ global meta_format
+ global meta_format_artist
+ global meta_format_title
+ global meta_format_album
+
+ parser = argparse.ArgumentParser(description="Write metadata from MPRIS-compliant media players into a text file.")
+ parser.add_argument("--file",
+ type = str,
+ dest = "filename",
+ default = "/tmp/mpris_info.txt",
+ help = "Full path to file (default: \"/tmp/mpris_info.txt\")"
+ )
+ parser.add_argument("--format-artist",
+ type = str,
+ dest = "format_artist",
+ default = "{} ",
+ help = "Format string for the artist part (default: \"{} \")"
+ )
+ parser.add_argument("--format-title",
+ type = str,
+ dest = "format_title",
+ default = "\"{}\"",
+ help = "Format string for the title part (default: \"\"{}\"\")"
+ )
+ parser.add_argument("--format-album",
+ type = str,
+ dest = "format_album",
+ default = " from \"{}\"",
+ help = "Format string for the album part (default: \" from \"{}\"\")"
+ )
+ parser.add_argument("--format",
+ type = str,
+ dest = "format",
+ default = "{artist}{title}{album} ",
+ help = "Full format string (default: \"{artist}{title}{album} \")"
+ )
+
+ args = parser.parse_args()
+ filename = args.filename
+ meta_format = args.format
+ meta_format_artist = args.format_artist
+ meta_format_title = args.format_title
+ meta_format_album = args.format_album
+
+
+
+read_args()
+
+signal.signal(signal.SIGWINCH, on_resize)
+
+init_dbus()
+
+blessed_thread = threading.Thread(target=init_blessed)
+blessed_thread.start()
+
+menu_thread = threading.Thread(target=draw_menu)
+menu_thread.start()
+
+loop.run_until_complete(exit_task)
diff --git a/music_update.py b/music_update.py
deleted file mode 100755
index d9f14c3..0000000
--- a/music_update.py
+++ /dev/null
@@ -1,302 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import asyncio
-import re
-import threading
-import argparse
-import signal
-
-from blessed import Terminal
-
-import dbussy as dbus
-import ravel
-
-
-loop = asyncio.get_event_loop()
-name_regex = re.compile("^org\.mpris\.MediaPlayer2\.")
-
-bus = None
-term = Terminal()
-refresh_cond = threading.Condition()
-refresh_flag = True
-exit_flag = False
-exit_task = asyncio.Future()
-
-players = []
-player_id_to_index = {}
-active_player = ""
-current_output = ""
-
-filename = ""
-meta_format = ""
-meta_format_artist = ""
-meta_format_title = ""
-meta_format_album = ""
-
-
-def track_string(metadata):
- artist = metadata["xesam:artist"][1][0] if "xesam:artist" in metadata else ""
- title = metadata["xesam:title"][1] if "xesam:title" in metadata else ""
- album = metadata["xesam:album"][1] if "xesam:album" in metadata else ""
-
- return meta_format.format(
- artist = meta_format_artist.format(artist) if artist != "" else "",
- title = meta_format_title.format(title) if title != "" else "",
- album = meta_format_album.format(album) if title != "" else ""
- )
-
-
-def write_track(track):
- global filename
- global current_output
-
- current_output = track
- f = open(filename, "w")
- f.write(track)
- f.close()
-
-
-@ravel.signal(name = "PropertiesChanged", in_signature = "sa{sv}as", args_keyword = "args")
-def playing_song_changed(args):
- global refresh_cond
- global refresh_flag
-
- [ player, changed_properties, invalidated_properties ] = args
- if "Metadata" in changed_properties:
- write_track(track_string(changed_properties["Metadata"][1]))
- with refresh_cond:
- refresh_flag = True
- refresh_cond.notify()
-
-
-@ravel.signal(name = "NameOwnerChanged", in_signature = "sss", args_keyword = "args")
-def dbus_name_owner_changed(args):
- global refresh_cond
- global refresh_flag
-
- [ name, old_owner, new_owner ] = args
- if name_regex.match(name):
- get_players()
- with refresh_cond:
- refresh_flag = True
- refresh_cond.notify()
-
-
-def set_active_player(player_id):
- global bus
- global active_player
-
- if player_id in player_id_to_index:
- active_player = player_id
- elif len(player_id_to_index) != 0:
- active_player = next(iter(player_id_to_index))
- else:
- active_player = ""
-
- for (name, player_id) in players:
- bus.unlisten_propchanged(
- path = "/org/mpris/MediaPlayer2",
- interface = name,
- func = playing_song_changed,
- fallback = True
- )
-
- if active_player != "":
- bus.listen_propchanged(
- path = "/org/mpris/MediaPlayer2",
- interface = active_player,
- func = playing_song_changed,
- fallback = True
- )
-
- player_path = bus[active_player]["/org/mpris/MediaPlayer2"]
- player_props = player_path.get_interface("org.freedesktop.DBus.Properties")
-
- write_track(track_string(player_props.Get("org.mpris.MediaPlayer2.Player", "Metadata")[0][1]))
- else:
- write_track("")
-
-
-def get_players():
- global players
- global player_id_to_index
-
- players = []
- player_id_to_index = {}
- bus_proxy = bus["org.freedesktop.DBus"]["/org/freedesktop/DBus"].get_interface("org.freedesktop.DBus")
- names = bus_proxy.ListNames()
-
- for name in names[0]:
- if name_regex.match(name):
- split_name = name.split(".")
- id_start_index = len(split_name[0]) + len(split_name[1]) + len(split_name[2]) + 3
-
- player_path = bus[name]["/org/mpris/MediaPlayer2"]
- player_proxy = player_path.get_interface("org.mpris.MediaPlayer2")
- player_id = name[id_start_index:]
- try:
- player_id = player_proxy.Identity
- except AttributeError:
- pass
-
- players.append((name, player_id))
- player_id_to_index[name] = len(players) - 1
-
- set_active_player(active_player)
-
-
-def draw_menu():
- global term
- global players
- global refresh_cond
- global refresh_flag
- global exit_flag
- global current_output
- global filename
-
- while not exit_flag:
- with refresh_cond:
- while not refresh_flag and not exit_flag:
- refresh_cond.wait()
-
- refresh_flag = False
-
- with term.fullscreen():
- print(term.move(0, 0) + term.bold_bright_white_on_bright_black(("{0:<{width}}").format("MPRIS To Text", width=term.width)) + "\n")
- print(term.move_x(2) + term.bold("Player: ") + term.move_up())
-
- for i in range(len(players)):
- player = players[i]
- output = "%d: %s" % (i, player[1])
-
- if players[player_id_to_index[active_player]][0] == player[0]:
- print(term.move_x(10) + term.standout(output))
- else:
- print(term.move_x(10) + output)
-
- print(term.move_x(2) + term.bold("File: ") + filename)
- print(term.move_x(2) + term.bold("Output: ") + "\n".join(term.wrap(current_output, width=term.width - 10, subsequent_indent=" " * 10)))
-
- print(term.move_x(0) + "\nEnter number to select player or q to exit." + term.move_up())
-
- with term.fullscreen():
- print(term.move(0, 0) + "Exiting...")
-
-
-def on_resize(*args):
- global refresh_cond
- global refresh_flag
-
- with refresh_cond:
- refresh_flag = True
- refresh_cond.notify()
-
-
-def init_dbus():
- global bus
- global loop
-
- bus = ravel.session_bus()
- bus.attach_asyncio(loop)
- bus.listen_signal(
- path = "/org/freedesktop/DBus",
- interface = "org.freedesktop.DBus",
- name = "NameOwnerChanged",
- func = dbus_name_owner_changed,
- fallback = True
- )
-
- get_players()
-
-
-def init_blessed():
- global bus
- global term
- global refresh_cond
- global refresh_flag
- global exit_flag
-
- with term.cbreak():
- val = None
-
- while val not in (u'q', u'Q',):
- val = term.inkey(timeout=5)
-
- if not val or val.is_sequence or not val.isnumeric():
- continue
-
- if int(val) < len(players):
- set_active_player(players[int(val)][0])
- with refresh_cond:
- refresh_flag = True
- refresh_cond.notify()
-
- with refresh_cond:
- exit_flag = True
- refresh_cond.notify()
-
- exit_task.set_result(True)
-
-
-def read_args():
- global filename
- global meta_format
- global meta_format_artist
- global meta_format_title
- global meta_format_album
-
- parser = argparse.ArgumentParser(description="Write metadata from MPRIS-compliant media players into a text file.")
- parser.add_argument("--file",
- type = str,
- dest = "filename",
- default = "/tmp/mpris_info.txt",
- help = "Full path to file (default: \"/tmp/mpris_info.txt\")"
- )
- parser.add_argument("--format-order",
- type = str,
- dest = "format",
- default = "{artist}{title}{album} ",
- help = "Format string (default: \"{artist}{title}{album} \")"
- )
- parser.add_argument("--format-artist",
- type = str,
- dest = "format_artist",
- default = "{} ",
- help = "Format string for the artist part (default: \"{} \")"
- )
- parser.add_argument("--format-title",
- type = str,
- dest = "format_title",
- default = "\"{}\"",
- help = "Format string for the title part (default: \"\"{}\"\")"
- )
- parser.add_argument("--format-album",
- type = str,
- dest = "format_album",
- default = " from \"{}\"",
- help = "Format string for the album part (default: \" from \"{}\"\")"
- )
-
- args = parser.parse_args()
- filename = args.filename
- meta_format = args.format
- meta_format_artist = args.format_artist
- meta_format_title = args.format_title
- meta_format_album = args.format_album
-
-
-
-read_args()
-
-signal.signal(signal.SIGWINCH, on_resize)
-
-init_dbus()
-
-blessed_thread = threading.Thread(target=init_blessed)
-blessed_thread.start()
-
-menu_thread = threading.Thread(target=draw_menu)
-menu_thread.start()
-
-loop.run_until_complete(exit_task)
--
cgit v1.2.3-70-g09d2