164 replies to this topic

[doglover]

Nice.

 

I only hope that users, do not have such a long customs.channel.xml file as I have.

Before we started on testing this, I was trying something out with this file.  And this file is still there and I get a very long list of skipped service refs.

But this is of course, just my set-up here.

 

Willy

[littlesat]

Mmmm it wasn’t there?!

[Huevos]

Give me a few minutes because I've noticed other bugs too.

[littlesat]

Thanks I cannot make changes anymore today.

[Huevos]

Willy please test this version.

 

Attached Files

•  plugin.py   45.22KB   4 downloads

[littlesat]

Can you also post a diff as that helps to discuss it

[littlesat]

And when I see the sanity checks it looks like you try some ‘crapy’ settings?....
And please put break on a second line after the not valid check.

Edited by littlesat, 24 June 2019 - 20:07.

[Huevos]

And when I see the sanity checks it looks like you try some ‘crapy’ settings?....
And please put break on a second line after the not valid check.

In your patch you put a try/except that will return "None" on failure. I just want to avoid that "None" value from being appended to the list we are creating.

 

One other small change is change variable name from "refstr" to "refnum"

--- plugin-old.py	Mon Jun 24 23:30:40 2019
+++ plugin.py	Mon Jun 24 23:29:56 2019
@@ -110,6 +110,13 @@
 	alternativeServices = enigma.eServiceCenter.getInstance().list(service)
 	return alternativeServices and alternativeServices.getContent("S", True)
 
+def getRefNum(ref):
+    ref = ref.split(':')[3:7]
+    try:
+        return int(ref[0], 16) << 48 | int(ref[1], 16) << 32 | int(ref[2], 16) << 16 | int(ref[3], 16) >> 16
+    except:
+        return
+
 def getBouquetChannelList():
 	channels = [ ]
 	global isFilterRunning, filterCounter
@@ -140,13 +147,13 @@
 										altrernative_list = getAlternatives(service)
 										if altrernative_list:
 											for channel in altrernative_list:
-												refstr = ':'.join(channel.split(':')[:11])
-												if refstr not in channels:
-													channels.append(refstr)
+												refnum = getRefNum(channel)
+												if refnum and refnum not in channels:
+													channels.append(refnum)
 									else:
-										refstr = ':'.join(service.toString().split(':')[:11])
-										if refstr not in channels:
-											channels.append(refstr)
+										refnum = getRefNum(service.toString())
+										if refnum and refnum not in channels:
+											channels.append(refnum)
 	else:
 		bouquet_rootstr = '1:7:1:0:0:0:0:0:0:0:FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'
 		bouquet_root = enigma.eServiceReference(bouquet_rootstr)
@@ -161,13 +168,13 @@
 						altrernative_list = getAlternatives(service)
 						if altrernative_list:
 							for channel in altrernative_list:
-								refstr = ':'.join(channel.split(':')[:11])
-								if refstr not in channels:
-									channels.append(refstr)
+								refnum = getRefNum(channel)
+								if refnum and refnum not in channels:
+									channels.append(refnum)
 					else:
-						refstr = ':'.join(service.toString().split(':')[:11])
-						if refstr not in channels:
-							channels.append(refstr)
+						refnum = getRefNum(service.toString())
+						if refnum and refnum not in channels:
+							channels.append(refnum)
 	isFilterRunning = 0
 	return channels
 
@@ -176,19 +183,19 @@
 	if not ref:
 		return False
 	sref = enigma.eServiceReference(ref)
-	refstr = ':'.join(sref.toString().split(':')[:11])
+	refnum = getRefNum(sref.toString())
 	if config.plugins.epgimport.import_onlybouquet.value:
 		global BouquetChannelListList
 		if BouquetChannelListList is None:
 			BouquetChannelListList = getBouquetChannelList()
-		if refstr not in BouquetChannelListList:
-			print>>log, "Serviceref not in bouquets:", refstr
+		if refnum not in BouquetChannelListList:
+			print>>log, "Serviceref not in bouquets:", sref.toString()
 			return False
 	global serviceIgnoreList
 	if serviceIgnoreList is None:
-		serviceIgnoreList = filtersServices.filtersServicesList.servicesList()
-	if refstr in serviceIgnoreList:
-		print>>log, "Serviceref is in ignore list:", refstr
+		serviceIgnoreList =  [getRefNum(x) for x in filtersServices.filtersServicesList.servicesList()]
+	if refnum in serviceIgnoreList:
+		print>>log, "Serviceref is in ignore list:", sref.toString()
 		return False
 	if "%3a//" in ref.lower():
 		# print>>log, "URL detected in serviceref, not checking fake recording on serviceref:", ref

[littlesat]

Indeed the None should not be added

[doglover]

#146 seems to work.

 

The log lists also now:

Serviceref not in bouquets: 1:0:1:1C0E:1C:46:E080000:0:0:0:
Serviceref not in bouquets: 1:0:1:83F:19:46:E080000:0:0:0:
Serviceref not in bouquets: 1:0:16:1BAD:19:46:E080000:0:0:0:
Serviceref not in bouquets: 1:0:16:132B:48:46:E080000:0:0:0:
Serviceref not in bouquets: 1:0:16:45F3:48:46:E080000:0:0:0:
Serviceref not in bouquets: 1:0:16:132A:48:46:E080000:0:0:0:
Serviceref not in bouquets: 1:0:16:132A:48:46:E080000:0:0:0:

Willy

[littlesat]

The last one from Huevos is good... might only need some finetuning (and considering to move refnum en get all bouquet services to a tool or so, other plug-ins might use it aswell)

[littlesat]

I just forwarded to WanWizard that he can merge #146's plugin.py... I do not want to add some finetuning ...(see it as big compliment).

And also thanks for Doglover for testing

[littlesat]

P.S.

1. Do we also agree with this statement...'I also thing a selection by userbouquet is not really required as you can also already select the xml which you like...'?

2. And another question is the ignore list mandatory or can we also consider to remove it? or do we just leave it as it does not harm (it still can solve when you only want to see EIT for a special service).

Edited by littlesat, 25 June 2019 - 08:44.

[doglover]

I did not know before of the existence of the ignore list.

But I can see it can have its use. So leave it as is.

 

Willy

[ColinB]

Thanks Littlesat. "Muda" is now my word of the day

 

https://en.wikipedia...(Japanese_term)

 

No offense ment. Just cool.

[Pr2]

P.S.
1. Do we also agree with this statement...'I also thing a selection by userbouquet is not really required as you can also already select the xml which you like...'?

 
I agree.
 

And another question is the ignore list mandatory or can we also consider to remove it? or do we just leave it as it does not harm (it still can solve when you only want to see EIT for a special service).

Leave it, if I remember well this was introduced by another plugin that allows to load EPG only for channels were people really wants EPG.

This was done for low-end STB with really poor memory.

[WanWizard]

I just forwarded to WanWizard that he can merge #146's plugin.py... I do not want to add some finetuning ...(see it as big compliment).

And also thanks for Doglover for testing

 

There is no attachment in #146.

 

Do you mean the attachment in #145, or the diff in #148, or perhaps both?

[Huevos]

1) It is required. The XML may contain 100 channels and only 5 of them are in your userbouquets. For example I have TF1 and France 2-5 in my bouquets. No other French channels. The XML for basic French channels contains a lot more channels. If that option were removed I would have hundreds of channels loaded in my epg-cache that I never watch.

[Huevos]

@WanWizard, I've created a PR.

 

https://github.com/O...gimport/pull/27

[WanWizard]

Thanks, merged.