Nav extensions

Author: DimitarCC

lib/python/Components/Sources/CurrentService.py

@@ -38,8 +38,18 @@ def serviceEvent(self, event):
 	def getCurrentService(self):
 		return self.srv or self.navcore.getCurrentService()
 
+	def getCurrentServiceReference(self):
+		return self.navcore.getCurrentlyPlayingServiceReference()
+
 	service = property(getCurrentService)
 
+	def getCurrentServiceWithFallback(self):
+		return self.srv or self.navcore.getCurrentService()
+
+	# this gets current service (set manually) with a fallback to the selected service from navigation.
+	# Typically that is used in ServiceName convertor.
+	servicealt = property(getCurrentServiceWithFallback)
+
 	@cached
 	def getCurrentServiceRef(self):
 		if self.ref:
@@ -48,6 +58,9 @@ def getCurrentServiceRef(self):
 			return self.srv or NavigationInstance.instance.getCurrentlyPlayingServiceOrGroup()
 		return None
 
+	# Setter added for iptv-m3u-reader plugin. For more info see:
+	# https://github.com/DimitarCC/iptv-m3u-reader/commit/08d93986f0f00de6d0ff172abd0bb7b641921bda#diff-834f0679bc61d0427df924d74c20767d5b8fa62227d824361dd81555df6f6725R477-R482
+
 	def setCurrentServiceRef(self, ref):
 		self.ref = ref
 

lib/python/Navigation.py

@@ -24,6 +24,8 @@
 
 
 class Navigation:
+	playServiceExtensions = []
+	recordServiceExtensions = []
 	def __init__(self):
 		if NavigationInstance.instance is not None:
 			raise NavigationInstance.instance
@@ -44,6 +46,7 @@ def __init__(self):
 		self.currentlyPlayingServiceReference = None
 		self.currentlyPlayingServiceOrGroup = None
 		self.currentlyPlayingService = None
+		self.originalPlayingServiceReference = None
 		self.isCurrentServiceStreamRelay = False
 		self.RecordTimer = RecordTimer.RecordTimer()
 		self.__wasTimerWakeup = getFPWasTimerWakeup()
@@ -117,7 +120,14 @@ def serviceHook(self, ref):
 				AddPopup(text=wrappererror, type=MessageBox.TYPE_ERROR, timeout=5, id="channelzapwrapper")
 		return nref, wrappererror
 
-	def playService(self, ref, checkParentalControl=True, forceRestart=False, adjust=True, ignoreStreamRelay=False):
+	def playService(self, ref, checkParentalControl=True, forceRestart=False, adjust=True, ignoreStreamRelay=False, event=None):
+		# Some plugins send None as ref becasue want to shutdown enigma play system.
+		# So we have to stop current service if someone send None.
+		if ref is None:
+			self.stopService()
+			return 0
+
+		InfoBarInstance = InfoBar.instance
 		session = None
 		startPlayingServiceOrGroup = None
 		count = isinstance(adjust, list) and len(adjust) or 0
