Author: duncan
Date: Sun Feb 4 21:56:37 2007
New Revision: 9165
Modified:
branches/rel-1/freevo/src/www/htdocs/fileinfo.rpy
Log:
Fixed two Unicode errors with the pop up window.
First, it crashed passing the filename to the box, required a urllib.quote
Second, the title, artist, and album needed converting to Unicode
Modified: branches/rel-1/freevo/src/www/htdocs/fileinfo.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/fileinfo.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/fileinfo.rpy Sun Feb 4 21:56:37 2007
@@ -74,16 +74,16 @@
title = item
else:
media_info = util.mediainfo.get(file)
- title = media_info['title']
+ title = Unicode(media_info['title'])
if not title:
title = item
#audio info
if media_info['artist']:
- info+='<tr><td><b>Artist:
</b></td><td>'+media_info['artist']+'</td></tr>'
+ info+='<tr><td><b>Artist:
</b></td><td>'+Unicode(media_info['artist'])+'</td></tr>'
if media_info['album']:
- info+='<tr><td><b>Album:
</b></td><td>'+media_info['album']+'</td></tr>'
+ info+='<tr><td><b>Album:
</b></td><td>'+Unicode(media_info['album'])+'</td></tr>'
if media_info['genre']:
- info+='<tr><td><b>Genre:
</b></td><td>'+media_info['genre']+'</td></tr>'
+ info+='<tr><td><b>Genre:
</b></td><td>'+Unicode(media_info['genre'])+'</td></tr>'
if media_info['length']:
length = str(int(media_info['length']) / 60) + " min."
info+='<tr><td><b>Length:
</b></td><td>'+length+'</td></tr>'
@@ -98,6 +98,7 @@
info+= "</table>"
file_link = self.convert_dir(file)
+ print 'DJW:file_link=%r' % (urllib.quote(file_link)),
fv.res += (
u"<script>\n" \
@@ -111,7 +112,7 @@
u"</script>\n"
) % ( Unicode(title.replace("'", "\\'")),
Unicode(info.replace("'", "\\'")),
- "function() { window.open(\"%s\"); }" % (file_link),
+ "function() { window.open(\"%s\"); }" %
(urllib.quote(file_link)),
'\
function() { \
vlc_window = window.open(""); \
-------------------------------------------------------------------------
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
