* add streamrelay flag to epg api's

plugin/controllers/models/epg.py

@@ -145,6 +145,7 @@ def __init__(self):
 		self.doref = True
 		self.currentpicon = ""
 		self.currentsref = ""
+		self.streamRelay = []
 
 	def search(self, querystring, searchfulldescription=False):
 		querytype = eEPGCache.PARTIAL_TITLE_SEARCH
@@ -247,6 +248,7 @@ def getEventDescription(self, sref, eventid, encode=True, default=""):
 	def convertEvent(self, *event):
 		encode = self.doencode
 		alter = self.doalter
+		streamRelay = self.streamRelay
 		ev = {}
 		ev["id"] = event[0]
 		if event[1]:
@@ -264,6 +266,9 @@ def convertEvent(self, *event):
 			ev["now_timestamp"] = event[3]
 			ev["remaining"] = (event[1] + event[2]) - event[3]
 			ev["genre"], ev["genreid"] = convertGenre(event[7])
+			if streamRelay:
+				ev['streamrelay'] = event[8] in streamRelay
+
 		else:
 			ev["begin_timestamp"] = 0
 			ev["duration_sec"] = 0

plugin/controllers/models/services.py

@@ -848,7 +848,7 @@ def getMultiChannelNowNextEpg(slist, encode=False):
 	return {"events": events, "result": True}
 
 
-def getBouquetNowNextEpg(bqref, nowornext, encode=False, showisplayable=False):
+def getBouquetNowNextEpg(bqref, nowornext, encode=False, showisplayable=False, showstreamrelay=False):
 	bqref = unquote(bqref)
 	services = eServiceCenter.getInstance().list(eServiceReference(bqref))
 	if not services:
@@ -899,6 +899,15 @@ def getBouquetNowNextEpg(bqref, nowornext, encode=False, showisplayable=False):
 				query.append((service, nowornext, -1))
 
 	epg = EPG()
+	streamRelay = []
+	if showstreamrelay:
+		try:
+			with open("/etc/enigma2/whitelist_streamrelay") as fd:
+				streamRelay = [line.strip() for line in fd.readlines()]
+		except OSError:
+			pass
+	epg.streamRelay = streamRelay
+
 	events = epg.getBouquetNowNextEpg(query, encode, alter=True, full=True)
 
 	return {"events": events, "isplayable": isPlayable, "result": True}

plugin/controllers/web.py

@@ -1608,7 +1608,8 @@ def epgnownext(self, request, nowornext):
 			return res
 		bref = getUrlArg(request, "bRef")
 		showisplayable = getUrlArg(request, "showIsPlayable") is not None
-		ret = getBouquetNowNextEpg(bref, nowornext, self.isJson, showisplayable)
+		showstreamrelay = True if getUrlArg(request, "showstreamrelay", "0") in ("1", "true") else False
+		ret = getBouquetNowNextEpg(bref, nowornext, self.isJson, showisplayable=showisplayable, showstreamrelay=showstreamrelay)
 		if nowornext == EPG.NOW_NEXT:
 			info = getCurrentService(self.session)
 			ret["info"] = info