mirror of
https://github.com/DYefremov/DemonEditor.git
synced 2025-12-21 07:59:40 +01:00
service deletion refactoring
This commit is contained in:
@@ -315,6 +315,7 @@ class MainAppWindow:
|
|||||||
self._fav_model.remove(itr)
|
self._fav_model.remove(itr)
|
||||||
self.update_fav_num_column(model)
|
self.update_fav_num_column(model)
|
||||||
|
|
||||||
|
@run_idle
|
||||||
def delete_services(self, bq_selected, itrs, model, rows):
|
def delete_services(self, bq_selected, itrs, model, rows):
|
||||||
""" Deleting services """
|
""" Deleting services """
|
||||||
srv_itrs = [self._services_model_filter.convert_iter_to_child_iter(
|
srv_itrs = [self._services_model_filter.convert_iter_to_child_iter(
|
||||||
@@ -322,6 +323,7 @@ class MainAppWindow:
|
|||||||
for s_itr in srv_itrs:
|
for s_itr in srv_itrs:
|
||||||
self._services_model.remove(s_itr)
|
self._services_model.remove(s_itr)
|
||||||
|
|
||||||
|
srv_ids_to_delete = set()
|
||||||
for row in rows:
|
for row in rows:
|
||||||
# There are channels with the same parameters except for the name.
|
# There are channels with the same parameters except for the name.
|
||||||
# None because it can have duplicates! Need fix
|
# None because it can have duplicates! Need fix
|
||||||
@@ -331,11 +333,12 @@ class MainAppWindow:
|
|||||||
if services:
|
if services:
|
||||||
with suppress(ValueError):
|
with suppress(ValueError):
|
||||||
services.remove(fav_id)
|
services.remove(fav_id)
|
||||||
|
srv_ids_to_delete.add(fav_id)
|
||||||
self._services.pop(fav_id, None)
|
self._services.pop(fav_id, None)
|
||||||
self._fav_model.clear()
|
|
||||||
|
|
||||||
if bq_selected:
|
for f_itr in filter(lambda r: r[7] in srv_ids_to_delete, self._fav_model):
|
||||||
self.update_bouquet_services(self._fav_model, None, bq_selected)
|
self._fav_model.remove(f_itr.iter)
|
||||||
|
self.update_fav_num_column(self._fav_model)
|
||||||
|
|
||||||
def delete_bouquets(self, itrs, model, bouquet):
|
def delete_bouquets(self, itrs, model, bouquet):
|
||||||
""" Deleting bouquets """
|
""" Deleting bouquets """
|
||||||
|
|||||||
Reference in New Issue
Block a user