[ChannelSelection]

* update imports
* use f-string
* comment out debug

Author: jbleyel

lib/python/Screens/ChannelSelection.py

@@ -346,12 +346,12 @@ def buildTitle(self):
 		functionType = f" [{functionType}]" if functionType else ""
 		self.setTitle(f"{mode} - {title}{functionType}")
 		# self.setTitle("{title} ({mode}){functionType}")
-		print(f"[ChannelSelection] buildTitle DEBUG: Setting title='{self.getTitle()}'.")
+		# print(f"[ChannelSelection] buildTitle DEBUG: Setting title='{self.getTitle()}'.")
 
 	def getServiceName(self, serviceReference):
 		serviceNameTmp = ServiceReference(serviceReference).getServiceName()
 		serviceName = serviceNameTmp.replace(_("(TV)") if self.mode == MODE_TV else _("(Radio)"), "").replace("  ", " ").strip()
-		print(f"[ChannelSelection] getServiceName DEBUG: Service Name Before='{serviceNameTmp}', After='{serviceName}'.")
+		# print(f"[ChannelSelection] getServiceName DEBUG: Service Name Before='{serviceNameTmp}', After='{serviceName}'.")
 		if "User - bouquets" in serviceName:
 			return _("User - Bouquets")
 		if not serviceName:
@@ -522,11 +522,7 @@ def showSatellites(self, changeMode=False):
 						if cur_ref:
 							# pos = self.service_types.rfind(":")  # DEBUG NOTE: This doesn't appear to be used.
 							ref = eServiceReference(self.service_types_ref)
-							path = "(channelID == %08x%04x%04x) && %s ORDER BY name" % (
-								cur_ref.getUnsignedData(4),  # Name space.
-								cur_ref.getUnsignedData(2),  # TSID.
-								cur_ref.getUnsignedData(3),  # ONID.
-								self.service_types_ref.getPath())
+							path = f"(channelID == {cur_ref.getUnsignedData(4):08x}{cur_ref.getUnsignedData(2):04x}{cur_ref.getUnsignedData(3):04x}) && {self.service_types_ref.getPath()} ORDER BY name"
 							ref.setPath(path)
 							ref.setName(_("Current transponder"))
 							self.servicelist.addService(ref, beforeCurrent=True)
@@ -570,7 +566,7 @@ def showProviders(self):
 							if info:
 								provider = info.getInfoString(iServiceInformation.sProvider)
 								ref = eServiceReference(eServiceReference.idDVB, eServiceReference.flagDirectory)
-								ref.setPath("(provider == \"%s\") && %s ORDER BY name" % (provider, self.service_types_ref.getPath()))
+								ref.setPath(f"(provider == \"{provider}\") && {self.service_types_ref.getPath()} ORDER BY name")
 								ref.setName(provider)
 								self.setCurrentSelectionAlternative(ref)
 
@@ -743,7 +739,7 @@ def gotoCurrentServiceOrProvider(self, ref):
 					provider = info.getInfoString(iServiceInformation.sProvider)
 					op = self.session.nav.getCurrentlyPlayingServiceOrGroup().getUnsignedData(4) >> 16
 					ref = eServiceReference(eServiceReference.idDVB, eServiceReference.flagDirectory)
-					ref.setPath("(provider == \"%s\") && (satellitePosition == %d) && %s ORDER BY name" % (provider, op, self.service_types_ref.getPath()))
+					ref.setPath(f"(provider == \"{provider}\") && (satellitePosition == {op}) && {self.service_types_ref.getPath()} ORDER BY name")
 					ref.setName(provider)
 					self.servicelist.setCurrent(eServiceReference(ref))
 		elif not self.isBasePathEqual(self.bouquet_root) or self.bouquet_mark_edit == EDIT_ALTERNATIVES or (self.startRoot and self.startRoot != ref):
@@ -909,10 +905,10 @@ def addAlternativeServices(self):
 			flags = eServiceReference.isGroup | eServiceReference.canDescent | eServiceReference.mustDescent
 			if self.mode == MODE_TV:
 				ref = eServiceReference(eServiceReference.idDVB, flags, eServiceReferenceDVB.dTv)
