From 0c114964f25ce4c56ea7a51f965542ce66104918 Mon Sep 17 00:00:00 2001 From: DYefremov Date: Thu, 1 Jan 2026 12:36:16 +0300 Subject: [PATCH] fav channels numbering adjustment (#236) --- app/ui/main.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/ui/main.py b/app/ui/main.py index 26c673bc..c6482f62 100644 --- a/app/ui/main.py +++ b/app/ui/main.py @@ -88,12 +88,13 @@ class Application(Gtk.Application): IPTV_MODEL = "iptv_list_store" DRAG_SEP = "::::" - MARKER_TYPES = {BqServiceType.MARKER.name, BqServiceType.SPACE.name, BqServiceType.ALT.name} + MARKER_TYPES = {BqServiceType.MARKER.name, BqServiceType.SPACE.name} + NON_REF_TYPES = {BqServiceType.MARKER.name, BqServiceType.SPACE.name, BqServiceType.ALT.name} DEL_FACTOR = 100 # Batch size to delete in one pass. FAV_FACTOR = DEL_FACTOR * 5 - _TV_TYPES = ("TV", "TV (HD)", "TV (UHD)", "TV (H264)") + _TV_TYPES = {"TV", "TV (HD)", "TV (UHD)", "TV (H264)"} BG_TASK_LIMIT = 5 @@ -1288,7 +1289,7 @@ class Application(Gtk.Application): def fav_service_data_func(self, column, renderer, model, itr, data): if self._display_epg and self._s_type is SettingsType.ENIGMA_2: srv_name = model.get_value(itr, Column.FAV_SERVICE) - if model.get_value(itr, Column.FAV_TYPE) in self.MARKER_TYPES: + if model.get_value(itr, Column.FAV_TYPE) in self.NON_REF_TYPES: return True event = self._epg_cache.get_current_event(srv_name) @@ -2780,7 +2781,7 @@ class Application(Gtk.Application): self._alt_revealer.set_visible(False) self.on_info_bar_close() - if self._page is Page.EPG and srv.service_type not in self.MARKER_TYPES: + if self._page is Page.EPG and srv.service_type not in self.NON_REF_TYPES: self.emit("fav-changed", srv) def on_services_selection(self, model, path, column): @@ -3677,7 +3678,7 @@ class Application(Gtk.Application): row = self._fav_model[path][:] srv_type, fav_id = row[Column.FAV_TYPE], row[Column.FAV_ID] - if srv_type in self.MARKER_TYPES and show_error: + if srv_type in self.NON_REF_TYPES and show_error: self.show_error_message("Not allowed in this context!") return @@ -4037,7 +4038,7 @@ class Application(Gtk.Application): if srv_type == BqServiceType.ALT.name: return self.show_error_message("Operation not allowed in this context!") - if srv_type in self.MARKER_TYPES: + if srv_type in self.NON_REF_TYPES: return self.on_rename(view) elif srv_type == BqServiceType.IPTV.name: return self.on_iptv_service_edit(model[paths][Column.FAV_ID], view) @@ -4167,7 +4168,7 @@ class Application(Gtk.Application): """ Marks services with duplicate [names] in the fav list. """ from collections import Counter - dup = Counter(r[Column.FAV_SERVICE] for r in self._fav_model if r[Column.FAV_TYPE] not in self.MARKER_TYPES) + dup = Counter(r[Column.FAV_SERVICE] for r in self._fav_model if r[Column.FAV_TYPE] not in self.NON_REF_TYPES) dup = {k for k, v in dup.items() if v > 1} for r in self._fav_model: