Author: duncan
Date: Mon Dec 31 13:41:16 2007
New Revision: 10251

Log:
[ 1861463 ] Patch for appletrailers crash
Patch from John Molohan applied
Moved appletrailers to the core as quite a few people use it


Added:
   branches/rel-1-7/freevo/src/video/plugins/applelib.py
      - copied unchanged from r10241, 
/branches/rel-1-7/freevo/contrib/video/plugins/appletrailers/applelib.py
   branches/rel-1-7/freevo/src/video/plugins/appletrailers.py
      - copied, changed from r10241, 
/branches/rel-1-7/freevo/contrib/video/plugins/appletrailers/appletrailers.py
   branches/rel-1/freevo/src/video/plugins/applelib.py
      - copied unchanged from r10249, 
/branches/rel-1/freevo/contrib/video/plugins/appletrailers/applelib.py
   branches/rel-1/freevo/src/video/plugins/appletrailers.py
      - copied, changed from r10249, 
/branches/rel-1/freevo/contrib/video/plugins/appletrailers/appletrailers.py
Removed:
   branches/rel-1-7/freevo/contrib/video/plugins/appletrailers/applelib.py
   branches/rel-1-7/freevo/contrib/video/plugins/appletrailers/appletrailers.py
   branches/rel-1/freevo/contrib/video/plugins/appletrailers/applelib.py
   branches/rel-1/freevo/contrib/video/plugins/appletrailers/appletrailers.py
Modified:
   branches/rel-1-7/freevo/ChangeLog
   branches/rel-1/freevo/ChangeLog

Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog   (original)
+++ branches/rel-1-7/freevo/ChangeLog   Mon Dec 31 13:41:16 2007
@@ -21,6 +21,7 @@
  * Updated recordings manager plug-in to add thumbnail support (F#1857397)
  * Updated recordserver to default watched/keep status (F#1857395)
  * Updated shut down to allow single key confirmation (F#1857456)
+ * Fixed apple trailers plug-in crashing (B#1861463)
  * 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)
  * Fixed tv guide not scrolling to last channel from second channel (B#1858010)

Copied: branches/rel-1-7/freevo/src/video/plugins/appletrailers.py (from 
r10241, 
/branches/rel-1-7/freevo/contrib/video/plugins/appletrailers/appletrailers.py)
==============================================================================
--- 
/branches/rel-1-7/freevo/contrib/video/plugins/appletrailers/appletrailers.py   
    (original)
+++ branches/rel-1-7/freevo/src/video/plugins/appletrailers.py  Mon Dec 31 
13:41:16 2007
@@ -122,10 +122,12 @@
         self.name = name
         self.type = 'video'
 
+        self.mode = ''
+        self.files = ''
         self.image = _fetch_image(title['image'])
-        self.description = "Genres: " + ",".join(title["genres"])
-        self.description += "\nCategories: " + ",".join(trailer["categories"])
-        self.description += "\nDate: " + trailer["date"]
+        self.description = 'Genres: ' + ','.join(title['genres'])
+        self.description += '\nCategories: ' + ','.join(trailer['categories'])
+        self.description += '\nDate: ' + trailer['date']
 
         self._title = title
         self._trailer = trailer

Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog     (original)
+++ branches/rel-1/freevo/ChangeLog     Mon Dec 31 13:41:16 2007
@@ -24,6 +24,7 @@
  * Updated recordings manager plug-in to add thumbnail support (F#1857397)
  * Updated recordserver to default watched/keep status (F#1857395)
  * Updated shut down to allow single key confirmation (F#1857456)
+ * Fixed apple trailers plug-in crashing (B#1861463)
  * 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)
  * Fixed tv guide not scrolling to last channel from second channel (B#1858010)

Copied: branches/rel-1/freevo/src/video/plugins/appletrailers.py (from r10249, 
/branches/rel-1/freevo/contrib/video/plugins/appletrailers/appletrailers.py)
==============================================================================
--- /branches/rel-1/freevo/contrib/video/plugins/appletrailers/appletrailers.py 
(original)
+++ branches/rel-1/freevo/src/video/plugins/appletrailers.py    Mon Dec 31 
13:41:16 2007
@@ -122,10 +122,12 @@
         self.name = name
         self.type = 'video'
 
+        self.mode = ''
+        self.files = ''
         self.image = _fetch_image(title['image'])
-        self.description = "Genres: " + ",".join(title["genres"])
-        self.description += "\nCategories: " + ",".join(trailer["categories"])
-        self.description += "\nDate: " + trailer["date"]
+        self.description = 'Genres: ' + ','.join(title['genres'])
+        self.description += '\nCategories: ' + ','.join(trailer['categories'])
+        self.description += '\nDate: ' + trailer['date']
 
         self._title = title
         self._trailer = trailer

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
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