diff options
| author | Mladen Horvat <acidburn@opendreambox.org> | 2008-12-10 09:53:18 +0100 |
|---|---|---|
| committer | Mladen Horvat <acidburn@opendreambox.org> | 2008-12-10 09:53:18 +0100 |
| commit | 9e9b0f5405807576512b9e9e5f6adeb87218822e (patch) | |
| tree | 3654db66ac7e6414ce6cfef0123a34c1065ec3a5 /lib/python/Components/Converter/ServicePosition.py | |
| parent | 35970b94b3b2df24f19d259fba04e23cfcf22e45 (diff) | |
| parent | a6976a2c3c6256a0c860827550aabd7ee9bdf3bf (diff) | |
| download | enigma2-9e9b0f5405807576512b9e9e5f6adeb87218822e.tar.gz enigma2-9e9b0f5405807576512b9e9e5f6adeb87218822e.zip | |
Merge branch 'master' of git://git.opendreambox.org/git/enigma2
Diffstat (limited to 'lib/python/Components/Converter/ServicePosition.py')
| -rw-r--r-- | lib/python/Components/Converter/ServicePosition.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/python/Components/Converter/ServicePosition.py b/lib/python/Components/Converter/ServicePosition.py index b488258b..d7a55dae 100644 --- a/lib/python/Components/Converter/ServicePosition.py +++ b/lib/python/Components/Converter/ServicePosition.py @@ -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.showNoSeconds = 'ShowNoSeconds' in args 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: - raise "type must be {Length|Position|Remaining|Gauge} with optional arguments {Negate|Detailed|ShowHours}" + raise "type must be {Length|Position|Remaining|Gauge} with optional arguments {Negate|Detailed|ShowHours|NoSeconds}" self.poll_enabled = self.type != self.TYPE_LENGTH @@ -94,9 +95,15 @@ class ServicePosition(Converter, Poll, object): 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: - 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) |