From cd24f4a5b5bf534a4be866d06c44e09668c488e1 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 9 Dec 2020 09:26:32 -0500 Subject: [PATCH] test --- origin/origin_channels.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/origin/origin_channels.py b/origin/origin_channels.py index 4bbd169..cd576b7 100644 --- a/origin/origin_channels.py +++ b/origin/origin_channels.py @@ -25,13 +25,20 @@ class OriginChannels(): def filterlist(self, unfiltered_chan_json): filtered_chan_list = [] for channels_item in unfiltered_chan_json: + filters_passed = True for filter_key in list(self.origin.filter_dict.keys()): - chan_filter_values = [] + if filters_passed: - if filter_key in ["country", "language"]: - for filter_subkey in ["code", "name"]: - chan_filter_values.append(channels_item[filter_key][filter_subkey]) + filter_values = self.origin.filter_dict[filter_key] + + if filter_key in ["country", "language"]: + chan_value = channels_item[filter_key]["name"] + + if chan_value.lower() not in [x.lower() for x in filter_values]: + filters_passed = False + if filters_passed: + filtered_chan_list.append(channels_item) return filtered_chan_list