Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

2 files changed, 39 insertions, 8 deletions

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)
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)