Author: duncan
Date: Mon Nov 19 14:34:31 2007
New Revision: 10147
Log:
Run reindent.py on all sources
Modified:
branches/rel-1-7/freevo/src/plugins/itv.py
branches/rel-1-7/freevo/src/tv/plugins/recordings_manager.py
branches/rel-1-7/freevo/src/video/configure.py
branches/rel-1-7/freevo/src/video/plugins/xine.py
branches/rel-1-7/freevo/src/video/videoitem.py
branches/rel-1/freevo/src/plugins/itv.py
branches/rel-1/freevo/src/tv/plugins/recordings_manager.py
branches/rel-1/freevo/src/video/configure.py
branches/rel-1/freevo/src/video/plugins/xine.py
branches/rel-1/freevo/src/video/videoitem.py
Modified: branches/rel-1-7/freevo/src/plugins/itv.py
==============================================================================
--- branches/rel-1-7/freevo/src/plugins/itv.py (original)
+++ branches/rel-1-7/freevo/src/plugins/itv.py Mon Nov 19 14:34:31 2007
@@ -113,8 +113,8 @@
os.mkdir(self.cachedir,
stat.S_IMODE(os.stat(config.FREEVO_CACHEDIR)[stat.ST_MODE]))
self.location_index = None
-
-
+
+
def actions(self):
"""
return a list of actions for this item
@@ -141,7 +141,7 @@
def fetchheadlinesfromurl(self):
- """
+ """
this fetches the headlines (title, link and description) from the url.
Here the parsing of the xml is done
"""
@@ -203,10 +203,10 @@
rawheadlines = []
rawheadlines = self.getsiteheadlines()
for title, link, description in rawheadlines:
- # create a VideoItem for each headline
+ # create a VideoItem for each headline
mi = VideoItem(link, self.parent)
mi.name = title
-
+
description = description.replace('\n\n', '&#xxx;').replace('\n',
' ').\
replace('&#xxx;', '\n')
description = description.replace('<p>', '\n').replace('<br>',
'\n')
@@ -258,5 +258,3 @@
headlines_site_menu = menu.Menu(_('Headlines Sites'), headlines_sites)
menuw.pushmenu(headlines_site_menu)
menuw.refresh()
-
-
Modified: branches/rel-1-7/freevo/src/tv/plugins/recordings_manager.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/plugins/recordings_manager.py
(original)
+++ branches/rel-1-7/freevo/src/tv/plugins/recordings_manager.py Mon Nov
19 14:34:31 2007
@@ -190,7 +190,7 @@
if sorting_reversed:
items.reverse()
-
+
if arg == 'update':
# update because of DiskManager
if not self.menu.choices:
@@ -199,10 +199,10 @@
# store the current selected item
selected_id = self.menu.selected.id()
selected_pos = self.menu.choices.index(self.menu.selected)
-
+
self.menu.choices = items
- self.menu.selected = None
-
+ self.menu.selected = None
+
if selected_pos !=-1 and items:
for i in items:
# find the selected item
@@ -215,11 +215,11 @@
# to the old item
pos = max(0, min(selected_pos-1, len(items)-1))
self.menu.selected = items[pos]
-
+
self.menuw.rebuild_page()
self.menuw.refresh()
else:
- self.menuw.init_page()
+ self.menuw.init_page()
self.menuw.refresh()
else:
# normal menu build
@@ -619,16 +619,16 @@
if Unicode(i.id()) == Unicode(selected_id):
self.menu.selected = i
break
-
+
if not self.menu.selected:
- # item is gone now, try to the selection close
+ # item is gone now, try to the selection close
# to the old item
pos = max(0, min(selected_pos-1, len(self.items)-1))
self.menu.selected = self.items[pos]
-
+
self.menuw.rebuild_page()
self.menuw.refresh()
- # Update the icon just incase we were called because
+ # Update the icon just incase we were called because
# a series item updated its watched/keep state.
self.set_icon()
else:
Modified: branches/rel-1-7/freevo/src/video/configure.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/configure.py (original)
+++ branches/rel-1-7/freevo/src/video/configure.py Mon Nov 19 14:34:31 2007
@@ -272,8 +272,8 @@
items = []
if len(item.possible_player) >1:
- items.append(menu.MenuItem(_('Play with alternate player'),
- player_selection_menu, item))
+ items.append(menu.MenuItem(_('Play with alternate player'),
+ player_selection_menu, item))
if item.filename or (item.mode in ('dvd', 'vcd') and item.player_rating >=
20):
if item.info.has_key('audio') and len(item.info['audio']) > 1:
Modified: branches/rel-1-7/freevo/src/video/plugins/xine.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/plugins/xine.py (original)
+++ branches/rel-1-7/freevo/src/video/plugins/xine.py Mon Nov 19 14:34:31 2007
@@ -133,7 +133,7 @@
return 2
if item.mode in ('http') and not item.filename and not item.media:
_debug_('%r unplayable' % (item.url), 2)
- return 0
+ return 0
if item.network_play:
_debug_('%r possible' % (item.url))
return 1
Modified: branches/rel-1-7/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1-7/freevo/src/video/videoitem.py (original)
+++ branches/rel-1-7/freevo/src/video/videoitem.py Mon Nov 19 14:34:31 2007
@@ -83,7 +83,7 @@
self.set_url(url, info=parse)
if info:
self.info.set_variables(info)
-
+
# deinterlacing and related things
video_deinterlace = config.VIDEO_DEINTERLACE != None and
config.VIDEO_DEINTERLACE or False
@@ -199,14 +199,14 @@
if hasattr(self, 'force_player') and p.name == self.force_player:
rating += 100
if rating >10:
- #exclude players that cannot play this item
+ #exclude players that cannot play this item
self.possible_player.append((rating, p))
- # sort the players in the order of the rating
+ # sort the players in the order of the rating
self.possible_player.sort(lambda l, o: -cmp(l[0], o[0]))
if len(self.possible_player) > 0:
- # choose the best player as default player
+ # choose the best player as default player
self.player_rating, self.player = self.possible_player[0]
- _debug_(self.possible_player, 2)
+ _debug_(self.possible_player, 2)
def id(self):
Modified: branches/rel-1/freevo/src/plugins/itv.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/itv.py (original)
+++ branches/rel-1/freevo/src/plugins/itv.py Mon Nov 19 14:34:31 2007
@@ -113,8 +113,8 @@
os.mkdir(self.cachedir,
stat.S_IMODE(os.stat(config.FREEVO_CACHEDIR)[stat.ST_MODE]))
self.location_index = None
-
-
+
+
def actions(self):
"""
return a list of actions for this item
@@ -141,7 +141,7 @@
def fetchheadlinesfromurl(self):
- """
+ """
this fetches the headlines (title, link and description) from the url.
Here the parsing of the xml is done
"""
@@ -203,10 +203,10 @@
rawheadlines = []
rawheadlines = self.getsiteheadlines()
for title, link, description in rawheadlines:
- # create a VideoItem for each headline
+ # create a VideoItem for each headline
mi = VideoItem(link, self.parent)
mi.name = title
-
+
description = description.replace('\n\n', '&#xxx;').replace('\n',
' ').\
replace('&#xxx;', '\n')
description = description.replace('<p>', '\n').replace('<br>',
'\n')
@@ -258,5 +258,3 @@
headlines_site_menu = menu.Menu(_('Headlines Sites'), headlines_sites)
menuw.pushmenu(headlines_site_menu)
menuw.refresh()
-
-
Modified: branches/rel-1/freevo/src/tv/plugins/recordings_manager.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/recordings_manager.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/recordings_manager.py Mon Nov 19
14:34:31 2007
@@ -190,7 +190,7 @@
if sorting_reversed:
items.reverse()
-
+
if arg == 'update':
# update because of DiskManager
if not self.menu.choices:
@@ -199,10 +199,10 @@
# store the current selected item
selected_id = self.menu.selected.id()
selected_pos = self.menu.choices.index(self.menu.selected)
-
+
self.menu.choices = items
- self.menu.selected = None
-
+ self.menu.selected = None
+
if selected_pos !=-1 and items:
for i in items:
# find the selected item
@@ -215,11 +215,11 @@
# to the old item
pos = max(0, min(selected_pos-1, len(items)-1))
self.menu.selected = items[pos]
-
+
self.menuw.rebuild_page()
self.menuw.refresh()
else:
- self.menuw.init_page()
+ self.menuw.init_page()
self.menuw.refresh()
else:
# normal menu build
@@ -619,16 +619,16 @@
if Unicode(i.id()) == Unicode(selected_id):
self.menu.selected = i
break
-
+
if not self.menu.selected:
- # item is gone now, try to the selection close
+ # item is gone now, try to the selection close
# to the old item
pos = max(0, min(selected_pos-1, len(self.items)-1))
self.menu.selected = self.items[pos]
-
+
self.menuw.rebuild_page()
self.menuw.refresh()
- # Update the icon just incase we were called because
+ # Update the icon just incase we were called because
# a series item updated its watched/keep state.
self.set_icon()
else:
Modified: branches/rel-1/freevo/src/video/configure.py
==============================================================================
--- branches/rel-1/freevo/src/video/configure.py (original)
+++ branches/rel-1/freevo/src/video/configure.py Mon Nov 19 14:34:31 2007
@@ -272,8 +272,8 @@
items = []
if len(item.possible_player) >1:
- items.append(menu.MenuItem(_('Play with alternate player'),
- player_selection_menu, item))
+ items.append(menu.MenuItem(_('Play with alternate player'),
+ player_selection_menu, item))
if item.filename or (item.mode in ('dvd', 'vcd') and item.player_rating >=
20):
if item.info.has_key('audio') and len(item.info['audio']) > 1:
Modified: branches/rel-1/freevo/src/video/plugins/xine.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/xine.py (original)
+++ branches/rel-1/freevo/src/video/plugins/xine.py Mon Nov 19 14:34:31 2007
@@ -133,7 +133,7 @@
return 2
if item.mode in ('http') and not item.filename and not item.media:
_debug_('%r unplayable' % (item.url), 2)
- return 0
+ return 0
if item.network_play:
_debug_('%r possible' % (item.url))
return 1
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 Mon Nov 19 14:34:31 2007
@@ -83,7 +83,7 @@
self.set_url(url, info=parse)
if info:
self.info.set_variables(info)
-
+
# deinterlacing and related things
video_deinterlace = config.VIDEO_DEINTERLACE != None and
config.VIDEO_DEINTERLACE or False
@@ -199,14 +199,14 @@
if hasattr(self, 'force_player') and p.name == self.force_player:
rating += 100
if rating >10:
- #exclude players that cannot play this item
+ #exclude players that cannot play this item
self.possible_player.append((rating, p))
- # sort the players in the order of the rating
+ # sort the players in the order of the rating
self.possible_player.sort(lambda l, o: -cmp(l[0], o[0]))
if len(self.possible_player) > 0:
- # choose the best player as default player
+ # choose the best player as default player
self.player_rating, self.player = self.possible_player[0]
- _debug_(self.possible_player, 2)
+ _debug_(self.possible_player, 2)
def id(self):
-------------------------------------------------------------------------
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
