Author: dmeyer
Date: Sun Oct 16 15:25:35 2005
New Revision: 7723
Modified:
trunk/freevo-tvserver/bin/freevo-tvserver
trunk/freevo-tvserver/share/config/tvserver.conf
trunk/freevo-tvserver/src/config.py
Log:
add more config options
Modified: trunk/freevo-tvserver/bin/freevo-tvserver
==============================================================================
--- trunk/freevo-tvserver/bin/freevo-tvserver (original)
+++ trunk/freevo-tvserver/bin/freevo-tvserver Sun Oct 16 15:25:35 2005
@@ -40,6 +40,7 @@
# kaa imports
import kaa
import kaa.notifier
+import kaa.epg
# insert freevo path information
__site__ = '../lib/python%s.%s/site-packages' % sys.version_info[:2]
@@ -48,7 +49,7 @@
sys.path.insert(0, __site__)
# create logger objects in conf
-import freevo.tvserver.config
+from freevo.tvserver import config
# get logging object
log = logging.getLogger('record')
@@ -56,23 +57,18 @@
# set basic recording debug to info
log.setLevel(logging.INFO)
-# import freevo config
-# FIXME:
-# import config
-
# change uid
try:
- if config.TV_RECORD_SERVER_UID and os.getuid() == 0:
- os.setgid(config.TV_RECORD_SERVER_GID)
- os.setuid(config.TV_RECORD_SERVER_UID)
+ if config.SERVER_UID and os.getuid() == 0:
+ os.setgid(config.SERVER_GID)
+ os.setuid(config.SERVER_UID)
os.environ['USER'] = pwd.getpwuid(os.getuid())[0]
os.environ['HOME'] = pwd.getpwuid(os.getuid())[5]
except Exception, e:
log.warning('unable to set uid: %s' % e)
-# FIXME: create kaa.epg
-import kaa.epg
-kaa.epg.connect('sqlite2', freevo.conf.datafile('epgdb2'))
+# load the epg
+kaa.epg.connect(config.EPG_BACKEND, config.EPG_FILENAME)
kaa.epg.load()
# import recordserver
@@ -82,9 +78,9 @@
server = RecordServer()
# start recorder for this machine
-# FIXME:
-# if config.TV_RECORD_START_RECORDER:
-# kaa.notifier.Process('freevo-tvdev').start()
+if config.START_TVDEV:
+ os.environ['PATH'] = '%s:%s' % (os.path.dirname(__file__),
os.environ['PATH'])
+ kaa.notifier.Process('freevo-tvdev').start()
try:
Modified: trunk/freevo-tvserver/share/config/tvserver.conf
==============================================================================
--- trunk/freevo-tvserver/share/config/tvserver.conf (original)
+++ trunk/freevo-tvserver/share/config/tvserver.conf Sun Oct 16 15:25:35 2005
@@ -4,11 +4,15 @@
[general]
# the recordserver will start with that uid if started as root
-uid = 0
+server_uid = 0
+server_gid = 0
# streaming url for live tv
livetv_url = 224.224.224.10
+# start freevo-tvdev for this host on startup
+start_tvdev = False
+
# The recordings sections defines same basic settings for
# recordings. They can be set individualy for each recording
Modified: trunk/freevo-tvserver/src/config.py
==============================================================================
--- trunk/freevo-tvserver/src/config.py (original)
+++ trunk/freevo-tvserver/src/config.py Sun Oct 16 15:25:35 2005
@@ -9,7 +9,8 @@
schema = { 'RECORDINGS_START_PADDING': int,
'RECORDINGS_STOP_PADDING' : int,
- 'GENERAL_UID' : int }
+ 'SERVER_UID' : int,
+ 'START_TVDEV': bool }
conf = Config('tvserver.conf', schema)
@@ -23,5 +24,5 @@
log.error('Please check the config file: %s' % conf.filename)
sys.exit(0)
-EPG_FILENAME.replace('$(DATADIR)', DATADIR)
-EPG_MAPPING = conf['epg mapping']
+EPG_FILENAME = EPG_FILENAME.replace('$(DATADIR)', DATADIR)
+EPG_MAPPING = conf['epg mapping']
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
