Bugfix + conf & argparse

conf-sample.ini

@@ -0,0 +1,5 @@
+[conf]
+host=127.0.0.1:8000
+mount=/fip.mp3
+login=admin
+password=hackme

fip_current.py

@@ -1,9 +1,36 @@
 #!/usr/bin/python3
 
+import os.path, sys
 import requests
+import argparse
+import configparser
 
 api_url = 'http://www.fipradio.fr/livemeta/7'
 
+def main():
+    parser = argparse.ArgumentParser(description="Fetch FIP radio stream metadata")
+    parser.add_argument(    '-u', '--icecast-update',
+                            dest = 'update',
+                            action = 'store_const',
+                            const = True,
+                            default = False,
+                            help = "To update an icecast instance")
+    parser.add_argument(    '-c', '--config',
+                            dest = 'conf',
+                            type=str,
+                            default='conf.ini')
+    args = parser.parse_args()
+    if args.update:
+        conf = configparser.ConfigParser()
+        conf.read(args.conf)
+        host = conf.get('conf', 'host', fallback='127.0.0.1:8000')
+        mount = conf.get('conf', 'mount', fallback='/example.ogg')
+        login = conf.get('conf', 'login', fallback='admin')
+        password = conf.get('conf', 'password', fallback='hackme')
+        url_upd = icecast_update(host, mount, login, password)
+    else:
+        print(format_current())
+
 def get_all():
 
     r = requests.get(api_url)
@@ -19,6 +46,10 @@ def get_current():
     position = datas['levels'][0]['position']
     item_id = datas['levels'][0]['items'][position]
     item = datas['steps'][item_id]
+    expt = ['authors','title', 'titreAlbum', 'visual', 'lienYoutube']
+    for k in expt:
+        if k not in item:
+            item[k] = ''
 
     return item
 
@@ -39,25 +70,33 @@ Youtube :\t{youtube}
 
 def icecast_infos():
     item = get_current()
-    infos = """{title} - {author} ({album})"""
-    return infos.format(    title = item['title'].title(),
-                            author = item['authors'].title(),
-                            album = item['titreAlbum'].title())
+    infos = item['title']
+    if len(item['authors']) > 0:
+        infos += ' - '+item['authors']
+    if len(item['titreAlbum']):
+        infos += ' ('+item['titreAlbum']+')'
+    return infos
 
-def icecast_url_update(host, mount, login = None, password = None):
+def icecast_update(host, mount, login = None, password = None):
     infos = icecast_infos()
-    url = "http://{host}/admin/medata?mount={mount}&mode=updinfo&song={infos}"
-    url = url.format(   host = host,
-                        mount = mount,
-                        infos = infos)
+    url = "http://{host}/admin/metadata"#?mount={mount}&mode=updinfo&song={infos}"
+    url = url.format(host = host)
+    params = {  'mount': mount,
+                'mode': 'updinfo',
+                'song': infos}
     auth = None
     if login is not None and password is not None:
         auth = (login, password)
-    res = requests.get(url, auth)
 
-    if r.status_code != 200:
+    try:
+        res = requests.get(url, auth=auth, params = params)
+    except requests.exceptions.ConnectionError:
+        raise RuntimeError("Connection refuse for "+res.url)
+
+    if res.status_code != 200:
         msg = "Got status code %d for %s"
-        msg %= (r.status_code, url)
+        msg %= (res.status_code, res.url)
         raise RuntimeError(msg)
     
-print(icecast_infos())
+if __name__ == '__main__':
+    main()