updated stream urls

lib/rfk/install.py

@@ -34,8 +34,7 @@ def setup_permissions():
 
 
 def setup_default_user(username, password):
-    users = []
-    users.append(User.add_user(username, password))
+    users = [User.add_user(username, password)]
     for user in users:
         rfk.database.session.add(user)
         user.add_permission(code='manage-liquidsoap')

lib/rfk/site/listen.py

@@ -13,25 +13,26 @@ def html5_player():
     return render_template('html5player.html')
 
 
-@listen.route('/<stream>')
+@listen.route('/<string:stream>.m3u')
 def playlist(stream):
     """Return a m3u playlist pointing to our load balancer"""
 
     stream = Stream.query.filter(Stream.code == stream).first()
     if stream is None:
         return make_response('I\'m sorry ;_; (Invalid stream)', 404)
+
     m3u = "#EXTM3U\r\n"
-    m3u += "#EXTINF:0, Radio freies Krautchan %s\r\n" % stream.name
-    m3u += "http://%s/listen/stream/%s\r\n" % (rfk.CONFIG.get('site', 'url'), stream.stream)
+    m3u += "#EXTINF:-1,Radio freies Krautchan %s\r\n" % stream.name
+    m3u += "http://%s/listen/%s\r\n" % (rfk.CONFIG.get('site', 'url'), stream.code)
     return make_response(m3u, 200, {'Content-Type': 'application/x-mpegurl',
                                     'Content-Disposition': 'attachment; filename="%s.m3u"' % stream.mount[1:]})
 
 
-@listen.route('/stream/<stream>')
+@listen.route('/<string:stream>')
 def stream(stream):
     """Redirect listener to relay with least traffic usage"""
 
-    stream = Stream.query.get(int(stream))
+    stream = Stream.query.filter(Stream.code == stream).first()
     if stream is None:
         return make_response('I\'m sorry ;_; (Invalid stream)', 404)
 

lib/rfk/templates/index.html

@@ -13,9 +13,9 @@ <h1 style="padding:0 10px;"><i class="fa fa-music"></i> ON AIR</h1>
                     {% for stream in streams %}
                     <li>
                         {% if stream.get_status() %}
-                        <a href="/listen/{{ stream.code }}"><i class="fa fa-play-circle"></i> {% trans %}Listen{% endtrans %} ({{ stream.name }})</a>
+                        <a href="/listen/{{ stream.code }}.m3u"><i class="fa fa-play-circle"></i> {% trans %}Listen{% endtrans %} ({{ stream.name }})</a>
                         {% else %}
-                        <a href="/listen/{{ stream.code }}"><i class="fa fa-frown"></i> {% trans %}Offline{% endtrans %} ({{ stream.name }})</a>
+                        <a href="/listen/{{ stream.code }}.m3u"><i class="fa fa-frown"></i> {% trans %}Offline{% endtrans %} ({{ stream.name }})</a>
                         {% endif %}
                     </li>
                     {% else %}