add showstreamrelay, showall, noiptv parameter to getservices api

plugin/controllers/models/services.py

@@ -492,7 +492,7 @@ def _getPicon(sref):
 	return {"channels": ret}
 
 
-def getServices(sref, showall=True, showhidden=False, pos=0, showproviders=False, picon=False, noiptv=False, removenamefromsref=False, excludeprogram=False, excludevod=False):
+def getServices(sref, showall=True, showhidden=False, pos=0, showproviders=False, picon=False, noiptv=False, removenamefromsref=False, excludeprogram=False, excludevod=False, showstreamrelay=False):
 	starttime = datetime.now()
 	services = []
 	allproviders = {}
@@ -518,6 +518,14 @@ def getServices(sref, showall=True, showhidden=False, pos=0, showproviders=False
 			for sitem in slist:
 				allproviders[sitem[0]] = provider[1]
 
+	streamRelay = []
+	if showstreamrelay:
+		try:
+			with open("/etc/enigma2/whitelist_streamrelay") as fd:
+				streamRelay = [line.strip() for line in fd.readlines()]
+		except OSError:
+			pass
+
 	bqservices = servicehandler.list(eServiceReference(sref))
 	slist = bqservices and bqservices.getContent("CN" if removenamefromsref else "SN", True)
 
@@ -575,6 +583,8 @@ def getServices(sref, showall=True, showhidden=False, pos=0, showproviders=False
 					lcn = LCNDB.get(lcnref, "")
 					if lcn:
 						service['lcn'] = lcn
+			if showstreamrelay:
+				service['streamrelay'] = sr in streamRelay
 
 			services.append(service)
 
@@ -587,7 +597,7 @@ def getServices(sref, showall=True, showhidden=False, pos=0, showproviders=False
 	}
 
 
-def getAllServices(mode, noiptv=False, nolastscanned=False, removenamefromsref=False, showall=True, showproviders=False, excludeprogram=False, excludevod=False):
+def getAllServices(mode, noiptv=False, nolastscanned=False, removenamefromsref=False, showall=True, showproviders=False, excludeprogram=False, excludevod=False, showstreamrelay=False):
 	starttime = datetime.now()
 	services = []
 	if mode is None:
@@ -597,7 +607,7 @@ def getAllServices(mode, noiptv=False, nolastscanned=False, removenamefromsref=F
 	for bouquet in bouquets:
 		if nolastscanned and 'LastScanned' in bouquet[0]:
 			continue
-		sv = getServices(sref=bouquet[0], showall=showall, showhidden=False, pos=pos, showproviders=showproviders, noiptv=noiptv, removenamefromsref=removenamefromsref, excludeprogram=excludeprogram, excludevod=excludevod)
+		sv = getServices(sref=bouquet[0], showall=showall, showhidden=False, pos=pos, showproviders=showproviders, noiptv=noiptv, removenamefromsref=removenamefromsref, excludeprogram=excludeprogram, excludevod=excludevod, showstreamrelay=showstreamrelay)
 		services.append({
 			"servicereference": bouquet[0],
 			"servicename": bouquet[1],

plugin/controllers/web.py

@@ -490,8 +490,9 @@ def P_getallservices(self, request):
 		excludevod = "vod" in excludes
 		excludeiptv = "iptv" in excludes
 		excludelastscanned = "lastscanned" in excludes
+		showstreamrelay = True if getUrlArg(request, "showstreamrelay", "0") in ("1", "true") else False
 
-		bouquets = getAllServices(mode, noiptv=noiptv or excludeiptv, nolastscanned=nolastscanned or excludelastscanned, removenamefromsref=removenamefromsref, showall=showall, showproviders=showproviders, excludeprogram=excludeprogram, excludevod=excludevod)
+		bouquets = getAllServices(mode, noiptv=noiptv or excludeiptv, nolastscanned=nolastscanned or excludelastscanned, removenamefromsref=removenamefromsref, showall=showall, showproviders=showproviders, excludeprogram=excludeprogram, excludevod=excludevod, showstreamrelay=showstreamrelay)
 		if b"renameserviceforxmbc" in list(request.args.keys()):
 			for bouquet in bouquets["services"]:
 				for service in bouquet["subservices"]:
@@ -521,7 +522,10 @@ def P_getservices(self, request):
 			showproviders = True
 		picon = True if getUrlArg(request, "picon", "0") in ("1", "true") else False
 		removenamefromsref = True if getUrlArg(request, "removenamefromsref", "0") in ("1", "true") else False
-		return getServices(sref=sref, showall=True, showhidden=hidden, showproviders=showproviders, picon=picon, removenamefromsref=removenamefromsref)
+		showstreamrelay = True if getUrlArg(request, "showstreamrelay", "0") in ("1", "true") else False
+		noiptv = True if getUrlArg(request, "noiptv", "0") in ("1", "true") else False
+		showall = False if getUrlArg(request, "showall", "1") in ("0", "false") else True
+		return getServices(sref=sref, showall=showall, showhidden=hidden, showproviders=showproviders, picon=picon, removenamefromsref=removenamefromsref, noiptv=noiptv, showstreamrelay=showstreamrelay)
 
 	def P_servicesxspf(self, request):
 		"""