Author: duncan
Date: Thu Feb 21 15:48:52 2008
New Revision: 10408
Log:
Consolidating differencies between rel-1 and rel-1-7
Modified:
branches/rel-1-7/freevo/src/helpers/plugins.py
branches/rel-1-7/freevo/src/helpers/schedulefavorites.py
branches/rel-1-7/freevo/src/helpers/tv_grab.py
branches/rel-1-7/freevo/src/helpers/webserver.py
branches/rel-1/freevo/src/helpers/cache.py
branches/rel-1/freevo/src/helpers/convert_config.py
branches/rel-1/freevo/src/helpers/recordserver.py
branches/rel-1/freevo/src/helpers/tv_grab.py
branches/rel-1/freevo/src/helpers/webserver.py
Modified: branches/rel-1-7/freevo/src/helpers/plugins.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/plugins.py (original)
+++ branches/rel-1-7/freevo/src/helpers/plugins.py Thu Feb 21 15:48:52 2008
@@ -44,7 +44,7 @@
def find_plugin_interface(data):
"""
Search a source file for the PluginInterface classes
- @returns a list of classes source code as a string
+ @return: a list of classes source code as a string
"""
has_classes = re.compile('\n\s*(class[^\n]*:.*?)((\n\s*class)|($))',
re.DOTALL)
@@ -248,9 +248,10 @@
def iscode(line):
"""
- Find code lines in the docstring
- When the line starts with a '|' then is has been marked as a code line
- @note this does not work too well in all cases
+ Find code lines in the docstring When the line starts with a '|' then is
has
+ been marked as a code line
+
+ @note: this does not work too well in all cases
"""
return line.strip().startswith('|')
return (len(line) > 2 and line[:2].upper() == line[:2] and \
Modified: branches/rel-1-7/freevo/src/helpers/schedulefavorites.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/schedulefavorites.py (original)
+++ branches/rel-1-7/freevo/src/helpers/schedulefavorites.py Thu Feb 21
15:48:52 2008
@@ -1,10 +1,9 @@
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# schedulefavorites.py - A helper to run in order to schedule any favories
-# for recording. This should be ran after updating
-# your program guide. This step will eventually be
-# handled by the recording server.
+# A helper to run in order to schedule any favories for recording. This
+# should be ran after updating your program guide. This step will
+# eventually be handled by the recording server.
# -----------------------------------------------------------------------
# $Id$
#
Modified: branches/rel-1-7/freevo/src/helpers/tv_grab.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/tv_grab.py (original)
+++ branches/rel-1-7/freevo/src/helpers/tv_grab.py Thu Feb 21 15:48:52 2008
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# tv_grab.py - wrapper for xmltv
+# Wrapper for xmltv
# -----------------------------------------------------------------------
# $Id$
#
Modified: branches/rel-1-7/freevo/src/helpers/webserver.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/webserver.py (original)
+++ branches/rel-1-7/freevo/src/helpers/webserver.py Thu Feb 21 15:48:52 2008
@@ -111,6 +111,8 @@
if __name__ == '__main__':
import traceback
try:
+ _debug_('main() starting')
main()
+ _debug_('main() finished')
except Exception, e:
traceback.print_exc()
Modified: branches/rel-1/freevo/src/helpers/cache.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/cache.py (original)
+++ branches/rel-1/freevo/src/helpers/cache.py Thu Feb 21 15:48:52 2008
@@ -266,6 +266,12 @@
"""
import encodingcore
import kaa.metadata
+ # load the fxd part of video
+ import fxdhandler
+
+ plugin.register_callback('fxditem', ['video'], 'movie',
fxdhandler.parse_movie)
+ plugin.register_callback('fxditem', ['video'], 'disc-set',
fxdhandler.parse_disc_set)
+
print 'checking cropdetect...................................',
print
sys.__stdout__.flush()
Modified: branches/rel-1/freevo/src/helpers/convert_config.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/convert_config.py (original)
+++ branches/rel-1/freevo/src/helpers/convert_config.py Thu Feb 21 15:48:52 2008
@@ -118,6 +118,7 @@
'TV_RECORDFILE_OKLETTERS': 'TV_RECORD_FILE_OKLETTERS',
'VIDEO_GROUPS': 'TV_VIDEO_GROUPS',
'upsoon': 'tv.upsoon',
+ 'audio\.playlist': 'audio.playlists',
'TV_TV_': 'TV_',
'MIXER_MIXER_': 'MIXER_',
}
Modified: branches/rel-1/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1/freevo/src/helpers/recordserver.py Thu Feb 21 15:48:52 2008
@@ -1145,7 +1145,7 @@
return (TRUE, fav.name)
# if we get this far prog is not a favorite
- return (False, ('not a favorite'))
+ return (False, _('not a favorite'))
def doesFavoriteRecordOnlyNewEpisodes(self, prog, favs=None):
if not favs:
Modified: branches/rel-1/freevo/src/helpers/tv_grab.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/tv_grab.py (original)
+++ branches/rel-1/freevo/src/helpers/tv_grab.py Thu Feb 21 15:48:52 2008
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# wrapper for xmltv
+# Wrapper for xmltv
# -----------------------------------------------------------------------
# $Id$
#
Modified: branches/rel-1/freevo/src/helpers/webserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/webserver.py (original)
+++ branches/rel-1/freevo/src/helpers/webserver.py Thu Feb 21 15:48:52 2008
@@ -75,9 +75,6 @@
def main():
# the start and stop stuff will be handled from the freevo script
- #logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
- #log.startLogging(open(logfile, 'a'))
-
if os.path.isdir(os.path.join(os.environ['FREEVO_PYTHON'], 'www/htdocs')):
docRoot = os.path.join(os.environ['FREEVO_PYTHON'], 'www/htdocs')
else:
-------------------------------------------------------------------------
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
