From be2d64e480ec0f90b1196f88fb39edcce4097f76 Mon Sep 17 00:00:00 2001 From: DYefremov Date: Sat, 3 Apr 2021 15:21:53 +0300 Subject: [PATCH] sid value fix for some picons --- app/tools/picons.py | 3 +++ app/ui/picons_manager.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/tools/picons.py b/app/tools/picons.py index d3946303..39d47d57 100644 --- a/app/tools/picons.py +++ b/app/tools/picons.py @@ -109,6 +109,9 @@ class PiconsParser(HTMLParser): namespace = "{:X}{:X}".format(int(pos), int(freq)) else: namespace = "{:X}0000".format(int(pos)) + + if single and not ssid.isdigit(): + ssid = "".join(c for c in ssid if c.isdigit()) or "0" name = PiconsParser.format(ssid if single else p.ssid, on_id, namespace, picon_ids, s_type) p_name = picons_path + (name if name else os.path.basename(p.ref)) picons_data.append(("{}{}".format(PiconsParser._BASE_URL, p.ref), p_name)) diff --git a/app/ui/picons_manager.py b/app/ui/picons_manager.py index 4a1cd45b..40c927fa 100644 --- a/app/ui/picons_manager.py +++ b/app/ui/picons_manager.py @@ -556,7 +556,10 @@ class PiconsDialog: executor.shutdown() return - picons.extend(future.result()) + pic = future.result() + if pic: + picons.extend(pic) + # Getting picon images. futures = {executor.submit(download_picon, pic[0], pic[1], self.append_output): pic for pic in picons} done, not_done = concurrent.futures.wait(futures, timeout=0)