From dda6bba1350fde3c9825e71d0d4caef0787ab013 Mon Sep 17 00:00:00 2001
From: deathbybandaid <github@deathbybandaid.net>
Date: Wed, 9 Dec 2020 12:02:45 -0500
Subject: [PATCH] test

---
 origin/origin_channels.py | 20 +++++++++++++-------
 origin/origin_epg.py      |  5 +++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/origin/origin_channels.py b/origin/origin_channels.py
index 032e6ce..a99fc69 100644
--- a/origin/origin_channels.py
+++ b/origin/origin_channels.py
@@ -7,7 +7,17 @@ class OriginChannels():
         self.origin = origin
 
         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):
 
@@ -17,7 +27,7 @@ class OriginChannels():
         self.unfiltered_chan_json = self.get_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))
 
         for channel_dict in self.filtered_chan_list:
@@ -31,8 +41,6 @@ class OriginChannels():
         return channel_list
 
     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"])
         streamurl = streamdict["url"]
         return streamurl
@@ -42,11 +50,9 @@ class OriginChannels():
         return urlopn.json()
 
     def filterlist(self):
-        if not self.unfiltered_chan_json:
-            self.unfiltered_chan_json = self.get_unfiltered_chan_json()
 
         filtered_chan_list = []
-        for channels_item in self.unfiltered_chan_json:
+        for channels_item in self.unfiltered_chan_list:
             filters_passed = []
             for filter_key in list(self.origin.filter_dict.keys()):
 
diff --git a/origin/origin_epg.py b/origin/origin_epg.py
index aa7727f..9fc93a7 100644
--- a/origin/origin_epg.py
+++ b/origin/origin_epg.py
@@ -15,7 +15,12 @@ class OriginEPG():
         for fhdhr_id in list(fhdhr_channels.list.keys()):
             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()):
                 programguide[str(chan_obj.dict["number"])] = chan_obj.epgdict
 
+            if filtered_chan_dict["tvg"]["url"]:
+                print(filtered_chan_dict["tvg"]["url"])
+
         return programguide