@@ -127,15 +137,33 @@ def playService(self, ref, checkParentalControl=True, forceRestart=False, adjust
 				startPlayingServiceOrGroup = adjust[2]
 			adjust = adjust[0]
 		oldref = self.currentlyPlayingServiceOrGroup
+		current_service_source = None
+		is_handled = False
+		if InfoBarInstance:
+			current_service_source = InfoBarInstance.session.screen["CurrentService"]
+
+		if "%3a//" in ref.toString():
+			self.currentlyPlayingServiceReference = None
+			self.currentlyPlayingService = None
+			if current_service_source:
+				current_service_source.newService(False)
+
 		if ref and oldref and ref == oldref and not forceRestart:
 			print("[Navigation] ignore request to play already running service(1)")
 			return 1
-		print("[Navigation] playing: ", ref and ref.toString())
-		if ref is None:
-			self.stopService()
-			return 0
-		from Components.ServiceEventTracker import InfoBarCount
-		InfoBarInstance = InfoBarCount == 1 and InfoBar.instance
+		print("[Navigation] playing ref", ref and ref.toString())
+
+		self.currentlyPlayingServiceReference = ref
+		self.currentlyPlayingServiceOrGroup = ref
+		self.originalPlayingServiceReference = ref
+
+		if InfoBarInstance and current_service_source:
+			current_service_source.serviceref = ref
+			current_service_source.newService(ref)
+			InfoBarInstance.session.screen["Event_Now"].updateSource(self.currentlyPlayingServiceReference)
+			InfoBarInstance.session.screen["Event_Next"].updateSource(self.currentlyPlayingServiceReference)
+			InfoBarInstance.serviceStarted()
+
 		isStreamRelay = False
 		if not checkParentalControl or parentalControl.isServicePlayable(ref, boundFunction(self.playService, checkParentalControl=False, forceRestart=forceRestart, adjust=(count > 1 and [0, session] or adjust)), session=session):
 			if ref.flags & eServiceReference.isGroup:
@@ -165,6 +193,7 @@ def playService(self, ref, checkParentalControl=True, forceRestart=False, adjust
 							print("[Navigation] Failed to start: ", alternativeref.toString())
 							self.currentlyPlayingServiceReference = None
 							self.currentlyPlayingServiceOrGroup = None
+							self.originalPlayingServiceReference = None
 							if oldref and ("://" in oldref.getPath() or streamrelay.checkService(oldref)):
 								print("[Navigation] Streaming was active -> try again") # use timer to give the streamserver the time to deallocate the tuner
 								self.retryServicePlayTimer = eTimer()
@@ -193,6 +222,13 @@ def playService(self, ref, checkParentalControl=True, forceRestart=False, adjust
 					if wrappererror:
 						return 1
 				print("[Navigation] playref", playref.toString())
+
+				if BoxInfo.getItem("FCCactive") and "%3a//" in ref.toString() and not isStreamRelay:
+					self.pnav.stopService()
+
+				for f in Navigation.playServiceExtensions:
+					playref, is_handled = f(self, playref, event, InfoBarInstance)
+
 				self.currentlyPlayingServiceOrGroup = ref
 				if startPlayingServiceOrGroup and startPlayingServiceOrGroup.flags & eServiceReference.isGroup and not ref.flags & eServiceReference.isGroup:
 					self.currentlyPlayingServiceOrGroup = startPlayingServiceOrGroup
@@ -239,9 +275,11 @@ def playService(self, ref, checkParentalControl=True, forceRestart=False, adjust
 					self.firstStart = False
 					self.retryServicePlayTimer.start(delay, True)
 					return 0
-				elif self.pnav.playService(playref):
+				elif not is_handled and self.pnav.playService(playref):
 					print("[Navigation] Failed to start: ", playref.toString())
+					current_service_source.serviceref = None
 					self.currentlyPlayingServiceReference = None
+					self.originalPlayingServiceReference = None
 					self.currentlyPlayingServiceOrGroup = None
 					if oldref and ("://" in oldref.getPath() or streamrelay.checkService(oldref)):
 						print("[Navigation] Streaming was active -> try again") # use timer to give the streamserver the time to deallocate the tuner
@@ -252,6 +290,9 @@ def playService(self, ref, checkParentalControl=True, forceRestart=False, adjust
 					self.isCurrentServiceStreamRelay = True
 				if setPriorityFrontend:
 					setPreferredTuner(int(config.usage.frontend_priority.value))
+				if InfoBarInstance and "%3a//" in playref.toString() and not is_handled:
+					current_service_source.serviceref = None
+					InfoBarInstance.serviceStarted()
 				return 0
 		elif oldref and InfoBarInstance and InfoBarInstance.servicelist.servicelist.setCurrent(oldref, adjust):
 			self.currentlyPlayingServiceOrGroup = InfoBarInstance.servicelist.servicelist.getCurrent()
@@ -261,7 +302,12 @@ def getCurrentlyPlayingServiceReference(self):
 		return self.currentlyPlayingServiceReference
 
 	def getCurrentlyPlayingServiceOrGroup(self):
-		return self.currentlyPlayingServiceOrGroup
+		if not self.currentlyPlayingServiceOrGroup:
+			return None
+		return self.originalPlayingServiceReference or self.currentlyPlayingServiceOrGroup
+
+	def getCurrentServiceReferenceOriginal(self):
+		return self.originalPlayingServiceReference
 
 	def getCurrentServiceRef(self):
 		curPlayService = self.getCurrentService()
@@ -283,6 +329,8 @@ def recordService(self, ref, simulate=False):
 		if ref:
 			if ref.flags & eServiceReference.isGroup:
 				ref = getBestPlayableServiceReference(ref, eServiceReference(), simulate)
+			for f in Navigation.recordServiceExtensions:
+				ref = f(self, ref)
 			if type != (pNavigation.isPseudoRecording | pNavigation.isFromEPGrefresh):
 				ref, isStreamRelay = streamrelay.streamrelayChecker(ref)
 				#if not isStreamRelay:

lib/python/Screens/InfoBarGenerics.py

@@ -269,6 +269,7 @@ def __setData(self, value):
 	data = property(__getData, __setData)
 
 	def streamrelayChecker(self, playref):
+		is_stream_relay = False
 		playrefstring = playref.toCompareString()
 		if "%3a//" not in playrefstring and playrefstring in self.__services:
 			url = f'http://{".".join("%d" % d for d in config.misc.softcam_streamrelay_url.value)}:{config.misc.softcam_streamrelay_port.value}/'
@@ -277,10 +278,11 @@ def streamrelayChecker(self, playref):
 			else:
 				playrefmod = playrefstring
 			playref = eServiceReference("%s%s%s:%s" % (playrefmod, url.replace(":", "%3a"), playrefstring.replace(":", "%3a"), ServiceReference(playref).getServiceName()))
+			is_stream_relay = True
 			print(f"[{self.__class__.__name__}] Play service {playref.toCompareString()} via streamrelay")
 			playref.setAlternativeUrl(playrefstring)
-			return playref, True
-		return playref, False
+			return playref, True, is_stream_relay
+		return playref, False, is_stream_relay
 
 	def checkService(self, service):
 		return service and service.toCompareString() in self.__services

lib/python/Screens/PictureInPicture.py

@@ -57,6 +57,7 @@ class PictureInPictureZapping(Screen):
 
 
 class PictureInPicture(Screen):
+	playServiceExtensions = []
 	def __init__(self, session):
 		global pip_config_initialized
 		Screen.__init__(self, session)
@@ -195,6 +196,8 @@ def playService(self, service):
 			return False
 		from Screens.InfoBarGenerics import streamrelay
 		ref, isStreamRelay = streamrelay.streamrelayChecker(self.resolveAlternatePipService(service))
+		for f in PictureInPicture.playServiceExtensions:
+			ref = f(self, ref)
 		if ref:
 			if BoxInfo.getItem("CanNotDoSimultaneousTranscodeAndPIP") and StreamServiceList:
 				self.pipservice = None