Author: rshortt
Date: Thu Mar  9 03:37:51 2006
New Revision: 8064

Modified:
   trunk/core/src/ipc/epg.py

Log:
Use groups in config.


Modified: trunk/core/src/ipc/epg.py
==============================================================================
--- trunk/core/src/ipc/epg.py   (original)
+++ trunk/core/src/ipc/epg.py   Thu Mar  9 03:37:51 2006
@@ -51,6 +51,9 @@
 log = logging.getLogger('epg')
 
 config = Config(desc=_('EPG Server configuration'), schema=[
+    Var(name='log_level', type=('CRITICAL', 'ERROR', 'WARNING', 'INFO', 
'DEBUG'),
+        default='WARNING',
+        desc=_('The log level of the server: CRITICAL, ERROR, WARNING, INFO, 
DEBUG.')),
     Var(name='database', default='%s/epg2.db' % freevo.conf.DATADIR,
         desc=_('Filename for the sqlite database file')),
     Var(name='address', default='',
@@ -58,27 +61,55 @@
                'by default for security reasons.  Setting this will make 
your\n'
                'EPG server listen on this address or have your client 
connect\n'
                'this way if it is not on the same host.  Format is ip:port.')),
-    Var(name='use_xmltv', default=1,
+
+    # XMLTV settings
+    Group(name='xmltv', desc=_('\nXMLTV settings\n'), schema = [
+    Var(name='activate', default=1,
         desc=_('Use XMLTV file to populate database.')),
-    Var(name='xmltv_file', default='',
+    Var(name='data_file', default='',
         desc=_('Location of XMLTV data file.')),
-    Var(name='xmltv_grabber', default='',
+    Var(name='grabber', default='',
         desc=_('If you want to run an XMLTV grabber to fetch your listings\n'
                'set this to the full path of your grabber program plus any\n'
                'additional arguments.')),
-    Var(name='xmltv_days', default=5,
+    Var(name='days', default=5,
         desc=_('How many days of XMLTV data you want to fetch.')),
-    Var(name='xmltv_sort', default='',
+    Var(name='sort', default='',
         desc=_('Set this to the path of the tv_sort program if you need to\n'
                'sort your listings.')),
-    Var(name='use_zap2it', default=0,
+    ]),
+
+    # Zap2it settings
+    Group(name='zap2it', desc=_('\nZap2it settings\n'), schema = [
+    Var(name='activate', default=0,
         desc=_('Use Zap2it service to populate database.')),
-    Var(name='zap2it_username', default='',
+    Var(name='username', default='',
         desc=_('Zap2it username.')),
-    Var(name='zap2it_password', default='',
+    Var(name='password', default='',
         desc=_('Zap2it password.')),
-    Var(name='log_level', type=('CRITICAL', 'ERROR', 'WARNING', 'INFO', 
'DEBUG'), default='WARNING',
-        desc=_('The log level of the server: CRITICAL, ERROR, WARNING, INFO, 
DEBUG.')),
+    ]),
+
+    # VDR settings
+    Group(name='vdr', desc=_('\nVDR settings\n'), schema = [
+    Var(name='activate', default=0,
+        desc=_('Use VDR to populate the database.')),
+    Var(name='dir', default='/video',
+        desc=_('VDR main directory.')),
+    Var(name='channels_file', default='channels.conf',
+        desc=_('VDR channels file name.')),
+    Var(name='epg_file', default='epg.data',
+        desc=_('VDR EPG file name.')),
+    Var(name='host', default='localhost',
+        desc=_('VDR SVDRP host.')),
+    Var(name='port', default=2001,
+        desc=_('VDR SVDRP port.')),
+    Var(name='access_by', type=('name', 'sid' 'rid'), default='sid',
+        desc=_('Which field to access channels by: name, sid (service id), \n'+
+               'or rid (radio id).')),
+    Var(name='limit_channels', type=('epg', 'chan' 'both'), default='chan',
+        desc=_('Limit channels added to those found in the EPG file, the \n'+
+               'channels file, or both.  Values: epg, chan, both')),
+    ]),
     ])
 
 config.load('/etc/freevo/epg.conf')


-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to