diff --git a/app/tools/picons.py b/app/tools/picons.py index 18014363..d5ea99ae 100644 --- a/app/tools/picons.py +++ b/app/tools/picons.py @@ -59,7 +59,7 @@ class PiconsCzDownloader: _BASE_LOGO_URL = "https://picon.cz/picon/0/" _HEADER = {"User-Agent": "DemonEditor/3.0.0", "Referer": ""} _LINK_PATTERN = re.compile(r"((.*)-\d+x\d+)-(.*)_by_chocholousek.7z$") - _FILE_PATTERN = re.compile(b"\\s+(1_.*\\.png).*") + _FILE_PATTERN = re.compile(b"\\s+(\\w+\\.png).*") def __init__(self, picon_ids=set(), appender=log): self._perm_links = {} @@ -220,7 +220,8 @@ class PiconsCzDownloader: "piconoled": "o96", "piconblack80": "b50", "piconblack3d": "b50", - "piconwin11": "win11220" + "piconwin11": "win11220", + "piconSNPtransparent": "t50" } def get_name_map(self): diff --git a/app/ui/picons.py b/app/ui/picons.py index c1b43d2c..57d10625 100644 --- a/app/ui/picons.py +++ b/app/ui/picons.py @@ -42,7 +42,8 @@ from app.tools.picons import (PiconsParser, parse_providers, Provider, convert_t PiconsError) from app.tools.satellites import SatellitesParser, SatelliteSource from .dialogs import show_dialog, DialogType, get_message, get_builder, get_chooser_dialog -from .main_helper import scroll_to, on_popup_menu, get_base_model, set_picon, get_picon_pixbuf, get_picon_dialog +from .main_helper import (scroll_to, on_popup_menu, get_base_model, set_picon, get_picon_pixbuf, get_picon_dialog, + get_picon_file_name) from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, TV_ICON, Column, KeyboardKey, Page, ViewTarget @@ -814,7 +815,12 @@ class PiconManager(Gtk.Box): fav_bouquet = self._app.current_bouquets[bq_selected] services = self._app.current_services - return {services.get(fav_id).picon_id for fav_id in fav_bouquet} + + ids = set() + for s in (services.get(fav_id) for fav_id in fav_bouquet): + ids.add(s.picon_id) + ids.add(get_picon_file_name(s.service)) + return ids def process_provider(self, prv, picons_path): log(f"Getting links to picons for: {prv.name}.\n")