Author: dmeyer
Date: Wed Mar 28 20:15:05 2007
New Revision: 9411
Modified:
trunk/tvserver/bin/freevo-tvserver
trunk/tvserver/src/conflict.py
trunk/tvserver/src/epg.py
trunk/tvserver/src/favorite.py
trunk/tvserver/src/recorder.py
trunk/tvserver/src/recording.py
trunk/tvserver/src/server.py
Log:
rename internal references to recordserver to tvserver
Modified: trunk/tvserver/bin/freevo-tvserver
==============================================================================
--- trunk/tvserver/bin/freevo-tvserver (original)
+++ trunk/tvserver/bin/freevo-tvserver Wed Mar 28 20:15:05 2007
@@ -1,7 +1,7 @@
#! /usr/bin/python
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------------
-# recordserver.py - start script for the recordserver
+# freevo-tvserver.py - start script for the tvserver
# -----------------------------------------------------------------------------
# $Id$
#
@@ -173,11 +173,11 @@
# set basic recording debug to info
log.setLevel(getattr(logging, config.loglevel))
- # import recordserver
- from freevo.tvserver.server import RecordServer
+ # import tvserver
+ from freevo.tvserver.server import TvServer
- # start recordserver
- server = RecordServer()
+ # start tvserver
+ server = TvServer()
# get mbus address for epg settings
mbus = freevo.ipc.Instance('tvserver')
Modified: trunk/tvserver/src/conflict.py
==============================================================================
--- trunk/tvserver/src/conflict.py (original)
+++ trunk/tvserver/src/conflict.py Wed Mar 28 20:15:05 2007
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------------
-# conflict.py - resolve conflicts for the recordserver
+# conflict.py - resolve conflicts for the tvserver
# -----------------------------------------------------------------------------
# $Id$
#
Modified: trunk/tvserver/src/epg.py
==============================================================================
--- trunk/tvserver/src/epg.py (original)
+++ trunk/tvserver/src/epg.py Wed Mar 28 20:15:05 2007
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------------
-# epg.py - EPG handling for the recordserver
+# epg.py - EPG handling for the tvserver
# -----------------------------------------------------------------------------
# $Id$
#
Modified: trunk/tvserver/src/favorite.py
==============================================================================
--- trunk/tvserver/src/favorite.py (original)
+++ trunk/tvserver/src/favorite.py Wed Mar 28 20:15:05 2007
@@ -220,7 +220,7 @@
def __str__(self):
"""
A simple string representation for a favorite for debugging in the
- recordserver.
+ tvserver.
"""
name = self.name
if len(name) > 30:
Modified: trunk/tvserver/src/recorder.py
==============================================================================
--- trunk/tvserver/src/recorder.py (original)
+++ trunk/tvserver/src/recorder.py Wed Mar 28 20:15:05 2007
@@ -208,7 +208,7 @@
def __init__(self, entity, handler, device):
self.type = 'recorder'
- # reference to the recordserver
+ # reference to the tvserver
self.handler = handler
self.entity = entity
self.device = device
Modified: trunk/tvserver/src/recording.py
==============================================================================
--- trunk/tvserver/src/recording.py (original)
+++ trunk/tvserver/src/recording.py Wed Mar 28 20:15:05 2007
@@ -167,7 +167,7 @@
def __str__(self):
"""
A simple string representation for a recording for debugging in the
- recordserver.
+ tvserver.
"""
channel = self.channel
if len(channel) > 10:
Modified: trunk/tvserver/src/server.py
==============================================================================
--- trunk/tvserver/src/server.py (original)
+++ trunk/tvserver/src/server.py Wed Mar 28 20:15:05 2007
@@ -58,9 +58,9 @@
# get logging object
log = logging.getLogger('record')
-class RecordServer(object):
+class TvServer(object):
"""
- Class for the recordserver. It handles the rpc calls and checks the
+ Class for the tvserver. It handles the rpc calls and checks the
schedule for recordings and favorites.
"""
LIVE_TV_ID = 0
@@ -257,7 +257,7 @@
try:
fxd = freevo.fxdparser.Document(self.fxdfile)
except Exception, e:
- log.exception('recordserver.load: %s corrupt:' % self.fxdfile)
+ log.exception('tvserver.load: %s corrupt:' % self.fxdfile)
sys.exit(1)
for child in fxd.children:
@@ -265,7 +265,7 @@
try:
r = Recording(node=child)
except Exception, e:
- log.exception('recordserver.load_recording')
+ log.exception('tvserver.load_recording')
continue
if r.status == RECORDING:
log.warning('recording in status \'recording\'')
@@ -282,7 +282,7 @@
try:
f = Favorite(node=child)
except Exception, e:
- log.exception('recordserver.load_favorite:')
+ log.exception('tvserver.load_favorite:')
continue
self.favorites.append(f)
@@ -478,8 +478,8 @@
# Already sending a stream of this channel, reuse it
channel.registered.append(source)
- RecordServer.LIVE_TV_ID += 1
- id = RecordServer.LIVE_TV_ID
+ TvServer.LIVE_TV_ID += 1
+ id = TvServer.LIVE_TV_ID
self.live_tv_map[id] = channel
return [ id, url ]
@@ -500,8 +500,8 @@
channel.recorder = rec, rec_id
channel.registered.append(source)
- RecordServer.LIVE_TV_ID += 1
- id = RecordServer.LIVE_TV_ID
+ TvServer.LIVE_TV_ID += 1
+ id = TvServer.LIVE_TV_ID
self.live_tv_map[id] = channel
# return id and url
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
