X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FMovieSelection.py;h=c05f145f9d9e96dcd3bfcdd06ef9a2fe6c8a465c;hp=ab36adda36e7e734678fd688a8b0369fe4410124;hb=04f4636324ab06c5a3a4f618100048e159eaf6f9;hpb=6f8002cec40c9b53387ace05ea1f9a083acd0f3a diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py index ab36add..c05f145 100644 --- a/lib/python/Screens/MovieSelection.py +++ b/lib/python/Screens/MovieSelection.py @@ -1,34 +1,93 @@ from Screen import Screen from Components.Button import Button -from Components.ServiceList import ServiceList -from Components.ActionMap import ActionMap +from Components.ActionMap import HelpableActionMap, ActionMap +from Components.MenuList import MenuList from Components.MovieList import MovieList from Components.DiskInfo import DiskInfo +from Components.Pixmap import Pixmap from Components.Label import Label from Components.PluginComponent import plugins +from Components.config import config, ConfigSubsection, ConfigText, ConfigInteger, ConfigLocations +from Components.Sources.ServiceEvent import ServiceEvent + from Plugins.Plugin import PluginDescriptor from Screens.MessageBox import MessageBox -from Screens.FixedMenu import FixedMenu from Screens.ChoiceBox import ChoiceBox +from Screens.LocationBox import MovieLocationBox +from Screens.HelpMenu import HelpableScreen from Tools.Directories import * from Tools.BoundFunction import boundFunction -from enigma import eServiceReference, eServiceCenter, eTimer +from enigma import eServiceReference, eServiceCenter, eTimer, eSize + +config.movielist = ConfigSubsection() +config.movielist.moviesort = ConfigInteger(default=MovieList.SORT_RECORDED) +config.movielist.listtype = ConfigInteger(default=MovieList.LISTTYPE_ORIGINAL) +config.movielist.description = ConfigInteger(default=MovieList.HIDE_DESCRIPTION) +config.movielist.last_videodir = ConfigText(default=resolveFilename(SCOPE_HDD)) +config.movielist.last_timer_videodir = ConfigText(default=resolveFilename(SCOPE_HDD)) +config.movielist.videodirs = ConfigLocations(default=[resolveFilename(SCOPE_HDD)]) -class ChannelContextMenu(FixedMenu): +class MovieContextMenu(Screen): def __init__(self, session, csel, service): + Screen.__init__(self, session) self.csel = csel self.service = service - menu = [(_("back"), self.close), (_("delete..."), self.delete)] + self["actions"] = ActionMap(["OkCancelActions"], + { + "ok": self.okbuttonClick, + "cancel": self.cancelClick + }) + menu = [(_("delete..."), self.delete)] + for p in plugins.getPlugins(PluginDescriptor.WHERE_MOVIELIST): menu.append((p.description, boundFunction(self.execPlugin, p))) + + if config.movielist.moviesort.value == MovieList.SORT_ALPHANUMERIC: + menu.append((_("sort by date"), boundFunction(self.sortBy, MovieList.SORT_RECORDED))) + else: + menu.append((_("alphabetic sort"), boundFunction(self.sortBy, MovieList.SORT_ALPHANUMERIC))) + + menu.append((_("list style default"), boundFunction(self.listType, MovieList.LISTTYPE_ORIGINAL))) + menu.append((_("list style compact with description"), boundFunction(self.listType, MovieList.LISTTYPE_COMPACT_DESCRIPTION))) + menu.append((_("list style compact"), boundFunction(self.listType, MovieList.LISTTYPE_COMPACT))) + menu.append((_("list style single line"), boundFunction(self.listType, MovieList.LISTTYPE_MINIMAL))) + + if config.movielist.description.value == MovieList.SHOW_DESCRIPTION: + menu.append((_("hide extended description"), boundFunction(self.showDescription, MovieList.HIDE_DESCRIPTION))) + else: + menu.append((_("show extended description"), boundFunction(self.showDescription, MovieList.SHOW_DESCRIPTION))) + self["menu"] = MenuList(menu) + + def okbuttonClick(self): + self["menu"].getCurrent()[1]() - FixedMenu.__init__(self, session, _("Movie Menu"), menu) - self.skinName = "Menu" + def cancelClick(self): + self.close(False) + + def sortBy(self, newType): + config.movielist.moviesort.value = newType + self.csel.selectedmovie = self.csel.getCurrent() + self.csel.setSortType(newType) + self.csel.reloadList() + self.csel.moveTo() + self.close() + + def listType(self, newType): + config.movielist.listtype.value = newType + self.csel.setListType(newType) + self.csel.list.redrawList() + self.close() + + def showDescription(self, newType): + config.movielist.description.value = newType + self.csel.setDescriptionState(newType) + self.csel.updateDescription() + self.close() def execPlugin(self, plugin): plugin(session=self.session, service=self.service) @@ -43,7 +102,6 @@ class ChannelContextMenu(FixedMenu): # simulate first if not offline.deleteFromDisk(1): result = True - if result == True: self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete %s?") % (name)) else: @@ -52,7 +110,7 @@ class ChannelContextMenu(FixedMenu): def deleteConfirmed(self, confirmed): if not confirmed: return self.close() - + serviceHandler = eServiceCenter.getInstance() offline = serviceHandler.offlineOperations(self.service) result = False @@ -64,54 +122,109 @@ class ChannelContextMenu(FixedMenu): if result == False: self.session.openWithCallback(self.close, MessageBox, _("Delete failed!"), MessageBox.TYPE_ERROR) else: - list = self.csel["list"].removeService(self.service) + self.csel["list"].removeService(self.service) + self.csel["freeDiskSpace"].update() self.close() - -class MovieSelection(Screen): + +class SelectionEventInfo: + def __init__(self): + self["Service"] = ServiceEvent() + self.list.connectSelChanged(self.__selectionChanged) + self.timer = eTimer() + self.timer.callback.append(self.updateEventInfo) + self.onShown.append(self.__selectionChanged) + + def __selectionChanged(self): + if self.execing and config.movielist.description.value == MovieList.SHOW_DESCRIPTION: + self.timer.start(100, True) + + def updateEventInfo(self): + serviceref = self.getCurrent() + self["Service"].newService(serviceref) + +class MovieSelection(Screen, HelpableScreen, SelectionEventInfo): def __init__(self, session, selectedmovie = None): Screen.__init__(self, session) - + HelpableScreen.__init__(self) + self.tags = [ ] self.selected_tags = None - - self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD)) - + self.movemode = False self.bouquet_mark_edit = False - + self.delayTimer = eTimer() - self.delayTimer.timeout.get().append(self.updateHDDData) - + self.delayTimer.callback.append(self.updateHDDData) + self["waitingtext"] = Label(_("Please wait... Loading list...")) - - self["list"] = MovieList(None) + + # create optional description border and hide immediately + self["DescriptionBorder"] = Pixmap() + self["DescriptionBorder"].hide() + + if not pathExists(config.movielist.last_videodir.value): + config.movielist.last_videodir.value = resolveFilename(SCOPE_HDD) + config.movielist.last_videodir.save() + self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + config.movielist.last_videodir.value) + + self["list"] = MovieList(None, + config.movielist.listtype.value, + config.movielist.moviesort.value, + config.movielist.description.value) + self.list = self["list"] self.selectedmovie = selectedmovie - + + # Need list for init + SelectionEventInfo.__init__(self) + self["key_red"] = Button(_("All...")) self["key_green"] = Button("") self["key_yellow"] = Button("") self["key_blue"] = Button("") - - #self["okbutton"] = Button("ok", [self.channelSelected]) - self["freeDiskSpace"] = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE, update=False) - - self["actions"] = ActionMap(["OkCancelActions", "MovieSelectionActions", "ColorActions"], + + self["freeDiskSpace"] = self.diskinfo = DiskInfo(config.movielist.last_videodir.value, DiskInfo.FREE, update=False) + + if config.usage.setup_level.index >= 2: # expert+ + self["InfobarActions"] = HelpableActionMap(self, "InfobarActions", + { + "showMovies": (self.doPathSelect, _("select the movie path")), + }) + + + self["MovieSelectionActions"] = HelpableActionMap(self, "MovieSelectionActions", + { + "contextMenu": (self.doContext, _("menu")), + "showEventInfo": (self.showEventInformation, _("show event details")), + }) + + self["ColorActions"] = HelpableActionMap(self, "ColorActions", + { + "red": (self.showAll, _("show all")), + "green": (self.showTagsFirst, _("show first tag")), + "yellow": (self.showTagsSecond, _("show second tag")), + "blue": (self.showTagsMenu, _("show tag menu")), + }) + + self["OkCancelActions"] = HelpableActionMap(self, "OkCancelActions", { - "cancel": self.abort, - "ok": self.movieSelected, - "showEventInfo": self.showEventInformation, - "contextMenu": self.doContext, - - "red": self.showAll, - "green": self.showTagsFirst, - "yellow": self.showTagsSecond, - "blue": self.showTagsMenu, + "cancel": (self.abort, _("exit movielist")), + "ok": (self.movieSelected, _("select movie")), }) - self["actions"].csel = self + self.onShown.append(self.go) + self.onLayoutFinish.append(self.saveListsize) self.inited = False + def updateDescription(self): + if config.movielist.description.value == MovieList.SHOW_DESCRIPTION: + self["DescriptionBorder"].show() + self["list"].instance.resize(eSize(self.listWidth, self.listHeight-self["DescriptionBorder"].instance.size().height())) + else: + self["Service"].newService(None) + self["DescriptionBorder"].hide() + self["list"].instance.resize(eSize(self.listWidth, self.listHeight)) + def showEventInformation(self): from Screens.EventView import EventViewSimple from ServiceReference import ServiceReference @@ -126,14 +239,17 @@ class MovieSelection(Screen): self.delayTimer.start(10, 1) self.inited=True + def saveListsize(self): + listsize = self["list"].instance.size() + self.listWidth = listsize.width() + self.listHeight = listsize.height() + self.updateDescription() + def updateHDDData(self): self.reloadList() if self.selectedmovie is not None: self.moveTo() - self["waitingtext"].instance.hide() - - self["freeDiskSpace"].update() - + self["waitingtext"].visible = False self.updateTags() def moveTo(self): @@ -145,16 +261,23 @@ class MovieSelection(Screen): def movieSelected(self): current = self.getCurrent() if current is not None: + self.saveconfig() self.close(current) def doContext(self): current = self.getCurrent() if current is not None: - self.session.open(ChannelContextMenu, self, current) + self.session.open(MovieContextMenu, self, current) def abort(self): + self.saveconfig() self.close(None) + def saveconfig(self): + config.movielist.moviesort.save() + config.movielist.listtype.save() + config.movielist.description.save() + def getTagDescription(self, tag): # TODO: access the tag database return tag @@ -185,12 +308,54 @@ class MovieSelection(Screen): else: self["key_blue"].text = "" + def setListType(self, type): + self["list"].setListType(type) + + def setDescriptionState(self, val): + self["list"].setDescriptionState(val) + + def setSortType(self, type): + self["list"].setSortType(type) + def reloadList(self): + if not pathExists(config.movielist.last_videodir.value): + path = resolveFilename(SCOPE_HDD) + config.movielist.last_videodir.value = path + config.movielist.last_videodir.save() + self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + path) + self["freeDiskSpace"].path = path self["list"].reload(self.current_ref, self.selected_tags) title = _("Recorded files...") if self.selected_tags is not None: title += " - " + ','.join(self.selected_tags) + if config.usage.setup_level.index >= 2: # expert+ + title += " " + config.movielist.last_videodir.value self.setTitle(title) + self["freeDiskSpace"].update() + + def doPathSelect(self): + self.session.openWithCallback( + self.gotFilename, + MovieLocationBox, + _("Please select the movie path..."), + config.movielist.last_videodir.value + ) + + def gotFilename(self, res): + if res is not None and res is not config.movielist.last_videodir.value: + if pathExists(res): + config.movielist.last_videodir.value = res + config.movielist.last_videodir.save() + self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + res) + self["freeDiskSpace"].path = res + self.reloadList() + else: + self.session.open( + MessageBox, + _("Directory %s nonexistent.") % (res), + type = MessageBox.TYPE_ERROR, + timeout = 5 + ) def showAll(self): self.selected_tags = None