X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=fd2da33c58b1ca4d491dc8166ba66f9bc0940242;hp=f8e0dbd7472ca5d9013b1ed8c2af6b509d1b980c;hb=bbbf50f9d0c7d3fbd66b07460a7af835ec111f5b;hpb=76e5181cade262b86610dcc851bcb4452196ccdc

diff --git a/RecordTimer.py b/RecordTimer.py
index f8e0dbd..fd2da33 100644
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -1,6 +1,6 @@
 import time
 #from time import datetime
-from Tools import Directories, Notifications
+from Tools import Directories, Notifications, ASCIItranslit
 
 from Components.config import config
 import timer
@@ -63,7 +63,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
 		if event == iRecordableService.evEnd:
 			print "RecordTimer.staticGotRecordEvent(iRecordableService.evEnd)"
 			recordings = NavigationInstance.instance.getRecordings()
-			if not len(recordings): # no more recordings exist
+			if not recordings: # no more recordings exist
 				rec_time = NavigationInstance.instance.RecordTimer.getNextRecordingTime()
 				if rec_time > 0 and (rec_time - time.time()) < 360:
 					print "another recording starts in", rec_time - time.time(), "seconds... do not shutdown yet"
@@ -141,6 +141,9 @@ class RecordTimerEntry(timer.TimerEntry, object):
 		if self.name:
 			filename += " - " + self.name
 
+		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)
@@ -181,24 +184,12 @@ class RecordTimerEntry(timer.TimerEntry, object):
 				if event_id is None:
 					event_id = -1
 
-			prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id)
+			prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id, self.name.replace("\n", ""), self.description.replace("\n", ""), ' '.join(self.tags))
 			if prep_res:
-				self.log(2, "'prepare' failed: error %d" % prep_res)
-				NavigationInstance.instance.stopRecordService(self.record_service)
-				self.record_service = None
-				return False
-
-			self.log(3, "prepare ok, writing meta information to %s" % self.Filename)
-			try:
-				f = open(self.Filename + ".ts.meta", "w")
-				f.write(rec_ref.toString() + "\n")
-				f.write(self.name + "\n")
-				f.write(self.description + "\n")
-				f.write(str(self.begin) + "\n")
-				f.write(' '.join(self.tags))
-				f.close()
-			except IOError:
-				self.log(4, "failed to write meta information")
+				if prep_res == 255:
+					self.log(4, "failed to write meta information")
+				else:
+					self.log(2, "'prepare' failed: error %d" % prep_res)
 				NavigationInstance.instance.stopRecordService(self.record_service)
 				self.record_service = None
 				return False