Cleanup, readme update

2 files changed, 20 insertions, 12 deletions

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/music_update.py b/mpris_to_text.py
index d9f14c3..1284300 100755
--- a/music_update.py
+++ b/mpris_to_text.py
@@ -9,15 +9,14 @@ import signal
 
 from blessed import Terminal
 
-import dbussy as dbus
 import ravel
 
 
-loop       = asyncio.get_event_loop()
-name_regex = re.compile("^org\.mpris\.MediaPlayer2\.")
-
+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
@@ -253,12 +252,6 @@ def read_args():
         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",
@@ -277,6 +270,12 @@ def read_args():
         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