Author: duncan
Date: Wed Jun 6 18:50:36 2007
New Revision: 9661
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/skins/main/skin_utils.py
branches/rel-1/freevo/src/util/vfs.py
branches/rel-1/freevo/src/video/__init__.py
branches/rel-1/freevo/src/video/videoitem.py
Log:
[ 1731825 ] utf8 encode/decode errors
Patch from Valera Koval applied
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Wed Jun 6 18:50:36 2007
@@ -29,6 +29,7 @@
* Fixed Panorama skin thumbnail (B#1731877)
* Fixed recordings manager not deleting old video when the disk is full
(B#1728182)
* Fixed tv recordings manager not deleting files when out of space (B#1728182)
+ * Fixed unicoding errors for media ids when there are Unicode (F#1731825)
== Release 1.7.2 (2007-05-26) ==
--------------------------------
Modified: branches/rel-1/freevo/src/skins/main/skin_utils.py
==============================================================================
--- branches/rel-1/freevo/src/skins/main/skin_utils.py (original)
+++ branches/rel-1/freevo/src/skins/main/skin_utils.py Wed Jun 6 18:50:36 2007
@@ -65,7 +65,12 @@
type = item.type
- cname = '%s-%s-%s-%s-%s-%s-%s' % (settings.icon_dir, item.image, type,
+ if isinstance(item.image, str):
+ item_image=Unicode(item.image)
+ else:
+ item_image=item.image
+
+ cname = '%s-%s-%s-%s-%s-%s-%s' % (settings.icon_dir, item_image, type,
item.type, width, height, force)
if hasattr(item, 'rotation') and item['rotation']:
Modified: branches/rel-1/freevo/src/util/vfs.py
==============================================================================
--- branches/rel-1/freevo/src/util/vfs.py (original)
+++ branches/rel-1/freevo/src/util/vfs.py Wed Jun 6 18:50:36 2007
@@ -72,7 +72,7 @@
for media in config.REMOVABLE_MEDIA:
if directory.startswith(media.mountdir):
directory = directory[len(media.mountdir):]
- return '%s/disc/%s%s' % (config.OVERLAY_DIR, media.id, directory)
+ return '%s/disc/%s%s' % (config.OVERLAY_DIR, String(media.id),
directory)
return config.OVERLAY_DIR + directory
Modified: branches/rel-1/freevo/src/video/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/video/__init__.py (original)
+++ branches/rel-1/freevo/src/video/__init__.py Wed Jun 6 18:50:36 2007
@@ -136,7 +136,7 @@
pos += file[pos:].find('1') + 1
if parent.media:
- file_id = parent.media.id + \
+ file_id = String(parent.media.id) + \
file[len(os.path.join(parent.media.mountdir,"")):]
try:
x.mplayer_options = discset_information[file_id]
Modified: branches/rel-1/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1/freevo/src/video/videoitem.py (original)
+++ branches/rel-1/freevo/src/video/videoitem.py Wed Jun 6 18:50:36 2007
@@ -128,7 +128,7 @@
# extra infos in discset_information
if parent and parent.media:
- fid = parent.media.id + \
+ fid = String(parent.media.id) + \
self.filename[len(os.path.join(parent.media.mountdir,'')):]
from video import discset_information
if discset_information.has_key(fid):
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
