Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2025-12-21 16:09:41 +01:00
Code Issues Packages Projects Releases Activity

fix getting the maximum marker number, little refactoring

Browse Source
This commit is contained in:
DYefremov
2018-12-18 19:23:44 +03:00
parent 6c7d39889d
commit c7c0a4055b
2 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/ui/main_app_window.py
View File

@@ -444,7 +444,7 @@ class Application(Gtk.Application):
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
fav_id = row[-2] fav_id = row[Column.SRV_FAV_ID]
for bq in self._bouquets: for bq in self._bouquets:
services = self._bouquets[bq] services = self._bouquets[bq]
if services: if services:
@@ -453,7 +453,7 @@ class Application(Gtk.Application):
srv_ids_to_delete.add(fav_id) srv_ids_to_delete.add(fav_id)
self._services.pop(fav_id, None) self._services.pop(fav_id, None)
for f_itr in filter(lambda r: r[7] in srv_ids_to_delete, self._fav_model): for f_itr in filter(lambda r: r[Column.FAV_ID] in srv_ids_to_delete, self._fav_model):
self._fav_model.remove(f_itr.iter) self._fav_model.remove(f_itr.iter)
self.update_fav_num_column(self._fav_model) self.update_fav_num_column(self._fav_model)
self.update_sat_positions() self.update_sat_positions()

90
app/ui/main_helper.py
View File

