projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes for python 2.6 by Moritz Venn
[vuplus_dvbapp]
/
lib
/
python
/
Components
/
Converter
/
ServicePosition.py
diff --git
a/lib/python/Components/Converter/ServicePosition.py
b/lib/python/Components/Converter/ServicePosition.py
index
b488258
..
2bcc549
100644
(file)
--- a/
lib/python/Components/Converter/ServicePosition.py
+++ b/
lib/python/Components/Converter/ServicePosition.py
@@
-1,7
+1,7
@@
from Converter import Converter
from Poll import Poll
from enigma import iPlayableService
from Converter import Converter
from Poll import Poll
from enigma import iPlayableService
-from Components.Element import cached
+from Components.Element import cached
, ElementError
class ServicePosition(Converter, Poll, object):
TYPE_LENGTH = 0
class ServicePosition(Converter, Poll, object):
TYPE_LENGTH = 0
@@
-19,6
+19,7
@@
class ServicePosition(Converter, Poll, object):
self.negate = 'Negate' in args
self.detailed = 'Detailed' in args
self.showHours = 'ShowHours' in args
self.negate = 'Negate' in args
self.detailed = 'Detailed' in args
self.showHours = 'ShowHours' in args
+ self.showNoSeconds = 'ShowNoSeconds' in args
if self.detailed:
self.poll_interval = 100
if self.detailed:
self.poll_interval = 100
@@
-34,7
+35,7
@@
class ServicePosition(Converter, Poll, object):
elif type == "Gauge":
self.type = self.TYPE_GAUGE
else:
elif type == "Gauge":
self.type = self.TYPE_GAUGE
else:
- raise
"type must be {Length|Position|Remaining|Gauge} with optional arguments {Negate|Detailed|ShowHours}"
+ raise
ElementError("type must be {Length|Position|Remaining|Gauge} with optional arguments {Negate|Detailed|ShowHours|NoSeconds}")
self.poll_enabled = self.type != self.TYPE_LENGTH
self.poll_enabled = self.type != self.TYPE_LENGTH
@@
-94,9
+95,15
@@
class ServicePosition(Converter, Poll, object):
if not self.detailed:
if self.showHours:
if not self.detailed:
if self.showHours:
- return sign + "%d:%02d:%02d" % (l/3600, l%3600/60, l%60)
+ if self.showNoSeconds:
+ return sign + "%d:%02d" % (l/3600, l%3600/60)
+ else:
+ return sign + "%d:%02d:%02d" % (l/3600, l%3600/60, l%60)
else:
else:
- return sign + "%d:%02d" % (l/60, l%60)
+ if self.showNoSeconds:
+ return sign + "%d" % (l/60)
+ else:
+ return sign + "%d:%02d" % (l/60, l%60)
else:
if self.showHours:
return sign + "%d:%02d:%02d:%03d" % ((l/3600/90000), (l/90000)%3600/60, (l/90000)%60, (l%90000)/90)
else:
if self.showHours:
return sign + "%d:%02d:%02d:%03d" % ((l/3600/90000), (l/90000)%3600/60, (l/90000)%60, (l%90000)/90)