deathbybandaid/fHDHR_IPTVorg-US
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test

Browse Source
This commit is contained in:
deathbybandaid 2020-12-09 12:02:45 -05:00
parent 4caccf5581
commit dda6bba135
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
origin/origin_channels.py
View File

@ -7,7 +7,17 @@ class OriginChannels():
self.origin = origin self.origin = origin
self.unfiltered_chan_json = None self.unfiltered_chan_json = None
self.filtered_chan_list = None self.filtered_chan_json = None
def filtered_chan_list(self):
if not self.filtered_chan_json:
self.filtered_chan_json = self.filterlist()
return self.filtered_chan_json
def unfiltered_chan_list(self):
if not self.unfiltered_chan_json:
self.unfiltered_chan_json = self.get_unfiltered_chan_json()
return self.unfiltered_chan_json
def get_channels(self): def get_channels(self):
@ -17,7 +27,7 @@ class OriginChannels():
self.unfiltered_chan_json = self.get_unfiltered_chan_json() self.unfiltered_chan_json = self.get_unfiltered_chan_json()
self.fhdhr.logger.info("Found %s Total Channels" % len(self.unfiltered_chan_json)) self.fhdhr.logger.info("Found %s Total Channels" % len(self.unfiltered_chan_json))
self.filtered_chan_list = self.filterlist() self.filtered_chan_json = self.filterlist()
self.fhdhr.logger.info("Found %s Channels after applying filters." % len(self.filtered_chan_list)) self.fhdhr.logger.info("Found %s Channels after applying filters." % len(self.filtered_chan_list))
for channel_dict in self.filtered_chan_list: for channel_dict in self.filtered_chan_list:
@ -31,8 +41,6 @@ class OriginChannels():
return channel_list return channel_list
def get_channel_stream(self, chandict): def get_channel_stream(self, chandict):
if not self.filtered_chan_list:
self.filtered_chan_list = self.filterlist()
streamdict = self.get_channel_dict(self.filtered_chan_list, "name", chandict["origin_name"]) streamdict = self.get_channel_dict(self.filtered_chan_list, "name", chandict["origin_name"])
streamurl = streamdict["url"] streamurl = streamdict["url"]
return streamurl return streamurl
@ -42,11 +50,9 @@ class OriginChannels():
return urlopn.json() return urlopn.json()
def filterlist(self): def filterlist(self):
if not self.unfiltered_chan_json:
self.unfiltered_chan_json = self.get_unfiltered_chan_json()
filtered_chan_list = [] filtered_chan_list = []
for channels_item in self.unfiltered_chan_json: for channels_item in self.unfiltered_chan_list:
filters_passed = [] filters_passed = []
for filter_key in list(self.origin.filter_dict.keys()): for filter_key in list(self.origin.filter_dict.keys()):

5
origin/origin_epg.py
View File

@ -15,7 +15,12 @@ class OriginEPG():
for fhdhr_id in list(fhdhr_channels.list.keys()): for fhdhr_id in list(fhdhr_channels.list.keys()):
chan_obj = fhdhr_channels.list[fhdhr_id] chan_obj = fhdhr_channels.list[fhdhr_id]
filtered_chan_dict = self.get_channel_dict(fhdhr_channels.origin.filtered_chan_list, "name", chan_obj.dict["origin_name"])
if str(chan_obj.dict["number"]) not in list(programguide.keys()): if str(chan_obj.dict["number"]) not in list(programguide.keys()):
programguide[str(chan_obj.dict["number"])] = chan_obj.epgdict programguide[str(chan_obj.dict["number"])] = chan_obj.epgdict
if filtered_chan_dict["tvg"]["url"]:
print(filtered_chan_dict["tvg"]["url"])
return programguide return programguide