git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clamp jumps at SOF
[enigma2.git]
/
RecordTimer.py
diff --git
a/RecordTimer.py
b/RecordTimer.py
index a5df6725997a2ab67526785b5d642cbdc453d4e6..f41a485737b0bb45bde349ad55e6862ccda1c0ea 100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-12,7
+12,7
@@
from Screens.SubserviceSelection import SubserviceSelection
import NavigationInstance
from time import localtime
import NavigationInstance
from time import localtime
-from Tools.XMLTools import elementsWithTag, mergeText
+from Tools.XMLTools import elementsWithTag, mergeText
, stringToXML
from ServiceReference import ServiceReference
# ok, for descriptions etc we have:
from ServiceReference import ServiceReference
# ok, for descriptions etc we have:
@@
-238,9
+238,6
@@
class RecordTimer(timer.Timer):
for timer in elementsWithTag(root.childNodes, "timer"):
self.record(createTimer(timer))
for timer in elementsWithTag(root.childNodes, "timer"):
self.record(createTimer(timer))
- def strToXML(self, str):
- return str.replace('&', '&').replace('<', '<').replace('>', '>').replace("'", '''). replace('"', '"')
-
def saveTimer(self):
#doc = xml.dom.minidom.Document()
#root_element = doc.createElement('timers')
def saveTimer(self):
#doc = xml.dom.minidom.Document()
#root_element = doc.createElement('timers')
@@
-296,8
+293,8
@@
class RecordTimer(timer.Timer):
list.append(' end="' + str(int(timer.end)) + '"')
list.append(' serviceref="' + str(timer.service_ref) + '"')
list.append(' repeated="' + str(int(timer.repeated)) + '"')
list.append(' end="' + str(int(timer.end)) + '"')
list.append(' serviceref="' + str(timer.service_ref) + '"')
list.append(' repeated="' + str(int(timer.repeated)) + '"')
- list.append(' name="' + str(s
elf.str
ToXML(timer.name)) + '"')
- list.append(' description="' + str(s
elf.str
ToXML(timer.description)) + '"')
+ list.append(' name="' + str(s
tring
ToXML(timer.name)) + '"')
+ list.append(' description="' + str(s
tring
ToXML(timer.description)) + '"')
if timer.eit is not None:
list.append(' eit="' + str(timer.eit) + '"')
list.append(' disabled="' + str(int(timer.disabled)) + '"')
if timer.eit is not None:
list.append(' eit="' + str(timer.eit) + '"')
list.append(' disabled="' + str(int(timer.disabled)) + '"')
@@
-345,7
+342,7
@@
class RecordTimer(timer.Timer):
time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60
elif chktimecmp <= timecmp < (chktimecmp + (duration / 60)):
time_match = ((chktimecmp + (duration / 60)) - timecmp) * 60
time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60
elif chktimecmp <= timecmp < (chktimecmp + (duration / 60)):
time_match = ((chktimecmp + (duration / 60)) - timecmp) * 60
- elif x.eit is None:
+ el
se: #
if x.eit is None:
end = begin + duration
if begin <= x.begin <= end:
diff = end - x.begin
end = begin + duration
if begin <= x.begin <= end:
diff = end - x.begin