Skip to content

added jmp2 proxy as live source #24

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

Open
xcentaurix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added jmp2 proxy as live source #24

Show file tree
Hide file tree
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
11 changes: 10 additions & 1 deletion src/PlutoDownload.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ class PlutoRequest:
# for URL insertion at runtime
PLUTO_SCHEMA = "pluto%3a//"

# JMP2 proxy URL template (alternative live stream source, resolved at bouquet-build time)
JMP2_URL_TEMPLATE = "https://jmp2.uk/plu-%s.m3u8"

def __init__(self):
self.session = requests.Session()
self.bootCache = {}
Expand Down Expand Up @@ -468,6 +471,7 @@ def recordServiceExtension(self, nav, sref, *args, **kwargs):
config.plugins.plutotv = ConfigSubsection()
config.plugins.plutotv.country = ConfigSelection(default="local", choices=[("local", _("Local"))] + list(COUNTRY_NAMES.items()))
config.plugins.plutotv.picons = ConfigSelection(default="snp", choices=[("snp", _("service name")), ("srp", _("service reference")), ("", _("None"))])
config.plugins.plutotv.live_tv_mode = ConfigSelection(default="plutotv", choices=[("plutotv", _("PlutoTV")), ("proxy", _("Proxy (JMP2)"))])


def getselectedcountries(skip=0):
Expand Down Expand Up @@ -693,7 +697,12 @@ def updateprogress(self, param):

ch_sid, ch_hash, ch_name, ch_logourl, _id = self.channelsList[key][self.chitem]

self.bouquet.append("4097:0:1:%s:%s:FF:CCCC0000:0:0:0:%s:%s" % (ch_sid, self.tsid, plutoRequest.PLUTO_SCHEMA + _id, ch_name))
if config.plugins.plutotv.live_tv_mode.value == "proxy":
stream_url = (plutoRequest.JMP2_URL_TEMPLATE % _id).replace(":", "%3a")
else:
stream_url = plutoRequest.PLUTO_SCHEMA + _id

self.bouquet.append("4097:0:1:%s:%s:FF:CCCC0000:0:0:0:%s:%s" % (ch_sid, self.tsid, stream_url, ch_name))
self.chitem += 1

ref = "4097:0:1:%s:%s:FF:CCCC0000:0:0:0" % (ch_sid, self.tsid)
Expand Down
1 change: 1 addition & 0 deletions src/plugin.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@ def createSetup(self):
if n == 1 or getattr(config.plugins.plutotv, "live_tv_country" + str(n - 1)).value:
configList.append((_("LiveTV bouquet %s") % n, getattr(config.plugins.plutotv, "live_tv_country" + str(n)), _("Country for which LiveTV bouquet %s will be created.") % n))
configList.append(("---",))
configList.append((_("Live TV source"), config.plugins.plutotv.live_tv_mode, _("Select the live stream source. PlutoTV uses Pluto's own server with a JWT auth token resolved at playback. Proxy uses the jmp2.uk proxy. Requires bouquet update to take effect.")))
configList.append((_("Picon type"), config.plugins.plutotv.picons, _("Using service name picons means they will continue to work even if the service reference changes. Also, they can be shared between channels of the same name that don't have the same service references.")))
configList.append((_("Data location"), config.plugins.plutotv.datalocation, _("Used for storing video cover graphics, etc. A hard drive that goes into standby mode or a slow network mount are not good choices.")))
self["config"].list = configList
Expand Down
Loading