Author: dmeyer
Date: Tue Oct 18 17:22:38 2005
New Revision: 7745
Added:
trunk/freevo-core/src/ipc/
trunk/freevo-core/src/ipc/__init__.py
trunk/freevo-core/src/ipc/tvserver.py
- copied, changed from r7740, /trunk/freevo-ui/src/record/client.py
Removed:
trunk/freevo-ui/src/record/client.py
Modified:
trunk/freevo-core/setup.py
trunk/freevo-ui/src/gui/areas/info_area.py
trunk/freevo-ui/src/gui/areas/tvlisting_area.py
trunk/freevo-ui/src/helpers/webserver.py
trunk/freevo-ui/src/tv/favorite.py
trunk/freevo-ui/src/tv/program.py
trunk/freevo-ui/src/tv/tvmenu.py
trunk/freevo-ui/src/www/pages/index.py
trunk/freevo-ui/src/www/plugins/guide.py
trunk/freevo-ui/src/www/plugins/recordings.py
trunk/freevo-ui/src/www/plugins/search.py
Log:
move record.client to core as ipc.tvserver
Modified: trunk/freevo-core/setup.py
==============================================================================
--- trunk/freevo-core/setup.py (original)
+++ trunk/freevo-core/setup.py Tue Oct 18 17:22:38 2005
@@ -14,7 +14,7 @@
url = "http://www.freevo.org";,
license = "GPL",
- package_dir = { 'freevo': 'src' },
- packages = [ 'freevo', 'freevo' ],
+ package_dir = { 'freevo': 'src', 'freevo.ipc': 'src/ipc' },
+ packages = [ 'freevo', 'freevo.ipc' ],
data_files = [('share/freevo', share_files)]
)
Added: trunk/freevo-core/src/ipc/__init__.py
==============================================================================
Copied: trunk/freevo-core/src/ipc/tvserver.py (from r7740,
/trunk/freevo-ui/src/record/client.py)
==============================================================================
--- /trunk/freevo-ui/src/record/client.py (original)
+++ trunk/freevo-core/src/ipc/tvserver.py Tue Oct 18 17:22:38 2005
@@ -30,6 +30,9 @@
#
# -----------------------------------------------------------------------------
+__all__ = [ 'MISSED', 'SAVED', 'SCHEDULED', 'RECORDING', 'CONFLICT', 'DELETED',
+ 'FAILED', 'recordings', 'favorites' ]
+
# python imports
import sys
import time
Modified: trunk/freevo-ui/src/gui/areas/info_area.py
==============================================================================
--- trunk/freevo-ui/src/gui/areas/info_area.py (original)
+++ trunk/freevo-ui/src/gui/areas/info_area.py Tue Oct 18 17:22:38 2005
@@ -40,7 +40,6 @@
# freevo imports
import util
-import record.client
# gui imports
from area import Area
Modified: trunk/freevo-ui/src/gui/areas/tvlisting_area.py
==============================================================================
--- trunk/freevo-ui/src/gui/areas/tvlisting_area.py (original)
+++ trunk/freevo-ui/src/gui/areas/tvlisting_area.py Tue Oct 18 17:22:38 2005
@@ -46,15 +46,15 @@
import time
import config
+# freevo core imports
+import freevo.ipc.tvserver as tvserver
+
from area import Area
from gui.widgets import Rectangle
-from record.client import recordings
-from record.record_types import *
import logging
log = logging.getLogger('gui')
-
class _Geometry(object):
"""
Simple object with x, y, with, height values
@@ -415,11 +415,12 @@
if prg == selected_prog:
val = selected_val
else:
- rs = recordings.get(prg.channel.id, prg.start,
- prg.stop)
- if rs and rs.status in (SCHEDULED, RECORDING, SAVED):
+ rs = tvserver.recordings.get(prg.channel.id, prg.start,
+ prg.stop)
+ if rs and rs.status in (tvserver.SCHEDULED,
tvserver.RECORDING,
+ tvserver.SAVED):
val = scheduled_val
- elif rs and rs.status == CONFLICT:
+ elif rs and rs.status == tvserver.CONFLICT:
val = conflict_val
else:
val = default_val
Modified: trunk/freevo-ui/src/helpers/webserver.py
==============================================================================
--- trunk/freevo-ui/src/helpers/webserver.py (original)
+++ trunk/freevo-ui/src/helpers/webserver.py Tue Oct 18 17:22:38 2005
@@ -41,15 +41,15 @@
# set basic recording debug to info
log.setLevel(logging.INFO)
+# import ipc.tvserver to attach to the mbus
+from freevo.ipc.tvserver import recordings
+
# import freevo config
import config
# import webserver
from www.server import Server, RequestHandler
-# import record.client to attach to the mbus
-import record.client
-
cgi_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../www'))
htdocs = [ os.path.join(cgi_dir, 'htdocs'),
os.path.join(config.SHARE_DIR, 'htdocs'),
Modified: trunk/freevo-ui/src/tv/favorite.py
==============================================================================
--- trunk/freevo-ui/src/tv/favorite.py (original)
+++ trunk/freevo-ui/src/tv/favorite.py Tue Oct 18 17:22:38 2005
@@ -31,14 +31,13 @@
#
# -----------------------------------------------------------------------------
+# freevo core imports
+import freevo.ipc.tvserver as tvserver
+
# freevo imports
from menu import Item, Action, Menu
from gui.windows import MessageBox
-# tv imports
-import record.client
-
-
class FavoriteItem(Item):
"""
A favorite item to add/delete/change a favorite for the recordserver.
@@ -88,7 +87,7 @@
def add(self):
- (result, msg) = record.client.favorites.add(self)
+ (result, msg) = tvserver.favorites.add(self)
if result:
txt = _('"%s" has been scheduled as favorite') % self.title
else:
Modified: trunk/freevo-ui/src/tv/program.py
==============================================================================
--- trunk/freevo-ui/src/tv/program.py (original)
+++ trunk/freevo-ui/src/tv/program.py Tue Oct 18 17:22:38 2005
@@ -35,6 +35,9 @@
import time
import kaa.epg
+# freevo core imports
+import freevo.ipc.tvserver as tvserver
+
# freevo imports
import config
import plugin
@@ -42,7 +45,6 @@
from gui.windows import MessageBox
# tv imports
-from record.client import recordings
import favorite
class ProgramItem(Item):
@@ -63,7 +65,7 @@
self.description = program.description
self.episode = program.episode
- self.scheduled = recordings.get(program.channel.id,
+ self.scheduled = tvserver.recordings.get(program.channel.id,
program.start, program.stop)
# TODO: add category support (from epgdb)
@@ -172,7 +174,7 @@
def schedule(self):
- (result, msg) = recordings.schedule(self)
+ (result, msg) = tvserver.recordings.schedule(self)
if result:
MessageBox(_('"%s" has been scheduled for recording') % \
self.title).show()
@@ -182,7 +184,7 @@
def remove(self):
- (result, msg) = recordings.remove(self.scheduled.id)
+ (result, msg) = tvserver.recordings.remove(self.scheduled.id)
if result:
MessageBox(_('"%s" has been removed as recording') % \
self.title).show()
Modified: trunk/freevo-ui/src/tv/tvmenu.py
==============================================================================
--- trunk/freevo-ui/src/tv/tvmenu.py (original)
+++ trunk/freevo-ui/src/tv/tvmenu.py Tue Oct 18 17:22:38 2005
@@ -45,6 +45,9 @@
import time
+# freevo core imports
+import freevo.ipc.tvserver as tvserver
+
import config
import plugin
@@ -52,7 +55,6 @@
from menu import Item, ActionItem, Menu
import tvguide
-from record.client import recordings
from directory import DirItem
from gui.windows import MessageBox
@@ -62,9 +64,9 @@
class Info(Item):
def __getitem__(self, key):
if key in ('comingup', 'running'):
- return getattr(recordings, key)
+ return getattr(tvserver.recordings, key)
if key == 'recordserver':
- return recordings.server
+ return tvserver.recordings.server
return Info.__getitem__(self, key)
Modified: trunk/freevo-ui/src/www/pages/index.py
==============================================================================
--- trunk/freevo-ui/src/www/pages/index.py (original)
+++ trunk/freevo-ui/src/www/pages/index.py Tue Oct 18 17:22:38 2005
@@ -2,10 +2,11 @@
import sys, time
+import freevo.ipc.tvserver as tvserver
+
from www.base import HTMLResource, FreevoResource
import config
import util
-import record.client
class IndexResource(FreevoResource):
def render(self, request):
@@ -16,7 +17,7 @@
fv.res += '<h2>'+( _('Freevo Web Status as of %s') % \
time.strftime('%B %d ' + config.TV_TIMEFORMAT,
time.localtime()) ) +'</h2>'
- if record.client.recordings.server:
+ if tvserver.recordings.server:
fv.res += '<p class="normal">'\
+_('The recording server is up and running.')+'</p>\n'
else:
Modified: trunk/freevo-ui/src/www/plugins/guide.py
==============================================================================
--- trunk/freevo-ui/src/www/plugins/guide.py (original)
+++ trunk/freevo-ui/src/www/plugins/guide.py Tue Oct 18 17:22:38 2005
@@ -128,11 +128,13 @@
import config
import logging
+# freevo core imports
+import freevo.ipc.tvserver as tvserver
+
from www.base import HTMLResource, FreevoResource
import util
import config
-import record.client
import kaa.epg
@@ -236,7 +238,7 @@
# Fool "is prog scheduled" until that is hooked up.
got_schedule = False
- if not record.client.recordings.server:
+ if not tvserver.recordings.server:
fv.res += '<p class="alert"><b>'+_('Notice')+'</b>: ' \
+_('The recording server is down.')+'</p>\n'
Modified: trunk/freevo-ui/src/www/plugins/recordings.py
==============================================================================
--- trunk/freevo-ui/src/www/plugins/recordings.py (original)
+++ trunk/freevo-ui/src/www/plugins/recordings.py Tue Oct 18 17:22:38 2005
@@ -38,12 +38,12 @@
# epg support
import kaa.epg
+# freevo core imports
+from freevo.ipc.tvserver import recordings
+
# freevo imports
import config
-# recordserver bindings
-from record.client import recordings
-
# webserver basics
from www.base import HTMLResource, FreevoResource
Modified: trunk/freevo-ui/src/www/plugins/search.py
==============================================================================
--- trunk/freevo-ui/src/www/plugins/search.py (original)
+++ trunk/freevo-ui/src/www/plugins/search.py Tue Oct 18 17:22:38 2005
@@ -35,9 +35,11 @@
import time
import logging
+# freevo core imports
+import freevo.ipc.tvserver as tvserver
+
# freevo imports
import config
-import record.client
from www.base import HTMLResource, FreevoResource
import kaa.epg
@@ -82,7 +84,7 @@
fv.tableCell(_('Actions'), 'class="guidehead" colspan="1"')
fv.tableRowClose()
- rec_progs = record.client.recordings.list()
+ rec_progs = tvserver.recordings.list()
for p in programs:
status = 'basic'
-------------------------------------------------------
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