-				ref.setPath("FROM BOUQUET \"alternatives.%s.tv\" ORDER BY bouquet" % self.buildBouquetID(name))
+				ref.setPath(f"FROM BOUQUET \"alternatives.{self.buildBouquetID(name)}.tv\" ORDER BY bouquet")
 			else:
 				ref = eServiceReference(eServiceReference.idDVB, flags, eServiceReferenceDVB.dRadio)
-				ref.setPath("FROM BOUQUET \"alternatives.%s.radio\" ORDER BY bouquet" % self.buildBouquetID(name))
+				ref.setPath(f"FROM BOUQUET \"alternatives.{self.buildBouquetID(name)}.radio\" ORDER BY bouquet")
 			new_ref = ServiceReference(ref)
 			if not mutableBouquet.addService(new_ref.ref, cur_service.ref):
 				mutableBouquet.removeService(cur_service.ref)
@@ -946,11 +942,11 @@ def addBouquet(self, bName, services):
 			if self.mode == MODE_TV:
 				bName = f"{bName} {_('(TV)')}"
 				new_bouquet_ref = eServiceReference(service_types_tv_ref)
-				new_bouquet_ref.setPath("FROM BOUQUET \"userbouquet.%s.tv\" ORDER BY bouquet" % self.buildBouquetID(bName))
+				new_bouquet_ref.setPath(f"FROM BOUQUET \"userbouquet.{self.buildBouquetID(bName)}.tv\" ORDER BY bouquet")
 			else:
 				bName = f"{bName} {_('(Radio)')}"
 				new_bouquet_ref = eServiceReference(service_types_radio_ref)
-				new_bouquet_ref.setPath("FROM BOUQUET \"userbouquet.%s.radio\" ORDER BY bouquet" % self.buildBouquetID(bName))
+				new_bouquet_ref.setPath(f"FROM BOUQUET \"userbouquet.{self.buildBouquetID(bName)}.radio\" ORDER BY bouquet")
 			if not mutableBouquetList.addService(new_bouquet_ref):
 				mutableBouquetList.flushChanges()
 				eDVBDB.getInstance().reloadBouquets()
@@ -988,7 +984,7 @@ def copyCurrentToStreamRelay(self):
 		provider = ServiceReference(self.getCurrentSelection())
 		serviceHandler = eServiceCenter.getInstance()
 		services = serviceHandler.list(provider.ref)
-		from Screens.InfoBarGenerics import streamrelay
+		from Screens.InfoBarGenerics import streamrelay  # This must be here to prevent cycle imports.
 		streamrelay.toggle(self.session.nav, services and services.getContent("R", True))
 
 	def getRefsforProvider(self):
@@ -1219,7 +1215,7 @@ def toggleMoveMode(self, select=False):
 			self.mutableList = None
 			self.function = EDIT_OFF
 			self.buildTitle()
-			print(f"[ChannelSelection] toggleMoveMode DEBUG: Setting title='{self.getTitle()}'.")
+			# print(f"[ChannelSelection] toggleMoveMode DEBUG: Setting title='{self.getTitle()}'.")
 			self.servicelist.resetRoot()
 			self.servicelist.setHideNumberMarker(config.usage.hide_number_markers.value)
 			self.servicelist.setCurrent(self.servicelist.getCurrent())
@@ -1229,7 +1225,7 @@ def toggleMoveMode(self, select=False):
 			select and self.toggleMoveMarked()
 			self.function = EDIT_MOVE
 			self.buildTitle()
-			print(f"[ChannelSelection] toggleMoveMode DEBUG: Setting title='{self.getTitle()}'.")
+			# print(f"[ChannelSelection] toggleMoveMode DEBUG: Setting title='{self.getTitle()}'.")
 			self.servicelist.setCurrent(self.servicelist.getCurrent())
 		self["Service"].editmode = True
 
@@ -1558,8 +1554,7 @@ def set3DMode(self, value):
 			applySettings(value and "sidebyside" or config.osd.threeDmode.value)
 
 	def toggleStreamrelay(self):
-		from Screens.InfoBarGenerics import streamrelay
-		from enigma import eTimer
+		from Screens.InfoBarGenerics import streamrelay  # This must be here to prevent cycle imports.
 		streamrelay.toggle(self.session.nav, self.csel.getCurrentSelection())
 		self.csel.refreshServiceListTimer = eTimer()
 		self.csel.refreshServiceListTimer.callback.append(self.csel.servicelist.resetRoot)
