from ServiceReference import ServiceReference
from Tools import Notifications
-from Tools.Directories import SCOPE_HDD, resolveFilename
+from Tools.Directories import SCOPE_HDD, resolveFilename, pathExists
from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
iPlayableService, eServiceReference, eDVBResourceManager, iFrontendInformation, eEPGCache
self.session.nav.RecordTimer.timeChanged(self.recording[self.selectedEntry])
def instantRecord(self):
+ dir = config.movielist.last_videodir.value
+ if not pathExists(dir):
+ dir = resolveFilename(SCOPE_HDD)
try:
- stat = os_stat(resolveFilename(SCOPE_HDD))
+ stat = os_stat(dir)
except:
+ # XXX: this message is a little odd as we might be recording to a remote device
self.session.open(MessageBox, _("No HDD found or HDD not initialized!"), MessageBox.TYPE_ERROR)
return
else:
return self["booklist"].getCurrent()
- def selectConfirmed(self, res):
- if res:
+ def selectConfirmed(self, ret):
+ if ret:
ret = ''.join([self.getPreferredFolder(), self.filename])
- if self.realBookmarks and self.autoAdd and not ret in self.bookmarks:
- self.bookmarks.append(self.getPreferredFolder())
- self.bookmarks.sort()
+ if self.realBookmarks:
+ if self.autoAdd and not ret in self.bookmarks:
+ self.bookmarks.append(self.getPreferredFolder())
+ self.bookmarks.sort()
+
+ if self.bookmarks != self.realBookmarks.value:
+ self.realBookmarks.value = self.bookmarks
+ self.realBookmarks.save()
self.close(ret)
def select(self):
_("There might not be enough Space on the selected Partition.\nDo you really want to continue?"),
type = MessageBox.TYPE_YESNO
)
- # No minimum free Space means we can safely close
+ # No minimum free Space means we can safely close
else:
self.selectConfirmed(True)
- def close(self, ret):
- if ret and self.realBookmarks and self.bookmarks != self.realBookmarks.value:
- self.realBookmarks.value = self.bookmarks
- self.realBookmarks.save()
- Screen.close(self, ret)
-
def changeName(self):
if self.filename != "":
# TODO: Add Information that changing extension is bad? disallow?
menu = []
if self.currList == "filelist":
menu.append((_("switch to bookmarks"), self.switchToBookList))
- menu.append((_("add bookmark"), self.AddRemoveBookmark))
+ menu.append((_("add bookmark"), self.addRemoveBookmark))
if self.editDir:
menu.append((_("create directory"), self.createDir))
menu.append((_("remove directory"), self.removeDir))
else:
menu.append((_("switch to filelist"), self.switchToFileList))
- menu.append((_("remove bookmark"), self.AddRemoveBookmark))
+ menu.append((_("remove bookmark"), self.addRemoveBookmark))
self.session.openWithCallback(
self.menuCallback,
class MovieLocationBox(LocationBox):
def __init__(self, session, text, dir, minFree = None):
- inhibitMounts = []
- if config.usage.setup_level.index < 2: # -expert
- inhibitMounts.append("/")
- LocationBox.__init__(self, session, text = text, currDir = dir, bookmarks = config.movielist.videodirs, autoAdd = True, editDir = True, inhibitMounts = inhibitMounts, minFree = minFree)
+ inhibitDirs = ["/bin", "/boot", "/dev", "/etc", "/lib", "/proc", "/sbin", "/sys", "/usr", "/var"]
+ LocationBox.__init__(self, session, text = text, currDir = dir, bookmarks = config.movielist.videodirs, autoAdd = True, editDir = True, inhibitDirs = inhibitDirs, minFree = minFree)
self.timerentry_enddate = ConfigDateTime(default = self.timer.end, formatstring = _("%d.%B %Y"), increment = 86400)
self.timerentry_endtime = ConfigClock(default = self.timer.end)
+ default = self.timer.dirname or resolveFilename(SCOPE_HDD)
tmp = config.movielist.videodirs.value
- if self.timer.dirname and not self.timer.dirname in tmp:
- tmp.append(self.timer.dirname)
- self.timerentry_dirname = ConfigSelection(default = self.timer.dirname or resolveFilename(SCOPE_HDD), choices = tmp)
+ if default not in tmp:
+ tmp.append(default)
+ self.timerentry_dirname = ConfigSelection(default = default, choices = tmp)
self.timerentry_repeatedbegindate = ConfigDateTime(default = self.timer.repeatedbegindate, formatstring = _("%d.%B %Y"), increment = 86400)