[Updated] Parental control handling

Author: DimitarCC

lib/python/Components/Converter/ServiceName.py

@@ -40,7 +40,7 @@ def __init__(self, type):
 
 	@cached
 	def getText(self):
-		service = self.source.service
+		service = self.source.service or (hasattr(self.source, "serviceref") and self.source.serviceref)
 		info = None
 		if isinstance(service, eServiceReference):
 			info = self.source.info

lib/python/Components/ParentalControl.py

@@ -122,6 +122,9 @@ def isServicePlayable(self, ref, callback, session=None):
 				self.PinDlg = session.openWithCallback(boundFunction(self.servicePinEntered, ref), PinInput, triesEntry=config.ParentalControl.retries.servicepin, pinList=self.getPinList(), service=ServiceReference(ref).getServiceName(), title=title, windowTitle=_("Parental control"), simple=False)
 			else:
 				Tools.Notifications.AddNotificationParentalControl(boundFunction(self.servicePinEntered, ref), PinInput, triesEntry=config.ParentalControl.retries.servicepin, pinList=self.getPinList(), service=ServiceReference(ref).getServiceName(), title=title, windowTitle=_("Parental control"))
+			import NavigationInstance
+			if NavigationInstance.instance and NavigationInstance.instance.currentlyPlayingServiceReference:
+				NavigationInstance.instance.stopService() # kill current service since we are on protected service and canceled the pin
 			return False
 		else:
 			return True
@@ -189,7 +192,10 @@ def servicePinEntered(self, service, result=None):
 		if result:
 			self.setSessionPinCached()
 			self.hideBlacklist()
-			self.callback(ref=service)
+			try:
+				self.callback(ref=service, forceRestart=True)
+			except:
+				self.callback(ref=service)
 		elif result is False:
 			messageText = _("The pin code you entered is wrong.")
 			if self.session:

lib/python/Components/Sources/EventInfo.py

@@ -118,6 +118,7 @@ class EventInfo(PerServiceBase, Source):
 
 	def __init__(self, navcore, now_or_next):
 		self.now_or_next = now_or_next
+		self.__service = None
 		self.timer = eTimer()
 		self.timer.callback.append(boundFunction(self.gotEvent, iPlayableService.evUpdatedEventInfo, True))
 		Source.__init__(self)
@@ -129,7 +130,6 @@ def __init__(self, navcore, now_or_next):
 				iPlayableService.evEnd: self.gotEvent
 			}, with_event=True)
 		self.epgQuery = eEPGCache.getInstance().lookupEventTime
-		self.__service = None
 
 	@cached
 	def getEvent(self):
@@ -156,7 +156,7 @@ def getEvent(self):
 	def gotEvent(self, what, from_timer=False):
 		self.timer.stop()
 		print("[EventInfo] gotEvent, type:", ("'now'" if self.now_or_next == self.NOW else "'next'") + ",", "what:", "'%s'" % str({iPlayableService.evStart: "evStart", iPlayableService.evUpdatedInfo: "evUpdatedInfo", iPlayableService.evUpdatedEventInfo: "evUpdatedEventInfo", iPlayableService.evEnd: "evEnd"}.get(what, "Unknown")) + ",", "is timed repeat:", str(from_timer))
-		if what == iPlayableService.evEnd:
+		if what == iPlayableService.evEnd and not self.__service:
 			self.changed((self.CHANGED_CLEAR,))
 		else:
 			self.changed((self.CHANGED_ALL,))

lib/python/Navigation.py

@@ -133,12 +133,6 @@ def playService(self, ref, checkParentalControl=True, forceRestart=False, adjust
 			return 1
 		print("[Navigation] playing ref", ref and ref.toString())
 
-		if "%3a//" in ref.toString():
-			self.currentlyPlayingServiceReference = None
-			self.currentlyPlayingService = None
-			if current_service_source:
-				current_service_source.newService(False)
-
 		self.currentlyPlayingServiceReference = ref
 		self.currentlyPlayingServiceOrGroup = ref
 		self.originalPlayingServiceReference = ref

lib/python/Screens/ChannelSelection.py

@@ -2594,7 +2594,7 @@ def saveChannel(self, ref):
 			refstr = ref.toString()
 		else:
 			refstr = ""
-		if refstr != self.lastservice.value and not Components.ParentalControl.parentalControl.isProtected(ref):
+		if refstr != self.lastservice.value:
 			self.lastservice.value = refstr
 			self.lastservice.save()