From 21ad640445f0812c5fa954015a3389e4824dc5e1 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Fri, 30 Dec 2005 05:12:34 +0000 Subject: the new hdd movie directory is /hdd/movie (for 7020 compatibility reasons) if /hdd/movies is found and /hdd/movie doesn't exist, /hdd/movies is moved to /hdd/movie --- lib/python/Screens/InfoBarGenerics.py | 5 +++-- lib/python/Screens/MovieSelection.py | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/python/Screens') diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index fa773d80..a659b5be 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -25,6 +25,7 @@ from Screens.MinuteInput import MinuteInput from Components.Harddisk import harddiskmanager from Tools import Notifications +from Tools.Directories import * #from enigma import eTimer, eDVBVolumecontrol, quitMainloop from enigma import * @@ -719,9 +720,9 @@ class InfoBarInstantRecord: def instantRecord(self): try: - stat = os.stat("/hdd/movies") + stat = os.stat(resolveFilename(SCOPE_HDD)) except: - self.session.open(MessageBox, "No HDD found!", MessageBox.TYPE_ERROR) + self.session.open(MessageBox, _("No HDD found or HDD not initialized!"), MessageBox.TYPE_ERROR) return if self.isInstantRecordRunning(): diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py index 2ba2d059..6bb18721 100644 --- a/lib/python/Screens/MovieSelection.py +++ b/lib/python/Screens/MovieSelection.py @@ -8,6 +8,8 @@ from Components.DiskInfo import DiskInfo from Screens.MessageBox import MessageBox from Screens.FixedMenu import FixedMenu +from Tools.Directories import * + from enigma import eServiceReference, eServiceCenter class ChannelContextMenu(FixedMenu): @@ -65,13 +67,13 @@ class MovieSelection(Screen): self.movemode = False self.bouquet_mark_edit = False - self["list"] = MovieList(eServiceReference("2:0:1:0:0:0:0:0:0:0:/hdd/movies/")) + self["list"] = MovieList(eServiceReference("2:0:1:0:0:0:0:0:0:0:" + resolveFilename(SCOPE_HDD))) if (selectedmovie is not None): self.onShown.append(self.moveTo) self.selectedmovie = selectedmovie #self["okbutton"] = Button("ok", [self.channelSelected]) - self["freeDiskSpace"] = DiskInfo("/hdd/movies", DiskInfo.FREE) + self["freeDiskSpace"] = DiskInfo(resolveFilename(SCOPE_HDD), DiskInfo.FREE) self["actions"] = ActionMap(["OkCancelActions", "ContextMenuActions"], { -- cgit v1.2.3