@@ -8,7 +8,7 @@ from app.eparser import Service
from app.eparser.ecommons import Flag, BouquetService, Bouquet, BqType from app.eparser.ecommons import Flag, BouquetService, Bouquet, BqType
from app.eparser.enigma.bouquets import BqServiceType, to_bouquet_id from app.eparser.enigma.bouquets import BqServiceType, to_bouquet_id
from app.properties import Profile from app.properties import Profile
from .uicommons import ViewTarget, BqGenType, Gtk, Gdk, HIDE_ICON, LOCKED_ICON, KeyboardKey from .uicommons import ViewTarget, BqGenType, Gtk, Gdk, HIDE_ICON, LOCKED_ICON, KeyboardKey, Column
from .dialogs import show_dialog, DialogType, get_chooser_dialog, WaitDialog from .dialogs import show_dialog, DialogType, get_chooser_dialog, WaitDialog
@@ -25,13 +25,13 @@ def insert_marker(view, bouquets, selected_bouquet, channels, parent_window):
return return
# Searching for max num value in all marker services (if empty default = 0) # Searching for max num value in all marker services (if empty default = 0)
max_num = max(map(lambda num: int(num.data_id, 18), max_num = max(map(lambda num: int(num.data_id, 16),
filter(lambda ch: ch.service_type == BqServiceType.MARKER.name, channels.values())), default=0) filter(lambda ch: ch.service_type == BqServiceType.MARKER.name, channels.values())), default=0)
max_num = '{:x}'.format(max_num + 1) max_num = '{:X}'.format(max_num + 1)
fav_id = "1:64:{}:0:0:0:0:0:0:0::{}\n#DESCRIPTION {}\n".format(max_num, response, response) fav_id = "1:64:{}:0:0:0:0:0:0:0::{}\n#DESCRIPTION {}\n".format(max_num, response, response)
s_type = BqServiceType.MARKER.name s_type = BqServiceType.MARKER.name
model, paths = view.get_selection().get_selected_rows() model, paths = view.get_selection().get_selected_rows()
marker = (None, None, response, None, None, s_type, None, fav_id, None) marker = (None, None, response, None, None, s_type, None, fav_id, None, None, None)
itr = model.insert_before(model.get_iter(paths[0]), marker) if paths else model.insert(0, marker) itr = model.insert_before(model.get_iter(paths[0]), marker) if paths else model.insert(0, marker)
bouquets[selected_bouquet].insert(model.get_path(itr)[0], fav_id) bouquets[selected_bouquet].insert(model.get_path(itr)[0], fav_id)
channels[fav_id] = Service(None, None, None, response, None, None, None, s_type, *[None] * 9, max_num, fav_id, None) channels[fav_id] = Service(None, None, None, response, None, None, None, s_type, *[None] * 9, max_num, fav_id, None)
@@ -130,32 +130,32 @@ def rename(view, parent_window, target, fav_view=None, service_view=None, servic
f_id, srv_name, srv_type = None, None, None f_id, srv_name, srv_type = None, None, None
if target is ViewTarget.SERVICES: if target is ViewTarget.SERVICES:
name, fav_id = model.get(itr, 3, 18) name, fav_id = model.get(itr, Column.SRV_SERVICE, Column.SRV_FAV_ID)
f_id = fav_id f_id = fav_id
response = show_dialog(DialogType.INPUT, parent_window, name) response = show_dialog(DialogType.INPUT, parent_window, name)
if response == Gtk.ResponseType.CANCEL: if response == Gtk.ResponseType.CANCEL:
return return
srv_name = response srv_name = response
model.set_value(itr, 3, response) model.set_value(itr, Column.SRV_SERVICE, response)
if fav_view is not None: if fav_view is not None:
for row in fav_view.get_model(): for row in fav_view.get_model():
if row[7] == fav_id: if row[Column.FAV_ID] == fav_id:
row[2] = response row[Column.FAV_SERVICE] = response
break break
elif target is ViewTarget.FAV: elif target is ViewTarget.FAV:
name, srv_type, fav_id = model.get(itr, 2, 5, 7) name, srv_type, fav_id = model.get(itr, Column.FAV_SERVICE, Column.FAV_TYPE, Column.FAV_ID)
f_id = fav_id f_id = fav_id
response = show_dialog(DialogType.INPUT, parent_window, name) response = show_dialog(DialogType.INPUT, parent_window, name)
if response == Gtk.ResponseType.CANCEL: if response == Gtk.ResponseType.CANCEL:
return return
srv_name = response srv_name = response
model.set_value(itr, 2, response) model.set_value(itr, Column.FAV_SERVICE, response)
if service_view is not None: if service_view is not None:
for row in get_base_model(service_view.get_model()): for row in get_base_model(service_view.get_model()):
if row[18] == fav_id: if row[Column.SRV_FAV_ID] == fav_id:
row[3] = response row[Column.SRV_SERVICE] = response
break break
old_srv = services.get(f_id, None) old_srv = services.get(f_id, None)
@@ -208,9 +208,9 @@ def set_flags(flag, services_view, fav_view, services, blacklist):
if target is ViewTarget.SERVICES: if target is ViewTarget.SERVICES:
set_hide(services, model, paths) set_hide(services, model, paths)
else: else:
fav_ids = [model.get_value(model.get_iter(path), 7) for path in paths] fav_ids = [model.get_value(model.get_iter(path), Column.FAV_ID) for path in paths]
srv_model = get_base_model(services_view.get_model()) srv_model = get_base_model(services_view.get_model())
srv_paths = [row.path for row in srv_model if row[18] in fav_ids] srv_paths = [row.path for row in srv_model if row[Column.SRV_FAV_ID] in fav_ids]
set_hide(services, srv_model, srv_paths) set_hide(services, srv_model, srv_paths)
elif flag is Flag.LOCK: elif flag is Flag.LOCK:
set_lock(blacklist, services, model, paths, target, services_model=get_base_model(services_view.get_model())) set_lock(blacklist, services, model, paths, target, services_model=get_base_model(services_view.get_model()))
@@ -220,20 +220,20 @@ def set_flags(flag, services_view, fav_view, services, blacklist):
def update_fav_model(fav_view, services): def update_fav_model(fav_view, services):
for row in get_base_model(fav_view.get_model()): for row in get_base_model(fav_view.get_model()):
srv = services.get(row[7], None) srv = services.get(row[Column.FAV_ID], None)
if srv: if srv:
row[3], row[4] = srv.locked, srv.hide row[Column.FAV_LOCKED], row[Column.FAV_HIDE] = srv.locked, srv.hide
def set_lock(blacklist, services, model, paths, target, services_model): def set_lock(blacklist, services, model, paths, target, services_model):
col_num = 4 if target is ViewTarget.SERVICES else 3 col_num = Column.SRV_LOCKED if target is ViewTarget.SERVICES else Column.FAV_LOCKED
locked = has_locked_hide(model, paths, col_num) locked = has_locked_hide(model, paths, col_num)
ids = [] ids = []
for path in paths: for path in paths:
itr = model.get_iter(path) itr = model.get_iter(path)
fav_id = model.get_value(itr, 18 if target is ViewTarget.SERVICES else 7) fav_id = model.get_value(itr, Column.SRV_FAV_ID if target is ViewTarget.SERVICES else Column.FAV_ID)
srv = services.get(fav_id, None) srv = services.get(fav_id, None)
if srv: if srv:
bq_id = to_bouquet_id(srv) bq_id = to_bouquet_id(srv)
@@ -251,13 +251,13 @@ def set_lock(blacklist, services, model, paths, target, services_model):
def update_services_model(ids, locked, services_model): def update_services_model(ids, locked, services_model):
for srv in services_model: for srv in services_model:
if srv[18] in ids: if srv[Column.SRV_FAV_ID] in ids:
srv[4] = None if locked else LOCKED_ICON srv[Column.SRV_LOCKED] = None if locked else LOCKED_ICON
yield True yield True
def set_hide(services, model, paths): def set_hide(services, model, paths):
col_num = 5 col_num = Column.SRV_HIDE
hide = has_locked_hide(model, paths, col_num) hide = has_locked_hide(model, paths, col_num)
for path in paths: for path in paths:
@@ -292,7 +292,7 @@ def set_hide(services, model, paths):
flags.append(value) flags.append(value)
model.set_value(itr, 0, (",".join(reversed(sorted(flags))))) model.set_value(itr, 0, (",".join(reversed(sorted(flags)))))
fav_id = model.get_value(itr, 18) fav_id = model.get_value(itr, Column.SRV_FAV_ID)
srv = services.get(fav_id, None) srv = services.get(fav_id, None)
if srv: if srv:
services[fav_id] = srv._replace(hide=None if hide else HIDE_ICON) services[fav_id] = srv._replace(hide=None if hide else HIDE_ICON)
@@ -317,9 +317,9 @@ def locate_in_services(fav_view, services_view, parent_window):
show_dialog(DialogType.ERROR, parent_window, "Please, select only one item!") show_dialog(DialogType.ERROR, parent_window, "Please, select only one item!")
return return
fav_id = model.get_value(model.get_iter(paths[0]), 7) fav_id = model.get_value(model.get_iter(paths[0]), Column.FAV_ID)
for index, row in enumerate(services_view.get_model()): for index, row in enumerate(services_view.get_model()):
if row[18] == fav_id: if row[Column.SRV_FAV_ID] == fav_id:
scroll_to(index, services_view) scroll_to(index, services_view)
break break
@@ -347,7 +347,7 @@ def update_picons_data(path, picons):
def append_picons(picons, model): def append_picons(picons, model):
def append_picons_data(pcs, mod): def append_picons_data(pcs, mod):
for r in mod: for r in mod:
mod.set_value(mod.get_iter(r.path), 8, pcs.get(r[9], None)) mod.set_value(mod.get_iter(r.path), Column.SRV_PICON, pcs.get(r[Column.SRV_PICON_ID], None))
yield True yield True
app = append_picons_data(picons, model) app = append_picons_data(picons, model)
@@ -368,11 +368,11 @@ def assign_picon(target, srv_view, fav_view, transient, picons, options, service
show_dialog(DialogType.ERROR, transient, text="No png file is selected!") show_dialog(DialogType.ERROR, transient, text="No png file is selected!")
return return
picon_pos = 8 picon_pos = Column.SRV_PICON
model = get_base_model(model) model = get_base_model(model)
itr = model.get_iter(paths) itr = model.get_iter(paths)
fav_id = model.get_value(itr, 18 if target is ViewTarget.SERVICES else 7) fav_id = model.get_value(itr, Column.SRV_FAV_ID if target is ViewTarget.SERVICES else Column.FAV_ID)
picon_id = services.get(fav_id)[9] picon_id = services.get(fav_id)[Column.SRV_PICON_ID]
if picon_id: if picon_id:
picon_file = options.get("picons_dir_path") + picon_id picon_file = options.get("picons_dir_path") + picon_id
@@ -382,9 +382,9 @@ def assign_picon(target, srv_view, fav_view, transient, picons, options, service
picons[picon_id] = picon picons[picon_id] = picon
model.set_value(itr, picon_pos, picon) model.set_value(itr, picon_pos, picon)
if target is ViewTarget.SERVICES: if target is ViewTarget.SERVICES:
set_picon(fav_id, fav_view.get_model(), picon, 7, picon_pos) set_picon(fav_id, fav_view.get_model(), picon, Column.FAV_ID, picon_pos)
else: else:
set_picon(fav_id, get_base_model(srv_view.get_model()), picon, 18, picon_pos) set_picon(fav_id, get_base_model(srv_view.get_model()), picon, Column.SRV_FAV_ID, picon_pos)
def set_picon(fav_id, model, picon, fav_id_pos, picon_pos): def set_picon(fav_id, model, picon, fav_id_pos, picon_pos):
@@ -401,26 +401,26 @@ def remove_picon(target, srv_view, fav_view, picons, options):
fav_ids = [] fav_ids = []
picon_ids = [] picon_ids = []
picon_pos = 8 # picon position is equal for services and fav picon_pos = Column.SRV_PICON # picon position is equal for services and fav
for path in paths: for path in paths:
itr = model.get_iter(path) itr = model.get_iter(path)
model.set_value(itr, picon_pos, None) model.set_value(itr, picon_pos, None)
if target is ViewTarget.SERVICES: if target is ViewTarget.SERVICES:
fav_ids.append(model.get_value(itr, 18)) fav_ids.append(model.get_value(itr, Column.SRV_FAV_ID))
picon_ids.append(model.get_value(itr, 9)) picon_ids.append(model.get_value(itr, Column.SRV_PICON_ID))
else: else:
srv_type, fav_id = model.get(itr, 5, 7) srv_type, fav_id = model.get(itr, Column.FAV_TYPE, Column.FAV_ID)
if srv_type == BqServiceType.IPTV.name: if srv_type == BqServiceType.IPTV.name:
picon_ids.append("{}_{}_{}_{}_{}_{}_{}_{}_{}_{}.png".format(*fav_id.split(":")[0:10]).strip()) picon_ids.append("{}_{}_{}_{}_{}_{}_{}_{}_{}_{}.png".format(*fav_id.split(":")[0:10]).strip())
else: else:
fav_ids.append(fav_id) fav_ids.append(fav_id)
def remove(md, path, it): def remove(md, path, it):
if md.get_value(it, 7 if target is ViewTarget.SERVICES else 18) in fav_ids: if md.get_value(it, Column.FAV_ID if target is ViewTarget.SERVICES else Column.SRV_FAV_ID) in fav_ids:
md.set_value(it, picon_pos, None) md.set_value(it, picon_pos, None)
if target is ViewTarget.FAV: if target is ViewTarget.FAV:
picon_ids.append(md.get_value(it, 9)) picon_ids.append(md.get_value(it, Column.SRV_PICON_ID))
fav_view.get_model().foreach(remove) if target is ViewTarget.SERVICES else get_base_model( fav_view.get_model().foreach(remove) if target is ViewTarget.SERVICES else get_base_model(
srv_view.get_model()).foreach(remove) srv_view.get_model()).foreach(remove)
@@ -443,13 +443,13 @@ def copy_picon_reference(target, view, services, clipboard, transient):
return return
if target is ViewTarget.SERVICES: if target is ViewTarget.SERVICES:
picon_id = model.get_value(model.get_iter(paths), 9) picon_id = model.get_value(model.get_iter(paths), Column.SRV_PICON_ID)
if picon_id: if picon_id:
clipboard.set_text(picon_id.rstrip(".png"), -1) clipboard.set_text(picon_id.rstrip(".png"), -1)
else: else:
show_dialog(DialogType.ERROR, transient, "No reference is present!") show_dialog(DialogType.ERROR, transient, "No reference is present!")
elif target is ViewTarget.FAV: elif target is ViewTarget.FAV:
fav_id = model.get_value(model.get_iter(paths), 7) fav_id = model.get_value(model.get_iter(paths), Column.FAV_ID)
srv = services.get(fav_id, None) srv = services.get(fav_id, None)
if srv and srv.picon_id: if srv and srv.picon_id:
clipboard.set_text(srv.picon_id.rstrip(".png"), -1) clipboard.set_text(srv.picon_id.rstrip(".png"), -1)
@@ -477,15 +477,19 @@ def get_picon_pixbuf(path):
def gen_bouquets(view, bq_view, transient, gen_type, tv_types, profile, callback): def gen_bouquets(view, bq_view, transient, gen_type, tv_types, profile, callback):
""" Auto-generate and append list of bouquets """ """ Auto-generate and append list of bouquets """
fav_id_index = 18 fav_id_index = Column.SRV_FAV_ID
index = 6 if gen_type in (BqGenType.PACKAGE, BqGenType.EACH_PACKAGE) else 16 if gen_type in ( index = Column.SRV_TYPE
BqGenType.SAT, BqGenType.EACH_SAT) else 7 if gen_type in (BqGenType.PACKAGE, BqGenType.EACH_PACKAGE):
index = Column.SRV_PACKAGE
elif gen_type in (BqGenType.SAT, BqGenType.EACH_SAT):
index = Column.SRV_POS
model, paths = view.get_selection().get_selected_rows() model, paths = view.get_selection().get_selected_rows()
bq_type = BqType.BOUQUET.value if profile is Profile.NEUTRINO_MP else BqType.TV.value bq_type = BqType.BOUQUET.value if profile is Profile.NEUTRINO_MP else BqType.TV.value
if gen_type in (BqGenType.SAT, BqGenType.PACKAGE, BqGenType.TYPE): if gen_type in (BqGenType.SAT, BqGenType.PACKAGE, BqGenType.TYPE):
if not is_only_one_item_selected(paths, transient): if not is_only_one_item_selected(paths, transient):
return return
service = Service(*model[paths][:]) service = Service(*model[paths][:Column.SRV_TOOLTIP])
if service.service_type not in tv_types: if service.service_type not in tv_types:
bq_type = BqType.RADIO.value bq_type = BqType.RADIO.value
append_bouquets(bq_type, bq_view, callback, fav_id_index, index, model, append_bouquets(bq_type, bq_view, callback, fav_id_index, index, model,
@@ -564,7 +568,7 @@ def append_text_to_tview(char, view):
def get_iptv_url(row, profile): def get_iptv_url(row, profile):
""" Returns url from iptv type row """ """ Returns url from iptv type row """
data = row[7].split(":" if profile is Profile.ENIGMA_2 else "::") data = row[Column.FAV_ID].split(":" if profile is Profile.ENIGMA_2 else "::")
if profile is Profile.ENIGMA_2: if profile is Profile.ENIGMA_2:
data = list(filter(lambda x: "http" in x, data)) data = list(filter(lambda x: "http" in x, data))
if data: if data: