Author: duncan
Date: Thu Feb 1 18:45:20 2007
New Revision: 9123
Modified:
branches/rel-1/freevo/src/audio/plugins/xmradio.py
Log:
[ 1649278 ] xmradio plugins inconsistent behavior
Patch from Justin Wetherell applied
Modified: branches/rel-1/freevo/src/audio/plugins/xmradio.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/xmradio.py (original)
+++ branches/rel-1/freevo/src/audio/plugins/xmradio.py Thu Feb 1 18:45:20 2007
@@ -106,7 +106,9 @@
string="rm -f /tmp/xmonline.cookies"
os.system(string)
- string=('curl -s -c /tmp/xmonline.cookies -d "user_id=%s" -d
"pword=%s" "http://xmro.xmradio.com/xstream/login_servlet.jsp"; >
/tmp/xmonlinelogin.out'%(config.XM_USER,config.XM_PASS))
+ string=('curl -s -c /tmp/xmonline.cookies -d "user_id=%s" -d "pword=%s
"'+ \
+ '"http://xmro.xmradio.com/xstream/login_servlet.jsp"; >
/tmp/xmonlinelogin.out' % \
+ (config.XM_USER, config.XM_PASS))
os.system(string)
station_items = []
@@ -114,7 +116,11 @@
string="rm -f /tmp/xmonlinechannel.out"
os.system(string)
- string=('curl -s -b /tmp/xmonline.cookies -d ""
"http://player.xmradio.com/player/2ft/playMedia.jsp?ch=%s&speed=%s"; >
/tmp/xmonlinestream.out'%(rstation[1],config.XM_RATE))
+ string=('curl -s \
+ -b /tmp/xmonline.cookies \
+ -d "" \
+
"http://player.xmradio.com/player/2ft/playMedia.jsp?ch=%s&speed=%s"; \
+ >
/tmp/xmonlinestream.out'%(rstation[1],config.XM_RATE))
os.system(string)
string='egrep "<PARAM NAME=.FileName. VALUE="
/tmp/xmonlinestream.out > /tmp/xmurl.out'
@@ -130,8 +136,8 @@
text = file.readlines()
file.close()
for line in text:
+ line=line.replace('"','')
radio_item = XmRadioItem(line,self,str(rstation[0]))
- config.CONF.fbxine = '/usr/local/bin/xine'
station_items += [ radio_item ]
if (len(station_items) == 0):
station_items += [menu.MenuItem( _( 'No Xm Radio Stations found' ),
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
