git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add ' fps'
[enigma2.git]
/
lib
/
python
/
Components
/
Converter
/
ClockToText.py
diff --git
a/lib/python/Components/Converter/ClockToText.py
b/lib/python/Components/Converter/ClockToText.py
index 65e431bcd5bd7a698983305d558b640eaa3d9485..8ef9874211555a1820be9fbe2257d7fb0079eb4a 100644
(file)
--- a/
lib/python/Components/Converter/ClockToText.py
+++ b/
lib/python/Components/Converter/ClockToText.py
@@
-8,6
+8,8
@@
class ClockToText(Converter, object):
IN_MINUTES = 2
DATE = 3
FORMAT = 4
IN_MINUTES = 2
DATE = 3
FORMAT = 4
+ AS_LENGTH = 5
+ TIMESTAMP = 6
# add: date, date as string, weekday, ...
# (whatever you need!)
# add: date, date as string, weekday, ...
# (whatever you need!)
@@
-20,7
+22,11
@@
class ClockToText(Converter, object):
self.type = self.IN_MINUTES
elif type == "Date":
self.type = self.DATE
self.type = self.IN_MINUTES
elif type == "Date":
self.type = self.DATE
- elif type.find("Format") != -1:
+ elif type == "AsLength":
+ self.type = self.AS_LENGTH
+ elif type == "Timestamp":
+ self.type = self.TIMESTAMP
+ elif str(type).find("Format") != -1:
self.type = self.FORMAT
self.fmt_string = type[7:]
else:
self.type = self.FORMAT
self.fmt_string = type[7:]
else:
@@
-35,6
+41,10
@@
class ClockToText(Converter, object):
# handle durations
if self.type == self.IN_MINUTES:
return "%d min" % (time / 60)
# handle durations
if self.type == self.IN_MINUTES:
return "%d min" % (time / 60)
+ elif self.type == self.AS_LENGTH:
+ return "%d:%02d" % (time / 60, time % 60)
+ elif self.type == self.TIMESTAMP:
+ return str(time)
t = localtime(time)
t = localtime(time)
@@
-52,6
+62,7
@@
class ClockToText(Converter, object):
return str(s1+s2)
else:
return strftime(self.fmt_string, t)
return str(s1+s2)
else:
return strftime(self.fmt_string, t)
+
else:
return "???"
else:
return "???"