fHDHR/fHDHR_NextPVR
1
0
Fork 0
mirror of https://github.com/fHDHR/fHDHR_NextPVR.git synced 2025-12-06 04:46:58 -05:00
Code Issues Releases Wiki Activity

Merge pull request #154 from deathbybandaid/dev

Browse Source 
Dev
This commit is contained in:
Deathbybandaid 2021-01-30 11:11:36 -05:00 committed by GitHub
commit 9caeac2f41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fHDHR/device/tuners/stream/__init__.py
View File

@ -17,7 +17,7 @@ class Stream():
self.method = Direct_Stream(fhdhr, stream_args, tuner) self.method = Direct_Stream(fhdhr, stream_args, tuner)
else: else:
plugin_name = self.fhdhr.config.dict["streaming"]["valid_methods"][stream_args["method"]]["plugin"] plugin_name = self.fhdhr.config.dict["streaming"]["valid_methods"][stream_args["method"]]["plugin"]
self.method = self.fhdhr.plugins.plugins[plugin_name].Plugin_OBJ(self.fhdhr.plugins.plugins[plugin_name].plugin_utils, stream_args, tuner) self.method = self.fhdhr.plugins.plugins[plugin_name].Plugin_OBJ(fhdhr, self.fhdhr.plugins.plugins[plugin_name].plugin_utils, stream_args, tuner)
def get(self): def get(self):
return self.method.get() return self.method.get()

2
fHDHR_web/api/m3u.py
View File

@ -63,7 +63,7 @@ class M3U():
channel_items.append(channel_obj) channel_items.append(channel_obj)
else: else:
return "Channel Disabled" return "Channel Disabled"
elif not origin and channel == "all" and str(channel) in [str(x) for x in self.fhdhr.device.channels.get_channel_list("id")]: elif not origin and channel == "all":
fileName = "channels.m3u" fileName = "channels.m3u"
for origin in list(self.fhdhr.origins.origins_dict.keys()): for origin in list(self.fhdhr.origins.origins_dict.keys()):
for fhdhr_id in [x["id"] for x in self.fhdhr.device.channels.get_channels(origin)]: for fhdhr_id in [x["id"] for x in self.fhdhr.device.channels.get_channels(origin)]:

2
fHDHR_web/api/w3u.py
View File

@ -61,7 +61,7 @@ class W3U():
channel_items.append(channel_obj) channel_items.append(channel_obj)
else: else:
return "Channel Disabled" return "Channel Disabled"
elif not origin and channel == "all" and str(channel) in [str(x) for x in self.fhdhr.device.channels.get_channel_list("id")]: elif not origin and channel == "all":
fileName = "channels.w3u" fileName = "channels.w3u"
for origin in list(self.fhdhr.origins.origins_dict.keys()): for origin in list(self.fhdhr.origins.origins_dict.keys()):
for fhdhr_id in [x["id"] for x in self.fhdhr.device.channels.get_channels(origin)]: for fhdhr_id in [x["id"] for x in self.fhdhr.device.channels.get_channels(origin)]:

3
plugins/fHDHR_plugin_stream_ffmpeg/__init__.py
View File

@ -23,7 +23,8 @@ def setup(plugin):
class Plugin_OBJ(): class Plugin_OBJ():
def __init__(self, plugin_utils, stream_args, tuner): def __init__(self, fhdhr, plugin_utils, stream_args, tuner):
self.fhdhr = fhdhr
self.plugin_utils = plugin_utils self.plugin_utils = plugin_utils
self.stream_args = stream_args self.stream_args = stream_args
self.tuner = tuner self.tuner = tuner

3
plugins/fHDHR_plugin_stream_vlc/__init__.py
View File

@ -23,7 +23,8 @@ def setup(plugin):
class Plugin_OBJ(): class Plugin_OBJ():
def __init__(self, plugin_utils, stream_args, tuner): def __init__(self, fhdhr, plugin_utils, stream_args, tuner):
self.fhdhr = fhdhr
self.plugin_utils = plugin_utils self.plugin_utils = plugin_utils
self.stream_args = stream_args self.stream_args = stream_args
self.tuner = tuner self.tuner = tuner