git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow non-binary states
[enigma2.git]
/
RecordTimer.py
diff --git
a/RecordTimer.py
b/RecordTimer.py
index 6075141e30e87399b4ad3fa920e90265163d17ca..e8b76e921aab631bc24aecf9111cda2b8b4b6d74 100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-1,6
+1,6
@@
import time
#from time import datetime
import time
#from time import datetime
-from Tools import Directories, Notifications
+from Tools import Directories, Notifications
, ASCIItranslit
from Components.config import config
import timer
from Components.config import config
import timer
@@
-141,6
+141,9
@@
class RecordTimerEntry(timer.TimerEntry, object):
if self.name:
filename += " - " + self.name
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)
if self.dirname and not Directories.fileExists(self.dirname, 'w'):
self.dirnameHadToFallback = True
self.Filename = Directories.getRecordingFilename(filename, None)
@@
-183,7
+186,7
@@
class RecordTimerEntry(timer.TimerEntry, object):
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:
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:
- if prep_res
t
== 255:
+ if prep_res == 255:
self.log(4, "failed to write meta information")
else:
self.log(2, "'prepare' failed: error %d" % prep_res)
self.log(4, "failed to write meta information")
else:
self.log(2, "'prepare' failed: error %d" % prep_res)
@@
-646,7
+649,7
@@
class RecordTimer(timer.Timer):
chktimecmp_end = chktimecmp + (duration / 60)
time = localtime(x.begin)
for y in (0, 1, 2, 3, 4, 5, 6):
chktimecmp_end = chktimecmp + (duration / 60)
time = localtime(x.begin)
for y in (0, 1, 2, 3, 4, 5, 6):
- if x.repeated & (2 ** y):
+ if x.repeated & (2 ** 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
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