Merge pull request #3699 from GhostofGeeeee/Subservices

[ChannelSelection]  Final subservices improvements

Author: jbleyel

lib/python/Screens/ChannelSelection.py

@@ -416,6 +416,8 @@ def enterUserbouquet(self, root, save_root=True):
 		if self.bouquet_root:
 			self.enterPath(self.bouquet_root)
 		self.enterPath(root)
+		if self.isSubservices(root):
+			self.enterSubservices()
 		self.startRoot = None
 		if save_root:
 			self.saveRoot()
@@ -2578,7 +2580,7 @@ def togglePipzap(self):
 			self.showPipzapMessage()
 			self.dopipzap = True
 			self.__evServiceStart()
-			# Move to service playing in pip (will not work with sub-services).
+			# Move to service playing in pip.
 			self.setCurrentSelection(self.session.pip.getCurrentService())
 			title = f"{title} {_('(PiP)')}"
 		self.setTitle(title)
@@ -2665,28 +2667,30 @@ def newServicePlayed(self):
 		return ret
 
 	def addToHistory(self, ref):
-		if not self.isSubservices() or not self.history:
-			if self.delhistpoint is not None:
-				x = self.delhistpoint
-				while x <= len(self.history) - 1:
+		if self.history and self.isSubservices(self.history[self.history_pos][0]) and self.isSubservices(self.servicePath[0]):  # Only replace subservice
+			self.history[self.history_pos] = self.servicePath[:] + [ref]
+			return
+		if self.delhistpoint is not None:
+			x = self.delhistpoint
+			while x <= len(self.history) - 1:
+				del self.history[x]
+		self.delhistpoint = None
+		if self.servicePath is not None:
+			tmp = self.servicePath[:]
+			tmp.append(ref)
+			self.history.append(tmp)
+			hlen = len(self.history)
+			x = 0
+			while x < hlen - 1:
+				if self.history[x][-1] == ref and not self.isSubservices() or self.isSubservices(self.history[x][0]):
 					del self.history[x]
-			self.delhistpoint = None
-			if self.servicePath is not None:
-				tmp = self.servicePath[:]
-				tmp.append(ref)
-				self.history.append(tmp)
-				hlen = len(self.history)
-				x = 0
-				while x < hlen - 1:
-					if self.history[x][-1] == ref:
-						del self.history[x]
-						hlen -= 1
-					else:
-						x += 1
-				if hlen > HISTORY_SIZE:
-					del self.history[0]
 					hlen -= 1
-				self.history_pos = hlen - 1
+				else:
+					x += 1
+			if hlen > HISTORY_SIZE:
+				del self.history[0]
+				hlen -= 1
+			self.history_pos = hlen - 1
 
 	def historyBack(self):
 		hlen = len(self.history)
@@ -2709,8 +2713,11 @@ def historyNext(self):
 	def setHistoryPath(self, doZap=True):
 		path = self.history[self.history_pos][:]
 		ref = path.pop()
-		del self.servicePath[:]
-		self.servicePath += path
+		if self.isSubservices(path[0]):
+			self.enterSubservices(ref)
+		else:
+			del self.servicePath[:]
+			self.servicePath += path
 		self.saveRoot()
 		root = path[-1]
 		cur_root = self.getRoot()
@@ -2754,7 +2761,7 @@ def historyMenuClosed(self, retval):
 			pos += 1
 		self.delhistpoint = pos + 1
 		if pos < hlen and pos != self.history_pos:
-			tmp = self.history[pos]  # noqa F841
+			# tmp = self.history[pos]
 			# self.history.append(tmp)
 			# del self.history[pos]
 			self.history_pos = pos
@@ -2832,7 +2839,11 @@ def recallPrevService(self):
 			self.addToHistory(currentPlayedRef)
 			hlen = len(self.history)
 		if hlen > 1:
-			if self.history_pos == hlen - 1:
+			if self.isSubservices(self.history[self.history_pos][0]):  # Exit subservice!
+				del self.history[self.history_pos]
+				if self.history_pos > 0:
+					self.history_pos -= 1
+			elif self.history_pos == hlen - 1:
 				tmp = self.history[self.history_pos]
 				self.history[self.history_pos] = self.history[self.history_pos - 1]
 				self.history[self.history_pos - 1] = tmp
@@ -2848,7 +2859,6 @@ def cancel(self):
 		if self.revertMode is None:
 			self.restoreRoot()
 			if self.dopipzap:
-				# This unfortunately won't work with sub-services.
 				self.setCurrentSelection(self.session.pip.getCurrentService())
 			else:
 				lastservice = eServiceReference(self.lastservice.value)
@@ -2879,7 +2889,6 @@ def zapBack(self):
 		self.startServiceRef = None
 		self.startRoot = None
 		if self.dopipzap:
-			# This unfortunately won't work with sub-services.
 			self.setCurrentSelection(self.session.pip.getCurrentService())
 		else:
 			lastservice = eServiceReference(self.lastservice.value)

lib/python/Screens/InfoBarGenerics.py

@@ -718,8 +718,6 @@ def keyNumberGlobal(self, number):
 		if number == 0:
 			if isinstance(self, InfoBarPiP) and self.pipHandles0Action():
 				self.pipDoHandle0Action()
-			elif self.servicelist.history and self.servicelist.isSubservices():
-				self.servicelist.setHistoryPath()
 			elif len(self.servicelist.history) > 1 or config.usage.panicbutton.value:
 				self.checkTimeshiftRunning(self.recallPrevService)
 		else: