Author: duncan
Date: Fri Feb  1 14:51:01 2008
New Revision: 10320

Log:
[ 1872465 ] m3u parsing error
Some final adjustments to the fix


Modified:
   branches/rel-1-7/freevo/ChangeLog
   branches/rel-1-7/freevo/src/playlist.py
   branches/rel-1/freevo/ChangeLog
   branches/rel-1/freevo/src/playlist.py

Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog   (original)
+++ branches/rel-1-7/freevo/ChangeLog   Fri Feb  1 14:51:01 2008
@@ -39,7 +39,7 @@
  * Deleted plug-in weather, moved to contrib/plugins (F#1863476)
  * Fixed apple trailers plug-in crashing (B#1861463)
  * Fixed audio play lists when the fxd file contains utf-8 characters 
(B#1865272)
- * Fixed audio play lists when the fxd file contains absolute paths and urls 
(B#1872465)
+ * Fixed audio play lists when the m3u file contains blank lines, absolute 
paths and urls (B#1872465)
  * Fixed audio cdbackup not showing the alert message when there is no data 
from freedb (B#1869928)
  * Fixed manual record tv plug-in to work in December (B#1858008)
  * Fixed oneclick weather plug-in to allow non-ascii location names (B#1856597)

Modified: branches/rel-1-7/freevo/src/playlist.py
==============================================================================
--- branches/rel-1-7/freevo/src/playlist.py     (original)
+++ branches/rel-1-7/freevo/src/playlist.py     Fri Feb  1 14:51:01 2008
@@ -101,7 +101,7 @@
 
         try:
             playlist_lines_dos = map(lambda l: l.strip(), lines)
-            playlist_lines     = filter(lambda l: l[0] != '#', 
playlist_lines_dos)
+            playlist_lines = filter(lambda l: len(l) > 0 and l[0] != '#', 
playlist_lines_dos)
         except IndexError:
             print 'Bad m3u playlist file "%s"' % plsname
             return 0

Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog     (original)
+++ branches/rel-1/freevo/ChangeLog     Fri Feb  1 14:51:01 2008
@@ -45,7 +45,7 @@
  * Deleted plug-in weather, moved to contrib/plugins (F#1863476)
  * Fixed apple trailers plug-in crashing (B#1861463)
  * Fixed audio play lists when the fxd file contains utf-8 characters 
(B#1865272)
- * Fixed audio play lists when the fxd file contains absolute paths and urls 
(B#1872465)
+ * Fixed audio play lists when the m3u file contains blank lines, absolute 
paths and urls (B#1872465)
  * Fixed audio cdbackup not showing the alert message when there is no data 
from freedb (B#1869928)
  * Fixed manual record tv plug-in to work in December (B#1858008)
  * Fixed oneclick weather plug-in to allow non-ascii location names (B#1856597)

Modified: branches/rel-1/freevo/src/playlist.py
==============================================================================
--- branches/rel-1/freevo/src/playlist.py       (original)
+++ branches/rel-1/freevo/src/playlist.py       Fri Feb  1 14:51:01 2008
@@ -101,7 +101,7 @@
 
         try:
             playlist_lines_dos = map(lambda l: l.strip(), lines)
-            playlist_lines     = filter(lambda l: l[0] != '#', 
playlist_lines_dos)
+            playlist_lines = filter(lambda l: len(l) > 0 and l[0] != '#', 
playlist_lines_dos)
         except IndexError:
             print 'Bad m3u playlist file "%s"' % plsname
             return 0

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to