Author: dmeyer
Date: Thu Jan 26 19:31:55 2006
New Revision: 7878
Modified:
trunk/ui/src/gui/areas/tvlisting_area.py
trunk/ui/src/tv/__init__.py
trunk/ui/src/tv/favorite.py
trunk/ui/src/tv/program.py
trunk/ui/src/tv/tvmenu.py
trunk/webserver/bin/freevo-webserver
trunk/webserver/src/pages/guide.py
trunk/webserver/src/pages/index.py
trunk/webserver/src/pages/recordings.py
trunk/webserver/src/pages/search.py
Log:
use new interface to ipc.tvserver
Modified: trunk/ui/src/gui/areas/tvlisting_area.py
==============================================================================
--- trunk/ui/src/gui/areas/tvlisting_area.py (original)
+++ trunk/ui/src/gui/areas/tvlisting_area.py Thu Jan 26 19:31:55 2006
@@ -47,7 +47,7 @@
import config
# freevo core imports
-import freevo.ipc.tvserver as tvserver
+import freevo.ipc
from area import Area
from gui.widgets import Rectangle
@@ -271,6 +271,9 @@
menu = self.menu
settings = self.settings
+ # get tvserver interface
+ tvserver = freevo.ipc.Instance('freevo').tvserver
+
# FIXME: debug, remove me
if self.__ONE_TIME_DEBUG:
t1 = time.time()
Modified: trunk/ui/src/tv/__init__.py
==============================================================================
--- trunk/ui/src/tv/__init__.py (original)
+++ trunk/ui/src/tv/__init__.py Thu Jan 26 19:31:55 2006
@@ -30,6 +30,9 @@
#
# -----------------------------------------------------------------------------
+# freevo core plugins
+import freevo.ipc
+
# freevo imports
import plugin
@@ -38,18 +41,30 @@
"""
Plugin interface to integrate the tv module into Freevo
"""
- def items(self, parent):
+ def __init__(self):
"""
- return the tv menu
+ init the plugin.
"""
+ plugin.MainMenuPlugin.__init__(self)
+
# import here to avoid importing all this when some helpers only
# want to import something from iside the tv directory
import config
- from tvmenu import TVMenu
- from mainmenu import MainMenuItem
-
+
# detect channels
config.detect('channels')
- return [ TVMenu(parent) ]
+ # connect to tvserver using freevo.ipc
+ mbus = freevo.ipc.Instance('freevo')
+ mbus.connect('freevo.ipc.tvserver')
+
+ from tvmenu import TVMenu
+ self.TVMenu = TVMenu
+
+
+ def items(self, parent):
+ """
+ return the tv menu
+ """
+ return [ self.TVMenu(parent) ]
Modified: trunk/ui/src/tv/favorite.py
==============================================================================
--- trunk/ui/src/tv/favorite.py (original)
+++ trunk/ui/src/tv/favorite.py Thu Jan 26 19:31:55 2006
@@ -32,12 +32,15 @@
# -----------------------------------------------------------------------------
# freevo core imports
-import freevo.ipc.tvserver as tvserver
+import freevo.ipc
# freevo imports
from menu import Item, Action, Menu
from gui.windows import MessageBox
+# get tvserver interface
+tvserver = freevo.ipc.Instance('freevo').tvserver
+
class FavoriteItem(Item):
"""
A favorite item to add/delete/change a favorite for the recordserver.
@@ -87,9 +90,6 @@
def add(self):
- (result, msg) = tvserver.favorites.add(self)
- if result:
- txt = _('"%s" has been scheduled as favorite') % self.title
- else:
- txt = _('Scheduling Failed') + (': %s' % msg)
+ tvserver.favorites.add(self)
+ txt = _('"%s" has been scheduled as favorite') % self.title
MessageBox(txt).show()
Modified: trunk/ui/src/tv/program.py
==============================================================================
--- trunk/ui/src/tv/program.py (original)
+++ trunk/ui/src/tv/program.py Thu Jan 26 19:31:55 2006
@@ -36,7 +36,7 @@
import kaa.epg
# freevo core imports
-import freevo.ipc.tvserver as tvserver
+import freevo.ipc
# freevo imports
import config
@@ -47,6 +47,9 @@
# tv imports
import favorite
+# get tvserver interface
+tvserver = freevo.ipc.Instance('freevo').tvserver
+
class ProgramItem(Item):
"""
A tv program item for the tv guide and other parts of the tv submenu.
Modified: trunk/ui/src/tv/tvmenu.py
==============================================================================
--- trunk/ui/src/tv/tvmenu.py (original)
+++ trunk/ui/src/tv/tvmenu.py Thu Jan 26 19:31:55 2006
@@ -46,7 +46,7 @@
import time
# freevo core imports
-import freevo.ipc.tvserver as tvserver
+import freevo.ipc
import config
import plugin
@@ -61,6 +61,9 @@
import logging
log = logging.getLogger('tv')
+# get tvserver interface
+tvserver = freevo.ipc.Instance('freevo').tvserver
+
class Info(Item):
def __getitem__(self, key):
if key in ('comingup', 'running'):
Modified: trunk/webserver/bin/freevo-webserver
==============================================================================
--- trunk/webserver/bin/freevo-webserver (original)
+++ trunk/webserver/bin/freevo-webserver Thu Jan 26 19:31:55 2006
@@ -55,6 +55,8 @@
# import freevo config
import freevo.conf
+import freevo.ipc
+
import freevo.webserver
def usage():
@@ -83,7 +85,8 @@
kaa.epg.load()
# import ipc.tvserver to attach to the mbus
-from freevo.ipc.tvserver import recordings
+mbus = freevo.ipc.Instance('webserver')
+mbus.connect('freevo.ipc.tvserver')
# import webserver
from freevo.webserver.server import Server, RequestHandler
Modified: trunk/webserver/src/pages/guide.py
==============================================================================
--- trunk/webserver/src/pages/guide.py (original)
+++ trunk/webserver/src/pages/guide.py Thu Jan 26 19:31:55 2006
@@ -39,7 +39,7 @@
import kaa.epg
# freevo core imports
-import freevo.ipc.tvserver as tvserver
+import freevo.ipc
# webserver includes
from freevo.webserver import *
@@ -47,6 +47,8 @@
# get logging object
log = logging.getLogger('www')
+# get tvserver interface
+tvserver = freevo.ipc.Instance().tvserver
class Resource(HTMLResource):
Modified: trunk/webserver/src/pages/index.py
==============================================================================
--- trunk/webserver/src/pages/index.py (original)
+++ trunk/webserver/src/pages/index.py Thu Jan 26 19:31:55 2006
@@ -2,11 +2,14 @@
import sys, time
-import freevo.ipc.tvserver as tvserver
+import freevo.ipc
# import basic website stuff
from freevo.webserver import *
+# get tvserver interface
+tvserver = freevo.ipc.Instance().tvserver
+
class Resource(HTMLResource):
def render(self):
Modified: trunk/webserver/src/pages/recordings.py
==============================================================================
--- trunk/webserver/src/pages/recordings.py (original)
+++ trunk/webserver/src/pages/recordings.py Thu Jan 26 19:31:55 2006
@@ -38,7 +38,7 @@
import kaa.epg
# freevo core imports
-from freevo.ipc.tvserver import recordings
+import freevo.ipc
# webserver includes
from freevo.webserver import *
@@ -46,6 +46,9 @@
# get logging object
log = logging.getLogger('www')
+# get tvserver interface
+tvserver = freevo.ipc.Instance().tvserver
+
class Resource(HTMLResource):
"""
@@ -61,7 +64,7 @@
action = form.get('action')
progs = []
- if not recordings.server:
+ if not tvserver.recordings.server:
self.printHeader('Scheduled Recordings', 'styles/main.css')
self.printMessages(
[ '<b>'+_('ERROR')+'</b>: '+\
@@ -72,7 +75,7 @@
return True
if action == 'remove':
- progs = recordings.list()
+ progs = tvserver.recordings.list()
prog = None
for p in progs:
@@ -83,8 +86,8 @@
if prog:
log.info('remove prog: %s' % String(prog))
- recordings.remove(prog.id)
- progs = recordings.wait_on_list()
+ tvserver.recordings.remove(prog.id)
+ progs = tvserver.recordings.wait_on_list()
elif action == 'add':
try:
@@ -106,13 +109,13 @@
self.printFooter()
return True
- recordings.schedule(prog)
+ tvserver.recordings.schedule(prog)
- progs = recordings.wait_on_list()
+ progs = tvserver.recordings.wait_on_list()
if not len(progs):
- progs = recordings.list()
+ progs = tvserver.recordings.list()
self.printHeader(_('Scheduled Recordings'), 'styles/main.css',
selected=_('Scheduled Recordings'))
Modified: trunk/webserver/src/pages/search.py
==============================================================================
--- trunk/webserver/src/pages/search.py (original)
+++ trunk/webserver/src/pages/search.py Thu Jan 26 19:31:55 2006
@@ -37,7 +37,7 @@
import kaa.epg
# freevo core imports
-import freevo.ipc.tvserver as tvserver
+import freevo.ipc
# webserver includes
from freevo.webserver import *
@@ -45,6 +45,8 @@
# get logging object
log = logging.getLogger('www')
+# get tvserver interface
+tvserver = freevo.ipc.Instance().tvserver
class Resource(HTMLResource):
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
