From 62a72a92cadbeb96f41fe52d9ee27ed358a063b2 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 9 Dec 2020 10:11:51 -0500 Subject: [PATCH] test --- origin/origin_channels.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/origin/origin_channels.py b/origin/origin_channels.py index b6d7bba..09ea961 100644 --- a/origin/origin_channels.py +++ b/origin/origin_channels.py @@ -30,25 +30,26 @@ class OriginChannels(): if len(self.origin.filter_dict[filter_key]): - if filter_key in ["country"]: - try: - chan_value = channels_item[filter_key]["name"] - except TypeError: - chan_value = None - print(channels_item[filter_key]) - elif filter_key in ["language"]: - try: - chan_value = channels_item[filter_key]["name"] - except TypeError: - chan_value = None - print(channels_item[filter_key]) + if filter_key in ["country", "language"]: + if isinstance(channels_item[filter_key], list): + if len(channels_item[filter_key]): + chan_values = [x["name"] for x in channels_item[filter_key]] + else: + chan_value = [channels_item[filter_key]["name"]] elif filter_key in ["category"]: - chan_value = channels_item[filter_key] + chan_values = [channels_item[filter_key]] - if not chan_value: + if not len(chan_values): filters_passed.append(False) - elif str(chan_value).lower() in [x.lower() for x in self.origin.filter_dict[filter_key]]: - filters_passed.append(True) + elif isinstance(chan_value, list): + values_passed = [] + for chan_value in chan_values: + if str(chan_value).lower() in [x.lower() for x in self.origin.filter_dict[filter_key]]: + values_passed.append(True) + else: + values_passed.append(False) + if True in values_passed: + filters_passed.append(True) else: filters_passed.append(False)