Revert "ignore the first three parts of the service ref when matching…

… bouquets" This reverts commit eee9491.
OpenPLi · Jun 24, 2019 · ef62b4f · ef62b4f
1 parent eee9491
commit ef62b4f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/EPGImport/plugin.py b/src/EPGImport/plugin.py
@@ -140,11 +140,11 @@ def getBouquetChannelList():
 										altrernative_list = getAlternatives(service)
 										if altrernative_list:
 											for channel in altrernative_list:
-												refstr = service.toString().upper().split(':')[3:7]
+												refstr = ':'.join(channel.split(':')[:11])
 												if refstr not in channels:
 													channels.append(refstr)
 									else:
-										refstr = service.toString().upper().split(':')[3:7]
+										refstr = ':'.join(service.toString().split(':')[:11])
 										if refstr not in channels:
 											channels.append(refstr)
 	else:
@@ -161,11 +161,11 @@ def getBouquetChannelList():
 						altrernative_list = getAlternatives(service)
 						if altrernative_list:
 							for channel in altrernative_list:
-								refstr = channel.upper().split(':')[3:7]
+								refstr = ':'.join(channel.split(':')[:11])
 								if refstr not in channels:
 									channels.append(refstr)
 					else:
-						refstr = service.toString().upper().split(':')[3:7]
+						refstr = ':'.join(service.toString().split(':')[:11])
 						if refstr not in channels:
 							channels.append(refstr)
 	isFilterRunning = 0
@@ -176,7 +176,7 @@ def channelFilter(ref):
 	if not ref:
 		return False
 	sref = enigma.eServiceReference(ref)
-	refstr = sref.toString().upper().split(':')[3:7]
+	refstr = ':'.join(sref.toString().split(':')[:11])
 	if config.plugins.epgimport.import_onlybouquet.value:
 		global BouquetChannelListList
 		if BouquetChannelListList is None:
@@ -186,7 +186,7 @@ def channelFilter(ref):
 			return False
 	global serviceIgnoreList
 	if serviceIgnoreList is None:
-		serviceIgnoreList = [x.upper().split(':')[3:7] for x in filtersServices.filtersServicesList.servicesList()]
+		serviceIgnoreList = filtersServices.filtersServicesList.servicesList()
 	if refstr in serviceIgnoreList:
 		print>>log, "Serviceref is in ignore list:", refstr
 		return False