From beabac5c2c0535e94c47cfb233fda814efe89ff7 Mon Sep 17 00:00:00 2001 From: Dmitriy Yefremov Date: Fri, 29 Dec 2017 19:49:01 +0300 Subject: [PATCH] added hide/skip for bouquet list --- app/ui/main_app_window.py | 5 +---- app/ui/main_helper.py | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index bccefb1d..ffad5feb 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -468,12 +468,9 @@ class MainAppWindow: fav_id = srv.data # IPTV and MARKER services s_type = srv.type - if s_type is BqServiceType.MARKER: + if s_type is BqServiceType.MARKER or s_type is BqServiceType.IPTV: self.__channels[fav_id] = Channel(*agr[0:3], srv.name, *agr[0:3], s_type.name, *agr, srv.num, fav_id, None) - elif s_type is BqServiceType.IPTV: - self.__channels[fav_id] = Channel(*agr[0:3], srv.name, *agr[0:3], - srv.type.name, *agr, srv.num, fav_id, None) services.append(fav_id) self.__bouquets["{}:{}".format(name, bt_type)] = services diff --git a/app/ui/main_helper.py b/app/ui/main_helper.py index b0c706eb..198dcef1 100644 --- a/app/ui/main_helper.py +++ b/app/ui/main_helper.py @@ -158,7 +158,13 @@ def set_flags(flag, services_view, fav_view, channels, blacklist): return if flag is FLAG.HIDE: - set_hide(channels, model, paths, target) + if target is ViewTarget.SERVICES: + set_hide(channels, model, paths) + else: + fav_ids = [model.get_value(model.get_iter(path), 7) for path in paths] + srv_model = services_view.get_model() + srv_paths = [row.path for row in srv_model if row[16] in fav_ids] + set_hide(channels, srv_model, srv_paths) elif flag is FLAG.LOCK: set_lock(blacklist, channels, model, paths, target, services_model=services_view.get_model()) @@ -188,9 +194,7 @@ def set_lock(blacklist, channels, model, paths, target, services_model): ch[4] = None if locked else LOCKED_ICON -def set_hide(channels, model, paths, target): - if target is ViewTarget.FAV: - return +def set_hide(channels, model, paths): col_num = 5 hide = has_locked_hide(model, paths, col_num) @@ -216,11 +220,14 @@ def set_hide(channels, model, paths, target): continue # skip if already allowed to show value -= FLAG.HIDE.value - value = "f:{}".format(value) if value > 10 else "f:0{}".format(value) - if index is not None: - flags[index] = value + if value == 0 and index is not None: + del flags[index] else: - flags.append(value) + value = "f:{}".format(value) if value > 10 else "f:0{}".format(value) + if index is not None: + flags[index] = value + else: + flags.append(value) model.set_value(itr, 0, (",".join(reversed(sorted(flags))))) fav_id = model.get_value(itr, 16)