@@ -1577,7 +1572,7 @@ def selectCamProvidercallback(answer):
 			name = service.getName()
 			services = self.csel.getRefsforProvider()
 			if services:
-				from Screens.InfoBarGenerics import autocam
+				from Screens.InfoBarGenerics import autocam  # This must be here to prevent cycle imports.
 				cams = BoxInfo.getItem("Softcams")
 				if len(cams) > 2 and "None" in cams:
 					choiceList = []
@@ -1593,7 +1588,7 @@ def selectCamProvidercallback(answer):
 							desc = _("Remove")
 						choiceList.append((desc, cam))
 					if choiceList:
-						message = _("Select the Softcam for '%s'" % name)
+						message = _("Select the Softcam for '%s'") % name
 						self.session.openWithCallback(selectCamProvidercallback, MessageBox, message, list=choiceList)
 
 	def selectCam(self):
@@ -1604,7 +1599,7 @@ def selectCamcallback(answer):
 
 		service = self.csel.getCurrentSelection()
 		if service:
-			from Screens.InfoBarGenerics import autocam
+			from Screens.InfoBarGenerics import autocam  # This must be here to prevent cycle imports.
 			cams = BoxInfo.getItem("Softcams")
 			if len(cams) > 2 and "None" in cams:
 				channelcam = autocam.getCam(service)
@@ -1629,7 +1624,7 @@ def selectCamcallback(answer):
 					if channelcamidx == -1:
 						channelcamidx = defaultcamidx
 					name = self.getCurrentSelectionName()
-					message = _("Select the Softcam for '%s'" % name)
+					message = _("Select the Softcam for '%s'") % name
 					self.session.openWithCallback(selectCamcallback, MessageBox, message, list=choiceList, default=channelcamidx)
 
 	def addHideVBIFlag(self):
@@ -2587,7 +2582,7 @@ def togglePipzap(self):
 			self.setCurrentSelection(self.session.pip.getCurrentService())
 			title = f"{title} {_('(PiP)')}"
 		self.setTitle(title)
-		print(f"[ChannelSelection] togglePipzap DEBUG: Setting title='{self.getTitle()}'.")
+		# print(f"[ChannelSelection] togglePipzap DEBUG: Setting title='{self.getTitle()}'.")
 		self.buildTitle()
 
 	def showPipzapMessage(self):
@@ -2944,7 +2939,7 @@ def correctChannelNumber(self):
 				# title = title[:pos]
 				# title += _(" (PiP)")
 				self.setTitle(f"{title[:pos]} {_('(PiP)')}")
-				print(f"[ChannelSelection] correctChannelNumber DEBUG: Setting title='{self.getTitle()}'.")
+				# print(f"[ChannelSelection] correctChannelNumber DEBUG: Setting title='{self.getTitle()}'.")
 				self.buildTitle()
 			if tmp_ref and pip_ref and tmp_ref.getChannelNum() != pip_ref.getChannelNum():
 				self.session.pip.currentService = tmp_ref
@@ -2971,7 +2966,7 @@ def switchToAll(self, sref):
 					bouquet = eServiceReference(f"{service_types_tv} ORDER BY name")
 				servicelist.clearPath()
 				if config.usage.multibouquet.value:
-					rootBouquet = eServiceReference("1:7:1:0:0:0:0:0:0:0:FROM BOUQUET \"bouquets.%s\" ORDER BY bouquet" % typestr)
+					rootBouquet = eServiceReference(f"1:7:1:0:0:0:0:0:0:0:FROM BOUQUET \"bouquets.{typestr}\" ORDER BY bouquet")
 					if servicelist.bouquet_root != rootBouquet:
 						servicelist.bouquet_root = rootBouquet
 				servicelist.enterPath(bouquet)
@@ -3144,7 +3139,7 @@ class RadioInfoBar(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 		self.setTitle(_("Radio Channel Selection"))
-		print(f"[ChannelSelection] RadioInfoBar DEBUG: Setting title='{self.getTitle()}'.")
+		# print(f"[ChannelSelection] RadioInfoBar DEBUG: Setting title='{self.getTitle()}'.")
 		self["RdsDecoder"] = RdsDecoder(self.session.nav)