X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=f670417a5eddca05f8322c01b3b60c88bb372141;hp=febc7f9b7e87bdbf545cef73657004615f006c9f;hb=45f45f957859201a7d11e8339da70d91d0eab8f7;hpb=65e93a627a7299c2087f85ae8f2f26bfcea3d122

diff --git a/RecordTimer.py b/RecordTimer.py
index febc7f9..f670417 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -2,6 +2,7 @@ from enigma import eEPGCache, getBestPlayableServiceReference, \
 	eServiceReference, iRecordableService, quitMainloop
 
 from Components.config import config
+from Components.UsageConfig import defaultMoviePath
 from Components.TimerSanityCheck import TimerSanityCheck
 
 from Screens.MessageBox import MessageBox
@@ -141,11 +142,13 @@ class RecordTimerEntry(timer.TimerEntry, object):
 		if config.recording.ascii_filenames.value:
 			filename = ASCIItranslit.legacyEncode(filename)
 
-		if self.dirname and not Directories.fileExists(self.dirname, 'w'):
-			self.dirnameHadToFallback = True
-			self.Filename = Directories.getRecordingFilename(filename, None)
+		if not self.dirname or not Directories.fileExists(self.dirname, 'w'):
+			if self.dirname:
+				self.dirnameHadToFallback = True
+			dirname = defaultMoviePath()
 		else:
-			self.Filename = Directories.getRecordingFilename(filename, self.dirname)
+			dirname = self.dirname
+		self.Filename = Directories.getRecordingFilename(filename, dirname)
 		self.log(0, "Filename calculated as: '%s'" % self.Filename)
 		#begin_date + " - " + service_name + description)
 
@@ -690,7 +693,7 @@ class RecordTimer(timer.Timer):
 						chktimecmp_end = chktimecmp + (duration / 60)
 					time = localtime(x.begin)
 					for y in (0, 1, 2, 3, 4, 5, 6):
-						if x.repeated & (2 ** y) and (x.begin <= begin or begin <= x.begin <= end):
+						if x.repeated & (1 << y) and (x.begin <= begin or begin <= x.begin <= end):
 							timecmp = y * 1440 + time.tm_hour * 60 + time.tm_min
 							if timecmp <= chktimecmp < (timecmp + ((x.end - x.begin) / 60)):
 								time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60