From bc1683beb596cf9d0736c2a1d2c9359c8cb8efa1 Mon Sep 17 00:00:00 2001 From: enkore Date: Fri, 1 Aug 2014 00:03:02 +0200 Subject: [PATCH] Update readme #93 --- README.rst | 11 ++++++----- README.tpl.rst | 2 +- i3pystatus/mpd.py | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 7dc57cb..6e1e058 100644 --- a/README.rst +++ b/README.rst @@ -93,7 +93,7 @@ next * `mpd`_: add color setting * Add `reddit`_ module * `network`_: fixed some issues with interface up/down detection - +* `mpd`_: add filename formatter 3.29 ++++ @@ -422,9 +422,9 @@ Settings: :alert_format_title: The title of the notification, all formatters can be used (default: ``Low battery``) :alert_format_body: The body text of the notification, all formatters can be used (default: ``Battery {battery_ident} has only {percentage:.2f}% ({remaining:%E%hh:%Mm}) remaining!``) :path: Override the default-generated path (default: ``None``) -:status: A dictionary mapping ('DIS', 'CHR', 'FULL') to alternative names (default: ``{'DIS': 'DIS', 'CHR': 'CHR', 'FULL': 'FULL'}``) +:status: A dictionary mapping ('DIS', 'CHR', 'FULL') to alternative names (default: ``{'FULL': 'FULL', 'CHR': 'CHR', 'DIS': 'DIS'}``) :color: The text color (default: ``#ffffff``) -:full_color: The full color (default: ``#11aa11``) +:full_color: The full color (default: ``#00ff00``) :charging_color: The charging color (default: ``#00ff00``) :critical_color: The critical color (default: ``#ff0000``) :not_present_color: The not present color. (default: ``#ffffff``) @@ -470,7 +470,7 @@ Settings: :leftclick: URL to visit or command to run on left click (default: ``electrum``) :rightclick: URL to visit or command to run on right click (default: ``https://bitcoinaverage.com/``) :interval: Update interval. (default: ``600``) -:status: (default: ``{'price_up': '▲', 'price_down': '▼'}``) +:status: (default: ``{'price_down': '▼', 'price_up': '▲'}``) @@ -786,6 +786,7 @@ Available formatters (uses `formatp`_) * `{title}` — (the title of the current song) * `{album}` — (the album of the current song, can be an empty string (e.g. for online streams)) * `{artist}` — (can be empty, too) +* `{filename}` — (file name with out extension and path; empty unless title is empty) * `{song_elapsed}` — (Position in the currently playing song, uses `TimeWrapper`_, default is `%m:%S`) * `{song_length}` — (Length of the current song, same as song_elapsed) * `{pos}` — (Position of current song in playlist, one-based) @@ -802,7 +803,7 @@ Settings: :host: (default: ``localhost``) :port: MPD port (default: ``6600``) :format: formatp string (default: ``{title} {status}``) -:status: Dictionary mapping pause, play and stop to output (default: ``{'pause': '▷', 'play': '▶', 'stop': '◾'}``) +:status: Dictionary mapping pause, play and stop to output (default: ``{'play': '▶', 'pause': '▷', 'stop': '◾'}``) :color: The color of the text (default: ``#FFFFFF``) :interval: (default: ``1``) diff --git a/README.tpl.rst b/README.tpl.rst index d1917e6..a131747 100644 --- a/README.tpl.rst +++ b/README.tpl.rst @@ -93,7 +93,7 @@ next * `mpd`_: add color setting * Add `reddit`_ module * `network`_: fixed some issues with interface up/down detection - +* `mpd`_: add filename formatter 3.29 ++++ diff --git a/i3pystatus/mpd.py b/i3pystatus/mpd.py index 83e7d4c..9e60aef 100644 --- a/i3pystatus/mpd.py +++ b/i3pystatus/mpd.py @@ -14,7 +14,7 @@ class MPD(IntervalModule): * `{title}` — (the title of the current song) * `{album}` — (the album of the current song, can be an empty string (e.g. for online streams)) * `{artist}` — (can be empty, too) - * `{filename}` — (empty unless title is empty) + * `{filename}` — (file name with out extension and path; empty unless title is empty) * `{song_elapsed}` — (Position in the currently playing song, uses `TimeWrapper`_, default is `%m:%S`) * `{song_length}` — (Length of the current song, same as song_elapsed) * `{pos}` — (Position of current song in playlist, one-based)