From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 9 Dec 2008 22:23:40 +0000 (+0100)
Subject: RemainingToText.py: more flexible use
X-Git-Tag: 2.6.0~543^2~20^2~2
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/9ef5b8eaa067430868c27f7ef063ecf32e84ea68

RemainingToText.py: more flexible use
---

diff --git a/lib/python/Components/Converter/RemainingToText.py b/lib/python/Components/Converter/RemainingToText.py
index adefe9cf..4249e30a 100644
--- a/lib/python/Components/Converter/RemainingToText.py
+++ b/lib/python/Components/Converter/RemainingToText.py
@@ -2,19 +2,43 @@ from Components.Converter.Converter import Converter
 from Components.Element import cached
 
 class RemainingToText(Converter, object):
+	DEFAULT = 0
+	WITH_SECONDS = 1
+	NO_SECONDS = 2
+
 	def __init__(self, type):
 		Converter.__init__(self, type)
+		if type == "WithSeconds":
+			self.type = self.WITH_SECONDS
+		elif type == "NoSeconds":
+			self.type = self.NO_SECONDS
+		else:
+			self.type = self.DEFAULT
 
 	@cached
 	def getText(self):
-		r = self.source.time
-		if r is None:
+		time = self.source.time
+		if time is None:
 			return ""
 
 		(duration, remaining) = self.source.time
-		if remaining is not None:
-			return "+%d min" % (remaining / 60)
+
+		if self.type == self.WITH_SECONDS:
+			if remaining is not None:
+				return "%d:%02d:%02d" % (remaining / 3600, (remaining / 60) - ((remaining / 3600) * 60), remaining % 60)
+			else:
+				return "%02d:%02d:%02d" % (duration / 3600, (duration / 60) - ((duration / 3600) * 60), duration % 60)
+		elif self.type == self.NO_SECONDS:
+			if remaining is not None:
+				return "+%d:%02d" % (remaining / 3600, (remaining / 60) - ((remaining / 3600) * 60))
+			else:
+				return "%02d:%02d" % (duration / 3600, (duration / 60) - ((duration / 3600) * 60))
+		elif self.type == self.DEFAULT:
+			if remaining is not None:
+				return "+%d min" % (remaining / 60)
+			else:
+				return "%d min" % (duration / 60)
 		else:
-			return "%d min" % (duration / 60)
+			return "???"
 
 	text = property(getText)