Skip to content

Fix duplicate PlutoTV service references when channels share the same number #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xcentaurix wants to merge 1 commit into from
Closed

Fix duplicate PlutoTV service references when channels share the same number #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/PlutoDownload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import shutil
import time
import uuid
import zlib

import threading # for fetching picons
from twisted.internet import threads # for updating GUI widgets
Expand Down Expand Up @@ -643,6 +644,7 @@ def downloadBouquet(self, cc):
self.bouquet = []
self.bouquetCC = cc
self.tsid = TSIDS.get(cc, "0")
self.usedServiceIds = set()
self.stop()
self.channelsList.clear()
self.guideList.clear()
Expand Down Expand Up @@ -773,9 +775,22 @@ def buildM3U(self, channel):
self.categories.append(group)

if int(channel["number"]) == 0:
number = _id[-4:].upper()
sid = int(_id[-4:], 16) if len(_id) >= 4 else 0
else:
number = "%X" % channel["number"]
sid = int(channel["number"])

if sid <= 0:
sid = (zlib.crc32(_id.encode("utf-8")) & 0xFFFF) or 1

if sid in self.usedServiceIds:
sid = (zlib.crc32(_id.encode("utf-8")) & 0xFFFF) or 1
while sid in self.usedServiceIds:
sid = (sid + 1) & 0xFFFF
if sid == 0:
sid = 1

self.usedServiceIds.add(sid)
number = "%X" % sid

self.channelsList[group].append((str(number), _id, channel["name"], logo, _id))
return True
Expand Down
Loading