Changeset 34402 for ipk/source.sh4/network_xupnpd/_path_/etc/xupnpd/ui

Timestamp:

May 30, 2015, 5:44:59 PM (11 years ago)

Author:

Stephan

Message:

new xupnpd version 1.033

Location:

ipk/source.sh4/network_xupnpd/_path_/etc/xupnpd/ui

Files:

• api.txt (modified) (1 diff)
• ui_config.html (modified) (2 diffs)
• ui_main.html (modified) (1 diff)
• ui_template.html (modified) (1 diff)
• xupnpd_ui.lua (modified) (4 diffs)

ipk/source.sh4/network_xupnpd/_path_/etc/xupnpd/ui/api.txt

@@ -48 +48 @@
 
 wget -q -O - 'http://127.0.0.1:4044/ui/api?action=playlist&id=12'
-1;http://i.ytimg.com/vi/KQ6zr6kCPj8/1.jpg;LMFAO - Party Rock Anthem ft. Lauren Bennett, GoonRock
-2;http://i.ytimg.com/vi/kffacxfA7G4/1.jpg;Justin Bieber - Baby ft. Ludacris
-3;http://i.ytimg.com/vi/j5-yKhDd64s/1.jpg;Eminem - Not Afraid
-4;http://i.ytimg.com/vi/uelHwf8o7_U/1.jpg;Eminem - Love The Way You Lie ft. Rihanna
-5;http://i.ytimg.com/vi/fLexgOxsZu0/1.jpg;Bruno Mars - The Lazy Song [Official Video]
-6;http://i.ytimg.com/vi/rYEDA3JcQqw/1.jpg;Adele - Rolling In The Deep
-7;http://i.ytimg.com/vi/t4H_Zoh7G5A/1.jpg;Jennifer Lopez - On The Floor ft. Pitbull
+1;http://i.ytimg.com/vi/KQ6zr6kCPj8/1.jpg;LMFAO - Party Rock Anthem ft. Lauren Bennett, GoonRock;http://127.0.0.1:4044/proxy/0_1_1_1.mp4
+2;http://i.ytimg.com/vi/kffacxfA7G4/1.jpg;Justin Bieber - Baby ft. Ludacris;http://127.0.0.1:4044/proxy/0_1_1_2.mp4
+3;http://i.ytimg.com/vi/j5-yKhDd64s/1.jpg;Eminem - Not Afraid;http://127.0.0.1:4044/proxy/0_1_1_3.mp4
+4;http://i.ytimg.com/vi/uelHwf8o7_U/1.jpg;Eminem - Love The Way You Lie ft. Rihanna;http://127.0.0.1:4044/proxy/0_1_1_4.mp4
+5;http://i.ytimg.com/vi/fLexgOxsZu0/1.jpg;Bruno Mars - The Lazy Song [Official Video];http://127.0.0.1:4044/proxy/0_1_1_5.mp4
+6;http://i.ytimg.com/vi/rYEDA3JcQqw/1.jpg;Adele - Rolling In The Deep;http://127.0.0.1:4044/proxy/0_1_1_6.mp4
+7;http://i.ytimg.com/vi/t4H_Zoh7G5A/1.jpg;Jennifer Lopez - On The Floor ft. Pitbull;http://127.0.0.1:4044/proxy/0_1_1_7.mp4

ipk/source.sh4/network_xupnpd/_path_/etc/xupnpd/ui/ui_config.html

@@ -64 +64 @@
 
 <div class="controls controls-row">
+<div class="span4">Vimeo quality:</div>
+<select class="span4" name=vimeo_fmt id=vimeo_fmt>
+<option value="sd">Low</option>
+<option selected value="hd">High</option>
+</select>
+</div>
+
+<div class="controls controls-row">
 <div class="span4">Vimeo maximum videos:</div><input type=text class="span4" name=vimeo_video_count id=vimeo_video_count>
 </div>
@@ -157 +165 @@
 
 <div class="controls controls-row">
+<div class="span4">DLNA Subscribe TTL:</div><input class="span4" type=text name=dlna_subscribe_ttl id=dlna_subscribe_ttl>
+</div>
+
+<div class="controls controls-row">
 <div class="span4">Groups:</div>
 <select class="span4" name=group id=group>

ipk/source.sh4/network_xupnpd/_path_/etc/xupnpd/ui/ui_main.html

@@ -13 +13 @@
 <a class='btn btn-primary' href='/ui/downloads'>Downloads</a>
 <a class='btn btn-primary' href='/ui/config'>Config</a>
-<a class='btn btn-primary' href='/ui/status'">Status</a><br/>
+<a class='btn btn-primary' href='/ui/status'">Status</a>
+<a class='btn btn-primary' href='/app'">HTML5</a><br/>

ipk/source.sh4/network_xupnpd/_path_/etc/xupnpd/ui/ui_template.html

@@ -16 +16 @@
 <hr/>
 <p style='font-size: 8pt' align=left>
-Copyright (C) 2011-2012 Anton Burdinuk &lt;<a href='mailto:clark15b@gmail.com'>clark15b@gmail.com</a>&gt;<br/>
+Copyright (C) 2011-2015 Anton Burdinuk &lt;<a href='mailto:clark15b@gmail.com'>clark15b@gmail.com</a>&gt;<br/>
 License: <a href='http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt'>GPL-2.0</a><br/>
 www: <a href='http://xupnpd.org'>http://xupnpd.org</a><br/>

ipk/source.sh4/network_xupnpd/_path_/etc/xupnpd/ui/xupnpd_ui.lua

@@ -18 +18 @@
     http.send('<h3>Downloads</h3>')
     http.send('<br/><table class="table">')
-    for i,j in ipairs(playlist_data.elements[1].elements) do
-        http.send(string.format('<tr><td><a href="/ui/%s.m3u">%s</a></td></tr>',j.name,j.name))
+    if playlist_data.elements[1] then
+        for i,j in ipairs(playlist_data.elements[1].elements) do
+            http.send(string.format('<tr><td><a href="/ui/%s.m3u">%s</a></td></tr>',j.name,j.name))
+        end
     end
     http.send('</table>')
@@ -51 +53 @@
     http.send('#EXTM3U\n')
     for i,j in ipairs(pls.elements) do
-        local url=j.url or ''
-        if j.path then
-            url=string.format('%s/stream/%s.%s',www_location,j.objid,j.type)
-        else
-            if cfg.proxy>0 then
-                if cfg.proxy>1 or pls.mime[1]==2 then
-                    url=string.format('%s/proxy/%s.%s',www_location,j.objid,j.type)
-                end
-            end
-        end
-        http.send('#EXTINF:0,'..j.name..'\n'..url..'\n')
+        http.send('#EXTINF:0,'..j.name..'\n'..playlist_get_url(j)..'\n')
     end
 end
@@ -531 +523 @@
         if pls then
             for i,j in ipairs(pls.elements) do
-                http.send(string.format('%s;%s;%s\r\n',i,j.logo or '',j.name))
+                http.send(string.format('%s;%s;%s;%s\r\n',i,j.logo or '',j.name,playlist_get_url(j)))
             end
         end
@@ -631 +623 @@
     { "input",  "http_timeout", "int" },
     { "select", "dlna_notify", "bool"},
+    { "input",  "dlna_subscribe_ttl", "int"},
     { "select", "group", "bool" },
     { "select", "sort_files", "bool" },