fix dnd

# Conflicts:
#	app/tools/media.py
#	app/ui/app_menu_bar.ui
#	app/ui/main_app_window.py
#	app/ui/main_window.glade
#	app/ui/settings_dialog.py

DemonEditor.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=DemonEditor
-Comment=Channel and satellite list editor for Enigma2
-Comment[ru]=Редактор списка каналов и спутников для Enigma2
-Comment[be]=Рэдактар спіса каналаў і спадарожнікаў для Enigma2
-Comment[de]=Programm- und Satellitenlisten-Editor für Enigma2
-Icon=demon-editor
-Exec=bash -c 'cd $(dirname %k) && ./start.py'
-Terminal=false
-Type=Application
-Categories=Utility;Application;
-StartupNotify=false

DemonEditor.spec

@@ -27,7 +27,7 @@ a = Analysis([EXE_NAME],
              pathex=PATH_EXE,
              binaries=[],
              datas=ui_files,
-             hiddenimports=['fileinput', 'uuid', 'ctypes.wintypes'],
+             hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],
              excludes=excludes,

README.md

@@ -1,34 +1,27 @@
 # <img src="app/ui/icons/hicolor/96x96/apps/demon-editor.png" width="32" /> DemonEditor
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE) ![platform](https://img.shields.io/badge/platform-linux%20|%20macos-lightgrey)  
-### Enigma2 channel and satellite list editor for GNU/Linux. 
-[<img src="https://user-images.githubusercontent.com/7511379/118884719-8277e980-b8ff-11eb-8621-c8c4afd6181b.png" width="560"/>](https://user-images.githubusercontent.com/7511379/118884719-8277e980-b8ff-11eb-8621-c8c4afd6181b.png)  
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE) ![platform](https://img.shields.io/badge/platform-windows-lightgrey)
+## Enigma2 channel and satellite list editor for MS Windows (experimental).  
 
-Experimental support of Neutrino-MP or others on the same basis (BPanther, etc).                                                   
-Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc).
+[<img src="https://user-images.githubusercontent.com/7511379/116426009-6bd3fa80-a84b-11eb-81ea-3407396a0c4b.png" width="850"/>](https://user-images.githubusercontent.com/7511379/116426009-6bd3fa80-a84b-11eb-81ea-3407396a0c4b.png)   
+
+Experimental support of Neutrino-MP or others on the same basis (BPanther, etc).  
+Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc).                                
+**The functionality and performance of this version may be different from the [Linux version](https://github.com/DYefremov/DemonEditor)!**
 
 ## Main features of the program
-* Editing bouquets, channels, satellites.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118884747-8ad02480-b8ff-11eb-9104-8cf8fb6e785d.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118884747-8ad02480-b8ff-11eb-9104-8cf8fb6e785d.png)
-* Import function.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118526825-4dc23180-b749-11eb-8197-e9bbccbc3bdf.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118526825-4dc23180-b749-11eb-8197-e9bbccbc3bdf.png)
-* Backup function.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118528402-f58c2f00-b74a-11eb-9b84-edf220526e6e.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118528402-f58c2f00-b74a-11eb-9b84-edf220526e6e.png)
-* Support of picons.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118526864-5c104d80-b749-11eb-8497-6e8c78542ab1.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118526864-5c104d80-b749-11eb-8497-6e8c78542ab1.png)
-* Importing services, downloading picons and updating satellites from the Web.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118530243-1a81a180-b74d-11eb-8e01-aea904d954af.png" width="250"/>](https://user-images.githubusercontent.com/7511379/118530243-1a81a180-b74d-11eb-8e01-aea904d954af.png)
-  [<img src="https://user-images.githubusercontent.com/7511379/118526706-31be9000-b749-11eb-9956-c4bf2e13f968.png" width="292"/>](https://user-images.githubusercontent.com/7511379/118526706-31be9000-b749-11eb-9956-c4bf2e13f968.png)
+* Editing bouquets, channels, satellites.
+* Import function.
+* Backup function.
 * Extended support of IPTV.
+* Support of picons.
+* Importing services, downloading picons and updating satellites from the Web.
 * Import to bouquet(Neutrino WEBTV) from m3u.
 * Export of bouquets with IPTV services in m3u.
-* Assignment of EPG from DVB or XML for IPTV services (only Enigma2, experimental).
-* Preview (playback) of IPTV or other streams directly from the bouquet list.  
-  [<img src="https://user-images.githubusercontent.com/7511379/118884891-b3f0b500-b8ff-11eb-8717-3588d6e089de.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118884891-b3f0b500-b8ff-11eb-8717-3588d6e089de.png)
-* Control panel with the ability to view EPG and manage timers (via HTTP API, experimental).  
-  [<img src="https://user-images.githubusercontent.com/7511379/118886284-66754780-b901-11eb-9068-29b5a607ccaf.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118886284-66754780-b901-11eb-9068-29b5a607ccaf.png)
-* Simple FTP client (experimental).   
-  [<img src="https://user-images.githubusercontent.com/7511379/118527372-e8bb0b80-b749-11eb-9653-4ad64c99a05a.png" width="480"/>](https://user-images.githubusercontent.com/7511379/118527372-e8bb0b80-b749-11eb-9653-4ad64c99a05a.png)
-  
+* Assignment of EPGs from DVB or XML for IPTV services (only Enigma2, experimental).
+* Preview (playback) of IPTV or other streams directly from the bouquet list.
+* Control panel with the ability to view EPG and manage timers (via HTTP API, experimental).
+* Simple FTP client (experimental). 
+
 #### Keyboard shortcuts
 * **Ctrl + X** - only in bouquet list.
 * **Ctrl + C** - only in services list.                                                              
@@ -53,42 +46,28 @@ Clipboard is **"rubber"**. There is an accumulation before the insertion!
 * **Ctrl + I** - extra info, details.
 * **Ctrl + F** - show/hide search bar.
 * **Ctrl + Shift + F** - show/hide filter bar.
-                                                                          
+
 For **multiple** selection with the mouse, press and hold the **Ctrl** key!
 
 ## Minimum requirements
-*Python >= 3.6, GTK+ >= 3.22, python3-gi, python3-gi-cairo, python3-requests.*
-
-***Optional:** python3-pil, python3-chardet.*                      
-## Installation and Launch
-* ### Linux                                                                                                          
-To start the program, in most cases it is enough to download the [archive](https://github.com/DYefremov/DemonEditor/archive/master.zip), unpack  
-and run it by double clicking on DemonEditor.desktop in the root directory,  
-or launching from the console with the command:```./start.py```                                                                                
-Extra folders can be deleted, excluding the *app* folder and root files like *DemonEditor.desktop* and *start.py*!      
-
-To create a simple **debian package**, you can use the *build-deb.sh.* You can also download a ready-made *.deb package from the [releases](https://github.com/DYefremov/DemonEditor/releases) page.                                                 
-Users of **LTS** versions of [Ubuntu](https://ubuntu.com/) or distributions based on them can use [PPA](https://launchpad.net/~dmitriy-yefremov/+archive/ubuntu/demon-editor) repository.  
-A ready-made [package](https://aur.archlinux.org/packages/demoneditor-bin) is also available for [Arch Linux](https://archlinux.org/) users in the [AUR](https://aur.archlinux.org/) repository. 
-* ### macOS
-**This program can be run on macOS.** To work in this OS, you must use a [separate branch](https://github.com/DYefremov/DemonEditor/tree/experimental-mac). A ready-made package can be downloaded from the [releases](https://github.com/DYefremov/DemonEditor/releases) page.  
-**The functionality and performance of this version may be different from the Linux version!**
-
+*Python >= 3.5.2, GTK+ >= 3.22 with PyGObject bindings, python3-requests.*
+                                                                    
 ## Important
-The program is tested only with [openATV](https://www.opena.tv/) image and **Formuler F1** receiver in [Linux Mint](https://linuxmint.com/) (MATE 64-bit) distribution!
+**This version is not fully tested and has experimental status!**
 
 Terrestrial(DVB-T/T2) and cable(DVB-C) channels are only supported for Enigma2.                                                                                                
-Main supported *lamedb* format is version **4**. Versions **3** and **5** has only **experimental** support! For version **3** is only read mode available. When saving, version **4** format is used instead.   
+Main supported *lamedb* format is version **4**. Versions **3** and **5** has only **experimental** support!                                                                                                                                                        
+For version **3** is only read mode available. When saving, version **4** format is used instead.   
 
 When using the multiple import feature, from *lamedb* will be taken data **only for channels that are in the selected bouquets!**
 If you need full set of the data, including *[satellites, terrestrial, cables].xml* (current files will be overwritten), 
 just load your data via *"File/Open"* and press *"Save"*. When importing separate bouquet files, only those services 
 (excluding IPTV) that are in the **current open lamedb** (main list of services) will be imported.
 
-For streams playback, this app supports [VLC](https://www.videolan.org/vlc/), [MPV](https://mpv.io/) and [GStreamer](https://gstreamer.freedesktop.org/). Depending on your distro, you may need to install additional packages and libraries. 
 #### Command line arguments:
 * **-l** - write logs to file.
 * **-d on/off** - turn on/off debug mode. Allows to display more information in the logs.
+* **-t on/off** - show/hide simple built-in **telnet** client (experimental). **ANSI escape sequences are not supported!**
 
 ## License
-Licensed under the [MIT](LICENSE) license.                  
+Licensed under the [MIT](LICENSE) license.                                     

app/commons.py

@@ -1,5 +1,4 @@
 import logging
-from collections import defaultdict
 from functools import wraps
 from threading import Thread, Timer
 
@@ -7,12 +6,13 @@ from gi.repository import GLib
 
 _LOG_FILE = "demon-editor.log"
 _DATE_FORMAT = "%d-%m-%y %H:%M:%S"
-
-LOGGER_NAME = "main_logger"
+_LOGGER_NAME = None
 
 
 def init_logger():
-    logging.Logger(LOGGER_NAME)
+    global _LOGGER_NAME
+    _LOGGER_NAME = "main_logger"
+    logging.Logger(_LOGGER_NAME)
     logging.basicConfig(level=logging.INFO,
                         format="%(asctime)s %(message)s",
                         datefmt=_DATE_FORMAT,
@@ -22,7 +22,7 @@ def init_logger():
 
 def log(message, level=logging.ERROR, debug=False, fmt_message="{}"):
     """ The main logging function. """
-    logger = logging.getLogger(LOGGER_NAME)
+    logger = logging.getLogger(_LOGGER_NAME)
     if debug:
         from traceback import format_exc
         logger.log(level, fmt_message.format(format_exc()))
@@ -67,7 +67,7 @@ def run_with_delay(timeout=5):
                 timer.cancel()
 
             def run():
-                GLib.idle_add(func, *args, **kwargs, priority=GLib.PRIORITY_LOW)
+                GLib.idle_add(func, priority=GLib.PRIORITY_LOW, *args, **kwargs)
 
             timer = Timer(interval=timeout, function=run)
             timer.start()
@@ -77,18 +77,5 @@ def run_with_delay(timeout=5):
     return run_with
 
 
-class DefaultDict(defaultdict):
-    """ Extended to support functions with params as default factory. """
-
-    def __missing__(self, key):
-        if self.default_factory:
-            value = self[key] = self.default_factory(key)
-            return value
-        return super().__missing__(key)
-
-    def get(self, key, default=None):
-        return self[key]
-
-
 if __name__ == "__main__":
     pass

app/connections.py

@@ -6,10 +6,9 @@ import urllib
 import xml.etree.ElementTree as ETree
 from enum import Enum
 from ftplib import FTP, CRLF, Error, error_perm
-from http.client import RemoteDisconnected
 from telnetlib import Telnet
 from urllib.error import HTTPError, URLError
-from urllib.parse import urlencode, quote
+from urllib.parse import urlencode
 from urllib.request import (urlopen, HTTPPasswordMgrWithDefaultRealm, HTTPBasicAuthHandler, build_opener,
                             install_opener, Request)
 
@@ -17,7 +16,7 @@ from app.commons import log, run_task
 from app.settings import SettingsType
 
 BQ_FILES_LIST = ("tv", "radio",  # enigma 2
-                 "services.xml", "myservices.xml", "bouquets.xml", "ubouquets.xml")  # neutrino
+                 "myservices.xml", "bouquets.xml", "ubouquets.xml")  # neutrino
 
 DATA_FILES_LIST = ("lamedb", "lamedb5", "blacklist", "whitelist",)
 
@@ -328,7 +327,7 @@ def download_data(*, settings, download_type=DownloadType.ALL, callback=log, fil
     with UtfFTP(host=settings.host, user=settings.user, passwd=settings.password) as ftp:
         ftp.encoding = "utf-8"
         callback("FTP OK.\n")
-        save_path = settings.profile_data_path
+        save_path = settings.data_local_path
         os.makedirs(os.path.dirname(save_path), exist_ok=True)
         # bouquets
         if download_type is DownloadType.ALL or download_type is DownloadType.BOUQUETS:
@@ -342,7 +341,7 @@ def download_data(*, settings, download_type=DownloadType.ALL, callback=log, fil
             ftp.download_xml(save_path, settings.satellites_xml_path, WEB_TV_XML_FILE, callback)
 
         if download_type is DownloadType.PICONS:
-            picons_path = settings.profile_picons_path
+            picons_path = settings.picons_local_path
             os.makedirs(os.path.dirname(picons_path), exist_ok=True)
             ftp.download_picons(settings.picons_path, picons_path, callback, files_filter)
         # epg.dat
@@ -362,16 +361,15 @@ def download_data(*, settings, download_type=DownloadType.ALL, callback=log, fil
 def upload_data(*, settings, download_type=DownloadType.ALL, remove_unused=False,
                 callback=log, done_callback=None, use_http=False, files_filter=None):
     s_type = settings.setting_type
-    data_path = settings.profile_data_path
-    host, port, use_ssl = settings.host, settings.http_port, settings.http_use_ssl
-    base_url = f"http{'s' if use_ssl else ''}://{host}:{port}"
-    base = "web" if s_type is SettingsType.ENIGMA_2 else "control"
-    url = f"{base_url}/{base}/"
+    data_path = settings.data_local_path
+    host = settings.host
+    base_url = "http{}://{}:{}".format("s" if settings.http_use_ssl else "", host, settings.http_port)
+    url = "{}/web/".format(base_url)
     tn, ht = None, None  # telnet, http
 
     try:
-        if use_http:
-            ht = http(settings.user, settings.password, base_url, callback, use_ssl, s_type)
+        if s_type is SettingsType.ENIGMA_2 and use_http:
+            ht = http(settings.user, settings.password, base_url, callback, settings.http_use_ssl)
             next(ht)
             message = ""
             if download_type is DownloadType.BOUQUETS:
@@ -383,26 +381,22 @@ def upload_data(*, settings, download_type=DownloadType.ALL, remove_unused=False
             elif download_type is DownloadType.PICONS:
                 message = "Picons will be updated!"
 
-            if s_type is SettingsType.ENIGMA_2:
-                params = urlencode({"text": message, "type": 2, "timeout": 5})
-            else:
-                params = urlencode({"nmsg": message, "timeout": 5}, quote_via=quote)
+            params = urlencode({"text": message, "type": 2, "timeout": 5})
+            ht.send((url + "message?{}".format(params), "Sending info message... "))
 
-            ht.send((f"{url}message?{params}", "Sending info message... "))
-
-            if s_type is SettingsType.ENIGMA_2 and download_type is DownloadType.ALL:
+            if download_type is DownloadType.ALL:
                 time.sleep(5)
-                ht.send((f"{url}powerstate?newstate=0", "Toggle Standby "))
+                ht.send((url + "powerstate?newstate=0", "Toggle Standby "))
                 time.sleep(2)
         else:
             if download_type is not DownloadType.PICONS:
-                # Telnet
+                # telnet
                 tn = telnet(host=host,
                             user=settings.user,
                             password=settings.password,
                             timeout=settings.telnet_timeout)
                 next(tn)
-                # Terminate Enigma2 or Neutrino.
+                # terminate enigma or neutrino
                 callback("Telnet initialization ...\n")
                 tn.send("init 4")
                 callback("Stopping GUI...\n")
@@ -433,21 +427,18 @@ def upload_data(*, settings, download_type=DownloadType.ALL, remove_unused=False
                 ftp.upload_files(data_path, DATA_FILES_LIST, callback)
 
             if download_type is DownloadType.PICONS:
-                ftp.upload_picons(settings.profile_picons_path, settings.picons_path, callback, files_filter)
+                ftp.upload_picons(settings.picons_local_path, settings.picons_path, callback, files_filter)
 
             if tn and not use_http:
-                # Resume Enigma2 or restart Neutrino.
+                # resume enigma or restart neutrino
                 tn.send("init 3" if s_type is SettingsType.ENIGMA_2 else "init 6")
                 callback("Starting...\n" if s_type is SettingsType.ENIGMA_2 else "Rebooting...\n")
             elif ht and use_http:
-                if s_type is SettingsType.ENIGMA_2:
-                    if download_type is DownloadType.BOUQUETS:
-                        ht.send((f"{url}servicelistreload?mode=2", "Reloading Userbouquets."))
-                    elif download_type is DownloadType.ALL:
-                        ht.send((f"{url}servicelistreload?mode=0", "Reloading lamedb and Userbouquets."))
-                        ht.send((f"{url}powerstate?newstate=4", "Wakeup from Standby."))
-                else:
-                    ht.send((f"{url}reloadchannels", "Reloading channels..."))
+                if download_type is DownloadType.BOUQUETS:
+                    ht.send((url + "servicelistreload?mode=2", "Reloading Userbouquets."))
+                elif download_type is DownloadType.ALL:
+                    ht.send((url + "servicelistreload?mode=0", "Reloading lamedb and Userbouquets."))
+                    ht.send((url + "powerstate?newstate=4", "Wakeup from Standby."))
 
             if done_callback is not None:
                 done_callback()
@@ -473,17 +464,14 @@ def picons_filter_function(files_filter=None):
     return lambda f: f in files_filter if files_filter else f.endswith(PICONS_SUF)
 
 
-def http(user, password, url, callback, use_ssl=False, s_type=SettingsType.ENIGMA_2):
-    HttpAPI.init_auth(user, password, url, use_ssl)
-    data = HttpAPI.get_post_data(url, password, url) if s_type is SettingsType.ENIGMA_2 else None
+def http(user, password, url, callback, use_ssl=False):
+    init_auth(user, password, url, use_ssl)
+    data = get_post_data(url, password, url)
 
     while True:
         url, message = yield
-        resp = HttpAPI.get_response(HttpAPI.Request.TEST, url, data, s_type)
-        if s_type is SettingsType.ENIGMA_2:
-            resp = resp.get("e2statetext", None)
-
-        callback(f"HTTP: {message} {'Successful.' if resp and message else ''}\n")
+        resp = get_response(HttpAPI.Request.TEST, url, data).get("e2statetext", None)
+        callback("HTTP: {} {}\n".format(message, "Successful." if resp and message else ""))
 
 
 def telnet(host, port=23, user="", password="", timeout=5):
@@ -516,12 +504,11 @@ def telnet(host, port=23, user="", password="", timeout=5):
 class HttpAPI:
     __MAX_WORKERS = 4
 
-    class Request(str, Enum):
+    class Request(Enum):
         ZAP = "zap?sRef="
         INFO = "about"
         SIGNAL = "signal"
         STREAM = "stream.m3u?ref="
-        STREAM_TS = "ts.m3u?file="
         STREAM_CURRENT = "streamcurrent.m3u"
         CURRENT = "getcurrent"
         TEST = None
@@ -543,16 +530,8 @@ class HttpAPI:
         # Timer
         TIMER = ""
         TIMER_LIST = "timerlist"
-        # Recordings
-        RECORDINGS = "movielist?dirname="
-        REC_DIRS = "getlocations"
-        REC_CURRENT = "getcurrlocation"
         # Screenshot
         GRUB = "grab?format=jpg&"
-        # Neutrino requests.
-        N_INFO = "info"
-        N_ZAP = "zapto"
-        N_STREAM = "build_playlist?id="
 
     class Remote(str, Enum):
         """ Args for HttpRequestType [REMOTE] class. """
@@ -563,12 +542,10 @@ class HttpAPI:
         MENU = "139"
         EXIT = "174"
         OK = "352"
-        INFO = "358"
         RED = "398"
         GREEN = "399"
         YELLOW = "400"
         BLUE = "401"
-        BACK = "412"
 
     class Power(str, Enum):
         """ Args for HttpRequestType [POWER] class. """
@@ -579,19 +556,6 @@ class HttpAPI:
         WAKEUP = "4"
         STANDBY = "5"
 
-    PARAM_REQUESTS = {Request.REMOTE,
-                      Request.POWER,
-                      Request.VOL,
-                      Request.EPG,
-                      Request.TIMER,
-                      Request.RECORDINGS,
-                      Request.N_ZAP}
-
-    STREAM_REQUESTS = {Request.STREAM,
-                       Request.STREAM_CURRENT,
-                       Request.STREAM_TS,
-                       Request.N_STREAM}
-
     def __init__(self, settings):
         from concurrent.futures import ThreadPoolExecutor as PoolExecutor
         self._executor = PoolExecutor(max_workers=self.__MAX_WORKERS)
@@ -603,45 +567,46 @@ class HttpAPI:
         self._base_url = None
         self._data = None
         self._is_owif = True
-        self._s_type = SettingsType.ENIGMA_2
         self.init()
 
     def send(self, req_type, ref, callback=print, ref_prefix=""):
         if self._shutdown:
             return
 
-        url = self._base_url + req_type
+        url = self._base_url + req_type.value
         data = self._data
 
-        if req_type is self.Request.ZAP or req_type in self.STREAM_REQUESTS:
-            url += quote(ref)
+        if req_type is self.Request.ZAP or req_type is self.Request.STREAM:
+            url += urllib.parse.quote(ref)
         elif req_type is self.Request.PLAY or req_type is self.Request.PLAYER_REMOVE:
-            url = f"{url}{ref_prefix}{quote(ref).replace('%3A', '%253A')}"
+            url += "{}{}".format(ref_prefix, urllib.parse.quote(ref).replace("%3A", "%253A"))
         elif req_type is self.Request.GRUB:
             data = None  # Must be disabled for token-based security.
-            url = f"{self._main_url}/{req_type}{ref}"
-        elif req_type in self.PARAM_REQUESTS:
+            url = "{}/{}{}".format(self._main_url, req_type.value, ref)
+        elif req_type in (self.Request.REMOTE,
+                          self.Request.POWER,
+                          self.Request.VOL,
+                          self.Request.EPG,
+                          self.Request.TIMER):
             url += ref
 
         def done_callback(f):
             callback(f.result())
 
-        future = self._executor.submit(self.get_response, req_type, url, data, self._s_type)
+        future = self._executor.submit(get_response, req_type, url, data)
         future.add_done_callback(done_callback)
 
     @run_task
     def init(self):
-        self._s_type = self._settings.setting_type
-        user, password, use_ssl = self._settings.user, self._settings.password, self._settings.http_use_ssl
-        self._main_url = f"http{'s' if use_ssl else ''}://{self._settings.host}:{self._settings.http_port}"
-        self._base_url = f"{self._main_url}/{'web' if self._s_type is SettingsType.ENIGMA_2 else 'control'}/"
-        self.init_auth(user, password, self._main_url, use_ssl)
-
-        self._data = None
-        if self._s_type is SettingsType.ENIGMA_2:
-            s_id = self.get_session_id(user, password, f"{self._main_url}/web/{self.Request.TOKEN}")
-            if s_id != "0":
-                self._data = urlencode({"user": user, "password": password, "sessionid": s_id}).encode("utf-8")
+        user, password = self._settings.user, self._settings.password
+        use_ssl = self._settings.http_use_ssl
+        self._main_url = "http{}://{}:{}".format("s" if use_ssl else "", self._settings.host, self._settings.http_port)
+        self._base_url = "{}/web/".format(self._main_url)
+        init_auth(user, password, self._main_url, use_ssl)
+        url = "{}/web/{}".format(self._main_url, self.Request.TOKEN.value)
+        s_id = get_session_id(user, password, url)
+        if s_id != "0":
+            self._data = urllib.parse.urlencode({"user": user, "password": password, "sessionid": s_id}).encode("utf-8")
 
         self.send(self.Request.INFO, None, self.init_callback)
 
@@ -662,91 +627,69 @@ class HttpAPI:
         self._shutdown = True
         self._executor.shutdown()
 
-    @staticmethod
-    def get_response(req_type, url, data=None, s_type=SettingsType.ENIGMA_2):
-        try:
-            with urlopen(Request(url, data=data), timeout=10) as f:
-                if s_type is SettingsType.ENIGMA_2:
-                    return HttpAPI.get_e2_response_data(req_type, f)
-                elif s_type is SettingsType.NEUTRINO_MP:
-                    return HttpAPI.get_neutrino_response_data(req_type, f)
-                else:
-                    return f.read().decode("utf-8")
-        except HTTPError as e:
-            if req_type is HttpAPI.Request.TEST:
-                raise e
-            return {"error_code": e.code}
-        except (URLError, RemoteDisconnected, ConnectionResetError) as e:
-            if req_type is HttpAPI.Request.TEST:
-                raise e
-        except ETree.ParseError as e:
-            log("Parsing response error: {}".format(e))
 
-        return {"error_code": -1}
+def get_response(req_type, url, data=None):
+    try:
+        with urlopen(Request(url, data=data), timeout=10) as f:
+            if req_type is HttpAPI.Request.STREAM or req_type is HttpAPI.Request.STREAM_CURRENT:
+                return {"m3u": f.read().decode("utf-8")}
+            elif req_type is HttpAPI.Request.GRUB:
+                return {"img_data": f.read()}
+            elif req_type is HttpAPI.Request.CURRENT:
+                for el in ETree.fromstring(f.read().decode("utf-8")).iter("e2event"):
+                    return {el.tag: el.text for el in el.iter()}  # return first[current] event from the list
+            elif req_type is HttpAPI.Request.PLAYER_LIST:
+                return [{el.tag: el.text for el in el.iter()} for el in
+                        ETree.fromstring(f.read().decode("utf-8")).iter("e2file")]
+            elif req_type is HttpAPI.Request.EPG:
+                return {"event_list": [{el.tag: el.text for el in el.iter()} for el in
+                                       ETree.fromstring(f.read().decode("utf-8")).iter("e2event")]}
+            elif req_type is HttpAPI.Request.TIMER_LIST:
+                return {"timer_list": [{el.tag: el.text for el in el.iter()} for el in
+                                       ETree.fromstring(f.read().decode("utf-8")).iter("e2timer")]}
+            else:
+                return {el.tag: el.text for el in ETree.fromstring(f.read().decode("utf-8")).iter()}
+    except HTTPError as e:
+        if req_type is HttpAPI.Request.TEST:
+            raise e
+        return {"error_code": e.code}
+    except (URLError, ConnectionResetError) as e:
+        if req_type is HttpAPI.Request.TEST:
+            raise e
+    except ETree.ParseError as e:
+        log("Parsing response error: {}".format(e))
 
-    @staticmethod
-    def get_e2_response_data(req_type, f):
-        if req_type in HttpAPI.STREAM_REQUESTS:
-            return {"m3u": f.read().decode("utf-8")}
-        elif req_type is HttpAPI.Request.GRUB:
-            return {"img_data": f.read()}
-        elif req_type is HttpAPI.Request.CURRENT:
-            for el in ETree.fromstring(f.read().decode("utf-8")).iter("e2event"):
-                return {el.tag: el.text for el in el.iter()}  # return first[current] event from the list
-        elif req_type is HttpAPI.Request.PLAYER_LIST:
-            return [{el.tag: el.text for el in el.iter()} for el in
-                    ETree.fromstring(f.read().decode("utf-8")).iter("e2file")]
-        elif req_type is HttpAPI.Request.EPG:
-            return {"event_list": [{el.tag: el.text for el in el.iter()} for el in
-                                   ETree.fromstring(f.read().decode("utf-8")).iter("e2event")]}
-        elif req_type is HttpAPI.Request.TIMER_LIST:
-            return {"timer_list": [{el.tag: el.text for el in el.iter()} for el in
-                                   ETree.fromstring(f.read().decode("utf-8")).iter("e2timer")]}
-        elif req_type is HttpAPI.Request.REC_DIRS:
-            return {"rec_dirs": [el.text for el in ETree.fromstring(f.read().decode("utf-8")).iter("e2location")]}
-        elif req_type is HttpAPI.Request.RECORDINGS:
-            return {"recordings": [{el.tag: el.text for el in el.iter()} for el in
-                                   ETree.fromstring(f.read().decode("utf-8")).iter("e2movie")]}
-        else:
-            return {el.tag: el.text for el in ETree.fromstring(f.read().decode("utf-8")).iter()}
+    return {"error_code": -1}
 
-    @staticmethod
-    def get_neutrino_response_data(req_type, f):
-        if req_type is HttpAPI.Request.N_INFO:
-            return {"info": f.read().decode("utf-8").strip()}
-        elif req_type is HttpAPI.Request.N_STREAM:
-            return {"m3u": f.read().decode("utf-8")}
-        return {"data": f.read().decode("utf-8")}
 
-    @staticmethod
-    def init_auth(user, password, url, use_ssl=False):
-        """ Init authentication """
-        pass_mgr = HTTPPasswordMgrWithDefaultRealm()
-        pass_mgr.add_password(None, url, user, password)
-        auth_handler = HTTPBasicAuthHandler(pass_mgr)
+def init_auth(user, password, url, use_ssl=False):
+    """ Init authentication """
+    pass_mgr = HTTPPasswordMgrWithDefaultRealm()
+    pass_mgr.add_password(None, url, user, password)
+    auth_handler = HTTPBasicAuthHandler(pass_mgr)
 
-        if use_ssl:
-            import ssl
-            from urllib.request import HTTPSHandler
+    if use_ssl:
+        import ssl
+        from urllib.request import HTTPSHandler
 
-            opener = build_opener(auth_handler, HTTPSHandler(context=ssl._create_unverified_context()))
-        else:
-            opener = build_opener(auth_handler)
+        opener = build_opener(auth_handler, HTTPSHandler(context=ssl._create_unverified_context()))
+    else:
+        opener = build_opener(auth_handler)
 
-        install_opener(opener)
+    install_opener(opener)
 
-    @staticmethod
-    def get_session_id(user, password, url):
-        data = urllib.parse.urlencode(dict(user=user, password=password)).encode("utf-8")
-        return HttpAPI.get_response(HttpAPI.Request.TOKEN, url, data=data).get("e2sessionid", "0")
 
-    @staticmethod
-    def get_post_data(base_url, password, user):
-        s_id = HttpAPI.get_session_id(user, password, "{}/web/{}".format(base_url, HttpAPI.Request.TOKEN))
-        data = None
-        if s_id != "0":
-            data = urllib.parse.urlencode({"user": user, "password": password, "sessionid": s_id}).encode("utf-8")
-        return data
+def get_session_id(user, password, url):
+    data = urllib.parse.urlencode(dict(user=user, password=password)).encode("utf-8")
+    return get_response(HttpAPI.Request.TOKEN, url, data=data).get("e2sessionid", "0")
+
+
+def get_post_data(base_url, password, user):
+    s_id = get_session_id(user, password, "{}/web/{}".format(base_url, HttpAPI.Request.TOKEN.value))
+    data = None
+    if s_id != "0":
+        data = urllib.parse.urlencode({"user": user, "password": password, "sessionid": s_id}).encode("utf-8")
+    return data
 
 
 # ***************** Connections testing *******************#
@@ -759,30 +702,17 @@ def test_ftp(host, port, user, password, timeout=5):
         raise TestException(e)
 
 
-def test_http(host, port, user, password, timeout=5, use_ssl=False, skip_message=False, s_type=SettingsType.ENIGMA_2):
-    t_msg = "Connection test!"
-    if s_type is SettingsType.ENIGMA_2:
-        params = urlencode({"text": t_msg, "type": 2, "timeout": timeout})
-        params = "statusinfo" if skip_message else f"message?{params}"
-    elif s_type is SettingsType.NEUTRINO_MP:
-        params = urlencode({"nmsg": t_msg, "timeout": 5}, quote_via=quote)
-        params = "info" if skip_message else f"message?{params}"
-    else:
-        raise TestException("This type of settings is not supported!")
-
-    base_url = f"http{'s' if use_ssl else ''}://{host}:{port}"
-    base = "web" if s_type is SettingsType.ENIGMA_2 else "control"
-    url = f"{base_url}/{base}/{params}"
-    # Authentication
-    HttpAPI.init_auth(user, password, base_url, use_ssl)
-    data = HttpAPI.get_post_data(base_url, password, user) if s_type is SettingsType.ENIGMA_2 else None
+def test_http(host, port, user, password, timeout=5, use_ssl=False, skip_message=False):
+    params = urlencode({"text": "Connection test", "type": 2, "timeout": timeout})
+    params = "statusinfo" if skip_message else "message?{}".format(params)
+    base_url = "http{}://{}:{}".format("s" if use_ssl else "", host, port)
+    # authentication
+    init_auth(user, password, base_url, use_ssl)
+    data = get_post_data(base_url, password, user)
 
     try:
-        resp = HttpAPI.get_response(HttpAPI.Request.TEST, url, data, s_type)
-        if s_type is SettingsType.ENIGMA_2:
-            return resp.get("e2statetext", "")
-        return resp
-    except (RemoteDisconnected, URLError, HTTPError) as e:
+        return get_response(HttpAPI.Request.TEST, "{}/web/{}".format(base_url, params), data).get("e2statetext", "")
+    except (URLError, HTTPError) as e:
         raise TestException(e)
 
 

app/eparser/__init__.py

@@ -1,30 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
 from app.commons import run_task
 from app.settings import SettingsType
 from .ecommons import Service, Satellite, Transponder, Bouquet, Bouquets, is_transponder_valid
@@ -59,15 +32,6 @@ def get_bouquets(path, s_type):
         return get_neutrino_bouquets(path)
 
 
-def write_bouquet(path, bq, s_type):
-    if s_type is SettingsType.ENIGMA_2:
-        writer = BouquetsWriter(path, None)
-        writer.write_bouquet(path + "userbouquet.{}.{}".format(bq.name, bq.type), bq.name, bq.services)
-    elif s_type is SettingsType.NEUTRINO_MP:
-        from .neutrino.bouquets import write_bouquet
-        write_bouquet(path, bq)
-
-
 @run_task
 def write_bouquets(path, bouquets, s_type, force_bq_names=False):
     if s_type is SettingsType.ENIGMA_2:

app/eparser/ecommons.py

@@ -15,7 +15,6 @@ class BqServiceType(Enum):
     MARKER = "MARKER"  # 64
     SPACE = "SPACE"  # 832 [hidden marker]
     ALT = "ALT"  # Service with alternatives
-    BOUQUET = "BOUQUET"  # Sub bouquet.
 
 
 Bouquet = namedtuple("Bouquet", ["name", "type", "services", "locked", "hidden", "file"])
@@ -40,16 +39,11 @@ class TrType(Enum):
 
 
 class BqType(Enum):
-    """ Bouquet type. """
+    """ Bouquet type"""
     BOUQUET = "bouquet"
     TV = "tv"
     RADIO = "radio"
     WEBTV = "webtv"
-    MARKER = "marker"
-
-    @classmethod
-    def _missing_(cls, value):
-        return cls.TV
 
 
 class Flag(Enum):
@@ -82,21 +76,6 @@ class Flag(Enum):
     def is_new(value: int):
         return value & 1 << 5
 
-    @staticmethod
-    def parse(value: str) -> int:
-        """ Returns an int representation of the flag value.
-
-            The flag value is usually represented by the number [int],
-            but can also be appear in hex format.
-         """
-        if len(value) < 3:
-            return 0
-
-        value = value[2:]
-        if value.isdigit():
-            return int(value)
-        return int(value, 16)
-
 
 class Pids(Enum):
     VIDEO = "c:00"
@@ -116,20 +95,12 @@ class Inversion(Enum):
     On = "1"
     Auto = "2"
 
-    @classmethod
-    def _missing_(cls, value):
-        return cls.Auto
-
 
 class Pilot(Enum):
     Off = "0"
     On = "1"
     Auto = "2"
 
-    @classmethod
-    def _missing_(cls, value):
-        return cls.Auto
-
 
 class SystemCable(Enum):
     """  System of cable service """

app/eparser/enigma/blacklist.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 """ This module used for parsing blacklist file
 
     Parent Lock/Unlock
@@ -39,8 +11,9 @@ def get_blacklist(path):
     with suppress(FileNotFoundError):
         with open(path + __FILE_NAME, "r", encoding="utf-8") as file:
             # filter empty values and "\n"
-            return {*list(filter(None, (x.strip() for x in file.readlines())))}
-    return {}
+
+            return set(filter(None, (x.strip() for x in file.readlines())))
+    return set()
 
 
 def write_blacklist(path, channels):

app/eparser/enigma/bouquets.py

@@ -1,35 +1,6 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 """ Module for working with Enigma2 bouquets. """
 import re
 from collections import Counter
-from enum import Enum
 from pathlib import Path
 
 from app.commons import log
@@ -38,11 +9,10 @@ from app.eparser.ecommons import BqServiceType, BouquetService, Bouquets, Bouque
 _TV_FILE = "bouquets.tv"
 _RADIO_FILE = "bouquets.radio"
 _DEFAULT_BOUQUET_NAME = "favourites"
-_MARKER_PREFIX = "[MARKER!] "
 
 
 class BouquetsWriter:
-    """ Class for creating and writing bouquet files.
+    """ Class for creating and writing bouquet files..
 
         If "force_bq_names" then naming the files using the name of the bouquet.
         Some images may have problems displaying the favorites list!
@@ -70,7 +40,6 @@ class BouquetsWriter:
             line.append("#NAME {}\n".format(bqs.name))
             bq_file_names = {b.file for b in bqs.bouquets}
             count = 1
-            m_count = 0
 
             for bq in bqs.bouquets:
                 bq_name = bq.file
@@ -84,25 +53,19 @@ class BouquetsWriter:
                             bq_name = "de{0:02d}".format(count)
                         bq_file_names.add(bq_name)
 
-                if BqType(bq.type) is BqType.MARKER:
-                    m_data = bq.file.split(":") if bq.file else None
-                    b_name = m_data[-1].strip() if m_data else bq.name.lstrip(_MARKER_PREFIX)
-                    line.append(self._MARKER.format(m_count, b_name))
-                    m_count += 1
-                else:
-                    line.append(self._SERVICE.format(2 if bq.type == BqType.RADIO.value else 1, bq_name, bq.type))
-                    self.write_bouquet(f"{self._path}userbouquet.{bq_name}.{bq.type}", bq.name, bq.services)
+                line.append(self._SERVICE.format(2 if bq.type == BqType.RADIO.value else 1, bq_name, bq.type))
+                self.write_bouquet(self._path + "userbouquet.{}.{}".format(bq_name, bq.type), bq.name, bq.services)
 
             with open(self._path + "bouquets.{}".format(bqs.type), "w", encoding="utf-8") as file:
                 file.writelines(line)
 
     def write_bouquet(self, path, name, services):
         """ Writes single bouquet file. """
-        bouquet = [f"#NAME {name}\n"]
+        bouquet = ["#NAME {}\n".format(name)]
         for srv in services:
             s_type = srv.service_type
             if s_type == BqServiceType.IPTV.name:
-                bouquet.append(f"#SERVICE {srv.fav_id.strip()}\n")
+                bouquet.append("#SERVICE {}\n".format(srv.fav_id.strip()))
             elif s_type == BqServiceType.MARKER.name:
                 m_data = srv.fav_id.strip().split(":")
                 m_data[2] = self._marker_index
@@ -116,44 +79,30 @@ class BouquetsWriter:
                 if services:
                     p = Path(path)
                     alt_name = srv.data_id
-                    f_name = f"alternatives.{alt_name}{p.suffix}"
+                    f_name = "alternatives.{}{}".format(alt_name, p.suffix)
 
                     if self._force_bq_names:
                         alt_name = re.sub(self._ALT_PAT, "_", srv.service).lower()
-                        f_name = f"alternatives.{alt_name}{p.suffix}"
+                        f_name = "alternatives.{}{}".format(alt_name, p.suffix)
 
+                    alt_path = "{}/{}".format(p.parent, f_name)
                     bouquet.append(self._ALT.format(f_name))
-                    self.write_bouquet(f"{p.parent}/{f_name}", srv.service, services)
+                    self.write_bouquet(alt_path, srv.service, services)
             else:
                 data = to_bouquet_id(srv)
                 if srv.service:
-                    bouquet.append(f"#SERVICE {data}:{srv.service}\n#DESCRIPTION {srv.service}\n")
+                    bouquet.append("#SERVICE {}:{}\n#DESCRIPTION {}\n".format(data, srv.service, srv.service))
                 else:
-                    bouquet.append(f"#SERVICE {data}\n")
+                    bouquet.append("#SERVICE {}\n".format(data))
 
         with open(path, "w", encoding="utf-8") as file:
             file.writelines(bouquet)
 
 
-class ServiceType(Enum):
-    SERVICE = "0"
-    BOUQUET = "7"  # Sub bouquet.
-    MARKER = "64"
-    SPACE = "832"  # Hidden marker.
-    ALT = "134"  # Alternatives.
-    UDP = "256"
-
-    @classmethod
-    def _missing_(cls, value):
-        log("Error. No matching service type [{} {}] was found.".format(cls.__name__, value))
-        return cls.SERVICE
-
-
 class BouquetsReader:
     """ Class for reading and parsing bouquets. """
     _ALT_PAT = re.compile(".*alternatives\\.+(.*)\\.([tv|radio]+).*")
     _BQ_PAT = re.compile(".*userbouquet\\.+(.*)\\.+[tv|radio].*")
-    _SUB_BQ_PAT = re.compile(".*subbouquet\\.+(.*)\\.([tv|radio]+).*")
     _STREAM_TYPES = {"4097", "5001", "5002", "8193", "8739"}
 
     __slots__ = ["_path"]
@@ -167,44 +116,37 @@ class BouquetsReader:
 
     def parse_bouquets(self, bq_name, bq_type):
         with open(self._path + bq_name, encoding="utf-8", errors="replace") as file:
-            line = file.readline()
-            _, _, bqs_name = line.partition("#NAME")
-            if not bqs_name:
-                log(f"No bouquets name found in '{bq_name}'")
-                bqs_name = "Bouquets (TV)" if bq_type == BqType.TV.value else "Bouquets (Radio)"
-            bouquets = Bouquets(bqs_name.strip(), bq_type, [])
-
+            lines = file.readlines()
+            bouquets = None
+            nm_sep = "#NAME"
             b_names = set()
             real_b_names = Counter()
 
-            for line in file.readlines():
-                if "#SERVICE" in line:
+            for line in lines:
+                if nm_sep in line:
+                    _, _, name = line.partition(nm_sep)
+                    bouquets = Bouquets(name.strip(), bq_type, [])
+                if bouquets and "#SERVICE" in line:
                     name = re.match(self._BQ_PAT, line)
                     if name:
                         b_name = name.group(1)
                         if b_name in b_names:
-                            log(f"The list of bouquets contains duplicate [{b_name}] names!")
+                            log("The list of bouquets contains duplicate [{}] names!".format(b_name))
                         else:
                             b_names.add(b_name)
 
                         rb_name, services = self.get_bouquet(self._path, b_name, bq_type)
                         if rb_name in real_b_names:
-                            log(f"Bouquet file 'userbouquet.{b_name}.{bq_type}' has duplicate name: {rb_name}")
+                            log("Bouquet file 'userbouquet.{}.{}' has duplicate name: {}".format(b_name, bq_type,
+                                                                                                 rb_name))
                             real_b_names[rb_name] += 1
-                            rb_name = f"{rb_name} {real_b_names[rb_name]}"
+                            rb_name = "{} {}".format(rb_name, real_b_names[rb_name])
                         else:
                             real_b_names[rb_name] = 0
 
                         bouquets[2].append(Bouquet(rb_name, bq_type, services, None, None, b_name))
                     else:
-                        s_data = line.split(":")
-                        if len(s_data) == 12 and s_data[1] == ServiceType.MARKER.value:
-                            b_name = "{}{}".format(_MARKER_PREFIX, s_data[-1].strip())
-                            bouquets[2].append(Bouquet(b_name, BqType.MARKER.value, [], None, None, line.strip()))
-                        else:
-                            log(f"Unsupported or invalid data format: [{line}].")
-                else:
-                    log(f"Unsupported or invalid line format: [{line}].")
+                        raise ValueError("No bouquet name found for: {}".format(line))
 
         return bouquets
 
@@ -224,31 +166,19 @@ class BouquetsReader:
 
             for num, srv in enumerate(srvs, start=1):
                 srv_data = srv.strip().split(":")
-                data_len = len(srv_data)
-                if data_len < 10:
-                    log("The bouquet [{}] service [{}] has the wrong data format: [{}]".format(bq_name, num, srv))
-                    continue
-
-                s_type = ServiceType(srv_data[1])
-                if s_type is ServiceType.MARKER:
+                s_type = srv_data[1]
+                if s_type == "64":
                     m_data, sep, desc = srv.partition("#DESCRIPTION")
                     services.append(BouquetService(desc.strip() if desc else "", BqServiceType.MARKER, srv, num))
-                elif s_type is ServiceType.SPACE:
+                elif s_type == "832":
                     m_data, sep, desc = srv.partition("#DESCRIPTION")
                     services.append(BouquetService(desc.strip() if desc else "", BqServiceType.SPACE, srv, num))
-                elif s_type is ServiceType.ALT:
+                elif s_type == "134":
                     alt = re.match(BouquetsReader._ALT_PAT, srv)
                     if alt:
                         alt_name, alt_type = alt.group(1), alt.group(2)
                         alt_bq_name, alt_srvs = BouquetsReader.get_bouquet(path, alt_name, alt_type, "alternatives")
                         services.append(BouquetService(alt_bq_name, BqServiceType.ALT, alt_name, tuple(alt_srvs)))
-                elif s_type is ServiceType.BOUQUET:
-                    sub = re.match(BouquetsReader._SUB_BQ_PAT, srv)
-                    if sub:
-                        sub_name, sub_type = sub.group(1), sub.group(2)
-                        sub_bq_name, sub_srvs = BouquetsReader.get_bouquet(path, sub_name, sub_type, "subbouquet")
-                        bq = Bouquet(sub_bq_name, sub_type, tuple(sub_srvs), None, None, sub_name)
-                        services.append(BouquetService(sub_bq_name, BqServiceType.BOUQUET, bq, num))
                 elif srv_data[0].strip() in BouquetsReader._STREAM_TYPES or srv_data[10].startswith(("http", "rtsp")):
                     stream_data, sep, desc = srv.partition("#DESCRIPTION")
                     desc = desc.lstrip(":").strip() if desc else srv_data[-1].strip()
@@ -256,7 +186,7 @@ class BouquetsReader:
                 else:
                     fav_id = "{}:{}:{}:{}".format(srv_data[3], srv_data[4], srv_data[5], srv_data[6])
                     name = None
-                    if data_len == 12:
+                    if len(srv_data) == 12:
                         name, sep, desc = str(srv_data[-1]).partition("\n#DESCRIPTION")
                     services.append(BouquetService(name, BqServiceType.DEFAULT, fav_id.upper(), num))
 

app/eparser/enigma/lamedb.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 """   This module used for parsing and write lamedb file   """
 import re
 
@@ -151,18 +123,18 @@ class LameDbReader:
             is_v3 = False
             if len(tid) < 4:
                 is_v3 = True
-                tid = f"{tid:0>4}"
+                tid = "{:0>4}".format(tid)
                 data[2] = tid
             if len(nid) < 4:
                 is_v3 = True
-                nid = f"{nid:0>4}"
+                nid = "{:0>4}".format(nid)
                 data[3] = nid
             if is_v3:
-                data[0] = f"{data[0]:0>4}"
+                data[0] = "{:0>4}".format(data[0])
                 data_id = _SEP.join(data)
 
             srv_type = int(data[4])
-            transponder_id = f"{data[1]}:{tid}:{nid}"
+            transponder_id = "{}:{}:{}".format(data[1], tid, nid)
             transponder = transponders.get(transponder_id, None)
 
             tid = tid.lstrip(sp).upper()
@@ -170,14 +142,14 @@ class LameDbReader:
             ssid = str(data[0]).lstrip(sp).upper()
             onid = str(data[1]).lstrip(sp).upper()
             # For comparison in bouquets. Needed in upper case!!!
-            fav_id = f"{ssid}:{tid}:{nid}:{onid}"
-            picon_id = f"1_0_{srv_type:X}_{ssid}_{tid}_{nid}_{onid}_0_0_0.png"
-            s_id = f"1:0:{srv_type:X}:{ssid}:{tid}:{nid}:{onid}:0:0:0:"
+            fav_id = "{}:{}:{}:{}".format(ssid, tid, nid, onid)
+            picon_id = "1_0_{:X}_{}_{}_{}_{}_0_0_0.png".format(srv_type, ssid, tid, nid, onid)
+            s_id = "1:0:{:X}:{}:{}:{}:{}:0:0:0:".format(srv_type, ssid, tid, nid, onid)
 
             all_flags = srv[2].split(",")
             coded = CODED_ICON if list(filter(lambda x: x.startswith("C:"), all_flags)) else None
             flags = list(filter(lambda x: x.startswith("f:"), all_flags))
-            hide = HIDE_ICON if flags and Flag.is_hide(Flag.parse(flags[0])) else None
+            hide = HIDE_ICON if flags and Flag.is_hide(int(flags[0][2:])) else None
             locked = LOCKED_ICON if s_id in blacklist else None
 
             package = list(filter(lambda x: x.startswith("p:"), all_flags))
@@ -203,7 +175,7 @@ class LameDbReader:
                     system = "DVB-S2" if len(tr) > 7 else "DVB-S"
                     pos = tr[4]
                 if tr_type is TrType.Terrestrial:
-                    system = T_SYSTEM.get(tr[10] if len(tr) > 10 else "0", None)
+                    system = T_SYSTEM.get(tr[9], None)
                     pos = "T"
                     fec = T_FEC.get(tr[3], None)
                 elif tr_type is TrType.Cable:
@@ -217,13 +189,13 @@ class LameDbReader:
 
                 # Formatting displayed values.
                 try:
-                    freq = f"{int(freq) // 1000}"
-                    rate = f"{int(rate) // 1000}"
+                    freq = "{}".format(int(freq) // 1000)
+                    rate = "{}".format(int(rate) // 1000)
                     if tr_type is TrType.Satellite:
                         pos = int(pos)
-                        pos = f"{abs(pos / 10):0.1f}{'W' if pos < 0 else 'E'}"
+                        pos = "{:0.1f}{}".format(abs(pos / 10), "W" if pos < 0 else "E")
                 except ValueError as e:
-                    log(f"Parse error [parse_services]: {e}")
+                    log("Parse error [parse_services]: {}".format(e))
 
                 s = Service(srv[2], tr_type.value, coded, srv_name, locked, hide, package, service_type, None,
                             picon_id, data[0], freq, rate, pol, fec, system, pos, data_id, fav_id, transponder)

app/eparser/iptv.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 """ Module for IPTV and streams support """
 import re
 from enum import Enum
@@ -38,7 +10,7 @@ from app.ui.uicommons import IPTV_ICON
 
 # url, description, urlkey, account, usrname, psw, s_type, iconsrc, iconsrc_b, group
 NEUTRINO_FAV_ID_FORMAT = "{}::{}::{}::{}::{}::{}::{}::{}::{}::{}"
-ENIGMA2_FAV_ID_FORMAT = " {}:{}:{}:{:X}:{:X}:{:X}:{:X}:0:0:0:{}:{}\n#DESCRIPTION: {}\n"
+ENIGMA2_FAV_ID_FORMAT = " {}:0:{}:{:X}:{:X}:{:X}:{:X}:0:0:0:{}:{}\n#DESCRIPTION: {}\n"
 MARKER_FORMAT = " 1:64:{}:0:0:0:0:0:0:0::{}\n#DESCRIPTION {}\n"
 
 
@@ -79,6 +51,9 @@ def parse_m3u(path, s_type, detect_encoding=True, params=None):
 
         for line in str(data, encoding=encoding, errors="ignore").splitlines():
             if line.startswith("#EXTINF"):
+                inf, sep, line = line.partition(" ")
+                if not line:
+                    line = inf
                 line, sep, name = line.rpartition(",")
 
                 data = re.split('"', line)
@@ -93,7 +68,8 @@ def parse_m3u(path, s_type, detect_encoding=True, params=None):
                     groups.add(grp_name)
                     fav_id = MARKER_FORMAT.format(marker_counter, grp_name, grp_name)
                     marker_counter += 1
-                    mr = Service(None, None, None, grp_name, *aggr[0:3], BqServiceType.MARKER.name, *aggr, fav_id, None)
+                    mr = Service(None, None, None, grp_name, None, None, None, BqServiceType.MARKER.name, None, None,
+                                 None, None, None, None, None, None, None, None, fav_id, None)
                     services.append(mr)
             elif line.startswith("#EXTGRP") and s_type is SettingsType.ENIGMA_2:
                 grp_name = line.strip("#EXTGRP:").strip()
@@ -101,7 +77,8 @@ def parse_m3u(path, s_type, detect_encoding=True, params=None):
                     groups.add(grp_name)
                     fav_id = MARKER_FORMAT.format(marker_counter, grp_name, grp_name)
                     marker_counter += 1
-                    mr = Service(None, None, None, grp_name, *aggr[0:3], BqServiceType.MARKER.name, *aggr, fav_id, None)
+                    mr = Service(None, None, None, grp_name, None, None, None, BqServiceType.MARKER.name, None, None,
+                                 None, None, None, None, None, None, None, None, fav_id, None)
                     services.append(mr)
             elif not line.startswith("#"):
                 url = line.strip()
@@ -109,7 +86,8 @@ def parse_m3u(path, s_type, detect_encoding=True, params=None):
                 sid_counter += 1
                 fav_id = get_fav_id(url, name, s_type, params)
                 if all((name, url, fav_id)):
-                    srv = Service(None, None, IPTV_ICON, name, *aggr[0:3], st, picon, p_id, *s_aggr, url, fav_id, None)
+                    srv = Service(None, None, IPTV_ICON, name, None, None, None, st, picon, p_id, None, None, None,
+                                  None, None, None, None, url, fav_id, None)
                     services.append(srv)
                 else:
                     log("*.m3u* parse error ['{}']: name[{}], url[{}], fav id[{}]".format(path, name, url, fav_id))
@@ -140,12 +118,14 @@ def export_to_m3u(path, bouquet, s_type):
         file.writelines(lines)
 
 
-def get_fav_id(url, name, settings_type, params=None, st_type=None, s_id=0, srv_type=1):
+def get_fav_id(url, service_name, settings_type, params=None, stream_type=None, s_type=1):
     """ Returns fav id depending on the profile. """
     if settings_type is SettingsType.ENIGMA_2:
-        st_type = st_type or StreamType.NONE_TS.value
+        stream_type = stream_type or StreamType.NONE_TS.value
         params = params or (0, 0, 0, 0)
-        return ENIGMA2_FAV_ID_FORMAT.format(st_type, s_id, srv_type, *params, quote(url), name, name, None)
+        v1, v2, v3, v4 = params
+        return ENIGMA2_FAV_ID_FORMAT.format(stream_type, s_type, v1, v2, v3, v4, quote(url),
+                                            service_name, service_name, None)
     elif settings_type is SettingsType.NEUTRINO_MP:
         return NEUTRINO_FAV_ID_FORMAT.format(url, "", 0, None, None, None, None, "", "", 1)
 

app/eparser/neutrino/__init__.py

@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-SP = "_:::_"
-KSP = "_::_"
-API_VER = "4"
-
-
-def get_attributes(data):
-    return {el[0]: el[1] for el in (e.split(KSP) for e in data.split(SP))}
-
-
-def get_xml_attributes(attr):
-    attrs = attr.attributes
-    return {t: attrs[t].value for t in attrs.keys()}

app/eparser/neutrino/bouquets.py

@@ -1,36 +1,7 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import os
+from xml.dom.minidom import parse, Document
 
 from app.eparser.iptv import NEUTRINO_FAV_ID_FORMAT
-from app.eparser.neutrino import KSP, SP, get_xml_attributes, get_attributes, API_VER
-from app.eparser.neutrino.nxml import XmlHandler, NeutrinoDocument
 from app.ui.uicommons import LOCKED_ICON, HIDE_ICON
 from ..ecommons import Bouquets, Bouquet, BouquetService, BqServiceType, PROVIDER, BqType
 
@@ -52,29 +23,29 @@ def parse_bouquets(file, name, bq_type):
     if not os.path.exists(file):
         return bouquets
 
-    dom = XmlHandler.parse(file)
+    dom = parse(file)
 
     for elem in dom.getElementsByTagName("Bouquet"):
         if elem.hasAttributes():
-            bq_attrs = get_xml_attributes(elem)
-            bq_name = bq_attrs.get("name", "")
-            hidden = bq_attrs.get("hidden", "0")
-            locked = bq_attrs.get("locked", "0")
+            bq_name = elem.attributes["name"].value
+            hidden = elem.attributes.get("hidden")
+            hidden = hidden.value if hidden else hidden
+            locked = elem.attributes.get("locked")
+            locked = locked.value if locked else locked
+            # epg = elem.attributes["epg"].value
             services = []
             for srv_elem in elem.getElementsByTagName("S"):
                 if srv_elem.hasAttributes():
-                    s_attrs = get_xml_attributes(srv_elem)
-                    ssid = s_attrs.get("i", "0")
-                    on = s_attrs.get("on", "0")
-                    tr_id = s_attrs.get("t", "0")
+                    ssid = srv_elem.attributes["i"].value
+                    on = srv_elem.attributes["on"].value
+                    tr_id = srv_elem.attributes["t"].value
                     fav_id = "{}:{}:{}".format(tr_id, on, ssid)
                     services.append(BouquetService(None, BqServiceType.DEFAULT, fav_id, 0))
             bouquets[2].append(Bouquet(name=bq_name,
                                        type=bq_type,
                                        services=services,
                                        locked=LOCKED_ICON if locked == "1" else None,
-                                       hidden=HIDE_ICON if hidden == "1" else None,
-                                       file=SP.join("{}{}{}".format(k, KSP, v) for k, v in bq_attrs.items())))
+                                       hidden=HIDE_ICON if hidden == "1" else None))
 
     if BqType(bq_type) is BqType.BOUQUET:
         for bq in bouquets.bouquets:
@@ -92,27 +63,35 @@ def parse_webtv(path, name, bq_type):
     if not os.path.exists(path):
         return bouquets
 
-    dom = XmlHandler.parse(path)
+    dom = parse(path)
     services = []
     for elem in dom.getElementsByTagName("webtv"):
         if elem.hasAttributes():
-            web_attrs = get_xml_attributes(elem)
-            title = web_attrs.get("title", "")
-            url = web_attrs.get("url", "")
-            description = web_attrs.get("description", "")
-            urlkey = web_attrs.get("urlkey", None)
-            account = web_attrs.get("account", None)
-            usrname = web_attrs.get("usrname", None)
-            psw = web_attrs.get("psw", None)
-            s_type = web_attrs.get("type", None)
-            iconsrc = web_attrs.get("iconsrc", None)
-            iconsrc_b = web_attrs.get("iconsrc_b", None)
-            group = web_attrs.get("group", None)
+            title = elem.attributes["title"].value
+            url = elem.attributes["url"].value
+            description = elem.attributes.get("description")
+            description = description.value if description else description
+            urlkey = elem.attributes.get("urlkey", None)
+            urlkey = urlkey.value if urlkey else urlkey
+            account = elem.attributes.get("account", None)
+            account = account.value if account else account
+            usrname = elem.attributes.get("usrname", None)
+            usrname = usrname.value if usrname else usrname
+            psw = elem.attributes.get("psw", None)
+            psw = psw.value if psw else psw
+            s_type = elem.attributes.get("type", None)
+            s_type = s_type.value if s_type else s_type
+            iconsrc = elem.attributes.get("iconsrc", None)
+            iconsrc = iconsrc.value if iconsrc else iconsrc
+            iconsrc_b = elem.attributes.get("iconsrc_b", None)
+            iconsrc_b = iconsrc_b.value if iconsrc_b else iconsrc_b
+            group = elem.attributes.get("group", None)
+            group = group.value if group else group
             fav_id = NEUTRINO_FAV_ID_FORMAT.format(url, description, urlkey, account, usrname, psw, s_type, iconsrc,
                                                    iconsrc_b, group)
             services.append(BouquetService(name=title, type=BqServiceType.IPTV, data=fav_id, num=0))
 
-    bouquet = Bouquet(name="default", type=bq_type, services=services, locked=None, hidden=None, file=None)
+    bouquet = Bouquet(name="default", type=bq_type, services=services, locked=None, hidden=None)
     bouquets[2].append(bouquet)
 
     return bouquets
@@ -128,47 +107,38 @@ def write_bouquets(path, bouquets):
 
 
 def write_bouquet(file, bouquet):
-    doc = NeutrinoDocument()
+    doc = Document()
     root = doc.createElement("zapit")
-    root.setAttribute("api", API_VER)
     doc.appendChild(root)
     comment = doc.createComment(_COMMENT)
     doc.appendChild(comment)
 
     for bq in bouquet.bouquets:
-        attrs = get_attributes(bq.file) if bq.file else {}
-        attrs["name"] = bq.name
-        if bq.hidden:
-            attrs["hidden"] = "1"
-        else:
-            attrs.pop("hidden", None)
-        if bq.locked:
-            attrs["locked"] = "1"
-        else:
-            attrs.pop("locked", None)
-
         bq_elem = doc.createElement("Bouquet")
-        for k, v in attrs.items():
-            bq_elem.setAttribute(k, v)
-
+        bq_elem.setAttribute("name", bq.name)
+        bq_elem.setAttribute("hidden", "1" if bq.hidden else "0")
+        bq_elem.setAttribute("locked", "1" if bq.locked else "0")
+        bq_elem.setAttribute("epg", "0")
         root.appendChild(bq_elem)
 
         for srv in bq.services:
+            f_data = srv.flags_cas.split(":")
             tr_id, on, ssid = srv.fav_id.split(":")
             srv_elem = doc.createElement("S")
             srv_elem.setAttribute("i", ssid)
             srv_elem.setAttribute("n", srv.service)
             srv_elem.setAttribute("t", tr_id)
             srv_elem.setAttribute("on", on)
+            srv_elem.setAttribute("s", f_data[1])
             srv_elem.setAttribute("frq", srv.freq)
-            srv_elem.setAttribute("s", get_attributes(srv.flags_cas).get("position", "0"))
+            srv_elem.setAttribute("l", "0")  # temporary !!!
             bq_elem.appendChild(srv_elem)
 
-    doc.write_xml(file)
+    doc.writexml(open(file, "w"), addindent="    ", newl="\n", encoding="UTF-8")
 
 
 def write_webtv(file, bouquet):
-    doc = NeutrinoDocument()
+    doc = Document()
     root = doc.createElement("webtvs")
     doc.appendChild(root)
     comment = doc.createComment(_COMMENT)
@@ -202,7 +172,7 @@ def write_webtv(file, bouquet):
 
             root.appendChild(srv_elem)
 
-    doc.write_xml(file)
+    doc.writexml(open(file, "w"), addindent="    ", newl="\n", encoding="UTF-8")
 
 
 if __name__ == "__main__":

app/eparser/neutrino/nxml.py

@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
-""" Additional module for working with Neutrino xml files. """
-import re
-from xml.dom.minidom import parseString, Document, Element, Node
-from xml.parsers.expat import ExpatError
-
-from app.commons import log
-
-
-class XmlHandler:
-    """ Utility class for handling Neutrino xml files. """
-    __slots__ = ()
-
-    ERROR_MESSAGE = "The file [{}] is not formatted correctly or contains invalid characters! Cause: {}"
-
-    @staticmethod
-    def parse(path):
-        """ Parses a file into the DOM by filename. """
-        try:
-            return parseString(open(path, "r", encoding="utf-8", errors="ignore").read())
-        except ExpatError as e:
-            # Some neutrino configuration files may contain text data with invalid character ['&'].
-            # https://www.w3.org/TR/xml/#syntax
-            # Apparently there is an error in Neutrino itself and the document is not initially formed correctly.
-            log(XmlHandler.ERROR_MESSAGE.format(path, e))
-
-            return XmlHandler.preprocess(path)
-
-    @staticmethod
-    def preprocess(path):
-        """ Pre-processing xml [for '&' symbol] for correct parsing. """
-        with open(path, "r", encoding="utf-8", errors="ignore") as f:
-            pat = re.compile("&([^;\\W]*([^;\\w]|$))")
-            log("Processing the file '{}'...".format(path))
-            try:
-                dom = parseString(re.sub(pat, "&", f.read()))
-            except ExpatError as e:
-                msg = XmlHandler.ERROR_MESSAGE.format(path, e)
-                log(msg)
-                raise ValueError(e)
-            else:
-                log("Done!")
-                return dom
-
-
-class NeutrinoDocument(Document):
-
-    def createElement(self, tag_name):
-        e = NElement(tag_name)
-        e.ownerDocument = self
-        return e
-
-    def write_xml(self, path):
-        self.writexml(open(path, "w", encoding="utf-8"), addindent="    ", newl="\n", encoding="UTF-8")
-
-
-class NElement(Element):
-
-    def writexml(self, writer, indent="", add_indent="", new_line=""):
-        """ Overridden specifically for neutrino for more correct [' -> optional] xml attrs generation. """
-        writer.write(indent + "<" + self.tagName)
-        attrs = self._get_attributes()
-
-        for a_name in attrs.keys():
-            writer.write(" %s=\"" % a_name)
-            self.write_data(writer, attrs[a_name].value)
-            writer.write("\"")
-        if self.childNodes:
-            writer.write(">")
-            if len(self.childNodes) == 1 and self.childNodes[0].nodeType in (Node.TEXT_NODE, Node.CDATA_SECTION_NODE):
-                self.childNodes[0].writexml(writer, '', '', '')
-            else:
-                writer.write(new_line)
-                for node in self.childNodes:
-                    node.writexml(writer, indent + add_indent, add_indent, new_line)
-                writer.write(indent)
-            writer.write("</%s>%s" % (self.tagName, new_line))
-        else:
-            writer.write("/>%s" % new_line)
-
-    @staticmethod
-    def write_data(writer, data):
-        """ Writes data chars to writer."""
-        if data:
-            data = data.replace("&", "&amp;").replace("<", "&lt;").replace("\"", "&quot;").replace(">", "&gt;")
-            data = data.replace("'", "&apos;")
-            writer.write(data)

app/eparser/neutrino/services.py

@@ -1,227 +1,160 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
-from collections import defaultdict
+from xml.dom.minidom import parse, Document
 
 from app.commons import log
-from app.eparser.ecommons import (Service, POLARIZATION, FEC, SYSTEM, SERVICE_TYPE, PROVIDER, T_SYSTEM, TrType,
-                                  SystemCable)
-from app.eparser.neutrino import get_xml_attributes, SP, KSP, get_attributes, API_VER
-from app.eparser.neutrino.nxml import XmlHandler, NeutrinoDocument
+from ..ecommons import Service, POLARIZATION, FEC, SYSTEM, SERVICE_TYPE, PROVIDER
 
 _FILE = "services.xml"
+_TR_ATTR_NAMES = ("id", "on", "frq", "inv", "sr", "fec", "pol", "mod", "sys")  # transponder attributes
+_SRV_ATTR_NAMES = ("t", "s", "num", "f", "v", "a", "p", "pmt", "tx", "vt")  # service attributes
 
 
 def write_services(path, services):
-    NeutrinoServiceWriter(path, services).write()
+    doc = Document()
+    root = doc.createElement("zapit")
+    root.setAttribute("api", "4")
+    doc.appendChild(root)
+    comment = doc.createComment(" File was created in DemonEditor. Enjoy watching! ")
+    doc.appendChild(comment)
+
+    sats = {}
+    for srv in services:
+        flag = srv[0]
+        if flag in sats:
+            sats.get(flag).append(srv)
+        else:
+            srv_list = [srv]
+            sats[flag] = srv_list
+
+    for sat in sats:
+        tr_atr = sat.split(":")
+        sat_elem = doc.createElement("sat")
+        sat_elem.setAttribute("name", tr_atr[0])
+        sat_elem.setAttribute("position", tr_atr[1])
+        sat_elem.setAttribute("diseqc", tr_atr[2])
+        sat_elem.setAttribute("uncommited", tr_atr[3])
+        root.appendChild(sat_elem)
+
+        transponers = {}
+        for srv in sats.get(sat):
+            flag = srv[-1]
+            if flag in transponers:
+                transponers.get(flag).append(srv)
+            else:
+                srv_list = [srv]
+                transponers[flag] = srv_list
+
+        for tr in transponers:
+            tr_elem = doc.createElement("TS")
+            tr_atr = tr.split(":")
+            for i, value in enumerate(tr_atr):
+                if value == "None":
+                    continue
+                tr_elem.setAttribute(_TR_ATTR_NAMES[i], value)
+            sat_elem.appendChild(tr_elem)
+
+            for srv in transponers.get(tr):
+                srv_elem = doc.createElement("S")
+                srv_elem.setAttribute("i", srv.ssid)
+                srv_elem.setAttribute("n", srv.service)
+
+                srv_attrs = srv.data_id.split(":")
+                api = srv_attrs.pop(0)
+
+                if api == "3":
+                    root.setAttribute("api", "3")  # !!!
+                for i, value in enumerate(srv_attrs):
+                    if value == "None":
+                        continue
+                    srv_elem.setAttribute(_SRV_ATTR_NAMES[i], value)
+
+                tr_elem.appendChild(srv_elem)
+
+    doc.writexml(open(path + _FILE, "w"), addindent="    ", newl="\n", encoding="UTF-8")
+    doc.unlink()
 
 
 def get_services(path):
-    return NeutrinoServicesReader(path).get_services()
+    return parse_services(path)
 
 
-class NeutrinoServiceWriter:
+def parse_services(path):
+    """ Parsing services from xml"""
+    dom = parse(path + _FILE)
+    services = []
 
-    def __init__(self, path, services):
-        self._path = path + _FILE
-        self._services = services
+    for root in dom.getElementsByTagName("zapit"):
+        api = root.attributes["api"].value
 
-        self._api = API_VER
-        self._doc = NeutrinoDocument()
-        self._root = self._doc.createElement("zapit")
-        self._root.setAttribute("api", self._api)
-        self._doc.appendChild(self._root)
-        self._doc.appendChild(self._doc.createComment(" File was created in DemonEditor. Enjoy watching! "))
+        for elem in root.getElementsByTagName("sat"):
+            if elem.hasAttributes():
+                sat_name = elem.attributes["name"].value
+                sat_pos = elem.attributes["position"].value
+                diseqc = elem.attributes.get("diseqc")
+                diseqc = diseqc.value if diseqc else diseqc
+                uncommited = elem.attributes.get("uncommited")
+                uncommited = uncommited.value if uncommited else uncommited
+                sat = "{}:{}:{}:{}".format(sat_name, sat_pos, diseqc, uncommited)
 
-    def write(self):
-        srvs = defaultdict(list)
-        for s in self._services:
-            srvs[s.transponder_type].append(s)
-        self.append_services(srvs.get(TrType.Satellite.value), "sat")
-        self.append_services(srvs.get(TrType.Terrestrial.value), "terrestrial")
-        self.append_services(srvs.get(TrType.Cable.value), "cable")
+                for tr_elem in elem.getElementsByTagName("TS"):
+                    if tr_elem.hasAttributes():
+                        parse_transponder(api, sat, sat_pos, services, tr_elem)
 
-        self._doc.write_xml(self._path)
-        self._doc.unlink()
-
-    def append_services(self, services, s_type):
-        if not services:
-            return
-
-        sats = defaultdict(list)
-        for srv in services:
-            sats[srv[0]].append(srv)
-
-        for sat in sats:
-            sat_elem = self._doc.createElement(s_type)
-            attrs = get_attributes(sat)
-            for k, v in attrs.items():
-                sat_elem.setAttribute(k, v)
-
-            self._root.appendChild(sat_elem)
-
-            transponders = defaultdict(list)
-            for srv in sats.get(sat):
-                transponders[srv[-1]].append(srv)
-
-            for tr in transponders:
-                tr_elem = self._doc.createElement("TS")
-                for k, v in get_attributes(tr).items():
-                    tr_elem.setAttribute(k, v)
-                sat_elem.appendChild(tr_elem)
-
-                for srv in transponders.get(tr):
-                    srv_elem = self._doc.createElement("S")
-                    s_attrs = get_attributes(srv.data_id)
-                    api = s_attrs.pop("api", self._api)
-                    if api != self._api:
-                        self._root.setAttribute("api", api)
-
-                    for k, v in s_attrs.items():
-                        srv_elem.setAttribute(k, v)
-
-                    tr_elem.appendChild(srv_elem)
+        return services
 
 
-class NeutrinoServicesReader:
+def parse_transponder(api, sat, sat_pos, services, tr_elem):
+    tr_id = tr_elem.attributes["id"].value
+    on = tr_elem.attributes["on"].value
+    freq = tr_elem.attributes["frq"].value
+    rate = tr_elem.attributes["sr"].value
+    inv = tr_elem.attributes["inv"].value
+    fec = tr_elem.attributes["fec"].value
+    pol = tr_elem.attributes["pol"].value
+    mod = tr_elem.attributes.get("mod")
+    mod = mod.value if mod else mod
+    sys = tr_elem.attributes.get("sys")
+    sys = sys.value if sys else sys
 
-    def __init__(self, path):
-        self._path = path + _FILE
-        self._attrs = None
-        self._tr = None
-        self._api = "4"
-        self._services = []
+    tr = "{}:{}:{}:{}:{}:{}:{}:{}:{}".format(tr_id, on, freq, inv, rate, fec, pol, mod, sys)
+    tr_id = tr_id.lstrip("0")
+    pol = POLARIZATION.get(pol)
+    # Formatting displayed values.
+    try:
+        freq = "{}".format(int(freq) // 1000)
+        rate = "{}".format(int(rate) // 1000)
+        sat_pos = int(sat_pos)
+        sat_pos = "{:0.1f}{}".format(abs(sat_pos / 10), "W" if sat_pos < 0 else "E")
+    except ValueError as e:
+        log("Neutrino parsing error [parse_transponder]: {}".format(e))
 
-    def get_services(self):
-        dom = XmlHandler.parse(self._path)
+    for srv_elem in tr_elem.getElementsByTagName("S"):
+        if srv_elem.hasAttributes():
+            ssid = srv_elem.attributes["i"].value
+            name = srv_elem.attributes["n"].value
+            srv_type = srv_elem.attributes["t"].value
+            sys = srv_elem.attributes["s"].value
+            num = srv_elem.attributes.get("num")
+            num = num.value if num else num
+            f = srv_elem.attributes.get("f")
+            f = f.value if f else f
+            v, a, p, pmt, tx, vt = [None] * 6
+            # For v3 is possible so: '<S i="0001" n="name" t="1" s="0" num="770" f="4"/>' (equals v4 api)
+            if api == "3" and len(srv_elem.attributes) > 6:
+                v = srv_elem.attributes["v"].value
+                a = srv_elem.attributes["a"].value
+                p = srv_elem.attributes["p"].value
+                pmt = srv_elem.attributes["pmt"].value
+                tx = srv_elem.attributes["tx"].value
+                vt = srv_elem.attributes["vt"].value
 
-        for root in dom.getElementsByTagName("zapit"):
-            if root.hasAttributes():
-                api = root.attributes["api"]
-                self._api = api.value if api else self._api
+            data_id = "{}:{}:{}:{}:{}:{}:{}:{}:{}:{}:{}".format(api, srv_type, sys, num, f, v, a, p, pmt, tx, vt)
+            fav_id = "{}:{}:{}".format(tr_id, on.lstrip("0"), ssid.lstrip("0"))
+            picon_id = "{}{}{}.png".format(tr_id, on, ssid)
+            prv, st, = PROVIDER.get(int(on, 16)), SERVICE_TYPE.get(str(int(srv_type, 16)), SERVICE_TYPE.get("-2"))
 
-            for elem in root.getElementsByTagName("sat"):
-                if elem.hasAttributes():
-                    sat_attrs = get_xml_attributes(elem)
-                    sat_pos = 0
-                    try:
-                        sat_pos = int(sat_attrs.get("position", "0"))
-                        sat_pos = "{:0.1f}{}".format(abs(sat_pos / 10), "W" if sat_pos < 0 else "E")
-                    except ValueError as e:
-                        log("Neutrino parsing error [parse sat position]: {}".format(e))
-                    sat = SP.join("{}{}{}".format(k, KSP, v) for k, v in sat_attrs.items())
-                    for tr_elem in elem.getElementsByTagName("TS"):
-                        if tr_elem.hasAttributes():
-                            self.parse_sat_transponder(sat, sat_pos, tr_elem)
-
-            # Terrestrial DVB-T[2].
-            for elem in root.getElementsByTagName("terrestrial"):
-                if elem.hasAttributes():
-                    terr_attrs = get_xml_attributes(elem)
-                    terr = SP.join("{}{}{}".format(k, KSP, v) for k, v in terr_attrs.items())
-
-                    for tr_elem in elem.getElementsByTagName("TS"):
-                        if tr_elem.hasAttributes():
-                            self.parse_ct_transponder(terr, tr_elem, TrType.Terrestrial)
-
-            # Cable.
-            for elem in root.getElementsByTagName("cable"):
-                if elem.hasAttributes():
-                    cable_attrs = get_xml_attributes(elem)
-                    cable = SP.join("{}{}{}".format(k, KSP, v) for k, v in cable_attrs.items())
-
-                    for tr_elem in elem.getElementsByTagName("TS"):
-                        if tr_elem.hasAttributes():
-                            self.parse_ct_transponder(cable, tr_elem, TrType.Cable)
-
-        return self._services
-
-    def parse_sat_transponder(self, sat, sat_pos, tr_elem):
-        tr_attr = get_xml_attributes(tr_elem)
-        tr = SP.join("{}{}{}".format(k, KSP, v) for k, v in tr_attr.items())
-        tr_id = tr_attr.get("id", "0").lstrip("0")
-        on = tr_attr.get("on", "0")
-        freq = tr_attr.get("frq", "0")
-        rate = tr_attr.get("sr", "0")
-        fec = tr_attr.get("fec", "0")
-
-        pol = POLARIZATION.get(tr_attr.get("pol", "0"))
-        # Formatting displayed values.
-        try:
-            freq = "{}".format(int(freq) // 1000)
-            rate = "{}".format(int(rate) // 1000)
-        except ValueError as e:
-            log("Neutrino parsing error [parse_transponder]: {}".format(e))
-
-        for srv_elem in tr_elem.getElementsByTagName("S"):
-            if srv_elem.hasAttributes():
-                at = get_xml_attributes(srv_elem)
-                at["api"] = self._api
-                ssid, name, s_type, sys = at.get("i", "0"), at.get("n", ""), at.get("t", "3"), at.get("s", "0")
-                data_id = SP.join("{}{}{}".format(k, KSP, v) for k, v in at.items())
-                fav_id = "{}:{}:{}".format(tr_id, on.lstrip("0"), ssid.lstrip("0"))
-                picon_id = "{}{}{}.png".format(tr_id, on, ssid)
-                prv = PROVIDER.get(int(on, 16), "")
-                st = SERVICE_TYPE.get(str(int(s_type, 16)), SERVICE_TYPE.get("-2"))
-
-                srv = Service(sat, TrType.Satellite.value, None, name, None, None, prv, st, None, picon_id, ssid, freq,
-                              rate, pol, FEC.get(fec), SYSTEM.get(sys), sat_pos, data_id, fav_id, tr)
-                self._services.append(srv)
-
-    def parse_ct_transponder(self, terr, tr_elem, tr_type):
-        attrs = get_xml_attributes(tr_elem)
-        tr = SP.join("{}{}{}".format(k, KSP, v) for k, v in attrs.items())
-        tr_id, on, freq = attrs.get("id", "0").lstrip("0"), attrs.get("on", "0"), attrs.get("frq", "0")
-
-        for srv_elem in tr_elem.getElementsByTagName("S"):
-            if srv_elem.hasAttributes():
-                s_at = get_xml_attributes(srv_elem)
-                s_at["api"] = self._api
-                ssid, name, s_type, sys = s_at.get("i", "0"), s_at.get("n", ""), s_at.get("t", "3"), s_at.get("s", "0")
-                data_id = SP.join("{}{}{}".format(k, KSP, v) for k, v in s_at.items())
-                fav_id = "{}:{}:{}".format(tr_id, on.lstrip("0"), ssid.lstrip("0"))
-                picon_id = "{}{}{}.png".format(tr_id, on, ssid)
-                prv = PROVIDER.get(int(on, 16), "")
-                st = SERVICE_TYPE.get(str(int(s_type, 16)), SERVICE_TYPE.get("-2"))
-
-                if tr_type is TrType.Terrestrial:
-                    sys = T_SYSTEM.get(sys)
-                    pos = "T"
-                elif tr_type is TrType.Cable:
-                    sys = SystemCable(sys).name
-                    pos = "C"
-                else:
-                    log("Parse transponder error: Not supported type [{}]".format(tr_type))
-                    break
-
-                srv = Service(terr, tr_type.value, None, name, None, None, prv, st, None, picon_id, ssid,
-                              freq, "0", None, None, sys, pos, data_id, fav_id, tr)
-                self._services.append(srv)
+            srv = Service(sat, None, None, name, None, None, prv, st, None, picon_id, ssid, freq, rate, pol,
+                          FEC.get(fec), SYSTEM.get(sys), sat_pos, data_id, fav_id, tr)
+            services.append(srv)
 
 
 if __name__ == "__main__":

app/settings.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import copy
 import json
 import locale
@@ -33,55 +5,27 @@ import os
 import sys
 from enum import Enum, IntEnum
 from functools import lru_cache
-from pathlib import Path
 from pprint import pformat
 from textwrap import dedent
 
 SEP = os.sep
-HOME_PATH = str(Path.home())
+HOME_PATH = os.path.expanduser("~")
 CONFIG_PATH = HOME_PATH + "{}.config{}demon-editor{}".format(SEP, SEP, SEP)
 CONFIG_FILE = CONFIG_PATH + "config.json"
-DATA_PATH = HOME_PATH + "{}DemonEditor{}".format(SEP, SEP)
-GTK_PATH = os.environ.get("GTK_PATH", None)
+DATA_PATH = HOME_PATH + "{}DemonEditor{}data{}".format(SEP, SEP, SEP)
 
 IS_DARWIN = sys.platform == "darwin"
 IS_WIN = sys.platform == "win32"
-IS_LINUX = sys.platform == "linux"
 
 
 class Defaults(Enum):
     """ Default program settings """
-    USER = "root"
-    PASSWORD = ""
-    HOST = "127.0.0.1"
-    FTP_PORT = "21"
-    HTTP_PORT = "80"
-    TELNET_PORT = "23"
-    HTTP_USE_SSL = False
-    # Enigma2.
-    BOX_SERVICES_PATH = "/etc/enigma2/"
-    BOX_SATELLITE_PATH = "/etc/tuxbox/"
-    BOX_PICON_PATH = "/usr/share/enigma2/picon/"
-    BOX_PICON_PATHS = ("/usr/share/enigma2/picon/",
-                       "/media/hdd/picon/",
-                       "/media/usb/picon/",
-                       "/media/mmc/picon/",
-                       "/media/cf/picon/")
-    # Neutrino.
-    NEUTRINO_BOX_SERVICES_PATH = "/var/tuxbox/config/zapit/"
-    NEUTRINO_BOX_SATELLITE_PATH = "/var/tuxbox/config/"
-    NEUTRINO_BOX_PICON_PATH = "/usr/share/tuxbox/neutrino/icons/logo/"
-    NEUTRINO_BOX_PICON_PATHS = ("/usr/share/tuxbox/neutrino/icons/logo/",)
-    # Paths.
-    BACKUP_PATH = "{}backup{}".format(DATA_PATH, SEP)
-    PICON_PATH = "{}picons{}".format(DATA_PATH, SEP)
-
     DEFAULT_PROFILE = "default"
     BACKUP_BEFORE_DOWNLOADING = True
     BACKUP_BEFORE_SAVE = True
     V5_SUPPORT = False
     FORCE_BQ_NAMES = False
-    HTTP_API_SUPPORT = True
+    HTTP_API_SUPPORT = IS_WIN
     ENABLE_YT_DL = False
     ENABLE_SEND_TO = False
     USE_COLORS = True
@@ -98,41 +42,88 @@ class Defaults(Enum):
     ACTIVE_TRANSCODING_PRESET = "720p TV{}device".format(SEP)
 
 
+def get_settings():
+    if not os.path.isfile(CONFIG_FILE) or os.stat(CONFIG_FILE).st_size == 0:
+        write_settings(get_default_settings())
+
+    with open(CONFIG_FILE, "r", encoding="utf-8") as config_file:
+        return json.load(config_file)
+
+
+def get_default_settings(profile_name="default"):
+    def_settings = SettingsType.ENIGMA_2.get_default_settings()
+    set_local_paths(def_settings, profile_name)
+
+    return {
+        "version": 1,
+        "default_profile": Defaults.DEFAULT_PROFILE.value,
+        "profiles": {profile_name: def_settings},
+        "v5_support": Defaults.V5_SUPPORT.value,
+        "http_api_support": Defaults.HTTP_API_SUPPORT.value,
+        "enable_yt_dl": Defaults.ENABLE_YT_DL.value,
+        "enable_send_to": Defaults.ENABLE_SEND_TO.value,
+        "use_colors": Defaults.USE_COLORS.value,
+        "new_color": Defaults.NEW_COLOR.value,
+        "extra_color": Defaults.EXTRA_COLOR.value,
+        "fav_click_mode": Defaults.FAV_CLICK_MODE.value,
+        "profile_folder_is_default": Defaults.PROFILE_FOLDER_DEFAULT.value,
+        "records_path": Defaults.RECORDS_PATH.value
+    }
+
+
+def get_default_transcoding_presets():
+    return {"720p TV/device": {"vcodec": "h264", "vb": "1500", "width": "1280", "height": "720", "acodec": "mp3",
+                               "ab": "192", "channels": "2", "samplerate": "44100", "scodec": "none"},
+            "1080p TV/device": {"vcodec": "h264", "vb": "3500", "width": "1920", "height": "1080", "acodec": "mp3",
+                                "ab": "192", "channels": "2", "samplerate": "44100", "scodec": "none"}}
+
+
+def write_settings(config):
+    os.makedirs(os.path.dirname(CONFIG_PATH), exist_ok=True)
+    with open(CONFIG_FILE, "w", encoding="utf-8") as config_file:
+        json.dump(config, config_file, indent="    ")
+
+
+def set_local_paths(settings, profile_name, data_path=DATA_PATH, use_profile_folder=False):
+    settings["data_local_path"] = "{}{}{}".format(data_path, profile_name, SEP)
+    if use_profile_folder:
+        settings["picons_local_path"] = "{}{}{}{}{}".format(data_path, profile_name, SEP, "picons", SEP)
+        settings["backup_local_path"] = "{}{}{}{}{}".format(data_path, profile_name, SEP, "backup", SEP)
+    else:
+        settings["picons_local_path"] = "{}{}{}{}{}".format(data_path, "picons", SEP, profile_name, SEP)
+        settings["backup_local_path"] = "{}{}{}{}{}".format(data_path, "backup", SEP, profile_name, SEP)
+
+
 class SettingsType(IntEnum):
     """ Profiles for settings """
     ENIGMA_2 = 0
     NEUTRINO_MP = 1
 
     def get_default_settings(self):
-        """ Returns default settings for current type. """
-        if self is self.ENIGMA_2:
-            srv_path = Defaults.BOX_SERVICES_PATH.value
-            sat_path = Defaults.BOX_SATELLITE_PATH.value
-            picons_path = Defaults.BOX_PICON_PATH.value
-            http_timeout = 5
-            telnet_timeout = 5
-        else:
-            srv_path = Defaults.NEUTRINO_BOX_SERVICES_PATH.value
-            sat_path = Defaults.NEUTRINO_BOX_SATELLITE_PATH.value
-            picons_path = Defaults.NEUTRINO_BOX_PICON_PATH.value
-            http_timeout = 2
-            telnet_timeout = 1
-
-        return {"setting_type": self.value,
-                "host": Defaults.HOST.value,
-                "port": Defaults.FTP_PORT.value,
-                "timeout": 5,
-                "user": Defaults.USER.value,
-                "password": Defaults.PASSWORD.value,
-                "http_port": Defaults.HTTP_PORT.value,
-                "http_timeout": http_timeout,
-                "http_use_ssl": Defaults.HTTP_USE_SSL.value,
-                "telnet_port": Defaults.TELNET_PORT.value,
-                "telnet_timeout": telnet_timeout,
-                "services_path": srv_path,
-                "user_bouquet_path": srv_path,
-                "satellites_xml_path": sat_path,
-                "picons_path": picons_path}
+        """ Returns default settings for current type """
+        if self is SettingsType.ENIGMA_2:
+            return {"setting_type": self.value,
+                    "host": "127.0.0.1", "port": "21", "timeout": 5,
+                    "user": "root", "password": "root",
+                    "http_port": "80", "http_timeout": 5, "http_use_ssl": False,
+                    "telnet_port": "23", "telnet_timeout": 5,
+                    "services_path": "/etc/enigma2/", "user_bouquet_path": "/etc/enigma2/",
+                    "satellites_xml_path": "/etc/tuxbox/", "data_local_path": "{}enigma2{}".format(DATA_PATH, SEP),
+                    "picons_path": "/usr/share/enigma2/picon/",
+                    "picons_local_path": "{}enigma2{}picons{}".format(DATA_PATH, SEP, SEP),
+                    "backup_local_path": "{}enigma2{}backup{}".format(DATA_PATH, SEP, SEP)}
+        elif self is SettingsType.NEUTRINO_MP:
+            return {"setting_type": self,
+                    "host": "127.0.0.1", "port": "21", "timeout": 5,
+                    "user": "root", "password": "root",
+                    "http_port": "80", "http_timeout": 2, "http_use_ssl": False,
+                    "telnet_port": "23", "telnet_timeout": 1,
+                    "services_path": "/var/tuxbox/config/zapit/", "user_bouquet_path": "/var/tuxbox/config/zapit/",
+                    "satellites_xml_path": "/var/tuxbox/config/",
+                    "data_local_path": "{}neutrino{}".format(DATA_PATH, SEP),
+                    "picons_path": "/usr/share/tuxbox/neutrino/icons/logo/",
+                    "picons_local_path": "{}neutrino{}picons{}".format(DATA_PATH, SEP, SEP),
+                    "backup_local_path": "{}neutrino{}backup{}".format(DATA_PATH, SEP, SEP)}
 
 
 class SettingsException(Exception):
@@ -152,11 +143,11 @@ class PlayStreamsMode(IntEnum):
 
 class Settings:
     __INSTANCE = None
-    __VERSION = 2
+    __VERSION = 1
 
     def __init__(self, ext_settings=None):
         try:
-            settings = ext_settings or self.get_settings()
+            settings = ext_settings or get_settings()
         except PermissionError as e:
             raise SettingsReadException(e)
 
@@ -187,18 +178,22 @@ class Settings:
         return cls.__INSTANCE
 
     def save(self):
-        self.write_settings(self._settings)
+        write_settings(self._settings)
 
     def reset(self, force_write=False):
         for k, v in self.setting_type.get_default_settings().items():
             self._cp_settings[k] = v
 
+        def_path = self.default_data_path
+        def_path += "enigma2{}".format(SEP) if self.setting_type is SettingsType.ENIGMA_2 else "neutrino{}".format(SEP)
+        set_local_paths(self._cp_settings, self._current_profile, def_path, self.profile_folder_is_default)
+
         if force_write:
             self.save()
 
     @staticmethod
     def reset_to_default():
-        Settings.write_settings(Settings.get_default_settings())
+        write_settings(get_default_settings())
 
     def get_default(self, p_name):
         """ Returns default value for current settings type """
@@ -208,9 +203,9 @@ class Settings:
         """ Adds extra options """
         self._settings[name] = value
 
-    def get(self, name, default=None):
+    def get(self, name):
         """ Returns extra options or None """
-        return self._settings.get(name, default)
+        return self._settings.get(name, None)
 
     @property
     def settings(self):
@@ -239,10 +234,6 @@ class Settings:
     def default_profile(self, value):
         self._settings["default_profile"] = value
 
-    @property
-    def current_profile_settings(self):
-        return self._cp_settings
-
     @property
     def profiles(self):
         return self._profiles
@@ -366,20 +357,6 @@ class Settings:
     def picons_path(self, value):
         self._cp_settings["picons_path"] = value
 
-    @property
-    def picons_paths(self):
-        if self.setting_type is SettingsType.NEUTRINO_MP:
-            return self._settings.get("neutrino_picon_paths", Defaults.NEUTRINO_BOX_PICON_PATHS.value)
-        else:
-            return self._settings.get("picon_paths", Defaults.BOX_PICON_PATHS.value)
-
-    @picons_paths.setter
-    def picons_paths(self, value):
-        if self.setting_type is SettingsType.NEUTRINO_MP:
-            self._settings["neutrino_picon_paths"] = value
-        else:
-            self._settings["picon_paths"] = value
-
     # ***** Local paths ***** #
 
     @property
@@ -399,48 +376,28 @@ class Settings:
         self._settings["default_data_path"] = value
 
     @property
-    def default_backup_path(self):
-        return self._settings.get("default_backup_path", Defaults.BACKUP_PATH.value)
+    def data_local_path(self):
+        return self._cp_settings.get("data_local_path", self.get_default("data_local_path"))
 
-    @default_backup_path.setter
-    def default_backup_path(self, value):
-        self._settings["default_backup_path"] = value
+    @data_local_path.setter
+    def data_local_path(self, value):
+        self._cp_settings["data_local_path"] = value
 
     @property
-    def default_picon_path(self):
-        return self._settings.get("default_picon_path", Defaults.PICON_PATH.value)
+    def picons_local_path(self):
+        return self._cp_settings.get("picons_local_path", self.get_default("picons_local_path"))
 
-    @default_picon_path.setter
-    def default_picon_path(self, value):
-        self._settings["default_picon_path"] = value
+    @picons_local_path.setter
+    def picons_local_path(self, value):
+        self._cp_settings["picons_local_path"] = value
 
     @property
-    def profile_data_path(self):
-        return "{}data{}{}{}".format(self.default_data_path, SEP, self._current_profile, SEP)
+    def backup_local_path(self):
+        return self._cp_settings.get("backup_local_path", self.get_default("backup_local_path"))
 
-    @profile_data_path.setter
-    def profile_data_path(self, value):
-        self._cp_settings["profile_data_path"] = value
-
-    @property
-    def profile_picons_path(self):
-        if self.profile_folder_is_default:
-            return "{}picons{}".format(self.profile_data_path, SEP)
-        return "{}{}{}".format(self.default_picon_path, self._current_profile, SEP)
-
-    @profile_picons_path.setter
-    def profile_picons_path(self, value):
-        self._cp_settings["profile_picons_path"] = value
-
-    @property
-    def profile_backup_path(self):
-        if self.profile_folder_is_default:
-            return "{}backup{}".format(self.profile_data_path, SEP)
-        return "{}{}{}".format(self.default_backup_path, self._current_profile, SEP)
-
-    @profile_backup_path.setter
-    def profile_backup_path(self, value):
-        self._cp_settings["profile_backup_path"] = value
+    @backup_local_path.setter
+    def backup_local_path(self, value):
+        self._cp_settings["backup_local_path"] = value
 
     @property
     def records_path(self):
@@ -470,7 +427,7 @@ class Settings:
 
     @property
     def transcoding_presets(self):
-        return self._settings.get("transcoding_presets", self.get_default_transcoding_presets())
+        return self._settings.get("transcoding_presets", get_default_transcoding_presets())
 
     @transcoding_presets.setter
     def transcoding_presets(self, value):
@@ -663,13 +620,6 @@ class Settings:
 
     @property
     def dark_mode(self):
-        if IS_DARWIN:
-            import subprocess
-
-            cmd = ["defaults", "read", "-g", "AppleInterfaceStyle"]
-            p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-            return "Dark" in str(p[0])
-
         return self._settings.get("dark_mode", False)
 
     @dark_mode.setter
@@ -769,49 +719,6 @@ class Settings:
     def is_enable_experimental(self, value):
         self._settings["enable_experimental"] = value
 
-    # **************** Get-Set settings **************** #
-
-    @staticmethod
-    def get_settings():
-        if not os.path.isfile(CONFIG_FILE) or os.stat(CONFIG_FILE).st_size == 0:
-            Settings.write_settings(Settings.get_default_settings())
-
-        with open(CONFIG_FILE, "r", encoding="utf-8") as config_file:
-            return json.load(config_file)
-
-    @staticmethod
-    def get_default_settings(profile_name="default"):
-        def_settings = SettingsType.ENIGMA_2.get_default_settings()
-
-        return {
-            "version": Settings.__VERSION,
-            "default_profile": Defaults.DEFAULT_PROFILE.value,
-            "profiles": {profile_name: def_settings},
-            "v5_support": Defaults.V5_SUPPORT.value,
-            "http_api_support": Defaults.HTTP_API_SUPPORT.value,
-            "enable_yt_dl": Defaults.ENABLE_YT_DL.value,
-            "enable_send_to": Defaults.ENABLE_SEND_TO.value,
-            "use_colors": Defaults.USE_COLORS.value,
-            "new_color": Defaults.NEW_COLOR.value,
-            "extra_color": Defaults.EXTRA_COLOR.value,
-            "fav_click_mode": Defaults.FAV_CLICK_MODE.value,
-            "profile_folder_is_default": Defaults.PROFILE_FOLDER_DEFAULT.value,
-            "records_path": Defaults.RECORDS_PATH.value
-        }
-
-    @staticmethod
-    def get_default_transcoding_presets():
-        return {"720p TV/device": {"vcodec": "h264", "vb": "1500", "width": "1280", "height": "720", "acodec": "mp3",
-                                   "ab": "192", "channels": "2", "samplerate": "44100", "scodec": "none"},
-                "1080p TV/device": {"vcodec": "h264", "vb": "3500", "width": "1920", "height": "1080", "acodec": "mp3",
-                                    "ab": "192", "channels": "2", "samplerate": "44100", "scodec": "none"}}
-
-    @staticmethod
-    def write_settings(config):
-        os.makedirs(os.path.dirname(CONFIG_PATH), exist_ok=True)
-        with open(CONFIG_FILE, "w", encoding="utf-8") as config_file:
-            json.dump(config, config_file, indent="    ")
-
 
 if __name__ == "__main__":
     pass

app/tools/media.py

@@ -1,122 +1,56 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import os
 import sys
+from abc import ABC, abstractmethod
 from datetime import datetime
 
-from gi.repository import Gdk, Gtk, GObject
+from gi.repository import Gdk, Gtk
 
 from app.commons import run_task, log, _DATE_FORMAT, run_with_delay
 
 
-class Player(Gtk.DrawingArea):
+class Player(ABC):
     """ Base player class. Also used as a factory. """
 
-    def __init__(self, mode, widget, **kwargs):
-        super().__init__(**kwargs)
-
-        GObject.signal_new("error", self, GObject.SIGNAL_RUN_LAST,
-                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
-        GObject.signal_new("message", self, GObject.SIGNAL_RUN_LAST,
-                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
-        GObject.signal_new("position", self, GObject.SIGNAL_RUN_LAST,
-                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
-        GObject.signal_new("played", self, GObject.SIGNAL_RUN_LAST,
-                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
-        GObject.signal_new("audio-track", self, GObject.SIGNAL_RUN_LAST,
-                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
-        GObject.signal_new("subtitle-track", self, GObject.SIGNAL_RUN_LAST,
-                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
-
-        self.connect("draw", self.on_draw)
-        self.connect("motion-notify-event", self.on_mouse_motion)
-        self.set_events(Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.POINTER_MOTION_MASK)
-        widget.add(self)
-
-        parent = widget.get_parent()
-        parent.connect("play", self.on_play)
-        parent.connect("stop", self.on_stop)
-        self.show()
-
+    @abstractmethod
     def get_play_mode(self):
         pass
 
+    @abstractmethod
     def play(self, mrl=None):
         pass
 
+    @abstractmethod
     def stop(self):
         pass
 
+    @abstractmethod
     def pause(self):
         pass
 
+    @abstractmethod
     def set_time(self, time):
         pass
 
+    @abstractmethod
     def release(self):
         pass
 
+    @abstractmethod
     def is_playing(self):
         pass
 
-    def set_audio_track(self, track):
+    @abstractmethod
+    def get_instance(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
         pass
 
-    def get_audio_track(self):
-        pass
-
-    def set_subtitle_track(self, track):
-        pass
-
-    def set_aspect_ratio(self, ratio):
-        pass
-
-    def get_instance(self, mode, widget):
-        pass
-
-    def on_play(self, widget, url):
-        self.play(url)
-
-    def on_stop(self, widget, state):
-        self.stop()
-
-    def on_release(self, widget, state):
-        self.release()
-
-    def get_window_handle(self):
+    def get_window_handle(self, widget):
         """ Returns the identifier [pointer] for the window.
 
             Based on gtkvlc.py[get_window_pointer] example from here:
             https://github.com/oaubert/python-vlc/tree/master/examples
         """
         if sys.platform == "linux":
-            return self.get_window().get_xid()
+            return widget.get_window().get_xid()
         else:
             is_darwin = sys.platform == "darwin"
             try:
@@ -129,14 +63,23 @@ class Player(Gtk.DrawingArea):
                 # https://gitlab.gnome.org/GNOME/pygobject/-/issues/112
                 ctypes.pythonapi.PyCapsule_GetPointer.restype = ctypes.c_void_p
                 ctypes.pythonapi.PyCapsule_GetPointer.argtypes = [ctypes.py_object]
-                gpointer = ctypes.pythonapi.PyCapsule_GetPointer(self.get_window().__gpointer__, None)
+                gpointer = ctypes.pythonapi.PyCapsule_GetPointer(widget.get_window().__gpointer__, None)
                 get_pointer = libgdk.gdk_quartz_window_get_nsview if is_darwin else libgdk.gdk_win32_window_get_handle
                 get_pointer.restype = ctypes.c_void_p
                 get_pointer.argtypes = [ctypes.c_void_p]
 
                 return get_pointer(gpointer)
 
-    def on_draw(self, widget, cr):
+    def get_video_widget(self, widget):
+        area = Gtk.DrawingArea(visible=True)
+        area.connect("draw", self.on_drawing_area_draw)
+        area.connect("motion-notify-event", self.on_mouse_motion)
+        area.set_events(Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.POINTER_MOTION_MASK)
+        widget.add(area)
+
+        return area
+
+    def on_drawing_area_draw(self, widget, cr):
         """ Used for black background drawing in the player drawing area. """
         cr.set_source_rgb(0, 0, 0)
         cr.paint()
@@ -155,21 +98,25 @@ class Player(Gtk.DrawingArea):
         window.set_cursor(cursor)
 
     @staticmethod
-    def make(name, mode, widget):
+    def make(name, mode, widget, buf_cb=None, position_cb=None, error_cb=None, playing_cb=None):
         """ Factory method. We will not use a separate factory to return a specific implementation.
 
             @param name: implementation name.
             @param mode: current player mode [Built-in or windowed].
             @param widget: parent of video widget.
+            @param buf_cb: buffering callback.
+            @param position_cb: time (position) callback.
+            @param error_cb: error callback.
+            @param playing_cb: playing state callback.
 
             Throws a NameError if there is no implementation for the given name.
         """
         if name == "mpv":
-            return MpvPlayer.get_instance(mode, widget)
+            return MpvPlayer.get_instance(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
         elif name == "gst":
-            return GstPlayer.get_instance(mode, widget)
+            return GstPlayer.get_instance(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
         elif name == "vlc":
-            return VlcPlayer.get_instance(mode, widget)
+            return VlcPlayer.get_instance(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
         else:
             raise NameError("There is no such [{}] implementation.".format(name))
 
@@ -181,12 +128,11 @@ class MpvPlayer(Player):
     """
     __INSTANCE = None
 
-    def __init__(self, mode, widget):
-        super().__init__(mode, widget)
+    def __init__(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
         try:
             from app.tools import mpv
 
-            self._player = mpv.MPV(wid=str(self.get_window_handle()),
+            self._player = mpv.MPV(wid=str(self.get_window_handle(self.get_video_widget(widget), )),
                                    input_default_bindings=False,
                                    input_cursor=False,
                                    cursor_autohide="no")
@@ -200,24 +146,25 @@ class MpvPlayer(Player):
             @self._player.event_callback(mpv.MpvEventID.FILE_LOADED)
             def on_open(event):
                 log("Starting playback...")
-                self.emit("played", 0)
+                playing_cb()
 
             @self._player.event_callback(mpv.MpvEventID.END_FILE)
             def on_end(event):
                 event = event.get("event", {})
                 if event.get("reason", mpv.MpvEventEndFile.ERROR) == mpv.MpvEventEndFile.ERROR:
                     log("Stream playback error: {}".format(event.get("error", mpv.ErrorCode.GENERIC)))
-                    self.emit("error", "Can't Playback!")
+                    error_cb()
 
     @classmethod
-    def get_instance(cls, mode, widget):
+    def get_instance(cls, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
         if not cls.__INSTANCE:
-            cls.__INSTANCE = MpvPlayer(mode, widget)
+            cls.__INSTANCE = MpvPlayer(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
         return cls.__INSTANCE
 
     def get_play_mode(self):
         return self._mode
 
+    @run_task
     def play(self, mrl=None):
         if not mrl:
             return
@@ -225,6 +172,7 @@ class MpvPlayer(Player):
         self._player.play(mrl)
         self._is_playing = True
 
+    @run_task
     def stop(self):
         self._player.stop()
         self._is_playing = True
@@ -249,8 +197,7 @@ class GstPlayer(Player):
 
     __INSTANCE = None
 
-    def __init__(self, mode, widget):
-        super().__init__(mode, widget)
+    def __init__(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
         try:
             import gi
 
@@ -263,13 +210,20 @@ class GstPlayer(Player):
             log("{}: Load library error: {}".format(__class__.__name__, e))
             raise ImportError("No GStreamer is found. Check that it is installed!")
         else:
+            self._error_cb = error_cb
+            self._playing_cb = playing_cb
+
             self.STATE = Gst.State
             self.STAT_RETURN = Gst.StateChangeReturn
 
             self._mode = mode
             self._is_playing = False
             self._player = Gst.ElementFactory.make("playbin", "player")
-            self._player.set_window_handle(self.get_window_handle())
+            # Initialization of the playback widget.
+            vid_widget = self.get_video_widget(widget)
+            widget.add(vid_widget)
+            vid_widget.show()
+            self._player.set_window_handle(self.get_window_handle(vid_widget))
 
             bus = self._player.get_bus()
             bus.add_signal_watch()
@@ -278,9 +232,9 @@ class GstPlayer(Player):
             bus.connect("message::eos", self.on_eos)
 
     @classmethod
-    def get_instance(cls, mode, widget):
+    def get_instance(cls, mode, widget, buf_cb=None, position_cb=None, error_cb=None, playing_cb=None):
         if not cls.__INSTANCE:
-            cls.__INSTANCE = GstPlayer(mode, widget)
+            cls.__INSTANCE = GstPlayer(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
         return cls.__INSTANCE
 
     def get_play_mode(self):
@@ -297,11 +251,8 @@ class GstPlayer(Player):
         ret = self._player.set_state(self.STATE.PLAYING)
 
         if ret == self.STAT_RETURN.FAILURE:
-            msg = "ERROR: Unable to set the 'PLAYING' state for '{}'.".format(mrl)
-            log(msg)
-            self.emit("error", msg)
+            log("ERROR: Unable to set the 'PLAYING' state for '{}'.".format(mrl))
         else:
-            self.emit("played", 0)
             self._is_playing = True
 
     def stop(self):
@@ -330,7 +281,7 @@ class GstPlayer(Player):
     def on_error(self, bus, msg):
         err, dbg = msg.parse_error()
         log(err)
-        self.emit("error", "Can't Playback!")
+        self._error_cb()
 
     def on_state_changed(self, bus, msg):
         if not msg.src == self._player:
@@ -340,7 +291,7 @@ class GstPlayer(Player):
         old_state, new_state, pending = msg.parse_state_changed()
         if new_state is self.STATE.PLAYING:
             log("Starting playback...")
-            self.emit("played", 0)
+            self._playing_cb()
             self.get_stream_info()
 
     def on_eos(self, bus, msg):
@@ -375,12 +326,8 @@ class VlcPlayer(Player):
 
     __VLC_INSTANCE = None
 
-    def __init__(self, mode, widget):
-        super().__init__(mode, widget)
+    def __init__(self, mode, widget, buf_cb, position_cb, error_cb, playing_cb):
         try:
-            if sys.platform == "win32":
-                os.add_dll_directory(r"C:\Program Files\VideoLAN\VLC")
-
             from app.tools import vlc
             from app.tools.vlc import EventType
 
@@ -388,7 +335,7 @@ class VlcPlayer(Player):
             self._player = vlc.Instance(args).media_player_new()
             vlc.libvlc_video_set_key_input(self._player, False)
             vlc.libvlc_video_set_mouse_input(self._player, False)
-        except (OSError, AttributeError, NameError) as e:
+        except (OSError, AttributeError) as e:
             log("{}: Load library error: {}".format(__class__.__name__, e))
             raise ImportError("No VLC is found. Check that it is installed!")
         else:
@@ -396,28 +343,45 @@ class VlcPlayer(Player):
             self._is_playing = False
 
             ev_mgr = self._player.event_manager()
-            ev_mgr.event_attach(EventType.MediaPlayerVout, self.on_playback_start)
-            ev_mgr.event_attach(EventType.MediaPlayerTimeChanged,
-                                lambda et: self.emit("position", self._player.get_time()))
-            ev_mgr.event_attach(EventType.MediaPlayerEncounteredError, lambda et: self.emit("error", "Can't Playback!"))
+
+            if buf_cb:
+                # TODO look other EventType options
+                ev_mgr.event_attach(EventType.MediaPlayerBuffering,
+                                    lambda et, p: buf_cb(p.get_media().get_duration()),
+                                    self._player)
+            if position_cb:
+                ev_mgr.event_attach(EventType.MediaPlayerTimeChanged,
+                                    lambda et, p: position_cb(p.get_time()),
+                                    self._player)
+
+            if error_cb:
+                ev_mgr.event_attach(EventType.MediaPlayerEncounteredError,
+                                    lambda et, p: error_cb(),
+                                    self._player)
+            if playing_cb:
+                ev_mgr.event_attach(EventType.MediaPlayerPlaying,
+                                    lambda et, p: playing_cb(),
+                                    self._player)
 
             self.init_video_widget(widget)
 
     @classmethod
-    def get_instance(cls, mode, widget):
+    def get_instance(cls, mode, widget, buf_cb=None, position_cb=None, error_cb=None, playing_cb=None):
         if not cls.__VLC_INSTANCE:
-            cls.__VLC_INSTANCE = VlcPlayer(mode, widget)
+            cls.__VLC_INSTANCE = VlcPlayer(mode, widget, buf_cb, position_cb, error_cb, playing_cb)
         return cls.__VLC_INSTANCE
 
     def get_play_mode(self):
         return self._mode
 
+    @run_task
     def play(self, mrl=None):
         if mrl:
             self._player.set_mrl(mrl)
         self._player.play()
         self._is_playing = True
 
+    @run_task
     def stop(self):
         if self._is_playing:
             self._player.stop()
@@ -443,34 +407,14 @@ class VlcPlayer(Player):
     def is_playing(self):
         return self._is_playing
 
-    def set_audio_track(self, track):
-        self._player.audio_set_track(track)
-
-    def get_audio_track(self):
-        return self._player.audio_get_track()
-
-    def set_subtitle_track(self, track):
-        self._player.video_set_spu(track)
-
-    def set_aspect_ratio(self, ratio):
-        self._player.video_set_aspect_ratio(ratio)
-
-    def on_playback_start(self, event):
-        self.emit("played", self._player.get_media().get_duration())
-        # Audio tracks
-        a_desc = self._player.audio_get_track_description()
-        self.emit("audio-track", [(t[0], t[1].decode(encoding="utf-8", errors="ignore")) for t in a_desc])
-        # Subtitle
-        s_desc = self._player.video_get_spu_description()
-        self.emit("subtitle-track", [(s[0], s[1].decode(encoding="utf-8", errors="ignore")) for s in s_desc])
-
     def init_video_widget(self, widget):
+        video_widget = self.get_video_widget(widget)
         if sys.platform == "linux":
-            self._player.set_xwindow(self.get_window_handle())
+            self._player.set_xwindow(video_widget.get_window().get_xid())
         elif sys.platform == "darwin":
-            self._player.set_nsobject(self.get_window_handle())
+            self._player.set_nsobject(self.get_window_handle(video_widget))
         else:
-            self._player.set_hwnd(self.get_window_handle())
+            log("Video widget initialization error: platform '{}' is not supported. ".format(sys.platform))
 
 
 class Recorder:

app/tools/picons.py

@@ -1,43 +1,14 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import glob
 import os
 import re
 import shutil
-import subprocess
 from collections import namedtuple
 from html.parser import HTMLParser
 
 import requests
 
 from app.commons import run_task, log
-from app.settings import SettingsType, IS_LINUX, IS_WIN, IS_DARWIN, GTK_PATH
+from app.settings import SettingsType
 from .satellites import _HEADERS
 
 _ENIGMA2_PICON_KEY = "{:X}:{:X}:{}"
@@ -47,193 +18,6 @@ Provider = namedtuple("Provider", ["logo", "name", "pos", "url", "on_id", "ssid"
 Picon = namedtuple("Picon", ["ref", "ssid"])
 
 
-class PiconsError(Exception):
-    pass
-
-
-class PiconsCzDownloader:
-    """ The main class for loading picons from the https://picon.cz/ source (by Chocholoušek). """
-
-    _PERM_URL = "https://picon.cz/download/7337"
-    _BASE_URL = "https://picon.cz/download/"
-    _BASE_LOGO_URL = "https://picon.cz/picon/0/"
-    _HEADER = {"User-Agent": "DemonEditor/2.0.0", "Referer": ""}
-    _LINK_PATTERN = re.compile(r"((.*)-\d+x\d+)-(.*)_by_chocholousek.7z$")
-    _FILE_PATTERN = re.compile(b"\\s+(1_.*\\.png).*")
-
-    def __init__(self, picon_ids=set(), appender=log):
-        self._perm_links = {}
-        self._providers = {}
-        self._provider_logos = {}
-        self._picon_ids = picon_ids
-        self._appender = appender
-
-    def init(self):
-        """ Initializes dict with values: download_id -> perm link and provider data.  """
-        if self._perm_links:
-            return
-
-        self._HEADER["Referer"] = self._PERM_URL
-
-        with requests.get(url=self._PERM_URL, headers=self._HEADER, stream=True) as request:
-            if request.reason == "OK":
-                logo_map = self.get_logos_map()
-                name_map = self.get_name_map()
-
-                for line in request.iter_lines():
-                    data = line.decode(encoding="utf-8", errors="ignore").split(maxsplit=1)
-                    if len(data) != 2:
-                        continue
-
-                    l_id, perm_link = data
-                    self._perm_links[str(l_id)] = str(perm_link)
-                    data = re.match(self._LINK_PATTERN, perm_link)
-                    if data:
-                        sat_pos = data.group(3)
-                        # Logo url.
-                        logo = logo_map.get(data.group(2), None)
-                        l_name = name_map.get(sat_pos, None) or sat_pos.replace(".", "")
-                        logo_url = f"{self._BASE_LOGO_URL}{logo}/{l_name}.png" if logo else None
-
-                        prv = Provider(None, data.group(1), sat_pos, self._BASE_URL + l_id, l_id, logo_url, None, False)
-                        if sat_pos in self._providers:
-                            self._providers[sat_pos].append(prv)
-                        else:
-                            self._providers[sat_pos] = [prv]
-            else:
-                log(f"{self.__class__.__name__} [get permalinks] error: {request.reason}")
-                raise PiconsError(request.reason)
-
-    @property
-    def providers(self):
-        return self._providers
-
-    def get_sat_providers(self, url):
-        return self._providers.get(url, [])
-
-    def download(self, provider, picons_path, picon_ids=None):
-        self._HEADER["Referer"] = provider.url
-        with requests.get(url=provider.url, headers=self._HEADER, stream=True) as request:
-            if request.reason == "OK":
-                dest = f"{picons_path}{provider.on_id}.7z"
-                self._appender(f"Downloading: {provider.url}\n")
-                with open(dest, mode="bw") as f:
-                    for data in request.iter_content(chunk_size=1024):
-                        f.write(data)
-                self._appender(f"Extracting: {provider.on_id}\n")
-                self.extract(dest, picons_path, picon_ids)
-            else:
-                log(f"{self.__class__.__name__} [download] error: {request.reason}")
-
-    def extract(self, src, dest, picon_ids=None):
-        """ Extracts 7z archives. """
-        # TODO: think about https://github.com/miurahr/py7zr
-        exe = "7z"
-        if IS_DARWIN and GTK_PATH:
-            exe = "./7z"
-
-        if IS_LINUX and not os.path.isfile(f"/usr/bin/{exe}"):
-            raise PiconsError("7-zip [7z] archiver not found!")
-
-        if IS_WIN:
-            exe = f"C:{os.sep}Program Files{os.sep}7-Zip{os.sep}{exe}.exe"
-            if not os.path.isfile(exe):
-                raise PiconsError("7-Zip executable not found!")
-
-        cmd = [exe, "l", src]
-        try:
-            out, err = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-            if err:
-                log(f"{self.__class__.__name__} [extract] error: {err}")
-                raise PiconsError(err)
-        except OSError as e:
-            log(f"{self.__class__.__name__} [extract] error: {e}")
-            raise PiconsError(e)
-
-        is_filter = bool(picon_ids)
-        ids = picon_ids or self._picon_ids
-        to_extract = []
-
-        for o in re.finditer(self._FILE_PATTERN, out):
-            p_id = o.group(1).decode("utf-8", errors="ignore")
-            if p_id in ids:
-                to_extract.append(p_id)
-
-        if is_filter and not to_extract:
-            if os.path.isfile(src):
-                os.remove(src)
-            raise PiconsError("No matching picons found!")
-
-        cmd = [exe, "e", src, "-o{}".format(dest), "-y", "-r"]
-        cmd.extend(to_extract)
-        try:
-            out, err = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
-            if err:
-                log(f"{self.__class__.__name__} [extract] error: {err}")
-                raise PiconsError(err)
-            else:
-                if os.path.isfile(src):
-                    os.remove(src)
-        except OSError as e:
-            log(e)
-            raise PiconsError(e)
-
-    def get_logo_data(self, url):
-        """ Returns the logo data if present. """
-        return self._provider_logos.get(url, None)
-
-    def get_provider_logo(self, url):
-        """ Retrieves package logo. """
-        # Getting package logo.
-        logo = self._provider_logos.get(url, None)
-        if logo:
-            return logo
-
-        try:
-            with requests.get(url=url, stream=True) as logo_request:
-                if logo_request.reason == "OK":
-                    data = logo_request.content
-                    self._provider_logos[url] = data
-                    return data
-                else:
-                    log(f"Downloading package logo error: {logo_request.reason}")
-        except requests.exceptions.ConnectionError as e:
-            log(f"{self.__class__.__name__} error [get provider logo]: {e}")
-
-    def get_logos_map(self):
-        return {"piconblack": "b50",
-                "picontransparent": "t50",
-                "piconwhite": "w50",
-                "piconmirrorglass": "mr100",
-                "piconnoName": "n100",
-                "piconsrhd": "srhd100",
-                "piconfreezeframe": "ff220",
-                "piconfreezewhite": "fw100",
-                "piconpoolrainbow": "r100",
-                "piconsimpleblack": "s220",
-                "piconjustblack": "jb220",
-                "picondirtypaper": "dp220",
-                "picongray": "g400",
-                "piconmonochrom": "m220",
-                "picontransparentwhite": "tw100",
-                "picontransparentdark": "td220",
-                "piconoled": "o96",
-                "piconblack80": "b50",
-                "piconblack3d": "b50"
-                }
-
-    def get_name_map(self):
-        return {"antiksat": "ANTIK",
-                "digiczsk": "DIGI",
-                "DTTitaly": "picon_trs-it",
-                "dvbtCZSK": "picon_trs",
-                "PolandDTT": "picon_trs-pl",
-                "freeSAT": "UPC DIRECT",
-                "orangesat": "ORANGE TV",
-                "skylink": "M7 GROUP",
-                }
-
-
 class PiconsParser(HTMLParser):
     """ Parser for package html page. (https://www.lyngsat.com/packages/*provider-name*.html) """
     _BASE_URL = "https://www.lyngsat.com"

app/tools/satellites.py

@@ -14,7 +14,7 @@ from app.eparser import Satellite, Transponder, is_transponder_valid
 from app.eparser.ecommons import (PLS_MODE, get_key_by_value, FEC, SYSTEM, POLARIZATION, MODULATION, SERVICE_TYPE,
                                   Service, CAS)
 
-_HEADERS = {"User-Agent": "Mozilla/5.0 (Linux x86_64; rv:92.0) Gecko/20100101 Firefox/92.0"}
+_HEADERS = {"User-Agent": "Mozilla/5.0 (Linux x86_64; rv:85.0) Gecko/20100101 Firefox/85.0"}
 
 
 class SatelliteSource(Enum):
@@ -170,7 +170,7 @@ class SatellitesParser(HTMLParser):
                 return sats
             elif source is SatelliteSource.KINGOFSAT:
                 def get_sat(r):
-                    return r[3], self.parse_position(r[1]), None, r[2], False
+                    return r[3], self.parse_position(r[1]), None, r[0], False
 
                 return list(map(get_sat, filter(lambda x: len(x) == 17, self._rows)))
 
@@ -328,7 +328,7 @@ class ServicesParser(HTMLParser):
         self._S_TYPES = {"": "2", "MPEG-2 SD": "1", "MPEG-2/SD": "1", "SD": "1", "MPEG-4 SD": "22", "MPEG-4/SD": "22",
                          "MPEG-4": "22", "HEVC SD": "22", "MPEG-4/HD": "25", "MPEG-4 HD": "25", "MPEG-4 HD 1080": "25",
                          "MPEG-4 HD 720": "25", "HEVC HD": "25", "HEVC/HD": "25", "HEVC": "31", "HEVC/UHD": "31",
-                         "HEVC UHD": "31", "HEVC UHD 4K": "31", "3": "Data"}
+                         "HEVC UHD": "31", "HEVC UHD 4K": "31"}
         self._TR_PAT = re.compile(
             r".*?(\d+)\s+([RLHV]).*(DVB-S[2]?)/?(.*PSK)?\s(T2-MI)?\s?SR-FEC:\s(\d+)-(\d/\d)\s+.*ONID-TID:\s+(\d+)-(\d+).*")
         self._POS_PAT = re.compile(r".*?(\d+\.\d°[EW]).*")
@@ -344,25 +344,6 @@ class ServicesParser(HTMLParser):
         self._current_cell = Cell()
         self._rows = []
         self._source = source
-        self._t_url = ""
-        self._use_short_names = True
-
-    @property
-    def source(self):
-        return self._source
-
-    @source.setter
-    def source(self, value):
-        self._source = value
-        self.reset()
-
-    @property
-    def use_short_names(self):
-        return self._use_short_names
-
-    @use_short_names.setter
-    def use_short_names(self, value):
-        self._use_short_names = value
 
     def handle_starttag(self, tag, attrs):
         if tag == "td":
@@ -370,24 +351,10 @@ class ServicesParser(HTMLParser):
         elif tag == "tr":
             self._is_th = True
         elif tag == "a" and not self._current_cell.url:
-            if attrs:
-                for a in attrs:
-                    if a[0] == "href":
-                        self._current_cell.url = a[1]
-
-                    if self._source is SatelliteSource.KINGOFSAT and self._use_short_names:
-                        if a[0] != "title":
-                            continue
-                        txt = a[1]
-                        if txt and txt.startswith("Id: "):
-                            # Saving the 'short' name.
-                            self._current_cell.text = txt.lstrip("Id: ")
+            self._current_cell.url = attrs[0][1]
         elif tag == "img":
             img_link = attrs[0][1]
-            if self._source is SatelliteSource.LYNGSAT:
-                if img_link.startswith("/logo/"):
-                    self._current_cell.img = img_link
-            elif self._source is SatelliteSource.KINGOFSAT:
+            if img_link.startswith("/logo/"):
                 self._current_cell.img = img_link
 
     def handle_data(self, data):
@@ -402,9 +369,8 @@ class ServicesParser(HTMLParser):
             self._is_th = False
 
         if tag in ("td", "th"):
-            if not self._current_cell.text:
-                txt = self._separator.join(self._current_cell_text).strip()
-                self._current_cell.text = txt
+            final_cell = self._separator.join(self._current_cell_text).strip()
+            self._current_cell.text = final_cell
             self._current_row.append(self._current_cell)
             self._current_cell_text = []
             self._current_cell = Cell()
@@ -418,7 +384,7 @@ class ServicesParser(HTMLParser):
 
     def init_data(self, url):
         """ Initializes data for the given URL. """
-        if self._source not in (SatelliteSource.LYNGSAT, SatelliteSource.KINGOFSAT):
+        if self._source is not SatelliteSource.LYNGSAT:
             raise ValueError("Unsupported source: {}!".format(self._source.name))
 
         self._rows.clear()
@@ -433,26 +399,13 @@ class ServicesParser(HTMLParser):
     def get_transponders_links(self, sat_url):
         """ Returns transponder links. """
         try:
-            if self._source is SatelliteSource.KINGOFSAT:
-                sat_url = "https://en.kingofsat.net/" + sat_url
             self.init_data(sat_url)
         except ValueError as e:
             log(e)
         else:
-            if self._source is SatelliteSource.LYNGSAT:
-                url = "https://www.lyngsat.com/muxes/"
-                return [row[0] for row in
-                        filter(lambda x: x and len(x) > 8 and x[0].url and x[0].url.startswith(url), self._rows)]
-            elif self._source is SatelliteSource.KINGOFSAT:
-                trs = []
-                for r in self._rows:
-                    if len(r) == 13 and SatellitesParser.POS_PAT.match(r[0].text):
-                        t_cell = r[4]
-                        if t_cell.url and t_cell.url.startswith("tp.php?tp="):
-                            t_cell.url = f"https://en.kingofsat.net/{t_cell.url}"
-                            t_cell.text = f"{r[2].text} {r[3].text} {r[6].text} {r[8].text}"
-                            trs.append(t_cell)
-                return trs
+            url = "https://www.lyngsat.com/muxes/"
+            return [row[0] for row in
+                    filter(lambda x: x and len(x) > 8 and x[0].url and x[0].url.startswith(url), self._rows)]
         return []
 
     def get_transponder_services(self, tr_url, sat_position=None, use_pids=False):
@@ -462,155 +415,90 @@ class ServicesParser(HTMLParser):
             @param sat_position: custom satellite position. Sometimes required to adjust the namespace.
             @param use_pids: if possible use additional pids [video, audio].
         """
+        services = []
         try:
-            self._t_url = tr_url
             self.init_data(tr_url)
         except ValueError as e:
             log(e)
         else:
-            if self._source is SatelliteSource.LYNGSAT:
-                return self.get_lyngsat_services(sat_position, use_pids)
-            elif self._source is SatelliteSource.KINGOFSAT:
-                return self.get_kingofsat_services(sat_position, use_pids)
-            else:
-                return []
-
-    def get_lyngsat_services(self, sat_position=None, use_pids=False):
-        services = []
-        pos, freq, sr, fec, pol, nsp, tid, nid = sat_position or 0, 0, 0, 0, 0, 0, 0, 0
-        sys = "DVB-S"
-        pos_found = False
-        tr = None
-        # Transponder
-        for r in filter(lambda x: x and 6 < len(x) < 9, self._rows):
-            if not pos_found:
-                pos_tr = re.match(self._POS_PAT, r[0].text)
-                if not pos_tr:
-                    continue
-
-                if not sat_position:
-                    pos = self.get_position(pos_tr.group(1))
-
-                pos_found = True
-
-            if pos_found:
-                text = " ".join(c.text for c in r[1:])
-                td = re.match(self._TR_PAT, text)
-                if td:
-                    freq, pol = int(td.group(1)), get_key_by_value(POLARIZATION, td.group(2))
-                    if td.group(5):
-                        log("Detected T2-MI transponder!")
+            pos, freq, sr, fec, pol, namespace, tid, nid = sat_position or 0, 0, 0, 0, 0, 0, 0, 0
+            sys = "DVB-S"
+            pos_found = False
+            tr = None
+            # Transponder
+            for r in filter(lambda x: x and 6 < len(x) < 9, self._rows):
+                if not pos_found:
+                    pos_tr = re.match(self._POS_PAT, r[0].text)
+                    if not pos_tr:
                         continue
 
-                    sys, mod, sr, _fec, = td.group(3), td.group(4), td.group(6), td.group(7)
-                    nid, tid = td.group(8), td.group(9)
-                    sys, mod, fec, nsp, s2_flags, roll_off, pilot, inv = self.get_transponder_data(pos, _fec, sys, mod)
-                    nid, tid = int(nid), int(tid)
-                    tr = self._TR.format(freq, sr, pol, fec, pos, inv, sys, s2_flags)
+                    if not sat_position:
+                        pos = int(SatellitesParser.get_position(
+                            "".join(c for c in pos_tr.group(1) if c.isdigit() or c.isalpha())))
 
-        if not tr:
-            er = f"Transponder [{freq}] not found or its type [T2-MI, etc] not supported yet."
-            log(f"ServicesParser error [get transponder services]: {er}")
-            return services
+                    pos_found = True
 
-        # Services
-        for r in filter(lambda x: x and len(x) == 12 and (x[0].text.isdigit()), self._rows):
-            sid, name, s_type, v_pid, a_pid, cas, pkg = r[0].text, r[2].text, r[4].text, r[
-                5].text.strip(), r[6].text.split(), r[9].text, r[10].text.strip()
-            try:
-                s_type = self._S_TYPES.get(s_type, "3")  # 3 = Data
-                _s_type = SERVICE_TYPE.get(s_type, SERVICE_TYPE.get("3"))  # str repr
-                flags, sid, fav_id, picon_id, data_id = self.get_service_data(s_type, pkg, sid, tid, nid, nsp,
-                                                                              v_pid, a_pid, cas, use_pids)
-                services.append(Service(flags, "s", None, name, None, None, pkg, _s_type, r[1].img, picon_id,
-                                        sid, freq, sr, pol, fec, sys, pos, data_id, fav_id, tr))
-            except ValueError as e:
-                log(f"ServicesParser error [get transponder services]: {e}")
+                if pos_found:
+                    text = " ".join(c.text for c in r[1:])
+                    td = re.match(self._TR_PAT, text)
+                    if td:
+                        freq, pol = int(td.group(1)), get_key_by_value(POLARIZATION, td.group(2))
+                        if td.group(5):
+                            log("Detected T2-MI transponder!")
+                            continue
+
+                        sys, mod, sr, _fec, = td.group(3), td.group(4), td.group(6), td.group(7)
+                        nid, tid = td.group(8), td.group(9)
+
+                        neg_pos = False  # POS = W
+                        # For negative (West) positions: 3600 - numeric position value!!!
+                        namespace = "{:04x}0000".format(3600 - pos if neg_pos else pos)
+                        inv = 2  # Default
+                        fec = get_key_by_value(FEC, _fec)
+                        sys = get_key_by_value(SYSTEM, sys)
+                        tr_flag = 1
+                        mod = get_key_by_value(MODULATION, mod)
+                        roll_off = 0  # 35% DVB-S2/DVB-S (default)
+                        pilot = 2  # Auto
+                        s2_flags = "" if sys == "DVB-S" else self._S2_TR.format(tr_flag, mod or 0, roll_off, pilot)
+                        nid, tid = int(nid), int(tid)
+                        tr = self._TR.format(freq, sr, pol, fec, pos, inv, sys, s2_flags)
+
+            if not tr:
+                msg = "ServicesParser error [get transponder services]: {}"
+                er = "Transponder [{}] not found or its type [T2-MI, etc] not supported yet.".format(freq)
+                log(msg.format(er))
+                return []
+
+            # Services
+            for r in filter(lambda x: x and len(x) == 12 and (x[0].text.isdigit()), self._rows):
+                sid, name, s_type, v_pid, a_pid, cas, pkg = r[0].text, r[2].text, r[4].text, r[
+                    5].text.strip(), r[6].text.split(), r[9].text, r[10].text.strip()
+
+                try:
+                    s_type = self._S_TYPES.get(s_type, "3")  # 3 = Data
+                    _s_type = SERVICE_TYPE.get(s_type, SERVICE_TYPE.get("3"))  # str repr
+                    sid = int(sid)
+                    data_id = "{:04x}:{}:{:04x}:{:04x}:{}:0:0".format(sid, namespace, tid, nid, s_type)
+                    fav_id = "{}:{}:{}:{}".format(sid, tid, nid, namespace)
+                    picon_id = "1_0_{:X}_{}_{}_{}_{}_0_0_0.png".format(int(s_type), sid, tid, nid, namespace)
+                    # Flags.
+                    flags = "p:{}".format(pkg)
+                    cas = ",".join(get_key_by_value(CAS, c) or "C:0000" for c in cas.split()) if cas else None
+                    if use_pids:
+                        v_pid = "c:00{:04x}".format(int(v_pid)) if v_pid else None
+                        a_pid = ",".join(["c:01{:04x}".format(int(p)) for p in a_pid]) if a_pid else None
+                        flags = ",".join(filter(None, (flags, v_pid, a_pid, cas)))
+                    else:
+                        flags = ",".join(filter(None, (flags, cas)))
+
+                    services.append(Service(flags, "s", None, name, None, None, pkg, _s_type, r[1].img, picon_id,
+                                            sid, freq, sr, pol, fec, sys, pos, data_id, fav_id, tr))
+                except ValueError as e:
+                    log("ServicesParser error [get transponder services]: {}".format(e))
 
         return services
 
-    def get_kingofsat_services(self, sat_position=None, use_pids=False):
-        services = []
-        # Transponder
-        tr = list(filter(lambda r: len(r) == 13 and r[4].url and r[4].url.startswith("tp.php?tp="), self._rows))
-        if not tr:
-            log(f"ServicesParser error [get transponder services]: Transponder [{self._t_url}] not found!")
-            return services
-
-        tr = tr[0]
-        s_pos, freq, pol, sys, mod, sr_fec = tr[0].text, tr[2].text, tr[3].text, tr[6].text, tr[7].text, tr[8].text
-        tid, nid = tr[10].text, tr[11].text
-
-        pos = sat_position
-        if not sat_position:
-            pos_tr = re.match(self._POS_PAT, s_pos)
-            if pos_tr:
-                pos = self.get_position(pos_tr.group(1))
-
-        sr, fec = sr_fec.split()
-        pol = get_key_by_value(POLARIZATION, pol)
-        sys, mod, fec, nsp, s2_flags, roll_off, pilot, inv = self.get_transponder_data(pos, fec, sys, mod)
-        freq, nid, tid = int(float(freq)), int(nid), int(tid)
-        tr = self._TR.format(freq, sr, pol, fec, pos, inv, sys, s2_flags)
-
-        for r in filter(lambda x: len(x) == 14 and not x[1].text and x[7].text and x[7].text.isdigit(), self._rows):
-            if r[1].img == "/radio.gif":
-                s_type = ""
-            elif r[8].img == "/hd.gif":
-                s_type = "HEVC HD"
-            elif r[1].img == "/data.gif":
-                s_type = "Data"
-            else:
-                s_type = "SD"
-
-            s_type = self._S_TYPES.get(s_type, "3")
-            _s_type = SERVICE_TYPE.get(s_type, SERVICE_TYPE.get("3"))
-
-            name, pkg, cas, sid, v_pid, a_pid = r[2].text, r[5].text, r[6].text, r[7].text, None, None
-            flags, sid, fav_id, picon_id, data_id = self.get_service_data(s_type, pkg, sid, tid, nid, nsp,
-                                                                          v_pid, a_pid, cas, use_pids)
-            services.append(Service(flags, "s", None, name, None, None, pkg, _s_type, None, picon_id,
-                                    sid, str(freq), sr, pol, fec, sys, pos, data_id, fav_id, tr))
-
-        return services
-
-    def get_transponder_data(self, pos, fec, sys, mod):
-        """ Returns converted transponder data. """
-        sys = get_key_by_value(SYSTEM, sys)
-        mod = get_key_by_value(MODULATION, mod)
-        fec = get_key_by_value(FEC, fec)
-        # For negative (West) positions: 3600 - numeric position value!!!
-        namespace = "{:04x}0000".format(3600 - pos if pos < 0 else pos)
-        tr_flag = 1
-        roll_off = 0  # 35% DVB-S2/DVB-S (default)
-        pilot = 2  # Auto
-        s2_flags = "" if sys == "DVB-S" else self._S2_TR.format(tr_flag, mod or 0, roll_off, pilot)
-        inv = 2  # Default
-
-        return sys, mod, fec, namespace, s2_flags, roll_off, pilot, inv
-
-    @staticmethod
-    def get_service_data(s_type, pkg, sid, tid, nid, namespace, v_pid, a_pid, cas, use_pids=False):
-        sid = int(sid)
-        data_id = "{:04x}:{}:{:04x}:{:04x}:{}:0:0".format(sid, namespace, tid, nid, s_type)
-        fav_id = "{}:{}:{}:{}".format(sid, tid, nid, namespace)
-        picon_id = "1_0_{:X}_{}_{}_{}_{}_0_0_0.png".format(int(s_type), sid, tid, nid, namespace)
-        # Flags.
-        flags = "p:{}".format(pkg)
-        cas = ",".join(get_key_by_value(CAS, c) or "C:0000" for c in cas.split()) if cas else None
-        if use_pids:
-            v_pid = "c:00{:04x}".format(int(v_pid)) if v_pid else None
-            a_pid = ",".join(["c:01{:04x}".format(int(p)) for p in a_pid]) if a_pid else None
-            flags = ",".join(filter(None, (flags, v_pid, a_pid, cas)))
-        else:
-            flags = ",".join(filter(None, (flags, cas)))
-
-        return flags, sid, fav_id, picon_id, data_id
-
-    @staticmethod
-    def get_position(pos):
-        return int(SatellitesParser.get_position("".join(c for c in pos if c.isdigit() or c.isalpha())))
-
 
 if __name__ == "__main__":
     pass

app/tools/yt.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 """ Module for working with YouTube service """
 import gzip
 import json
@@ -34,7 +6,6 @@ import re
 import shutil
 import sys
 from html.parser import HTMLParser
-from json import JSONDecodeError
 from urllib.error import URLError
 from urllib.parse import unquote
 from urllib.request import Request, urlopen, urlretrieve
@@ -129,7 +100,7 @@ class YouTube:
             if player_resp:
                 try:
                     resp = json.loads(player_resp)
-                except JSONDecodeError as e:
+                except Exception as e:
                     log("{}: Parsing player response error: {}".format(__class__.__name__, e))
                 else:
                     det = resp.get("videoDetails", None)
@@ -199,7 +170,7 @@ class PlayListParser(HTMLParser):
 
                 try:
                     resp = json.loads(data)
-                except JSONDecodeError as e:
+                except YouTubeException as e:
                     log("{}: Parsing data error: {}".format(__class__.__name__, e))
                 else:
                     sb = resp.get("sidebar", None)
@@ -259,7 +230,7 @@ class YouTubeDL:
                 "cookiefile": "cookies.txt"}  # File name where cookies should be read from and dumped to.
 
     def __init__(self, settings, callback):
-        self._path = "{}tools{}".format(settings.default_data_path, SEP)
+        self._path = settings.default_data_path + "tools{}".format(SEP)
         self._update = settings.enable_yt_dl_update
         self._supported = {"22", "18"}
         self._dl = None
@@ -276,7 +247,7 @@ class YouTubeDL:
         return cls._DL_INSTANCE
 
     def init(self):
-        if not os.path.isfile("{}youtube_dl{}version.py".format(self._path, SEP)):
+        if not os.path.isfile(self._path + "youtube_dl{}version.py".format(SEP)):
             self.get_latest_release()
 
         if self._path not in sys.path:
@@ -343,7 +314,7 @@ class YouTubeDL:
                             os.makedirs(os.path.dirname(self._path), exist_ok=True)
 
                         for info in arch.infolist():
-                            pref, sep, f = info.filename.partition("/youtube_dl/")
+                            pref, sep, f = info.filename.partition("{}youtube_dl{}".format(SEP, SEP))
                             if sep:
                                 arch.extract(info.filename)
                                 shutil.move(info.filename, "{}{}{}".format(self._path, sep, f))

app/ui/app_menu.ui

@@ -1,461 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <menu id="menu_bar">
-    <submenu>
-      <attribute name="label" translatable="yes">Playback</attribute>
-      <attribute name="action">app.hide_media_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Close</attribute>
-          <attribute name="action">app.on_playback_close</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">File</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <submenu>
-          <attribute name="label" translatable="yes">Import</attribute>
-          <section>
-            <item>
-              <attribute name="label" translatable="yes">Bouquet</attribute>
-              <attribute name="action">app.on_import_bouquet</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">Bouquets and services</attribute>
-              <attribute name="action">app.on_import_bouquets</attribute>
-            </item>
-          </section>
-        </submenu>
-        <item>
-          <attribute name="label" translatable="yes">Import from Web</attribute>
-          <attribute name="action">app.on_import_from_web</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">New empty configuration</attribute>
-          <attribute name="action">app.on_new_configuration</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Open</attribute>
-          <attribute name="action">app.on_data_open</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Extract...</attribute>
-          <attribute name="action">app.on_archive_open</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Save</attribute>
-          <attribute name="action">app.on_data_save</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Save as</attribute>
-          <attribute name="action">app.on_data_save_as</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">FTP-transfer</attribute>
-          <attribute name="action">app.on_download</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Settings</attribute>
-          <attribute name="action">app.on_settings</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Exit</attribute>
-          <attribute name="action">app.on_close_app</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Edit</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Lock</attribute>
-          <attribute name="action">app.on_locked</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Hide</attribute>
-          <attribute name="action">app.on_hide</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu id="view_menu">
-      <attribute name="label" translatable="yes">View</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Bouquets</attribute>
-          <attribute name="action">app.show_bouquets</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Satellites</attribute>
-          <attribute name="action">app.show_satellites</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Picons</attribute>
-          <attribute name="action">app.show_picons</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">EPG</attribute>
-          <attribute name="action">app.show_epg</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Timers</attribute>
-          <attribute name="action">app.show_timers</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Recordings</attribute>
-          <attribute name="action">app.show_recordings</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">FTP</attribute>
-          <attribute name="action">app.show_ftp</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Control</attribute>
-          <attribute name="action">app.show_control</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu id="tools_menu">
-      <attribute name="label" translatable="yes">Tools</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Backups</attribute>
-          <attribute name="action">app.on_backup_tool_show</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Telnet</attribute>
-          <attribute name="action">app.on_telnet_show</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Logs</attribute>
-          <attribute name="action">app.on_logs_show</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">FTP client</attribute>
-      <attribute name="action">app.show_ftp_menu</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Close</attribute>
-        <attribute name="action">app.on_ftp_client_close</attribute>
-      </item>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Help</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">About</attribute>
-          <attribute name="action">app.on_about_app</attribute>
-        </item>
-      </section>
-    </submenu>
-  </menu>
-  <menu id="mac_app_menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.on_about_app</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Settings</attribute>
-        <attribute name="action">app.on_settings</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Exit</attribute>
-        <attribute name="action">app.on_close_app</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="mac_menu_bar">
-    <submenu>
-      <attribute name="label" translatable="yes">Playback</attribute>
-      <attribute name="action">app.hide_media_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Play</attribute>
-          <attribute name="action">app.on_play</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Stop</attribute>
-          <attribute name="action">app.on_stop</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Close</attribute>
-          <attribute name="action">app.on_playback_close</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">File</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <submenu>
-          <attribute name="label" translatable="yes">Import</attribute>
-          <section>
-            <item>
-              <attribute name="label" translatable="yes">Bouquet</attribute>
-              <attribute name="action">app.on_import_bouquet</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">Bouquets and services</attribute>
-              <attribute name="action">app.on_import_bouquets</attribute>
-            </item>
-          </section>
-        </submenu>
-        <item>
-          <attribute name="label" translatable="yes">Import from Web</attribute>
-          <attribute name="action">app.on_import_from_web</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">New empty configuration</attribute>
-          <attribute name="action">app.on_new_configuration</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Open</attribute>
-          <attribute name="action">app.on_data_open</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Extract...</attribute>
-          <attribute name="action">app.on_archive_open</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Save</attribute>
-          <attribute name="action">app.on_data_save</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Save as</attribute>
-          <attribute name="action">app.on_data_save_as</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">FTP-transfer</attribute>
-          <attribute name="action">app.on_download</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Edit</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Lock</attribute>
-          <attribute name="action">app.on_locked</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Hide</attribute>
-          <attribute name="action">app.on_hide</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">View</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Bouquets</attribute>
-          <attribute name="action">app.show_bouquets</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Satellites</attribute>
-          <attribute name="action">app.show_satellites</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Picons</attribute>
-          <attribute name="action">app.show_picons</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">EPG</attribute>
-          <attribute name="action">app.show_epg</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Timers</attribute>
-          <attribute name="action">app.show_timers</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Recordings</attribute>
-          <attribute name="action">app.show_recordings</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">FTP</attribute>
-          <attribute name="action">app.show_ftp</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Control</attribute>
-          <attribute name="action">app.show_control</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Tools</attribute>
-      <attribute name="action">app.hide_menu_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">Backups</attribute>
-          <attribute name="action">app.on_backup_tool_show</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Telnet</attribute>
-          <attribute name="action">app.on_telnet_show</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Logs</attribute>
-          <attribute name="action">app.on_logs_show</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">FTP client</attribute>
-      <attribute name="action">app.show_ftp_menu</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Close</attribute>
-        <attribute name="action">app.on_ftp_client_close</attribute>
-      </item>
-    </submenu>
-  </menu>
-  <menu id="iptv_menu">
-    <item>
-      <attribute name="label" translatable="yes">Add IPTV or stream service</attribute>
-      <attribute name="action">app.on_iptv</attribute>
-    </item>
-    <item>
-      <attribute name="label" translatable="yes">Import YouTube playlist</attribute>
-      <attribute name="action">app.on_import_yt_list</attribute>
-    </item>
-    <item>
-      <attribute name="label" translatable="yes">Import m3u</attribute>
-      <attribute name="action">app.on_import_m3u</attribute>
-    </item>
-    <item>
-      <attribute name="label" translatable="yes">Export to m3u</attribute>
-      <attribute name="action">app.on_export_to_m3u</attribute>
-    </item>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">EPG configuration</attribute>
-        <attribute name="action">app.on_epg_list_configuration</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">List configuration</attribute>
-        <attribute name="action">app.on_iptv_list_configuration</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Remove all unavailable</attribute>
-        <attribute name="action">app.on_remove_all_unavailable</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="audio_menu">
-    <submenu>
-      <attribute name="label" translatable="yes">Audio</attribute>
-      <attribute name="action">app.hide_media_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <submenu id="audio_track_menu">
-          <attribute name="label" translatable="yes">Audio Track</attribute>
-        </submenu>
-      </section>
-    </submenu>
-  </menu>
-  <menu id="video_menu">
-    <submenu>
-      <attribute name="label" translatable="yes">Video</attribute>
-      <attribute name="action">app.hide_media_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <submenu id="aspect_ratio_menu">
-          <attribute name="label" translatable="yes">Aspect ratio</attribute>
-          <item>
-            <attribute name="label" translatable="yes">Default</attribute>
-            <attribute name="action">app.on_set_aspect_ratio</attribute>
-            <attribute name="target"/>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">16:9</attribute>
-            <attribute name="action">app.on_set_aspect_ratio</attribute>
-            <attribute name="target">16:9</attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">4:3</attribute>
-            <attribute name="action">app.on_set_aspect_ratio</attribute>
-            <attribute name="target">4:3</attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">1:1</attribute>
-            <attribute name="action">app.on_set_aspect_ratio</attribute>
-            <attribute name="target">1:1</attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">16:10</attribute>
-            <attribute name="action">app.on_set_aspect_ratio</attribute>
-            <attribute name="target">16:10</attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">5:4</attribute>
-            <attribute name="action">app.on_set_aspect_ratio</attribute>
-            <attribute name="target">5:4</attribute>
-          </item>
-        </submenu>
-      </section>
-    </submenu>
-  </menu>
-  <menu id="subtitle_menu">
-    <submenu>
-      <attribute name="label" translatable="yes">Subtitle</attribute>
-      <attribute name="action">app.hide_media_bar</attribute>
-      <attribute name="hidden-when">action-disabled</attribute>
-      <section>
-        <submenu id="subtitle_track_menu">
-          <attribute name="label" translatable="yes">Subtitle Track</attribute>
-          <item>
-            <attribute name="label" translatable="yes">Default</attribute>
-            <attribute name="action">app.on_set_subtitle_track</attribute>
-            <attribute name="target"/>
-          </item>
-        </submenu>
-      </section>
-    </submenu>
-  </menu>
-</interface>

app/ui/app_menu_bar.ui

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <menu id="menu_bar">
+    <submenu>
+      <attribute name="label" translatable="yes">File</attribute>
+      <attribute name="action">app.hide_menu_bar</attribute>
+      <attribute name="hidden-when">action-disabled</attribute>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Import</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">Bouquet</attribute>
+              <attribute name="action">app.on_import_bouquet</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Bouquets and services</attribute>
+              <attribute name="action">app.on_import_bouquets</attribute>
+            </item>
+          </section>
+        </submenu>
+        <item>
+          <attribute name="label" translatable="yes">Import from Web</attribute>
+          <attribute name="action">app.on_import_from_web</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">New empty configuration</attribute>
+          <attribute name="action">app.on_new_configuration</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Open</attribute>
+          <attribute name="action">app.on_data_open</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Extract...</attribute>
+          <attribute name="action">app.on_archive_open</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Save</attribute>
+          <attribute name="action">app.on_data_save</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">FTP-transfer</attribute>
+          <attribute name="action">app.on_download</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Settings</attribute>
+          <attribute name="action">app.on_settings</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Exit</attribute>
+          <attribute name="action">app.on_close_app</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Edit</attribute>
+      <attribute name="action">app.hide_menu_bar</attribute>
+      <attribute name="hidden-when">action-disabled</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Lock</attribute>
+          <attribute name="action">app.on_locked</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Hide</attribute>
+          <attribute name="action">app.on_hide</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">View</attribute>
+      <attribute name="action">app.hide_menu_bar</attribute>
+      <attribute name="hidden-when">action-disabled</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Search</attribute>
+          <attribute name="action">win.search</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Filter</attribute>
+          <attribute name="action">win.filter</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Tools</attribute>
+      <attribute name="action">app.hide_menu_bar</attribute>
+      <attribute name="hidden-when">action-disabled</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Satellites editor</attribute>
+          <attribute name="action">app.on_satellite_editor_show</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Picons manager</attribute>
+          <attribute name="action">app.on_picons_manager_show</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Backups</attribute>
+          <attribute name="action">app.on_backup_tool_show</attribute>
+        </item>
+      </section>
+      <section id="telnet_section">
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">IPTV</attribute>
+      <attribute name="action">app.hide_menu_bar</attribute>
+      <attribute name="hidden-when">action-disabled</attribute>
+      <item>
+        <attribute name="label" translatable="yes">Add IPTV or stream service</attribute>
+        <attribute name="action">app.on_iptv</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Import YouTube playlist</attribute>
+        <attribute name="action">app.on_import_yt_list</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Import m3u</attribute>
+        <attribute name="action">app.on_import_m3u</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Export to m3u</attribute>
+        <attribute name="action">app.on_export_to_m3u</attribute>
+      </item>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">EPG configuration</attribute>
+          <attribute name="action">app.on_epg_list_configuration</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">List configuration</attribute>
+          <attribute name="action">app.on_iptv_list_configuration</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Remove all unavailable</attribute>
+          <attribute name="action">app.on_remove_all_unavailable</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">FTP client</attribute>
+      <attribute name="action">app.show_ftp_menu</attribute>
+      <attribute name="hidden-when">action-disabled</attribute>
+      <item>
+        <attribute name="label" translatable="yes">Close</attribute>
+        <attribute name="action">app.on_ftp_client_close</attribute>
+      </item>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">About</attribute>
+          <attribute name="action">app.on_about_app</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+</interface>

app/ui/backup.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import os
 import shutil
 import tempfile
@@ -35,10 +7,10 @@ from datetime import datetime
 from enum import Enum
 
 from app.commons import run_idle
-from app.settings import SettingsType, SEP
+from app.settings import SettingsType
 from app.ui.dialogs import show_dialog, DialogType, get_builder
 from app.ui.main_helper import append_text_to_tview
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK, IS_GNOME_SESSION
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
 
 
 class RestoreType(Enum):
@@ -62,8 +34,8 @@ class BackupDialog:
 
         self._settings = settings
         self._s_type = settings.setting_type
-        self._data_path = self._settings.profile_data_path
-        self._backup_path = self._settings.profile_backup_path or "{}backup{}".format(self._data_path, os.sep)
+        self._data_path = self._settings.data_local_path
+        self._backup_path = self._settings.backup_local_path or self._data_path + "backup/"
         self._open_data_callback = callback
         self._dialog_window = builder.get_object("dialog_window")
         self._dialog_window.set_transient_for(transient)
@@ -74,24 +46,6 @@ class BackupDialog:
         self._info_check_button = builder.get_object("info_check_button")
         self._info_bar = builder.get_object("info_bar")
         self._message_label = builder.get_object("message_label")
-
-        if IS_GNOME_SESSION:
-            header_bar = Gtk.HeaderBar(visible=True, show_close_button=True)
-            self._dialog_window.set_titlebar(header_bar)
-
-            button_box = builder.get_object("main_button_box")
-            button_box.set_margin_top(0)
-            button_box.set_margin_bottom(0)
-            button_box.set_margin_left(0)
-            button_box.reparent(header_bar)
-
-            ch_button = builder.get_object("info_check_button")
-            ch_button.set_margin_right(0)
-            h_bar = builder.get_object("header_bar")
-            h_bar.remove(ch_button)
-            h_bar.set_visible(False)
-            header_bar.pack_end(ch_button)
-
         # Setting the last size of the dialog window if it was saved
         window_size = self._settings.get("backup_tool_window_size")
         if window_size:
@@ -195,7 +149,7 @@ class BackupDialog:
                 clear_data_path(self._data_path)
                 shutil.unpack_archive(full_file_name, self._data_path)
             elif restore_type is RestoreType.BOUQUETS:
-                tmp_dir = tempfile.gettempdir() + SEP + file_name
+                tmp_dir = tempfile.gettempdir() + "/" + file_name
                 cond = (".tv", ".radio") if self._s_type is SettingsType.ENIGMA_2 else "bouquets.xml"
                 shutil.unpack_archive(full_file_name, tmp_dir)
                 for file in filter(lambda f: f.endswith(cond), os.listdir(self._data_path)):
@@ -234,7 +188,7 @@ def backup_data(path, backup_path, move=True):
 
         Returns full path to the compressed file.
     """
-    backup_path = "{}{}{}".format(backup_path, datetime.now().strftime("%Y-%m-%d_%H-%M-%S"), SEP)
+    backup_path = "{}{}/".format(backup_path, datetime.now().strftime("%Y-%m-%d_%H-%M-%S"))
     os.makedirs(os.path.dirname(backup_path), exist_ok=True)
     os.makedirs(os.path.dirname(path), exist_ok=True)
     # backup files in data dir(skipping dirs and satellites.xml)

app/ui/backup_dialog.glade

@@ -57,7 +57,7 @@ Author: Dmitriy Yefremov
         <property name="can_focus">False</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="on_restore_bouquets" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="Primary"/>
+        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
       </object>
     </child>
     <child>
@@ -67,7 +67,7 @@ Author: Dmitriy Yefremov
         <property name="can_focus">False</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="on_restore_all" swapped="no"/>
-        <accelerator key="e" signal="activate" modifiers="Primary"/>
+        <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
       </object>
     </child>
     <child>
@@ -123,118 +123,16 @@ Author: Dmitriy Yefremov
       <object class="GtkBox" id="main_box">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="margin_left">1</property>
+        <property name="margin_right">1</property>
+        <property name="margin_top">1</property>
+        <property name="margin_bottom">1</property>
         <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox" id="header_bar">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkButtonBox" id="main_button_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">center</property>
-                <property name="margin_left">15</property>
-                <property name="margin_top">10</property>
-                <property name="margin_bottom">10</property>
-                <property name="layout_style">expand</property>
-                <child>
-                  <object class="GtkButton" id="restore_bouquets_header_button">
-                    <property name="label" translatable="yes">Restore bouquets</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <property name="image">restore_bouquets_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_restore_bouquets" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="restore_all_header_button">
-                    <property name="label" translatable="yes">Restore all</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <property name="image">restore_all_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_restore_all" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="remove_header_button">
-                    <property name="label" translatable="yes">Remove</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <property name="image">remove_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_remove" swapped="no"/>
-                    <accelerator key="Delete" signal="clicked"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="info_check_button">
-                <property name="label" translatable="yes">Details</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">False</property>
-                <property name="valign">center</property>
-                <property name="margin_right">15</property>
-                <property name="image">details_image</property>
-                <property name="always_show_image">True</property>
-                <property name="draw_indicator">False</property>
-                <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
-                <accelerator key="i" signal="clicked" modifiers="Primary"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
+        <property name="spacing">5</property>
         <child>
           <object class="GtkPaned" id="main_paned">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="margin_top">5</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_bottom">5</property>
             <property name="wide_handle">True</property>
             <child>
               <object class="GtkScrolledWindow" id="main_view_scrolled_window">
@@ -311,6 +209,106 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">15</property>
+            <property name="margin_right">15</property>
+            <child>
+              <object class="GtkButtonBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="margin_top">10</property>
+                <property name="margin_bottom">10</property>
+                <property name="layout_style">expand</property>
+                <child>
+                  <object class="GtkButton" id="restore_bouquets_header_button">
+                    <property name="label" translatable="yes">Restore bouquets</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="valign">center</property>
+                    <property name="image">restore_bouquets_image</property>
+                    <property name="always_show_image">True</property>
+                    <signal name="clicked" handler="on_restore_bouquets" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="restore_all_header_button">
+                    <property name="label" translatable="yes">Restore all</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="valign">center</property>
+                    <property name="image">restore_all_image</property>
+                    <property name="always_show_image">True</property>
+                    <signal name="clicked" handler="on_restore_all" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="remove_header_button">
+                    <property name="label" translatable="yes">Remove</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="valign">center</property>
+                    <property name="image">remove_image</property>
+                    <property name="always_show_image">True</property>
+                    <signal name="clicked" handler="on_remove" swapped="no"/>
+                    <accelerator key="Delete" signal="clicked"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="info_check_button">
+                <property name="label" translatable="yes">Details</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="valign">center</property>
+                <property name="image">details_image</property>
+                <property name="always_show_image">True</property>
+                <property name="draw_indicator">False</property>
+                <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
+                <accelerator key="i" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -339,7 +337,6 @@ Author: Dmitriy Yefremov
                   <object class="GtkLabel" id="message_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
                     <property name="label" translatable="yes">message</property>
                   </object>
                   <packing>

app/ui/dialogs.glade

@@ -30,7 +30,7 @@ Author: Dmitriy Yefremov
   <requires lib="gtk+" version="3.16"/>
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellites list editor. -->
+  <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
   <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkAboutDialog" id="about_dialog">
@@ -40,15 +40,16 @@ Author: Dmitriy Yefremov
     <property name="icon_name">system-help</property>
     <property name="type_hint">normal</property>
     <property name="program_name">DemonEditor</property>
-    <property name="version">2.0.0 Beta</property>
+    <property name="version">1.0.7 Alpha</property>
     <property name="copyright">2018-2021 Dmitriy Yefremov
-</property>
-    <property name="comments" translatable="yes">Enigma2 channel and satellite list editor.</property>
-    <property name="website">https://dyefremov.github.io/DemonEditor/</property>
+    </property>
+    <property name="comments" translatable="yes">Enigma2 channel and satellite list editor for MS Windows.
+      (Experimental)</property>
+    <property name="website">https://github.com/DYefremov/DemonEditor/tree/experimental-win</property>
     <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
-Подробнее в &lt;a href="http://opensource.org/licenses/mit-license.php"&gt;The MIT License (MIT)&lt;/a&gt;.</property>
+      Подробнее в &lt;a href="http://opensource.org/licenses/mit-license.php"&gt;The MIT License (MIT)&lt;/a&gt;.</property>
     <property name="authors">Dmitriy Yefremov
-</property>
+    </property>
     <property name="translator_credits" translatable="yes">translator-credits</property>
     <property name="artists">Program logo: &lt;a href="http://ihad.tv"&gt;mfgeg&lt;/a&gt;</property>
     <property name="logo_icon_name">demon-editor</property>
@@ -91,36 +92,52 @@ Author: Dmitriy Yefremov
     <property name="type_hint">utility</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
-    <child type="action">
-      <object class="GtkButton" id="input_dialog_cancel_button">
-        <property name="label" translatable="yes">Cancel</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="valign">center</property>
-      </object>
-    </child>
-    <child type="action">
-      <object class="GtkButton" id="input_dialog_ok_button">
-        <property name="label" translatable="yes">OK</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="valign">center</property>
-        <accelerator key="Return" signal="activate"/>
-      </object>
+    <child type="titlebar">
+      <placeholder/>
     </child>
     <child internal-child="vbox">
       <object class="GtkBox">
         <property name="can_focus">False</property>
         <property name="margin_left">5</property>
         <property name="margin_right">5</property>
+        <property name="margin_top">4</property>
         <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
             <property name="can_focus">False</property>
             <property name="valign">center</property>
             <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="input_dialog_cancel_button">
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="valign">center</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="input_dialog_ok_button">
+                <property name="label" translatable="yes">OK</property>
+                <property name="width_request">100</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="valign">center</property>
+                <accelerator key="Return" signal="activate"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -132,11 +149,11 @@ Author: Dmitriy Yefremov
           <object class="GtkEntry" id="input_entry">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_top">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="primary_icon_name">document-edit-symbolic</property>
+            <property name="margin_left">2</property>
+            <property name="margin_right">2</property>
+            <property name="margin_top">2</property>
+            <property name="margin_bottom">2</property>
+
             <property name="primary_icon_activatable">False</property>
             <property name="secondary_icon_activatable">False</property>
             <property name="secondary_icon_sensitive">False</property>

app/ui/dialogs.py

@@ -1,37 +1,8 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 """ Common module for showing dialogs """
 import gettext
 from enum import Enum
 from functools import lru_cache
 from pathlib import Path
-import xml.etree.ElementTree as ET
 
 from app.commons import run_idle
 from app.settings import SEP, IS_WIN
@@ -118,12 +89,11 @@ def show_dialog(dialog_type, transient, text=None, settings=None, action_type=No
         return get_about_dialog(transient)
 
 
-def get_chooser_dialog(transient, settings, name, patterns, title=None, file_filter=None):
-    if not file_filter:
-        file_filter = Gtk.FileFilter()
-        file_filter.set_name(name)
-        for p in patterns:
-            file_filter.add_pattern(p)
+def get_chooser_dialog(transient, settings, name, patterns, title=None):
+    file_filter = Gtk.FileFilter()
+    file_filter.set_name(name)
+    for p in patterns:
+        file_filter.add_pattern(p)
 
     return show_dialog(dialog_type=DialogType.CHOOSER,
                        transient=transient,
@@ -134,18 +104,20 @@ def get_chooser_dialog(transient, settings, name, patterns, title=None, file_fil
 
 
 def get_file_chooser_dialog(transient, text, settings, action_type, file_filter, buttons=None, title=None, dirs=False):
+    text = get_message(text) if text else ""
     action_type = Gtk.FileChooserAction.SELECT_FOLDER if action_type is None else action_type
-    dialog = Gtk.FileChooserNative.new(get_message(title) if title else "", transient, action_type)
+    buttons = buttons or (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
+    dialog = Gtk.FileChooserDialog(text, transient, action_type, buttons, use_header_bar=IS_GNOME_SESSION)
+    dialog.set_title(get_message(title) if title else "")
     dialog.set_create_folders(dirs)
-    dialog.set_modal(True)
 
     if file_filter is not None:
         dialog.add_filter(file_filter)
 
-    dialog.set_current_folder(settings.profile_data_path)
+    dialog.set_current_folder(settings.data_local_path)
     response = dialog.run()
 
-    if response == Gtk.ResponseType.ACCEPT:
+    if response not in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
         path = Path(dialog.get_filename() or dialog.get_current_folder())
         if path.is_dir():
             response = "{}{}".format(path.resolve(), SEP)
@@ -208,48 +180,52 @@ def get_message(message):
 
 
 @lru_cache(maxsize=5)
-def get_dialogs_string(path, tag="property"):
-    if IS_WIN:
-        return translate_xml(path, tag)
-    else:
-        with open(path, "r", encoding="utf-8") as f:
-            return "".join(f)
+def get_dialogs_string(path):
+    with open(path, "r", encoding="utf-8") as f:
+        return "".join(f)
 
 
-def get_builder(path, handlers=None, use_str=False, objects=None, tag="property"):
+def get_builder(path, handlers=None, use_str=False, objects=None):
     """ Creates and returns a Gtk.Builder instance. """
     builder = Gtk.Builder()
     builder.set_translation_domain(TEXT_DOMAIN)
 
     if use_str:
         if objects:
-            builder.add_objects_from_string(get_dialogs_string(path, tag).format(use_header=IS_GNOME_SESSION), objects)
+            builder.add_objects_from_string(get_dialogs_string(path).format(use_header=IS_GNOME_SESSION), objects)
         else:
-            builder.add_from_string(get_dialogs_string(path, tag).format(use_header=IS_GNOME_SESSION))
+            builder.add_from_string(get_dialogs_string(path).format(use_header=IS_GNOME_SESSION))
     else:
         if objects:
-            builder.add_objects_from_string(get_dialogs_string(path, tag), objects)
+            builder.add_objects_from_file(path, objects)
         else:
-            builder.add_from_string(get_dialogs_string(path, tag))
+            builder.add_from_file(path)
 
     builder.connect_signals(handlers or {})
+    if IS_WIN:
+        translate_objects(builder.get_objects())
 
     return builder
 
 
-def translate_xml(path, tag="property"):
+def translate_objects(objects):
     """
         Used to translate GUI from * .glade files in MS Windows.
 
         More info: https://gitlab.gnome.org/GNOME/gtk/-/issues/569
     """
-    et = ET.parse(path)
-    root = et.getroot()
-    for e in root.iter(tag):
-        if e.attrib.get("translatable", None) == "yes":
-            e.text = get_message(e.text)
-
-    return ET.tostring(root, encoding="unicode", method="xml")
+    for o in objects:
+        if hasattr(o, "get_label"):
+            label = o.get_label()
+            if label:
+                o.set_label(get_message(label))
+            t_text = o.get_tooltip_text()
+            if t_text:
+                o.set_tooltip_text(get_message(t_text))
+        elif hasattr(o, "get_title"):
+            title = o.get_title()
+            if title:
+                o.set_title(get_message(title))
 
 
 if __name__ == "__main__":

app/ui/download_dialog.glade

@@ -3,7 +3,7 @@
 
 The MIT License (MIT)
 
-Copyright (c) 2018-2021 Dmitriy Yefremov
+Copyright (c) 2018-2020 Dmitriy Yefremov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -30,8 +30,8 @@ Author: Dmitriy Yefremov
   <requires lib="gtk+" version="3.16"/>
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellites list editor. -->
-  <!-- interface-copyright 2018 Dmitriy Yefremov -->
+  <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
+  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkImage" id="download_image">
     <property name="visible">True</property>
@@ -52,7 +52,7 @@ Author: Dmitriy Yefremov
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
-    <property name="icon_name">mail-send-receive-symbolic</property>
+    <property name="icon_name">mail-send-receive</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <child type="titlebar">
@@ -63,171 +63,14 @@ Author: Dmitriy Yefremov
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox" id="header_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkBox" id="profile_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="margin_top">5</property>
-                <property name="margin_bottom">5</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Profile:</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="profile_combo_box">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="active">0</property>
-                    <property name="has_frame">False</property>
-                    <signal name="changed" handler="on_profile_changed" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="options_button">
-                    <property name="label" translatable="yes">Options</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Options</property>
-                    <signal name="clicked" handler="on_settings" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="selection_data_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="margin_top">10</property>
-                <property name="margin_bottom">5</property>
-                <property name="spacing">5</property>
-                <child>
-                  <object class="GtkLabel" id="label10">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="all_radio_button">
-                    <property name="label" translatable="yes">All</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">satellites_radio_button</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="bouquets_radio_button">
-                    <property name="label" translatable="yes">Bouquets</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">satellites_radio_button</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="satellites_radio_button">
-                    <property name="label" translatable="yes">Satellites</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">all_radio_button</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="webtv_radio_button">
-                    <property name="label" translatable="yes">WebTV</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">all_radio_button</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkFrame" id="main_settings_box_frame">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_top">5</property>
+            <property name="margin_left">10</property>
+            <property name="margin_right">10</property>
+            <property name="margin_top">10</property>
+            <property name="margin_bottom">5</property>
             <property name="label_xalign">0.019999999552965164</property>
             <property name="shadow_type">in</property>
             <child>
@@ -236,16 +79,15 @@ Author: Dmitriy Yefremov
                 <property name="can_focus">False</property>
                 <property name="margin_left">10</property>
                 <property name="margin_right">10</property>
-                <property name="margin_top">10</property>
-                <property name="margin_bottom">10</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">10</property>
                 <child>
                   <object class="GtkGrid" id="main_settings_bo">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="row_spacing">5</property>
-                    <property name="column_spacing">10</property>
+                    <property name="row_spacing">2</property>
+                    <property name="column_spacing">2</property>
                     <property name="column_homogeneous">True</property>
                     <child>
                       <object class="GtkLabel" id="ip_label">
@@ -311,8 +153,9 @@ Author: Dmitriy Yefremov
                   <object class="GtkBox" id="extra_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">10</property>
-                    <property name="margin_right">10</property>
+                    <property name="margin_left">5</property>
+                    <property name="margin_right">5</property>
+                    <property name="margin_top">5</property>
                     <child>
                       <object class="GtkCheckButton" id="remove_unused_check_button">
                         <property name="label" translatable="yes">Remove unused bouquets</property>
@@ -384,11 +227,179 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkButtonBox" id="button_box">
+          <object class="GtkFrame">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">10</property>
+            <property name="margin_right">10</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkBox" id="selection_data_box">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="margin_top">10</property>
+                    <property name="margin_bottom">5</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkLabel" id="label10">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="all_radio_button">
+                        <property name="label" translatable="yes">All</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">satellites_radio_button</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="bouquets_radio_button">
+                        <property name="label" translatable="yes">Bouquets</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">satellites_radio_button</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="satellites_radio_button">
+                        <property name="label" translatable="yes">Satellites</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">all_radio_button</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="webtv_radio_button">
+                        <property name="label" translatable="yes">WebTV</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">all_radio_button</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="margin_top">5</property>
+                    <property name="margin_bottom">5</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Profile:</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBoxText" id="profile_combo_box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="focus_on_click">False</property>
+                        <property name="active">0</property>
+                        <property name="has_frame">False</property>
+                        <signal name="changed" handler="on_profile_changed" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="options_button">
+                        <property name="label" translatable="yes">Options</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Options</property>
+                        <signal name="clicked" handler="on_settings" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="label_item">
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="valign">center</property>
@@ -438,85 +449,54 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">2</property>
+            <property name="position">6</property>
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="log_bar_frame">
-            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_bottom">5</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">in</property>
+          <object class="GtkExpander" id="expander">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="margin_left">1</property>
+            <property name="margin_right">1</property>
+            <property name="margin_bottom">1</property>
+            <property name="resize_toplevel">True</property>
             <child>
-              <object class="GtkInfoBar" id="log_bar">
-                <property name="can_focus">False</property>
-                <property name="baseline_position">bottom</property>
-                <property name="message_type">other</property>
-                <property name="show_close_button">True</property>
-                <child internal-child="action_area">
-                  <object class="GtkButtonBox" id="log_bar_button_box">
-                    <property name="can_focus">False</property>
-                    <property name="layout_style">end</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child internal-child="content_area">
-                  <object class="GtkBox" id="log_bar_box">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolled_window">
-                        <property name="height_request">100</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <object class="GtkTextView" id="text_view">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="editable">False</property>
-                            <property name="left_margin">5</property>
-                            <property name="right_margin">5</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+              <object class="GtkScrolledWindow" id="scrolled_window">
+                <property name="height_request">120</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="shadow_type">in</property>
                 <child>
-                  <placeholder/>
+                  <object class="GtkTextView" id="text_view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="left_margin">5</property>
+                    <property name="right_margin">5</property>
+                  </object>
                 </child>
               </object>
             </child>
-            <child type="label_item">
-              <placeholder/>
+            <child type="label">
+              <object class="GtkLabel" id="expander_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Extra:</property>
+              </object>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="position">7</property>
           </packing>
         </child>
         <child>
           <object class="GtkInfoBar" id="info_bar">
             <property name="can_focus">False</property>
+            <property name="margin_left">1</property>
+            <property name="margin_right">1</property>
+            <property name="margin_bottom">1</property>
             <property name="show_close_button">True</property>
             <signal name="response" handler="on_info_bar_close" swapped="no"/>
             <child internal-child="action_area">

app/ui/download_dialog.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import os
 
 from gi.repository import GLib
@@ -35,7 +7,7 @@ from app.connections import download_data, DownloadType, upload_data
 from app.settings import SettingsType
 from app.ui.backup import backup_data, restore_data
 from app.ui.main_helper import append_text_to_tview
-from app.ui.settings_dialog import SettingsDialog
+from app.ui.settings_dialog import show_settings_dialog
 from .dialogs import show_dialog, DialogType, get_message, get_builder
 from .uicommons import Gtk, UI_RESOURCES_PATH
 
@@ -59,6 +31,10 @@ class DownloadDialog:
 
         self._dialog_window = builder.get_object("download_dialog_window")
         self._dialog_window.set_transient_for(transient)
+        self._info_bar = builder.get_object("info_bar")
+        self._message_label = builder.get_object("info_bar_message_label")
+        self._text_view = builder.get_object("text_view")
+        self._expander = builder.get_object("expander")
         self._host_entry = builder.get_object("host_entry")
         self._data_path_entry = builder.get_object("data_path_entry")
         self._remove_unused_check_button = builder.get_object("remove_unused_check_button")
@@ -68,14 +44,8 @@ class DownloadDialog:
         self._webtv_radio_button = builder.get_object("webtv_radio_button")
         self._use_http_switch = builder.get_object("use_http_switch")
         self._http_radio_button = builder.get_object("http_radio_button")
+        self._use_http_box = builder.get_object("use_http_box")
         self._profile_combo_box = builder.get_object("profile_combo_box")
-        # Info.
-        self._info_bar = builder.get_object("info_bar")
-        self._message_label = builder.get_object("info_bar_message_label")
-        self._text_view = builder.get_object("text_view")
-        self._log_bar = builder.get_object("log_bar")
-        self._log_bar.bind_property("visible", builder.get_object("log_bar_frame"), "visible")
-        self._log_bar.connect("response", lambda b, r: b.set_visible(False))
 
         self.init_settings()
 
@@ -88,10 +58,11 @@ class DownloadDialog:
 
     def init_ui_settings(self):
         self._host_entry.set_text(self._settings.host)
-        self._data_path_entry.set_text(self._settings.profile_data_path)
+        self._data_path_entry.set_text(self._settings.data_local_path)
         is_enigma = self._s_type is SettingsType.ENIGMA_2
         self._webtv_radio_button.set_visible(not is_enigma)
-        self._use_http_switch.set_active(self._settings.use_http)
+        self._use_http_box.set_visible(is_enigma)
+        self._use_http_switch.set_active(is_enigma and self._settings.use_http)
         self._remove_unused_check_button.set_active(self._settings.remove_unused_bouquets)
 
     def update_profiles(self):
@@ -123,9 +94,8 @@ class DownloadDialog:
         self._dialog_window.destroy()
 
     def on_settings(self, item):
-        dialog = SettingsDialog(self._dialog_window, self._settings)
-        dialog.show()
-        if dialog.is_updated():
+        response = show_settings_dialog(self._dialog_window, self._settings)
+        if response != Gtk.ResponseType.CANCEL:
             self._s_type = self._settings.setting_type
             self.update_profiles()
             gen = self._update_settings_callback()
@@ -151,16 +121,16 @@ class DownloadDialog:
     @run_task
     def download(self, download, d_type):
         """ Download/upload data from/to receiver """
-        GLib.idle_add(self._log_bar.set_visible, True)
+        GLib.idle_add(self._expander.set_expanded, True)
         self.clear_output()
         backup, backup_src, data_path = self._settings.backup_before_downloading, None, None
 
         try:
             if download:
                 if backup and d_type is not DownloadType.SATELLITES:
-                    data_path = self._settings.profile_data_path or self._data_path_entry.get_text()
+                    data_path = self._settings.data_local_path or self._data_path_entry.get_text()
                     os.makedirs(os.path.dirname(data_path), exist_ok=True)
-                    backup_path = self._settings.profile_backup_path or self._settings.default_backup_path
+                    backup_path = self._settings.backup_local_path or data_path + "backup/"
                     backup_src = backup_data(data_path, backup_path, d_type is DownloadType.ALL)
 
                 download_data(settings=self._settings, download_type=d_type, callback=self.append_output)

app/ui/epg_dialog.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import gzip
 import locale
 import os
@@ -40,11 +12,10 @@ from gi.repository import GLib
 from app.commons import run_idle, run_task
 from app.connections import download_data, DownloadType
 from app.eparser.ecommons import BouquetService, BqServiceType
-from app.settings import SEP
 from app.tools.epg import EPG, ChannelsParser
 from app.ui.dialogs import get_message, show_dialog, DialogType, get_builder
 from .main_helper import on_popup_menu, update_entry_data
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Column, EPG_ICON, KeyboardKey, IS_GNOME_SESSION
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Column, EPG_ICON, KeyboardKey, MOD_MASK
 
 
 class RefsSource(Enum):
@@ -80,7 +51,7 @@ class EpgDialog:
                     "on_enable_filtering_switch": self.on_enable_filtering_switch,
                     "on_update_on_start_switch": self.on_update_on_start_switch,
                     "on_field_icon_press": self.on_field_icon_press,
-                    "on_key_press": self.on_key_press}
+                    "on_key_release": self.on_key_release}
 
         self._services = {}
         self._ex_services = services
@@ -93,9 +64,10 @@ class EpgDialog:
         self._use_web_source = False
         self._update_epg_data_on_start = False
         self._refs_source = RefsSource.SERVICES
+        self._show_tooltips = True
         self._download_xml_is_active = False
 
-        builder = get_builder(UI_RESOURCES_PATH + "epg.glade", handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "epg_dialog.glade", handlers)
 
         self._dialog = builder.get_object("epg_dialog_window")
         self._dialog.set_transient_for(transient)
@@ -110,7 +82,6 @@ class EpgDialog:
         self._xml_download_progress_bar = builder.get_object("xml_download_progress_bar")
         # Filter
         self._filter_bar = builder.get_object("filter_bar")
-        self._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible")
         self._filter_entry = builder.get_object("filter_entry")
         self._services_filter_model = builder.get_object("services_filter_model")
         self._services_filter_model.set_visible_func(self.services_filter_function)
@@ -131,17 +102,6 @@ class EpgDialog:
         self._epg_dat_stb_path_entry = builder.get_object("epg_dat_stb_path_entry")
         self._update_on_start_switch = builder.get_object("update_on_start_switch")
         self._epg_dat_source_box = builder.get_object("epg_dat_source_box")
-
-        if IS_GNOME_SESSION:
-            header_bar = Gtk.HeaderBar(visible=True, show_close_button=True, title="EPG",
-                                       subtitle=get_message("List configuration"))
-            self._dialog.set_titlebar(header_bar)
-            builder.get_object("left_action_box").reparent(header_bar)
-            right_box = builder.get_object("right_action_box")
-            builder.get_object("main_actions_box").remove(right_box)
-            header_bar.pack_end(right_box)
-            builder.get_object("toolbar_box").set_visible(False)
-
         # Setting the last size of the dialog window
         window_size = self._settings.get("epg_tool_window_size")
         if window_size:
@@ -198,14 +158,14 @@ class EpgDialog:
                 try:
                     self.download_epg_from_stb()
                 except OSError as e:
-                    self.show_info_message(f"Download epg.dat file error: {e}", Gtk.MessageType.ERROR)
+                    self.show_info_message("Download epg.dat file error: {}".format(e), Gtk.MessageType.ERROR)
                     return
             yield True
 
             try:
                 refs = EPG.get_epg_refs(self._epg_dat_path_entry.get_text() + "epg.dat")
             except FileNotFoundError as e:
-                self.show_info_message(f"Read data error: {e}", Gtk.MessageType.ERROR)
+                self.show_info_message("Read data error: {}".format(e), Gtk.MessageType.ERROR)
                 return
             yield True
 
@@ -223,7 +183,7 @@ class EpgDialog:
 
     def init_bouquet_data(self):
         for r in self._ex_fav_model:
-            row = [*r[:]]
+            row = list(r[:])
             fav_id = r[Column.FAV_ID]
             self._services[fav_id] = self._ex_services[fav_id].fav_id
             yield self._bouquet_model.append(row)
@@ -235,7 +195,7 @@ class EpgDialog:
         s_types = (BqServiceType.MARKER.value, BqServiceType.IPTV.value)
         filtered = filter(None, [srvs.get(ref) for ref in refs]) if refs else filter(
             lambda s: s.service_type not in s_types, self._ex_services.values())
-        list(map(self._services_model.append, map(lambda s: (s.service, s.pos, s.fav_id), filtered)))
+        list(map(self._services_model.append, map(lambda s: (s.service, s.fav_id), filtered)))
         self.update_source_count_info()
 
     def init_xml_source(self, refs):
@@ -284,7 +244,7 @@ class EpgDialog:
 
                         path = tfp.name.rstrip(".gz")
             except (HTTPError, URLError) as e:
-                raise ValueError(f"{get_message('Download XML file error.')} {e}")
+                raise ValueError("{} {}".format(get_message("Download XML file error."), e))
             else:
                 try:
                     with open(path, "wb") as f_out:
@@ -292,7 +252,7 @@ class EpgDialog:
                             shutil.copyfileobj(f, f_out)
                     os.remove(tfp.name)
                 except Exception as e:
-                    raise ValueError(f"{get_message('Unpacking data error.')} {e}")
+                    raise ValueError("{} {}".format(get_message("Unpacking data error."), e))
             finally:
                 self._download_xml_is_active = False
                 self.update_active_header_elements(True)
@@ -301,7 +261,7 @@ class EpgDialog:
             s_refs, info = ChannelsParser.get_refs_from_xml(path)
             yield True
         except Exception as e:
-            raise ValueError(f"{get_message('XML parsing error:')} {e}")
+            raise ValueError("{} {}".format(get_message("XML parsing error:"), e))
         else:
             if refs:
                 s_refs = filter(lambda x: x.num in refs, s_refs)
@@ -310,13 +270,13 @@ class EpgDialog:
             self.update_source_count_info()
             yield True
 
-    def on_key_press(self, view, event):
+    def on_key_release(self, view, event):
         """  Handling  keystrokes  """
         key_code = event.hardware_keycode
         if not KeyboardKey.value_exist(key_code):
             return
         key = KeyboardKey(key_code)
-        ctrl = event.state & Gdk.ModifierType.CONTROL_MASK
+        ctrl = event.state & MOD_MASK
 
         if ctrl and key is KeyboardKey.C:
             self.on_copy_ref()
@@ -358,7 +318,7 @@ class EpgDialog:
         for row in self._services_model:
             name = re.sub("\\W+", "", str(row[0])).upper()
             name = name.translate(tr) if use_cyrillic else name
-            source[name] = row
+            source[name] = row[1]
 
         success_count = 0
         not_founded = {}
@@ -388,7 +348,7 @@ class EpgDialog:
                                                  get_message("Count of successfully configured services:"),
                                                  success_count), Gtk.MessageType.INFO)
 
-    def assign_data(self, row, data, show_error=False):
+    def assign_data(self, row, ref, show_error=False):
         if row[Column.FAV_TYPE] != BqServiceType.IPTV.value:
             if not show_error:
                 self.show_info_message(get_message("Not allowed in this context!"), Gtk.MessageType.ERROR)
@@ -396,15 +356,14 @@ class EpgDialog:
 
         fav_id = row[Column.FAV_ID]
         fav_id_data = fav_id.split(":")
-        fav_id_data[3:7] = data[-1].split(":")
+        fav_id_data[3:7] = ref.split(":")
         new_fav_id = ":".join(fav_id_data)
         service = self._services.pop(fav_id, None)
         if service:
             self._services[new_fav_id] = service
             row[Column.FAV_ID] = new_fav_id
             row[Column.FAV_LOCKED] = EPG_ICON
-            src = f"{get_message('EPG source')}: {data[0]} ({data[1]})"
-            row[Column.FAV_TOOLTIP] = f"{get_message('Service reference')}: {':'.join(fav_id_data[:10])}\n{src}"
+            row[Column.FAV_TOOLTIP] = ":".join(fav_id_data[:10]) if self._show_tooltips else None
 
     def on_filter_toggled(self, button: Gtk.ToggleButton):
         self._filter_bar.set_search_mode(button.get_active())
@@ -423,7 +382,7 @@ class EpgDialog:
         model, paths = self._source_view.get_selection().get_selected_rows()
         self._current_ref.clear()
         if paths:
-            self._current_ref.append(model[paths][:])
+            self._current_ref.append(model[paths][1])
 
     def on_assign_ref(self, item=None):
         if self._current_ref:
@@ -492,7 +451,7 @@ class EpgDialog:
     # ***************** Drag-and-drop *********************#
 
     def init_drag_and_drop(self):
-        """ Enable drag-and-drop. """
+        """ Enable drag-and-drop """
         target = []
         self._source_view.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK, target, Gdk.DragAction.COPY)
         self._source_view.drag_source_add_text_targets()
@@ -505,28 +464,23 @@ class EpgDialog:
         if selection.count_selected_rows() > 1:
             view.do_toggle_cursor_row(view)
 
-    def on_drag_data_get(self, view, drag_context, data, info, time):
+    def on_drag_data_get(self, view: Gtk.TreeView, drag_context, data, info, time):
         model, paths = view.get_selection().get_selected_rows()
         if paths:
-            s_data = model[paths][:]
-            if all(s_data):
-                data.set_text("::::".join(s_data), -1)
-            else:
-                self.show_info_message(get_message("Source error!"), Gtk.MessageType.ERROR)
+            val = model.get_value(model.get_iter(paths), 1)
+            data.set_text(val, -1)
 
-    def on_drag_data_received(self, view, drag_context, x, y, data, info, time):
+    def on_drag_data_received(self, view: Gtk.TreeView, drag_context, x, y, data, info, time):
         path, pos = view.get_dest_row_at_pos(x, y)
         model = view.get_model()
-        data = data.get_text()
-        if data:
-            self.assign_data(model[path], data.split("::::"))
-            self.update_epg_count()
+        self.assign_data(model[path], data.get_text())
+        self.update_epg_count()
         return False
 
     # ***************** Options *********************#
 
     def init_options(self):
-        epg_dat_path = "{}epg{}".format(self._settings.profile_data_path, SEP)
+        epg_dat_path = self._settings.data_local_path + "epg/"
         self._epg_dat_path_entry.set_text(epg_dat_path)
         default_epg_data_stb_path = "/etc/enigma2"
         epg_options = self._settings.epg_options

app/ui/ftp.glade

@@ -87,7 +87,10 @@ Author: Dmitriy Yefremov
   <object class="GtkFrame" id="main_frame">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="label_xalign">0.49000000953674316</property>
+    <property name="margin_left">1</property>
+    <property name="margin_right">1</property>
+    <property name="margin_bottom">1</property>
+    <property name="label_xalign">0</property>
     <property name="shadow_type">in</property>
     <child>
       <object class="GtkBox" id="main_ftp_box">
@@ -311,7 +314,7 @@ Author: Dmitriy Yefremov
                         <child>
                           <object class="GtkTreeViewColumn" id="ftp_attr_column">
                             <property name="sizing">fixed</property>
-                            <property name="min_width">85</property>
+                            <property name="min_width">75</property>
                             <property name="title" translatable="yes">Attr.</property>
                             <property name="alignment">0.5</property>
                             <property name="sort_column_id">4</property>
@@ -538,12 +541,8 @@ Author: Dmitriy Yefremov
         </child>
       </object>
     </child>
-    <child type="label">
-      <object class="GtkLabel" id="main_label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">FTP client</property>
-      </object>
+    <child type="label_item">
+      <placeholder/>
     </child>
   </object>
   <object class="GtkImage" id="remove_image">
@@ -583,7 +582,7 @@ Author: Dmitriy Yefremov
         <property name="image">rename_image</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="on_ftp_edit" object="ftp_name_column_renderer" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="Primary"/>
+        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
         <accelerator key="F2" signal="activate"/>
       </object>
     </child>
@@ -632,7 +631,7 @@ Author: Dmitriy Yefremov
         <property name="image">rename_image_2</property>
         <property name="use_stock">False</property>
         <signal name="activate" handler="on_file_edit" object="file_name_column_renderer" swapped="no"/>
-        <accelerator key="r" signal="activate" modifiers="Primary"/>
+        <accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
         <accelerator key="F2" signal="activate"/>
       </object>
     </child>

app/ui/ftp.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 """ Simple FTP client module. """
 import subprocess
 from collections import namedtuple
@@ -40,6 +12,7 @@ from gi.repository import GLib
 
 from app.commons import log, run_task, run_idle
 from app.connections import UtfFTP
+from app.settings import IS_WIN, SEP
 from app.ui.dialogs import show_dialog, DialogType, get_builder
 from app.ui.main_helper import on_popup_menu
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
@@ -168,7 +141,7 @@ class FtpClientBox(Gtk.HBox):
 
     @run_task
     def init_file_data(self, path=None):
-        self.append_file_data(Path(path if path else self._settings.profile_data_path))
+        self.append_file_data(Path(path if path else self._settings.data_local_path))
 
     @run_idle
     def append_file_data(self, path: Path):
@@ -241,7 +214,7 @@ class FtpClientBox(Gtk.HBox):
         else:
             b_size = row[self.Column.EXTRA]
             if b_size.isdigit() and int(b_size) > self.MAX_SIZE:
-                self._app.show_error_message("The file size is too large!")
+                self._app.show_error_dialog("The file size is too large!")
             else:
                 self.open_ftp_file(f_path)
 
@@ -259,22 +232,21 @@ class FtpClientBox(Gtk.HBox):
     def open_file(self, path):
         GLib.idle_add(self._file_view.set_sensitive, False)
         try:
-            cmd = ["open" if self._settings.is_darwin else "xdg-open", path]
-            subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+            cmd = ["start" if IS_WIN else "xdg-open", path]
+            subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=IS_WIN).communicate()
         finally:
             GLib.idle_add(self._file_view.set_sensitive, True)
 
     @run_task
     def open_ftp_file(self, f_path):
-        is_darwin = self._settings.is_darwin
         GLib.idle_add(self._ftp_view.set_sensitive, False)
 
         try:
             import tempfile
             import os
-            path = os.path.expanduser("~/Desktop") if is_darwin else None
+            path = os.path.expanduser("~/Desktop") if IS_WIN else None
 
-            with tempfile.NamedTemporaryFile(mode="wb", dir=path, delete=not is_darwin) as tf:
+            with tempfile.NamedTemporaryFile(mode="wb", dir=path, delete=not IS_WIN) as tf:
                 msg = "Downloading file: {}.   Status: {}"
                 try:
                     status = self._ftp.retrbinary("RETR " + f_path, tf.write)
@@ -283,8 +255,8 @@ class FtpClientBox(Gtk.HBox):
                     self.update_ftp_info(msg.format(f_path, e))
 
                 tf.flush()
-                cmd = ["open" if is_darwin else "xdg-open", tf.name]
-                subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+                cmd = ["start" if IS_WIN else "xdg-open", tf.name]
+                subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=IS_WIN).communicate()
         finally:
             GLib.idle_add(self._ftp_view.set_sensitive, True)
 
@@ -294,7 +266,7 @@ class FtpClientBox(Gtk.HBox):
             return
 
         if len(paths) > 1:
-            self._app.show_error_message("Please, select only one item!")
+            self._app.show_error_dialog("Please, select only one item!")
             return
 
         renderer.set_property("editable", True)
@@ -315,7 +287,7 @@ class FtpClientBox(Gtk.HBox):
     def on_file_edit(self, renderer):
         model, paths = self._file_view.get_selection().get_selected_rows()
         if len(paths) > 1:
-            self._app.show_error_message("Please, select only one item!")
+            self._app.show_error_dialog("Please, select only one item!")
             return
 
         renderer.set_property("editable", True)
@@ -334,7 +306,7 @@ class FtpClientBox(Gtk.HBox):
                 new_path = path.rename("{}/{}".format(path.parent, new_value))
             except ValueError as e:
                 log(e)
-                self._app.show_error_message(str(e))
+                self._app.show_error_dialog(str(e))
             else:
                 if new_path.name == new_value:
                     row[self.Column.NAME] = new_value
@@ -391,7 +363,7 @@ class FtpClientBox(Gtk.HBox):
             path.mkdir()
         except OSError as e:
             log(e)
-            self._app.show_error_message(str(e))
+            self._app.show_error_dialog(str(e))
         else:
             itr = self._file_model.append(File(self._folder_icon, path.name, self.FOLDER, "", str(path.resolve()), "0"))
             renderer.set_property("editable", True)
@@ -455,11 +427,12 @@ class FtpClientBox(Gtk.HBox):
     def on_ftp_drag_data_get(self, view, context, data, info, time):
         model, paths = view.get_selection().get_selected_rows()
         if len(paths) > 0:
-            sep = self.URI_SEP if self._settings.is_darwin else "\n"
+            sep = self.URI_SEP if IS_WIN else "\n"
             uris = []
             for r in [model[p][:] for p in paths]:
                 if r[self.Column.SIZE] != self.LINK and r[self.Column.NAME] != self.ROOT:
-                    uris.append(Path("/{}:{}".format(r[self.Column.NAME], r[self.Column.ATTR])).as_uri())
+                    path = Path("/{}:{}".format(r[self.Column.NAME], r[self.Column.ATTR]))
+                    uris.append(str(path.resolve()) if IS_WIN else path.as_uri())
             data.set_uris([sep.join(uris)])
 
     @run_task
@@ -469,15 +442,15 @@ class FtpClientBox(Gtk.HBox):
 
         resp = "2"
         try:
-            GLib.idle_add(self._app.wait_dialog.show)
+            GLib.idle_add(self._app._wait_dialog.show)
 
             uris = data.get_uris()
-            if self._settings.is_darwin and len(uris) == 1:
+            if IS_WIN and len(uris) == 1:
                 uris = uris[0].split(self.URI_SEP)
 
             for uri in uris:
-                uri = urlparse(unquote(uri)).path
-                path = Path(uri)
+                uri = urlparse(unquote(uri)).path.strip()
+                path = Path(uri.lstrip("/") if IS_WIN else uri)
                 if path.is_dir():
                     try:
                         self._ftp.mkd(path.name)
@@ -488,7 +461,7 @@ class FtpClientBox(Gtk.HBox):
                 else:
                     resp = self._ftp.send_file(path.name, str(path.parent) + "/", callback=self.update_ftp_info)
         finally:
-            GLib.idle_add(self._app.wait_dialog.hide)
+            GLib.idle_add(self._app._wait_dialog.hide)
             if resp and resp[0] == "2":
                 itr = self._ftp_model.get_iter_first()
                 if itr:
@@ -499,18 +472,18 @@ class FtpClientBox(Gtk.HBox):
     def on_file_drag_data_get(self, view, context, data: Gtk.SelectionData, info, time):
         model, paths = view.get_selection().get_selected_rows()
         if len(paths) > 0:
-            sep = self.URI_SEP if self._settings.is_darwin else "\n"
+            sep = self.URI_SEP if IS_WIN else "\n"
             uris = [sep.join([Path(model[p][self.Column.ATTR]).as_uri() for p in paths])]
             data.set_uris(uris)
 
     @run_task
     def on_file_drag_data_received(self, view, context, x, y, data, info, time):
-        cur_path = self._file_model.get_value(self._file_model.get_iter_first(), self.Column.ATTR) + "/"
+        cur_path = self._file_model.get_value(self._file_model.get_iter_first(), self.Column.ATTR) + SEP
         try:
-            GLib.idle_add(self._app.wait_dialog.show)
+            GLib.idle_add(self._app._wait_dialog.show)
 
             uris = data.get_uris()
-            if self._settings.is_darwin and len(uris) == 1:
+            if IS_WIN and len(uris) == 1:
                 uris = uris[0].split(self.URI_SEP)
 
             for uri in uris:
@@ -525,7 +498,7 @@ class FtpClientBox(Gtk.HBox):
         except OSError as e:
             log(e)
         finally:
-            GLib.idle_add(self._app.wait_dialog.hide)
+            GLib.idle_add(self._app._wait_dialog.hide)
             self.init_file_data(cur_path)
 
         Gtk.drag_finish(context, True, False, time)
@@ -564,10 +537,6 @@ class FtpClientBox(Gtk.HBox):
                 self.on_ftp_file_remove()
             elif self._file_view.is_focus():
                 self.on_file_remove()
-        elif key is KeyboardKey.RETURN:
-            path, column = view.get_cursor()
-            if path:
-                view.emit("row-activated", path, column)
 
     def on_view_press(self, view, event):
         if event.get_event_type() == Gdk.EventType.BUTTON_PRESS and event.button == Gdk.BUTTON_PRIMARY:

app/ui/import_dialog.glade

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2
+<!-- Generated with glade 3.22.1 
 
 The MIT License (MIT)
 
@@ -31,8 +31,8 @@ Author: Dmitriy Yefremov
   <!-- interface-css-provider-path style.css -->
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellite list editor. -->
-  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
+  <!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
+  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkImage" id="details_image">
     <property name="visible">True</property>
@@ -110,177 +110,21 @@ Author: Dmitriy Yefremov
         <property name="width_request">480</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="margin_left">1</property>
+        <property name="margin_right">1</property>
+        <property name="margin_bottom">1</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkBox" id="toolbar_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkButtonBox" id="actions_box">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">center</property>
-                <property name="margin_left">15</property>
-                <property name="margin_right">15</property>
-                <property name="margin_top">10</property>
-                <property name="margin_bottom">10</property>
-                <property name="layout_style">start</property>
-                <child>
-                  <object class="GtkButton" id="import_button">
-                    <property name="label" translatable="yes">Import</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Bouquets and services</property>
-                    <property name="valign">center</property>
-                    <property name="image">import_image</property>
-                    <property name="always_show_image">True</property>
-                    <signal name="clicked" handler="on_import" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="info_check_button">
-                    <property name="label" translatable="yes">Details</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Details</property>
-                    <property name="valign">center</property>
-                    <property name="image">details_image</property>
-                    <property name="always_show_image">True</property>
-                    <property name="draw_indicator">False</property>
-                    <accelerator key="i" signal="clicked" modifiers="Primary"/>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                    <property name="secondary">True</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkPaned" id="main_paned">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_bottom">5</property>
             <property name="wide_handle">True</property>
             <child>
-              <object class="GtkFrame" id="bouquets_box_frame">
+              <object class="GtkBox" id="bouquets_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label_xalign">0.49000000953674316</property>
-                <property name="shadow_type">in</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkBox" id="bouquets_box">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
-                    <property name="margin_right">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="bouquets_screlled_window">
-                        <property name="width_request">200</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <object class="GtkTreeView" id="main_view">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="model">main_list_store</property>
-                            <property name="headers_clickable">False</property>
-                            <property name="search_column">0</property>
-                            <signal name="button-press-event" handler="on_popup_menu" object="popup_menu" swapped="no"/>
-                            <signal name="cursor-changed" handler="on_cursor_changed" swapped="no"/>
-                            <signal name="key-press-event" handler="on_key_press" swapped="no"/>
-                            <signal name="select-all" handler="on_select_all" swapped="no"/>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection">
-                                <property name="mode">multiple</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="bouquet_name_column">
-                                <property name="title" translatable="yes">Name</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="bq_name_renderer">
-                                    <property name="xalign">0.019999999552965164</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="bouquet_type_column">
-                                <property name="title" translatable="yes">Type</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="bq_type_renderer">
-                                    <property name="xalign">0.50999999046325684</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">1</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="bouquet_selected_column">
-                                <property name="title" translatable="yes">Selected</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" id="bq_selected_renderer">
-                                    <property name="xalign">0.50999999046325684</property>
-                                    <signal name="toggled" handler="on_selected_toggled" swapped="no"/>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">2</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -288,6 +132,86 @@ Author: Dmitriy Yefremov
                     <property name="margin_bottom">5</property>
                     <property name="label" translatable="yes">Bouquets</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="bouquets_screlled_window">
+                    <property name="width_request">200</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkTreeView" id="main_view">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="model">main_list_store</property>
+                        <property name="headers_clickable">False</property>
+                        <property name="search_column">0</property>
+                        <signal name="button-press-event" handler="on_popup_menu" object="popup_menu" swapped="no"/>
+                        <signal name="cursor-changed" handler="on_cursor_changed" swapped="no"/>
+                        <signal name="key-press-event" handler="on_key_press" swapped="no"/>
+                        <signal name="select-all" handler="on_select_all" swapped="no"/>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection">
+                            <property name="mode">multiple</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="bouquet_name_column">
+                            <property name="title" translatable="yes">Name</property>
+                            <property name="expand">True</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="bq_name_renderer">
+                                <property name="xalign">0.019999999552965164</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="bouquet_type_column">
+                            <property name="title" translatable="yes">Type</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="bq_type_renderer">
+                                <property name="xalign">0.50999999046325684</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="bouquet_selected_column">
+                            <property name="title" translatable="yes">Selected</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererToggle" id="bq_selected_renderer">
+                                <property name="xalign">0.50999999046325684</property>
+                                <signal name="toggled" handler="on_selected_toggled" swapped="no"/>
+                              </object>
+                              <attributes>
+                                <attribute name="active">2</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -296,76 +220,10 @@ Author: Dmitriy Yefremov
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="services_box_frame">
+              <object class="GtkBox" id="services_box">
                 <property name="can_focus">False</property>
-                <property name="label_xalign">0.49000000953674316</property>
-                <property name="shadow_type">in</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkBox" id="services_box">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_left">5</property>
-                    <property name="margin_right">5</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="services_view_scrolled_window">
-                        <property name="width_request">150</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <object class="GtkTreeView" id="services_view">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="model">services_list_store</property>
-                            <property name="headers_clickable">False</property>
-                            <property name="search_column">0</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection"/>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="service_name_column">
-                                <property name="title" translatable="yes">Service</property>
-                                <property name="expand">True</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="info_name_renderer">
-                                    <property name="xalign">0.02</property>
-                                    <property name="ellipsize">end</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkTreeViewColumn" id="service_type_column">
-                                <property name="title" translatable="yes">Type</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="info_type_renderer">
-                                    <property name="xalign">0.50999999046325684</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="text">1</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
@@ -373,6 +231,65 @@ Author: Dmitriy Yefremov
                     <property name="margin_bottom">5</property>
                     <property name="label" translatable="yes">Bouquet details</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="services_view_scrolled_window">
+                    <property name="width_request">150</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkTreeView" id="services_view">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="model">services_list_store</property>
+                        <property name="headers_clickable">False</property>
+                        <property name="search_column">0</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection"/>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="service_name_column">
+                            <property name="title" translatable="yes">Service</property>
+                            <property name="expand">True</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="info_name_renderer">
+                                <property name="xalign">0.019999999552965164</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="service_type_column">
+                            <property name="title" translatable="yes">Type</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="info_type_renderer">
+                                <property name="xalign">0.50999999046325684</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -384,6 +301,62 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox" id="actions_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="valign">center</property>
+            <property name="margin_left">15</property>
+            <property name="margin_right">15</property>
+            <property name="margin_top">5</property>
+            <property name="margin_bottom">5</property>
+            <property name="layout_style">start</property>
+            <child>
+              <object class="GtkButton" id="import_button">
+                <property name="label" translatable="yes">Import</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Bouquets and services</property>
+                <property name="valign">center</property>
+                <property name="image">import_image</property>
+                <property name="always_show_image">True</property>
+                <signal name="clicked" handler="on_import" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="info_check_button">
+                <property name="label" translatable="yes">Details</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="tooltip_text" translatable="yes">Details</property>
+                <property name="valign">center</property>
+                <property name="image">details_image</property>
+                <property name="always_show_image">True</property>
+                <property name="draw_indicator">False</property>
+                <signal name="toggled" handler="on_info_button_toggled" swapped="no"/>
+                <accelerator key="i" signal="clicked"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>

app/ui/imports.py

@@ -20,7 +20,7 @@ def import_bouquet(transient, model, path, settings, services, appender, file_pa
 
     if profile is SettingsType.ENIGMA_2:
         pattern = ".{}".format(bq_type.value)
-        f_pattern = "userbouquet.*{}".format(pattern)
+        f_pattern = "*" + pattern if settings.is_darwin else "userbouquet.*{}".format(pattern)
     elif profile is SettingsType.NEUTRINO_MP:
         pattern = "webtv.xml" if bq_type is BqType.WEBTV else "bouquets.xml"
         f_pattern = "bouquets.xml"
@@ -33,11 +33,15 @@ def import_bouquet(transient, model, path, settings, services, appender, file_pa
     if file_path == Gtk.ResponseType.CANCEL:
         return
 
-    if not str(file_path).endswith(pattern):
+    if not file_path.endswith(pattern):
         show_dialog(DialogType.ERROR, transient, text="No bouquet file is selected!")
         return
 
     if profile is SettingsType.ENIGMA_2:
+        if settings.is_darwin and file_path.rfind("userbouquet.") < 0:
+            show_dialog(DialogType.ERROR, transient, text="No bouquet file is selected!")
+            return
+
         bq = get_enigma2_bouquet(file_path)
         imported = list(filter(lambda x: x.data in services or x.type is BqServiceType.IPTV, bq.services))
 
@@ -71,6 +75,7 @@ class ImportDialog:
     def __init__(self, transient, path, settings, service_ids, appender, bouquets=None):
         handlers = {"on_import": self.on_import,
                     "on_cursor_changed": self.on_cursor_changed,
+                    "on_info_button_toggled": self.on_info_button_toggled,
                     "on_selected_toggled": self.on_selected_toggled,
                     "on_info_bar_close": self.on_info_bar_close,
                     "on_select_all": self.on_select_all,
@@ -79,7 +84,7 @@ class ImportDialog:
                     "on_resize": self.on_resize,
                     "on_key_press": self.on_key_press}
 
-        builder = get_builder(UI_RESOURCES_PATH + "imports.glade", handlers)
+        builder = get_builder(UI_RESOURCES_PATH + "import_dialog.glade", handlers)
 
         self._bq_services = {}
         self._services = {}
@@ -95,8 +100,8 @@ class ImportDialog:
         self._main_view = builder.get_object("main_view")
         self._services_view = builder.get_object("services_view")
         self._services_model = builder.get_object("services_list_store")
+        self._services_box = builder.get_object("services_box")
         self._info_check_button = builder.get_object("info_check_button")
-        self._info_check_button.bind_property("active", builder.get_object("services_box_frame"), "visible")
         self._info_bar = builder.get_object("info_bar")
         self._message_label = builder.get_object("message_label")
         window_size = self._settings.get("import_dialog_window_size")
@@ -195,6 +200,10 @@ class ImportDialog:
             else:
                 self._services_model.append((bq_srv.name, bq_srv.type.value))
 
+    def on_info_button_toggled(self, button):
+        active = button.get_active()
+        self._services_box.set_visible(active)
+
     def on_selected_toggled(self, toggle, path):
         self._main_model.set_value(self._main_model.get_iter(path), 2, not toggle.get_active())
 

app/ui/iptv.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import concurrent.futures
 import os
 import re
@@ -48,7 +20,7 @@ from app.ui.main_helper import get_base_model, get_iptv_url, on_popup_menu, get_
 from app.ui.uicommons import (Gtk, Gdk, UI_RESOURCES_PATH, IPTV_ICON, Column, KeyboardKey, get_yt_icon)
 
 _DIGIT_ENTRY_NAME = "digit-entry"
-_ENIGMA2_REFERENCE = "{}:{}:{}:{:X}:{:X}:{:X}:{:X}:0:0:0"
+_ENIGMA2_REFERENCE = "{}:0:{}:{:X}:{:X}:{:X}:{:X}:0:0:0"
 _PATTERN = re.compile("(?:^[\\s]*$|\\D)")
 _UI_PATH = UI_RESOURCES_PATH + "iptv.glade"
 
@@ -104,7 +76,6 @@ class IptvDialog:
         self._url_entry = builder.get_object("url_entry")
         self._reference_entry = builder.get_object("reference_entry")
         self._srv_type_entry = builder.get_object("srv_type_entry")
-        self._srv_id_entry = builder.get_object("srv_id_entry")
         self._sid_entry = builder.get_object("sid_entry")
         self._tr_id_entry = builder.get_object("tr_id_entry")
         self._net_id_entry = builder.get_object("net_id_entry")
@@ -120,8 +91,8 @@ class IptvDialog:
         # style
         self._style_provider = Gtk.CssProvider()
         self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
-        self._digit_elems = (self._srv_id_entry, self._srv_type_entry, self._sid_entry, self._tr_id_entry,
-                             self._net_id_entry, self._namespace_entry)
+        self._digit_elems = (self._srv_type_entry, self._sid_entry, self._tr_id_entry, self._net_id_entry,
+                             self._namespace_entry)
         for el in self._digit_elems:
             el.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
                                                            Gtk.STYLE_PROVIDER_PRIORITY_USER)
@@ -196,7 +167,6 @@ class IptvDialog:
         except ValueError:
             self.show_info_message("Unknown stream type {}".format(s_type), Gtk.MessageType.ERROR)
 
-        self._srv_id_entry.set_text(data[1])
         self._srv_type_entry.set_text(data[2])
         self._sid_entry.set_text(str(int(data[3], 16)))
         self._tr_id_entry.set_text(str(int(data[4], 16)))
@@ -214,7 +184,6 @@ class IptvDialog:
         if self._s_type is SettingsType.ENIGMA_2 and is_data_correct(self._digit_elems):
             self.on_url_changed(self._url_entry)
             self._reference_entry.set_text(_ENIGMA2_REFERENCE.format(self.get_type(),
-                                                                     self._srv_id_entry.get_text(),
                                                                      self._srv_type_entry.get_text(),
                                                                      int(self._sid_entry.get_text()),
                                                                      int(self._tr_id_entry.get_text()),
@@ -299,7 +268,6 @@ class IptvDialog:
     def save_enigma2_data(self):
         name = self._name_entry.get_text().strip()
         fav_id = ENIGMA2_FAV_ID_FORMAT.format(self.get_type(),
-                                              self._srv_id_entry.get_text(),
                                               self._srv_type_entry.get_text(),
                                               int(self._sid_entry.get_text()),
                                               int(self._tr_id_entry.get_text()),
@@ -326,14 +294,14 @@ class IptvDialog:
             self._bouquet[self._paths[0][0]] = fav_id
             self._model.set(self._model.get_iter(self._paths), {Column.FAV_SERVICE: name, Column.FAV_ID: fav_id})
         else:
-            aggr = [None] * 10
             s_type = BqServiceType.IPTV.name
-            srv = (None, None, name, None, None, s_type, None, fav_id, *aggr[0:3])
+            srv = (None, None, name, None, None, s_type, None, fav_id, None, None, None)
             itr = self._model.insert_after(self._model.get_iter(self._paths[0]),
                                            srv) if self._paths else self._model.insert(0, srv)
             self._model.set_value(itr, 1, IPTV_ICON)
             self._bouquet.insert(self._model.get_path(itr)[0], fav_id)
-            self._services[fav_id] = Service(None, None, IPTV_ICON, name, *aggr[0:3], s_type, *aggr, fav_id, None)
+            self._services[fav_id] = Service(None, None, IPTV_ICON, name, None, None, None, s_type, None,
+                                             None, None, None, None, None, None, None, None, None, fav_id, None)
 
     @run_idle
     def on_info_bar_close(self, bar=None, resp=None):
@@ -436,7 +404,6 @@ class IptvListDialog:
                     "on_response": self.on_response,
                     "on_stream_type_default_togged": self.on_stream_type_default_togged,
                     "on_stream_type_changed": self.on_stream_type_changed,
-                    "on_default_id_toggled": self.on_default_id_toggled,
                     "on_default_type_toggled": self.on_default_type_toggled,
                     "on_auto_sid_toggled": self.on_auto_sid_toggled,
                     "on_default_tid_toggled": self.on_default_tid_toggled,
@@ -458,32 +425,25 @@ class IptvListDialog:
         self._info_bar = builder.get_object("list_configuration_info_bar")
         self._reference_label = builder.get_object("reference_label")
         self._stream_type_check_button = builder.get_object("stream_type_default_check_button")
-        self._id_default_check_button = builder.get_object("id_default_check_button")
         self._type_check_button = builder.get_object("type_default_check_button")
         self._sid_auto_check_button = builder.get_object("sid_auto_check_button")
         self._tid_check_button = builder.get_object("tid_default_check_button")
         self._nid_check_button = builder.get_object("nid_default_check_button")
         self._namespace_check_button = builder.get_object("namespace_default_check_button")
         self._stream_type_combobox = builder.get_object("stream_type_list_combobox")
-        self._list_srv_id_entry = builder.get_object("list_srv_id_entry")
         self._list_srv_type_entry = builder.get_object("list_srv_type_entry")
         self._list_sid_entry = builder.get_object("list_sid_entry")
         self._list_tid_entry = builder.get_object("list_tid_entry")
         self._list_nid_entry = builder.get_object("list_nid_entry")
         self._list_namespace_entry = builder.get_object("list_namespace_entry")
         self._apply_button = builder.get_object("list_configuration_apply_button")
-        self._cancel_button = builder.get_object("cancel_config_list_button")
-        self._ok_button = builder.get_object("list_configuration_ok_button")
-        self._ok_button.bind_property("visible", self._apply_button, "visible", 4)
-        self._ok_button.bind_property("visible", self._cancel_button, "visible", 4)
         # Style
         style_provider = Gtk.CssProvider()
         style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
-        self._default_elems = (self._stream_type_check_button, self._id_default_check_button, self._type_check_button,
-                               self._sid_auto_check_button, self._tid_check_button, self._nid_check_button,
-                               self._namespace_check_button)
-        self._digit_elems = (self._list_srv_id_entry, self._list_srv_type_entry, self._list_sid_entry,
-                             self._list_tid_entry, self._list_nid_entry, self._list_namespace_entry)
+        self._default_elems = (self._stream_type_check_button, self._type_check_button, self._sid_auto_check_button,
+                               self._tid_check_button, self._nid_check_button, self._namespace_check_button)
+        self._digit_elems = (self._list_srv_type_entry, self._list_sid_entry, self._list_tid_entry,
+                             self._list_nid_entry, self._list_namespace_entry)
         for el in self._digit_elems:
             el.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), style_provider,
                                                            Gtk.STYLE_PROVIDER_PRIORITY_USER)
@@ -505,28 +465,30 @@ class IptvListDialog:
             self._stream_type_combobox.set_active(1)
         self._stream_type_combobox.set_sensitive(not button.get_active())
 
-    def on_default_id_toggled(self, button):
-        self.set_default(button, self._list_srv_id_entry, "0")
-
     def on_default_type_toggled(self, button):
-        self.set_default(button, self._list_srv_type_entry, "1")
+        if button.get_active():
+            self._list_srv_type_entry.set_text("1")
+        self._list_srv_type_entry.set_sensitive(not button.get_active())
 
     def on_auto_sid_toggled(self, button):
-        self.set_default(button, self._list_sid_entry, "0")
+        if button.get_active():
+            self._list_sid_entry.set_text("0")
+        self._list_sid_entry.set_sensitive(not button.get_active())
 
     def on_default_tid_toggled(self, button):
-        self.set_default(button, self._list_tid_entry, "0")
+        if button.get_active():
+            self._list_tid_entry.set_text("0")
+        self._list_tid_entry.set_sensitive(not button.get_active())
 
     def on_default_nid_toggled(self, button):
-        self.set_default(button, self._list_nid_entry, "0")
+        if button.get_active():
+            self._list_nid_entry.set_text("0")
+        self._list_nid_entry.set_sensitive(not button.get_active())
 
     def on_default_namespace_toggled(self, button):
-        self.set_default(button, self._list_namespace_entry, "0")
-
-    def set_default(self, button, entry, value):
         if button.get_active():
-            entry.set_text(value)
-        entry.set_sensitive(not button.get_active())
+            self._list_namespace_entry.set_text("0")
+        self._list_namespace_entry.set_sensitive(not button.get_active())
 
     @run_idle
     def on_reset_to_default(self, item):
@@ -558,7 +520,7 @@ class IptvListDialog:
             self.update_reference()
 
     def is_default_values(self):
-        return any(el.get_text() == "0" for el in self._digit_elems[3:])
+        return any(el.get_text() == "0" for el in self._digit_elems[2:])
 
     def is_all_data_default(self):
         return all(el.get_active() for el in self._default_elems)
@@ -581,35 +543,31 @@ class IptvListConfigurationDialog(IptvListDialog):
             return
 
         if self._s_type is SettingsType.ENIGMA_2:
-            id_default = self._id_default_check_button.get_active()
             type_default = self._type_check_button.get_active()
             tid_default = self._tid_check_button.get_active()
             sid_auto = self._sid_auto_check_button.get_active()
             nid_default = self._nid_check_button.get_active()
             namespace_default = self._namespace_check_button.get_active()
-            all_default = self.is_all_data_default()
 
-            st_type = get_stream_type(self._stream_type_combobox)
-            s_id = "0" if id_default else self._list_srv_id_entry.get_text()
+            stream_type = get_stream_type(self._stream_type_combobox)
             srv_type = "1" if type_default else self._list_srv_type_entry.get_text()
-            sid = "0" if sid_auto else self._list_sid_entry.get_text()
-            tid = "0" if tid_default else f"{int(self._list_tid_entry.get_text()):X}"
-            nid = "0" if nid_default else f"{int(self._list_nid_entry.get_text()):X}"
-            namespace = "0" if namespace_default else f"{int(self._list_namespace_entry.get_text()):X}"
+            tid = "0" if tid_default else "{:X}".format(int(self._list_tid_entry.get_text()))
+            nid = "0" if nid_default else "{:X}".format(int(self._list_nid_entry.get_text()))
+            namespace = "0" if namespace_default else "{:X}".format(int(self._list_namespace_entry.get_text()))
 
             for index, row in enumerate(self._rows):
                 fav_id = row[Column.FAV_ID]
                 data, sep, desc = fav_id.partition("http")
                 data = data.split(":")
 
-                if all_default:
-                    data[1], data[2], data[3], data[4], data[5], data[6] = "010000"
+                if self.is_all_data_default():
+                    data[2], data[3], data[4], data[5], data[6] = "10000"
                 else:
-                    data[0], data[1], data[2], data[4], data[5], data[6] = st_type, s_id, srv_type, tid, nid, namespace
+                    data[0], data[2], data[4], data[5], data[6] = stream_type, srv_type, tid, nid, namespace
+                    data[3] = "{:X}".format(index) if sid_auto else "0"
 
-                data[3] = f"{index:X}" if sid_auto else sid
                 data = ":".join(data)
-                new_fav_id = f"{data}{sep}{desc}"
+                new_fav_id = "{}{}{}".format(data, sep, desc)
                 row[Column.FAV_ID] = new_fav_id
                 srv = self._services.pop(fav_id, None)
 
@@ -620,7 +578,6 @@ class IptvListConfigurationDialog(IptvListDialog):
             list(map(lambda r: self._bouquet.append(r[Column.FAV_ID]), self._fav_model))
 
             self._info_bar.set_visible(True)
-            self._ok_button.set_visible(True)
 
 
 class M3uImportDialog(IptvListDialog):
@@ -631,7 +588,7 @@ class M3uImportDialog(IptvListDialog):
 
         self._app = app
         self._picons = app._picons
-        self._pic_path = app._settings.profile_picons_path
+        self._pic_path = app._settings.picons_local_path
         self._services = None
         self._url_count = 0
         self._errors_count = 0
@@ -665,7 +622,7 @@ class M3uImportDialog(IptvListDialog):
         extra_box.pack_start(self._info_label, False, False, 5)
         extra_box.pack_end(self._picon_box, True, True, 5)
 
-        frame = Gtk.Frame(visible=True, margin_bottom=5)
+        frame = Gtk.Frame(visible=True)
         frame.add(extra_box)
         self._data_box.add(frame)
 
@@ -681,7 +638,7 @@ class M3uImportDialog(IptvListDialog):
                     GLib.idle_add(self._picon_box.set_sensitive, True)
                     break
         finally:
-            msg = f"{get_message('Streams detected:')} {len(self._services) if self._services else 0}."
+            msg = "{} {}.".format(get_message("Streams detected:"), len(self._services) if self._services else 0)
             GLib.idle_add(self._info_label.set_text, msg)
             GLib.idle_add(self._spinner.set_property, "active", False)
 
@@ -696,12 +653,9 @@ class M3uImportDialog(IptvListDialog):
         if not self.is_all_data_default():
             services = []
             params = [int(el.get_text()) for el in self._digit_elems]
-            s_id = params[0]
-            s_type = params[1]
-            params = params[2:]
-            st_type = get_stream_type(self._stream_type_combobox)
-            sid_auto = self._sid_auto_check_button.get_active()
-            sid = 0 if sid_auto else int(self._list_sid_entry.get_text())
+            s_type = params[0]
+            params = params[1:]
+            stream_type = get_stream_type(self._stream_type_combobox)
 
             for i, s in enumerate(self._services, start=params[0]):
                 # Skipping markers.
@@ -709,9 +663,9 @@ class M3uImportDialog(IptvListDialog):
                     services.append(s)
                     continue
 
-                params[0] = i if sid_auto else sid
-                picon_id = "{}_{}_{:X}_{:X}_{:X}_{:X}_{:X}_0_0_0.png".format(st_type, s_id, s_type, *params)
-                fav_id = get_fav_id(s.data_id, s.service, self._s_type, params, st_type, s_id, s_type)
+                params[0] = i
+                picon_id = "{}_0_{:X}_{:X}_{:X}_{:X}_{:X}_0_0_0.png".format(stream_type, s_type, *params)
+                fav_id = get_fav_id(s.data_id, s.service, self._s_type, params, stream_type, s_type)
                 if s.picon:
                     picons[s.picon] = picon_id
 
@@ -725,7 +679,6 @@ class M3uImportDialog(IptvListDialog):
 
             self.download_picons(picons)
         else:
-            GLib.idle_add(self._ok_button.set_visible, True)
             GLib.idle_add(self._info_bar.set_visible, True, priority=GLib.PRIORITY_LOW)
 
         self._app.append_imported_services(services)
@@ -769,16 +722,16 @@ class M3uImportDialog(IptvListDialog):
     @run_idle
     def on_picon_load_done(self, data, user_data):
         try:
-            self._info_label.set_text(f"Processing: {user_data}")
+            self._info_label.set_text("Processing: {}".format(user_data))
             f = Gio.MemoryInputStream.new_from_data(data)
             pixbuf = GdkPixbuf.Pixbuf.new_from_stream_at_scale(f, 220, 132, False, self._cancellable)
-            path = f"{self._pic_path}{user_data}"
+            path = "{}{}".format(self._pic_path, user_data)
             pixbuf.savev(path, "png", [], [])
             self._picons[user_data] = get_picon_pixbuf(path)
         except GLib.GError as e:
             self.update_progress(1)
             if e.code != Gio.IOErrorEnum.CANCELLED:
-                log(f"Loading picon [{user_data}] data error: {e}")
+                log("Loading picon [{}] data error: {}".format(user_data, e))
         else:
             self.update_progress()
 
@@ -794,14 +747,14 @@ class M3uImportDialog(IptvListDialog):
         self._progress_bar.set_visible(False)
         self._progress_bar.set_fraction(0.0)
         self._apply_button.set_sensitive(True)
-        self._info_label.set_text(f"Errors: {self._errors_count}.")
+        self._info_label.set_text("Errors: {}.".format(self._errors_count))
         self._is_download = False
 
         gen = self.update_fav_model()
         GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
 
     def update_fav_model(self):
-        services = self._app.current_services
+        services = self._app._services
         picons = self._app._picons
         model = self._app.fav_view.get_model()
         for r in model:
@@ -809,9 +762,7 @@ class M3uImportDialog(IptvListDialog):
             if s:
                 model.set_value(r.iter, Column.FAV_PICON, picons.get(s.picon_id, None))
                 yield True
-
         self._info_bar.set_visible(True)
-        self._ok_button.set_visible(True)
         yield True
 
     def on_response(self, dialog, response):
@@ -875,14 +826,10 @@ class YtListImportDialog:
         self._import_button.bind_property("visible", self._quality_box, "visible")
         self._import_button.bind_property("sensitive", self._quality_box, "sensitive")
         self._receive_button.bind_property("sensitive", self._import_button, "sensitive")
-
-        window_size = self._settings.get("yt_import_dialog_size")
-        if window_size:
-            self._dialog.resize(*window_size)
-        # Style
-        style_provider = Gtk.CssProvider()
-        style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
-        self._url_entry.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), style_provider,
+        # style
+        self._style_provider = Gtk.CssProvider()
+        self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
+        self._url_entry.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
                                                                     Gtk.STYLE_PROVIDER_PRIORITY_USER)
 
     def show(self):
@@ -927,6 +874,7 @@ class YtListImportDialog:
             self.update_active_elements(True)
 
     def on_receive(self, item):
+        self.show_invisible_elements()
         self.update_active_elements(False)
         self._model.clear()
         self._yt_count_label.set_text("0")
@@ -960,13 +908,13 @@ class YtListImportDialog:
 
     @run_idle
     def append_services(self, links):
-        aggr = [None] * 9
         srvs = []
 
         if self._yt_list_title:
             title = self._yt_list_title
             fav_id = MARKER_FORMAT.format(0, title, title)
-            mk = Service(None, None, None, title, *aggr[0:3], BqServiceType.MARKER.name, *aggr, 0, fav_id, None)
+            mk = Service(None, None, None, title, None, None, None, BqServiceType.MARKER.name, None,
+                         None, None, None, None, None, None, None, None, 0, fav_id, None)
             srvs.append(mk)
 
         act = self._quality_model.get_value(self._quality_box.get_active_iter(), 0)
@@ -976,7 +924,8 @@ class YtListImportDialog:
                 continue
             ln = lnk.get(act) if act in lnk else lnk[sorted(lnk, key=lambda x: int(x.rstrip("p")), reverse=True)[0]]
             fav_id = get_fav_id(ln, title, self._s_type)
-            srv = Service(None, None, IPTV_ICON, title, *aggr[0:3], BqServiceType.IPTV.name, *aggr, None, fav_id, None)
+            srv = Service(None, None, IPTV_ICON, title, None, None, None, BqServiceType.IPTV.name, None, None, None,
+                          None, None, None, None, None, None, None, fav_id, None)
             srvs.append(srv)
         self.appender(srvs)
 
@@ -985,6 +934,11 @@ class YtListImportDialog:
         self._url_entry.set_sensitive(sensitive)
         self._receive_button.set_sensitive(sensitive)
 
+    def show_invisible_elements(self):
+        self._list_view_scrolled_window.set_visible(True)
+        self._info_bar_box.set_visible(True)
+        self._dialog.set_resizable(True)
+
     def on_url_entry_changed(self, entry):
         url_str = entry.get_text()
         yt_id = YouTube.get_yt_list_id(url_str)
@@ -1040,9 +994,7 @@ class YtListImportDialog:
     def on_close(self, window, event):
         if self._download_task and show_dialog(DialogType.QUESTION, self._dialog) == Gtk.ResponseType.CANCEL:
             return True
-
         self._download_task = False
-        self._settings.add("yt_import_dialog_size", self._dialog.get_size())
 
 
 if __name__ == "__main__":

app/ui/logs.glade

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 
-
-The MIT License (MIT)
-
-Copyright (c) 2018-2021 Dmitriy Yefremov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Author: Dmitriy Yefremov
-
--->
-<interface domain="demon-editor">
-  <requires lib="gtk+" version="3.18"/>
-  <!-- interface-css-provider-path style.css -->
-  <!-- interface-license-type mit -->
-  <!-- interface-name DemonEditor -->
-  <!-- interface-description Enigma2 channel and satellite list editor. -->
-  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
-  <!-- interface-authors Dmitriy Yefremov -->
-  <object class="GtkFrame" id="log_frame">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="label_xalign">0.49000000953674316</property>
-    <property name="shadow_type">in</property>
-    <child>
-      <object class="GtkBox" id="main_box">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">5</property>
-        <property name="margin_right">5</property>
-        <property name="margin_bottom">5</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkBox" id="header_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_bottom">2</property>
-            <property name="spacing">5</property>
-            <child>
-              <object class="GtkButton" id="clear_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Clear</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="on_clear" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="clear_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-clear</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolled_window">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkTextView" id="log_view">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="editable">False</property>
-                <property name="left_margin">5</property>
-                <property name="right_margin">5</property>
-                <property name="top_margin">5</property>
-                <property name="bottom_margin">5</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child type="label">
-      <object class="GtkLabel" id="log_label">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Logs</property>
-      </object>
-    </child>
-  </object>
-</interface>

app/ui/logs.py

@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
-import logging
-
-from gi.repository import GLib
-
-from app.commons import LOGGER_NAME
-from app.ui.dialogs import get_builder
-from app.ui.main_helper import append_text_to_tview
-from app.ui.uicommons import Gtk, UI_RESOURCES_PATH
-
-
-class LogsClient(Gtk.Box):
-    """ Logger GUI client. """
-
-    class LogHandler(logging.Handler):
-        def __init__(self, view):
-            logging.Handler.__init__(self)
-            self._view = view
-
-        def handle(self, rec):
-            GLib.idle_add(append_text_to_tview, f"{rec.msg}\n", self._view)
-
-    def __init__(self, app, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._app = app
-
-        handlers = {"on_clear": self.on_clear}
-        builder = get_builder(UI_RESOURCES_PATH + "logs.glade", handlers)
-
-        self._log_view = builder.get_object("log_view")
-        self.pack_start(builder.get_object("log_frame"), True, True, 0)
-
-        logger = logging.getLogger(LOGGER_NAME)
-        logger.addHandler(LogsClient.LogHandler(self._log_view))
-
-        self.show()
-
-    def on_clear(self, button):
-        GLib.idle_add(self._log_view.get_buffer().set_text, "")

app/ui/mac_style.css

@@ -1,43 +0,0 @@
-* {
-  -GtkDialog-action-area-border: 6em;
-  -GtkDialog-button-spacing: 12;
-}
-
-entry {
-  min-height: 2.0em;
-}
-
-button {
-  min-height: 1.5em;
-  min-width: 1em;
-  padding-left: 0.4em;
-  padding-right: 0.4em;
-  padding-top: 0.1em;
-  padding-bottom: 0.1em;
-}
-
-spinbutton {
-  min-height: 1.5em;
-}
-
-toolbutton {
-  padding: 0.1em;
-}
-
-spinner {
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-infobar {
-  min-height: 2em;
-}
-
-switch slider {
-  min-height: 1.5em;
-  min-width: 1.5em;
-}
-
-.dialog-action-area button {
-  margin-bottom: 0.6em;
-}

app/ui/main_helper.py

@@ -1,51 +1,16 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
-""" Helper module for the GUI. """
-
-__all__ = ("insert_marker", "move_items", "rename", "ViewTarget", "set_flags", "locate_in_services",
-           "scroll_to", "get_base_model", "update_picons_data", "copy_picon_reference", "assign_picons",
-           "remove_picon", "is_only_one_item_selected", "gen_bouquets", "BqGenType", "append_picons",
-           "get_selection", "get_model_data", "remove_all_unused_picons", "get_picon_pixbuf", "get_base_itrs",
-           "get_iptv_url", "update_entry_data", "append_text_to_tview", "on_popup_menu")
-
+""" Helper module for the ui. """
 import os
 import shutil
-from collections import defaultdict
 from urllib.parse import unquote
 
 from gi.repository import GdkPixbuf, GLib
 
+from app.commons import run_task
 from app.eparser import Service
 from app.eparser.ecommons import Flag, BouquetService, Bouquet, BqType
 from app.eparser.enigma.bouquets import BqServiceType, to_bouquet_id
-from app.settings import SettingsType, SEP, IS_WIN
-from .dialogs import show_dialog, DialogType, get_chooser_dialog
+from app.settings import SettingsType
+from .dialogs import show_dialog, DialogType, get_chooser_dialog, WaitDialog
 from .uicommons import ViewTarget, BqGenType, Gtk, Gdk, HIDE_ICON, LOCKED_ICON, KeyboardKey, Column
 
 
@@ -72,7 +37,7 @@ def insert_marker(view, bouquets, selected_bouquet, services, parent_window, m_t
     marker = (None, None, text, 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)
     bouquets[selected_bouquet].insert(model.get_path(itr)[0], fav_id)
-    services[fav_id] = Service(None, None, None, text, None, None, None, s_type, *[None] * 9, 0, fav_id, None)
+    services[fav_id] = Service(None, None, None, text, None, None, None, s_type, None, None, None, None, None, None, None, None, None, 0, fav_id, None)
 
 
 # ***************** Movement *******************#
@@ -315,7 +280,7 @@ def set_hide(services, model, paths):
     for path in paths:
         itr = model.get_iter(path)
         model.set_value(itr, col_num, None if hide else HIDE_ICON)
-        flags = [*model.get_value(itr, 0).split(",")]
+        flags = list(model.get_value(itr, 0).split(","))
         index, flag = None, None
         for i, fl in enumerate(flags):
             if fl.startswith("f:"):
@@ -419,10 +384,6 @@ def assign_picons(target, srv_view, fav_view, transient, picons, settings, servi
         if src_path == Gtk.ResponseType.CANCEL:
             return picons_files
 
-    if IS_WIN:
-        src_path = src_path.lstrip("/")
-        dst_path = dst_path.lstrip("/") if dst_path else dst_path
-
     if not str(src_path).endswith(".png") or not os.path.isfile(src_path):
         show_dialog(DialogType.ERROR, transient, text="No png file is selected!")
         return picons_files
@@ -441,7 +402,7 @@ def assign_picons(target, srv_view, fav_view, transient, picons, settings, servi
         picon_id = services.get(fav_id)[Column.SRV_PICON_ID]
 
         if picon_id:
-            picons_path = dst_path or settings.profile_picons_path
+            picons_path = dst_path or settings.picons_local_path
             os.makedirs(os.path.dirname(picons_path), exist_ok=True)
             picon_file = picons_path + picon_id
             try:
@@ -538,8 +499,8 @@ def remove_all_unused_picons(settings, picons, services):
 
 
 def remove_picons(settings, picon_ids, picons):
-    pions_path = settings.profile_picons_path
-    backup_path = "{}{}{}".format(settings.profile_backup_path, "picons", SEP)
+    pions_path = settings.picons_local_path
+    backup_path = settings.backup_local_path + "picons/"
     os.makedirs(os.path.dirname(backup_path), exist_ok=True)
     for p_id in picon_ids:
         picons[p_id] = None
@@ -567,16 +528,10 @@ def get_picon_pixbuf(path, size=32):
         pass
 
 
-# ***************** Bouquets ********************* #
+# ***************** Bouquets *********************#
 
 def gen_bouquets(view, bq_view, transient, gen_type, s_type, callback):
-    """ Auto-generate and append list of bouquets. """
-    model, paths = view.get_selection().get_selected_rows()
-    single_types = (BqGenType.SAT, BqGenType.PACKAGE, BqGenType.TYPE)
-    if gen_type in single_types:
-        if not is_only_one_item_selected(paths, transient):
-            return
-
+    """ Auto-generate and append list of bouquets """
     fav_id_index = Column.SRV_FAV_ID
     index = Column.SRV_TYPE
     if gen_type in (BqGenType.PACKAGE, BqGenType.EACH_PACKAGE):
@@ -584,41 +539,50 @@ def gen_bouquets(view, bq_view, transient, gen_type, s_type, callback):
     elif gen_type in (BqGenType.SAT, BqGenType.EACH_SAT):
         index = Column.SRV_POS
 
-    # Splitting services [caching] by column value.
-    s_data = defaultdict(list)
-    for row in model:
-        s_data[row[index]].append(BouquetService(None, BqServiceType.DEFAULT, row[fav_id_index], 0))
-
+    model, paths = view.get_selection().get_selected_rows()
     bq_type = BqType.BOUQUET.value if s_type is SettingsType.NEUTRINO_MP else BqType.TV.value
-    bq_index = 0 if s_type is SettingsType.ENIGMA_2 else 1
-    bq_root_iter = bq_view.get_model().get_iter(bq_index)
-    srv = Service(*model[paths][:Column.SRV_TOOLTIP])
-    cond = srv.package if gen_type is BqGenType.PACKAGE else srv.pos if gen_type is BqGenType.SAT else srv.service_type
-    bq_view.expand_row(Gtk.TreePath(bq_index), 0)
-
-    bq_names = get_bouquets_names(bq_view.get_model())
-
-    if gen_type in single_types:
-        if cond in bq_names:
-            show_dialog(DialogType.ERROR, transient, "A bouquet with that name exists!")
-        else:
-            callback(Bouquet(cond, bq_type, s_data.get(cond)), bq_root_iter)
+    if gen_type in (BqGenType.SAT, BqGenType.PACKAGE, BqGenType.TYPE):
+        if not is_only_one_item_selected(paths, transient):
+            return
+        service = Service(*model[paths][:Column.SRV_TOOLTIP])
+        append_bouquets(bq_type, bq_view, callback, fav_id_index, index, model,
+                        [service.package if gen_type is BqGenType.PACKAGE else
+                         service.pos if gen_type is BqGenType.SAT else service.service_type], s_type)
     else:
-        # We add a bouquet only if the given name is missing [keys - names]!
-        for name in sorted(s_data.keys() - bq_names):
-            callback(Bouquet(name, BqType.TV.value, s_data.get(name)), bq_root_iter)
+        wait_dialog = WaitDialog(transient)
+        wait_dialog.show()
+        append_bouquets(bq_type, bq_view, callback, fav_id_index, index, model,
+                        {row[index] for row in model}, s_type, wait_dialog)
+
+
+@run_task
+def append_bouquets(bq_type, bq_view, callback, fav_id_index, index, model, names, s_type, wait_dialog=None):
+    bq_index = 0 if s_type is SettingsType.ENIGMA_2 else 1
+    bq_view.expand_row(Gtk.TreePath(bq_index), 0)
+    bqs_model = bq_view.get_model()
+    bouquets_names = get_bouquets_names(bqs_model)
+
+    for pos, name in enumerate(sorted(names)):
+        if name not in bouquets_names:
+            services = [BouquetService(None, BqServiceType.DEFAULT, row[fav_id_index], 0)
+                        for row in model if row[index] == name]
+            callback(Bouquet(name=name, type=bq_type, services=services, locked=None, hidden=None),
+                     bqs_model.get_iter(bq_index))
+
+    if wait_dialog is not None:
+        wait_dialog.destroy()
 
 
 def get_bouquets_names(model):
     """ Returns all current bouquets names """
-    bouquets_names = set()
+    bouquets_names = []
     for row in model:
         itr = row.iter
         if model.iter_has_child(itr):
             num_of_children = model.iter_n_children(itr)
             for num in range(num_of_children):
                 child_itr = model.iter_nth_child(itr, num)
-                bouquets_names.add(model[child_itr][0])
+                bouquets_names.append(model[child_itr][0])
     return bouquets_names
 
 
@@ -626,7 +590,9 @@ def get_bouquets_names(model):
 
 def update_entry_data(entry, dialog, settings):
     """ Updates value in text entry from chooser dialog. """
-    response = show_dialog(dialog_type=DialogType.CHOOSER, transient=dialog, settings=settings, create_dir=True)
+    response = show_dialog(dialog_type=DialogType.CHOOSER, transient=dialog, settings=settings,
+                           action_type=Gtk.FileChooserAction.CREATE_FOLDER if settings.is_darwin else None,
+                           create_dir=True)
     if response not in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
         entry.set_text(response)
         return response
@@ -659,7 +625,7 @@ def get_base_paths(paths, model):
 def get_model_data(view):
     """ Returns model name and base model from the given view """
     model = get_base_model(view.get_model())
-    model_name = model.get_name() if model else ""
+    model_name = model.get_name()
     return model_name, model
 
 

app/ui/playback.glade

@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkEventBox" id="event_box">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <signal name="button-press-event" handler="on_press" swapped="no"/>
-    <signal name="realize" handler="on_realize" swapped="no"/>
-    <child>
-      <placeholder/>
-    </child>
-  </object>
-  <object class="GtkToolbar" id="tool_bar">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkToolButton" id="prev_button">
-        <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Previous stream in the list</property>
-        <property name="use_underline">True</property>
-        <property name="stock_id">gtk-media-previous</property>
-        <signal name="clicked" handler="on_previous" swapped="no"/>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="homogeneous">False</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkToolButton" id="play_button">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Play</property>
-        <property name="action_name">app.on_play</property>
-        <property name="stock_id">gtk-media-play</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="homogeneous">False</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkToolButton" id="stop_button">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Stop playback</property>
-        <property name="action_name">app.on_stop</property>
-        <property name="use_underline">True</property>
-        <property name="stock_id">gtk-media-stop</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="homogeneous">False</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkToolButton" id="next_button">
-        <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Next stream in the list</property>
-        <property name="use_underline">True</property>
-        <property name="stock_id">gtk-media-next</property>
-        <signal name="clicked" handler="on_next" swapped="no"/>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="homogeneous">False</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkToolItem" id="player_item">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkBox" id="rewind_box">
-            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="spacing">2</property>
-            <child>
-              <object class="GtkLabel" id="current_time_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScale" id="scale">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="restrict_to_fill_level">False</property>
-                <property name="fill_level">0</property>
-                <property name="draw_value">False</property>
-                <property name="has_origin">False</property>
-                <signal name="change-value" handler="on_rewind" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="full_time_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">0</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="homogeneous">True</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkToolItem" id="extras_item">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkBox" id="extras_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="spacing">2</property>
-            <child>
-              <object class="GtkMenuButton" id="audio_menu_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">True</property>
-                <property name="relief">none</property>
-                <child>
-                  <object class="GtkImage" id="audio_menu_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Audio Track</property>
-                    <property name="icon_name">audio-volume-high</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="video_menu_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">True</property>
-                <property name="relief">none</property>
-                <child>
-                  <object class="GtkImage" id="video_menu_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Aspect ratio</property>
-                    <property name="icon_name">view-restore</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="subtitle_menu_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">True</property>
-                <property name="relief">none</property>
-                <child>
-                  <object class="GtkImage" id="subtitle_menu_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Subtitle Track</property>
-                    <property name="icon_name">format-text-underline</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="homogeneous">False</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkToolButton" id="full_button">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Toggle in fullscreen</property>
-        <property name="use_underline">True</property>
-        <property name="stock_id">gtk-fullscreen</property>
-        <signal name="clicked" handler="on_full_screen" swapped="no"/>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="homogeneous">False</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkToolButton" id="close_button">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes">Close playback</property>
-        <property name="use_underline">True</property>
-        <property name="stock_id">gtk-close</property>
-        <signal name="clicked" handler="on_close" swapped="no"/>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="homogeneous">False</property>
-      </packing>
-    </child>
-  </object>
-</interface>

app/ui/playback.py

@@ -1,416 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
-""" Additional module for playback. """
-from functools import lru_cache
-
-from gi.repository import GLib, GObject, Gio
-
-from app.commons import run_idle, run_with_delay
-from app.connections import HttpAPI
-from app.eparser.ecommons import BqServiceType
-from app.settings import PlayStreamsMode, IS_DARWIN, SettingsType
-from app.tools.media import Player
-from app.ui.dialogs import get_builder, get_message
-from app.ui.main_helper import get_iptv_url
-from app.ui.uicommons import Gtk, Gdk, UI_RESOURCES_PATH, FavClickMode, Column, IS_GNOME_SESSION, Page
-
-
-class PlayerBox(Gtk.Box):
-
-    def __init__(self, app, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # Signals.
-        GObject.signal_new("playback-full-screen", self, GObject.SIGNAL_RUN_LAST,
-                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
-        GObject.signal_new("playback-close", self, GObject.SIGNAL_RUN_LAST,
-                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
-        GObject.signal_new("play", self, GObject.SIGNAL_RUN_LAST,
-                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
-        GObject.signal_new("stop", self, GObject.SIGNAL_RUN_LAST,
-                           GObject.TYPE_PYOBJECT, (GObject.TYPE_PYOBJECT,))
-
-        self._app = app
-        self._app.connect("fav-clicked", self.on_fav_clicked)
-        self._app.connect("page-changed", self.on_page_changed)
-        self._app.connect("play-current", self.on_play_current)
-        self._app.connect("play-recording", self.on_play_recording)
-        self._fav_view = app.fav_view
-        self._player = None
-        self._current_mrl = None
-        self._full_screen = False
-        self._playback_window = None
-        self._audio_track_menu = None
-        self._subtitle_track_menu = None
-        self._play_mode = self._app.app_settings.play_streams_mode
-
-        handlers = {"on_realize": self.on_realize,
-                    "on_press": self.on_press,
-                    "on_next": self.on_next,
-                    "on_previous": self.on_previous,
-                    "on_rewind": self.on_rewind,
-                    "on_full_screen": self.on_full_screen,
-                    "on_close": self.on_close}
-
-        builder = get_builder(UI_RESOURCES_PATH + "playback.glade", handlers)
-        self.set_spacing(5)
-        self.set_orientation(Gtk.Orientation.VERTICAL)
-        self._event_box = builder.get_object("event_box")
-        self.pack_start(self._event_box, True, True, 0)
-        if not IS_DARWIN:
-            self.pack_end(builder.get_object("tool_bar"), False, True, 0)
-            self._scale = builder.get_object("scale")
-            self._full_time_label = builder.get_object("full_time_label")
-            self._current_time_label = builder.get_object("current_time_label")
-            self._rewind_box = builder.get_object("rewind_box")
-            self._tool_bar = builder.get_object("tool_bar")
-            self._prev_button = builder.get_object("prev_button")
-            self._next_button = builder.get_object("next_button")
-            self._audio_menu_button = builder.get_object("audio_menu_button")
-            self._video_menu_button = builder.get_object("video_menu_button")
-            self._subtitle_menu_button = builder.get_object("subtitle_menu_button")
-            self._fav_view.bind_property("sensitive", self._prev_button, "sensitive")
-            self._fav_view.bind_property("sensitive", self._next_button, "sensitive")
-
-        self.connect("delete-event", self.on_delete)
-        self.connect("show", self.set_player_area_size)
-
-    def on_fav_clicked(self, app, mode):
-        if mode is not FavClickMode.STREAM and not self._app.http_api:
-            return
-
-        self._fav_view.set_sensitive(False)
-        if mode is FavClickMode.STREAM:
-            self.on_play_stream()
-        elif mode is FavClickMode.ZAP_PLAY:
-            self._app.on_zap(self.on_watch)
-        elif mode is FavClickMode.PLAY:
-            self.on_play_service()
-
-    def on_play_current(self, app, url):
-        self.on_watch()
-
-    def on_play_recording(self, app, url):
-        self.play(url)
-
-    def on_page_changed(self, app, page):
-        self.on_close()
-        self.set_visible(False)
-
-    def on_realize(self, box):
-        if not self._player:
-            settings = self._app.app_settings
-            try:
-                self._player = Player.make(settings.stream_lib, settings.play_streams_mode, self._event_box)
-            except (ImportError, NameError) as e:
-                self._app.show_error_message(str(e))
-                return True
-            else:
-                self.init_playback_elements()
-                self.emit("play", self._current_mrl)
-            finally:
-                if settings.play_streams_mode is PlayStreamsMode.BUILT_IN:
-                    self.set_player_area_size(box)
-
-    def init_playback_elements(self):
-        self._player.connect("error", self.on_error)
-        self._player.connect("played", self.on_played)
-        self._player.connect("audio-track", self.on_audio_track_changed)
-        self._player.connect("subtitle-track", self.on_subtitle_track_changed)
-        self._app.app_window.connect("key-press-event", self.on_key_press)
-
-        builder = get_builder(UI_RESOURCES_PATH + "app_menu.ui")
-        self._audio_track_menu = builder.get_object("audio_track_menu")
-        self._subtitle_track_menu = builder.get_object("subtitle_track_menu")
-        audio_menu = builder.get_object("audio_menu")
-        video_menu = builder.get_object("video_menu")
-        subtitle_menu = builder.get_object("subtitle_menu")
-
-        if not IS_GNOME_SESSION:
-            menu_bar = self._app.get_menubar()
-            menu_bar.insert_section(1, None, audio_menu)
-            menu_bar.insert_section(2, None, video_menu)
-            menu_bar.insert_section(3, None, subtitle_menu)
-
-        if not IS_DARWIN:
-            self._player.connect("position", self.on_time_changed)
-            self._audio_menu_button.set_menu_model(self._audio_track_menu)
-            self._video_menu_button.set_menu_model(builder.get_object("aspect_ratio_menu"))
-            self._subtitle_menu_button.set_menu_model(self._subtitle_track_menu)
-        # Actions.
-        self._app.set_action("on_play", self.on_play)
-        self._app.set_action("on_stop", self.on_stop)
-        audio_track_action = Gio.SimpleAction.new_stateful("on_set_audio_track", GLib.VariantType.new("i"),
-                                                           GLib.Variant("i", 0))
-        audio_track_action.connect("activate", self.on_set_audio_track)
-        self._app.add_action(audio_track_action)
-        aspect_action = Gio.SimpleAction.new_stateful("on_set_aspect_ratio", GLib.VariantType.new("s"),
-                                                      GLib.Variant("s", ""))
-        aspect_action.connect("activate", self.on_set_aspect_ratio)
-        self._app.add_action(aspect_action)
-        subtitle_track_action = Gio.SimpleAction.new_stateful("on_set_subtitle_track", GLib.VariantType.new("i"),
-                                                              GLib.Variant("i", -1))
-        subtitle_track_action.connect("activate", self.on_set_subtitle_track)
-        self._app.add_action(subtitle_track_action)
-
-    def on_play(self, action=None, value=None):
-        self.emit("play", None)
-
-    def on_stop(self, action=None, value=None):
-        self.emit("stop", None)
-
-    def on_next(self, button):
-        if self._fav_view.do_move_cursor(self._fav_view, Gtk.MovementStep.DISPLAY_LINES, 1):
-            self.set_player_action()
-
-    def on_previous(self, button):
-        if self._fav_view.do_move_cursor(self._fav_view, Gtk.MovementStep.DISPLAY_LINES, -1):
-            self.set_player_action()
-
-    def on_rewind(self, scale, scroll_type, value):
-        self._player.set_time(int(value))
-
-    def on_full_screen(self, item=None):
-        self._full_screen = not self._full_screen
-        if self._play_mode is PlayStreamsMode.BUILT_IN:
-            self._tool_bar.set_visible(not self._full_screen)
-            self.emit("playback-full-screen", not self._full_screen)
-        elif self._playback_window:
-            if not IS_DARWIN:
-                self._tool_bar.set_visible(not self._full_screen)
-            self._playback_window.fullscreen() if self._full_screen else self._playback_window.unfullscreen()
-
-    def on_close(self, action=None, value=None):
-        if self._playback_window:
-            self._app.app_settings.add("playback_window_size", self._playback_window.get_size())
-            self._playback_window.hide()
-
-        self.on_stop()
-        self.hide()
-        self.emit("playback-close", None)
-
-        return True
-
-    @run_with_delay(1)
-    def on_audio_track_changed(self, player, tracks):
-        self._audio_track_menu.remove_all()
-        for t in tracks:
-            item = Gio.MenuItem.new(t[1], None)
-            item.set_action_and_target_value("app.on_set_audio_track", GLib.Variant("i", t[0]))
-            self._audio_track_menu.append_item(item)
-
-    @run_with_delay(1)
-    def on_subtitle_track_changed(self, player, tracks):
-        self._subtitle_track_menu.remove_all()
-        for t in tracks:
-            item = Gio.MenuItem.new(t[1], None)
-            item.set_action_and_target_value("app.on_set_subtitle_track", GLib.Variant("i", t[0]))
-            self._subtitle_track_menu.append_item(item)
-
-    def on_set_audio_track(self, action, value):
-        action.set_state(value)
-        self._player.set_audio_track(value.get_int32())
-
-    def on_set_aspect_ratio(self, action, value):
-        action.set_state(value)
-        self._player.set_aspect_ratio(value.get_string())
-
-    def on_set_subtitle_track(self, action, value):
-        action.set_state(value)
-        self._player.set_subtitle_track(value.get_int32())
-
-    def on_press(self, area, event):
-        if event.button == Gdk.BUTTON_PRIMARY:
-            if event.type == Gdk.EventType.DOUBLE_BUTTON_PRESS:
-                self.on_full_screen()
-
-    def on_key_press(self, widget, event):
-        if self._player and self.get_visible():
-            key = event.keyval
-            if any((key == Gdk.KEY_F11, key == Gdk.KEY_f, self._full_screen and key == Gdk.KEY_Escape)):
-                self.on_full_screen()
-
-    def on_delete(self, box):
-        if self._player:
-            self._player.release()
-
-    @run_with_delay(1)
-    def set_player_action(self):
-        click_mode = self._app.app_settings.fav_click_mode
-        self._fav_view.set_sensitive(False)
-        if click_mode is FavClickMode.PLAY:
-            self.on_play_service()
-        elif click_mode is FavClickMode.ZAP_PLAY:
-            self.on_zap(self.on_watch)
-        elif click_mode is FavClickMode.STREAM:
-            self.on_play_stream()
-
-    def update_buttons(self):
-        if self._player:
-            path, column = self._fav_view.get_cursor()
-            current_index = path[0]
-            self._player_prev_button.set_sensitive(current_index != 0)
-            self._player_next_button.set_sensitive(len(self._fav_model) != current_index + 1)
-
-    @lru_cache(maxsize=1)
-    def on_duration_changed(self, duration):
-        self._scale.set_value(0)
-        self._scale.get_adjustment().set_upper(duration)
-        GLib.idle_add(self._rewind_box.set_visible, duration > 0, priority=GLib.PRIORITY_LOW)
-        GLib.idle_add(self._current_time_label.set_text, "0", priority=GLib.PRIORITY_LOW)
-        GLib.idle_add(self._full_time_label.set_text, self.get_time_str(duration),
-                      priority=GLib.PRIORITY_LOW)
-
-    def on_time_changed(self, widget, t):
-        if not self._full_screen and self._rewind_box.get_visible():
-            GLib.idle_add(self._current_time_label.set_text, self.get_time_str(t),
-                          priority=GLib.PRIORITY_LOW)
-
-    def get_time_str(self, duration):
-        """ Returns a string representation of time from duration in milliseconds """
-        m, s = divmod(duration // 1000, 60)
-        h, m = divmod(m, 60)
-        return f"{str(h) + ':' if h else ''}{m:02d}:{s:02d}"
-
-    def set_player_area_size(self, widget):
-        w, h = self._app.app_window.get_size()
-        widget.set_size_request(w * 0.6, -1)
-
-    @run_idle
-    def show_playback_window(self):
-        width, height = 480, 240
-        size = self._app.app_settings.get("playback_window_size")
-        if size:
-            width, height = size
-
-        if self._playback_window:
-            self._playback_window.show()
-            self._playback_window.set_title(self.get_playback_title())
-        else:
-            self._playback_window = Gtk.Window(title=self.get_playback_title(),
-                                               window_position=Gtk.WindowPosition.CENTER,
-                                               icon_name="demon-editor")
-
-            self._playback_window.connect("delete-event", self.on_close)
-            self._playback_window.connect("key-press-event", self.on_key_press)
-            self._playback_window.bind_property("visible", self._event_box, "visible")
-
-            if not IS_DARWIN:
-                self._prev_button.set_visible(False)
-                self._next_button.set_visible(False)
-
-            self.reparent(self._playback_window)
-            self._playback_window.set_application(self._app)
-
-        self.show()
-        self._playback_window.resize(width, height)
-        self._playback_window.show()
-
-    def get_playback_title(self):
-        if self._app.page is not Page.RECORDINGS:
-            path, column = self._fav_view.get_cursor()
-            if path:
-                return f"DemonEditor [{self._app.fav_view.get_model()[path][:][Column.FAV_SERVICE]}]"
-        else:
-            return f"DemonEditor [{get_message('Recordings')}]"
-        return f"DemonEditor [{get_message('Playback')}]"
-
-    def on_play_stream(self):
-        path, column = self._fav_view.get_cursor()
-        if path:
-            row = self._fav_view.get_model()[path][:]
-            if row[Column.FAV_TYPE] != BqServiceType.IPTV.name:
-                self.on_error(None, "Not allowed in this context!")
-                return
-
-            url = get_iptv_url(row, self._app.app_settings.setting_type)
-            self.play(url) if url else self.on_error(None, "No reference is present!")
-
-    def on_play_service(self, item=None):
-        path, column = self._fav_view.get_cursor()
-        if not path or not self._app.http_api:
-            return
-
-        ref = self._app.get_service_ref(path)
-        if not ref:
-            return
-
-        if self._player and self._player.is_playing():
-            self.emit("stop", None)
-
-        s_type = self._app.app_settings.setting_type
-        req = HttpAPI.Request.STREAM if s_type is SettingsType.ENIGMA_2 else HttpAPI.Request.N_STREAM
-        self._app.http_api.send(req, ref, self.watch)
-
-    def on_watch(self, item=None):
-        """ Switch to the channel and watch in the player. """
-        s_type = self._app.app_settings.setting_type
-        if s_type is SettingsType.ENIGMA_2:
-            self._app.http_api.send(HttpAPI.Request.STREAM_CURRENT, "", self.watch)
-        elif s_type is SettingsType.NEUTRINO_MP:
-            self._app.http_api.send(HttpAPI.Request.N_ZAP, "",
-                                    lambda rf: self._app.http_api.send(HttpAPI.Request.N_STREAM, rf.get("data", ""),
-                                                                       self.watch))
-
-    def watch(self, data):
-        url = self._app.get_url_from_m3u(data)
-        GLib.timeout_add_seconds(1, self.play, url) if url else self.on_error(None, "Can't Playback!")
-
-    def play(self, url):
-        if self._play_mode is PlayStreamsMode.M3U:
-            self._app.save_stream_to_m3u(url)
-            return
-
-        if self._play_mode is not self._app.app_settings.play_streams_mode:
-            self.on_error(None, "Play mode has been changed!\nRestart the program to apply the settings.")
-            return
-
-        if self._play_mode is PlayStreamsMode.BUILT_IN:
-            self.show()
-        elif self._play_mode is PlayStreamsMode.WINDOW:
-            self.show_playback_window()
-
-        if self._player:
-            self.emit("play", url)
-        else:
-            self._current_mrl = url
-
-    @run_idle
-    def on_played(self, player, duration):
-        self._fav_view.set_sensitive(True)
-        if not IS_DARWIN:
-            self.on_duration_changed(duration)
-
-    @run_idle
-    def on_error(self, player, msg):
-        self._app.show_error_message(msg)
-        self._fav_view.set_sensitive(True)
-
-
-if __name__ == "__main__":
-    pass

app/ui/satellites_dialog.py

@@ -1,36 +1,7 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import concurrent.futures
 import re
 import time
 from math import fabs
-from pyexpat import ExpatError
 
 from gi.repository import GLib
 
@@ -39,89 +10,101 @@ from app.eparser import get_satellites, write_satellites, Satellite, Transponder
 from app.eparser.ecommons import PLS_MODE, get_key_by_value
 from app.tools.satellites import SatellitesParser, SatelliteSource, ServicesParser
 from .dialogs import show_dialog, DialogType, get_chooser_dialog, get_message, get_builder
-from .main_helper import move_items, append_text_to_tview, get_base_model, on_popup_menu
+from .main_helper import move_items, scroll_to, append_text_to_tview, get_base_model, on_popup_menu
 from .search import SearchProvider
 from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, MOVE_KEYS, KeyboardKey, MOD_MASK
 
-_UI_PATH = UI_RESOURCES_PATH + "satellites.glade"
+_UI_PATH = UI_RESOURCES_PATH + "satellites_dialog.glade"
 
 
-class SatellitesTool(Gtk.Box):
+def show_satellites_dialog(transient, options):
+    SatellitesDialog(transient, options).show()
+
+
+class SatellitesDialog:
     _aggr = [None for x in range(9)]  # aggregate
 
-    def __init__(self, app, settings, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self._app = app
+    def __init__(self, transient, settings):
+        self._data_path = settings.data_local_path + "satellites.xml"
         self._settings = settings
-        self._current_sat_path = None
 
-        handlers = {"on_remove": self.on_remove,
+        handlers = {"on_open": self.on_open,
+                    "on_remove": self.on_remove,
+                    "on_save": self.on_save,
+                    "on_save_as": self.on_save_as,
                     "on_update": self.on_update,
                     "on_up": self.on_up,
                     "on_down": self.on_down,
-                    "on_button_press": self.on_button_press,
+                    "on_popup_menu": on_popup_menu,
                     "on_satellite_add": self.on_satellite_add,
                     "on_transponder_add": self.on_transponder_add,
                     "on_edit": self.on_edit,
                     "on_key_release": self.on_key_release,
-                    "on_satellite_selection": self.on_satellite_selection}
+                    "on_row_activated": self.on_row_activated,
+                    "on_resize": self.on_resize,
+                    "on_quit": self.on_quit}
 
         builder = get_builder(_UI_PATH, handlers, use_str=True,
-                              objects=("satellite_editor_box", "satellite_view_model", "transponder_view_model",
-                                       "satellite_popup_menu", "transponder_popup_menu", "left_header_menu",
-                                       "popup_menu_add_image", "popup_menu_add_image_2"))
+                              objects=("satellites_editor_window", "satellites_tree_store", "popup_menu",
+                                       "left_header_menu", "popup_menu_add_image", "popup_menu_add_image_2",
+                                       "sat_editor_save_image", "sat_editor_update_image"))
 
-        self._satellite_view = builder.get_object("satellite_view")
-        self._transponder_view = builder.get_object("transponder_view")
-        builder.get_object("sat_pos_column").set_cell_data_func(builder.get_object("sat_pos_renderer"),
-                                                                self.sat_pos_func)
+        self._window = builder.get_object("satellites_editor_window")
+        self._window.set_transient_for(transient)
+        self._sat_view = builder.get_object("satellites_editor_tree_view")
+        # Setting the last size of the dialog window if it was saved
+        window_size = self._settings.get("sat_editor_window_size")
+        if window_size:
+            self._window.resize(*window_size)
 
         self._stores = {3: builder.get_object("pol_store"),
                         4: builder.get_object("fec_store"),
                         5: builder.get_object("system_store"),
                         6: builder.get_object("mod_store")}
 
-        self.pack_start(builder.get_object("satellite_editor_box"), True, True, 0)
-        self._app.connect("profile-changed", lambda a, m: self.load_satellites_list())
-        self.show()
-        self.load_satellites_list()
+        self.load_satellites_list(self._sat_view.get_model())
 
-    def load_satellites_list(self, path=None):
-        gen = self.on_satellites_list_load(path)
+    def load_satellites_list(self, model):
+        gen = self.on_satellites_list_load(model)
         GLib.idle_add(lambda: next(gen, False), priority=GLib.PRIORITY_LOW)
 
+    def show(self):
+        self._window.show()
+
+    def on_resize(self, window):
+        """ Stores new size properties for dialog window after resize """
+        if self._settings:
+            self._settings.add("sat_editor_window_size", window.get_size())
+
     @run_idle
-    def on_open(self):
-        response = get_chooser_dialog(self._app.app_window, self._settings, "satellites.xml", ("*.xml",))
+    def on_quit(self, *args):
+        self._window.destroy()
+
+    @run_idle
+    def on_open(self, model):
+        response = get_chooser_dialog(self._window, self._settings, "satellites.xml", ("*.xml",))
         if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT):
             return
 
         if not str(response).endswith("satellites.xml"):
-            self._app.show_error_message("No satellites.xml file is selected!")
+            show_dialog(DialogType.ERROR, self._window, text="No satellites.xml file is selected!")
             return
 
-        self.load_satellites_list(response)
+        self._data_path = response
+        self.load_satellites_list(model)
 
-    def on_satellite_selection(self, view):
-        model = self._transponder_view.get_model()
-        model.clear()
-
-        self._current_sat_path, column = view.get_cursor()
-        if self._current_sat_path:
-            list(map(model.append, view.get_model()[self._current_sat_path][-1]))
+    @staticmethod
+    def on_row_activated(view, path, column):
+        if view.row_expanded(path):
+            view.collapse_row(path)
+        else:
+            view.expand_row(path, column)
 
     def on_up(self, item):
-        move_items(KeyboardKey.UP, self._satellite_view)
+        move_items(KeyboardKey.UP, self._sat_view)
 
     def on_down(self, item):
-        move_items(KeyboardKey.DOWN, self._satellite_view)
-
-    def on_button_press(self, menu, event):
-        if event.get_event_type() == Gdk.EventType.DOUBLE_BUTTON_PRESS:
-            self.on_edit(self._satellite_view if self._satellite_view.is_focus() else self._transponder_view)
-        else:
-            on_popup_menu(menu, event)
+        move_items(KeyboardKey.DOWN, self._sat_view)
 
     def on_key_release(self, view, event):
         """  Handling  keystrokes  """
@@ -142,28 +125,24 @@ class SatellitesTool(Gtk.Box):
         elif ctrl and key is KeyboardKey.T:
             self.on_transponder()
         elif ctrl and key in MOVE_KEYS:
-            move_items(key, self._satellite_view)
+            move_items(key, self._sat_view)
         elif key is KeyboardKey.LEFT or key is KeyboardKey.RIGHT:
             view.do_unselect_all(view)
 
-    def on_satellites_list_load(self, path=None):
+    def on_satellites_list_load(self, model):
         """ Load satellites data into model """
-        model = self._satellite_view.get_model()
-        model.clear()
-
         try:
-            path = path or self._settings.profile_data_path + "satellites.xml"
-            satellites = get_satellites(path)
+            satellites = get_satellites(self._data_path)
             yield True
         except FileNotFoundError as e:
-            msg = get_message("Please, download files from receiver or setup your path for read data!")
-            self._app.show_error_message(f"{e}\n{msg}")
-        except ExpatError as e:
-            msg = f"The file [{path}] is not formatted correctly or contains invalid characters! Cause: {e}"
-            self._app.show_error_message(msg)
+            show_dialog(DialogType.ERROR, self._window, getattr(e, "message", str(e)) +
+                        "\n\nPlease, download files from receiver or setup your path for read data!")
+            return
         else:
+            model.clear()
             for sat in satellites:
-                yield model.append(sat)
+                append_satellite(model, sat)
+                yield True
 
     def on_add(self, view):
         """ Common adding """
@@ -182,104 +161,150 @@ class SatellitesTool(Gtk.Box):
             return
 
         model = view.get_model()
-        row = model[paths][:]
-        itr = model.get_iter(paths)
+        itr = model.get_iter(paths[0])
+        row = model.get(itr, *[x for x in range(view.get_n_columns())])
 
-        if view is self._satellite_view:
-            self.on_satellite(None if force else Satellite(*row), itr)
-        elif view is self._transponder_view:
-            self.on_transponder(None if force else Transponder(*row), itr)
+        if row[-1]:  # satellite
+            self.on_satellite(None if force else Satellite(row[0], None, row[-1], None), itr)
+        else:
+            self.on_transponder(None if force else Transponder(*row[1:-2]), itr)
 
     def on_satellite(self, satellite=None, edited_itr=None):
         """ Create or edit satellite"""
-        sat_dialog = SatelliteDialog(self._app.get_active_window(), satellite)
+        sat_dialog = SatelliteDialog(self._window, satellite)
         sat = sat_dialog.run()
         sat_dialog.destroy()
 
         if sat:
-            model, paths = self._satellite_view.get_selection().get_selected_rows()
+            view = self._sat_view
+            model = view.get_model()
             if satellite and edited_itr:
-                model.set(edited_itr, {i: v for i, v in enumerate(sat)})
+                model.set(edited_itr, {0: sat.name, 10: sat.flags, 11: sat.position})
             else:
-                if len(model):
-                    index = paths[0].get_indices()[0] + 1
-                    model.insert(index, sat)
-                else:
-                    model.append(sat)
+                index = self.get_sat_position_index(sat.position, model)
+                model.insert(None, index,
+                             [sat.name, None, None, None, None, None, None, None, None, None, sat.flags, sat.position])
+                scroll_to(index, view)
 
     def on_transponder(self, transponder=None, edited_itr=None):
         """ Create or edit transponder """
 
-        paths = self.check_selection(self._satellite_view, "Please, select only one satellite!")
+        paths = self.check_selection(self._sat_view, "Please, select only one satellite!")
         if paths is None:
             return
         elif len(paths) == 0:
-            self._app.show_error_message("No satellite is selected!")
+            show_dialog(DialogType.ERROR, self._window, "No satellite is selected!")
             return
 
-        dialog = TransponderDialog(self._app.get_active_window(), transponder)
+        dialog = TransponderDialog(self._window, transponder)
         tr = dialog.run()
         dialog.destroy()
 
         if tr:
-            sat_model = self._satellite_view.get_model()
-            transponders = sat_model[paths][-1]
-            tr_model, tr_paths = self._transponder_view.get_selection().get_selected_rows()
-
+            view = self._sat_view
+            model = view.get_model()
             if transponder and edited_itr:
-                tr_model.set(edited_itr, {i: v for i, v in enumerate(tr)})
-                transponders[tr_model.get_path(edited_itr).get_indices()[0]] = tr
+                model.set(edited_itr, {1: tr.frequency, 2: tr.symbol_rate, 3: tr.polarization,
+                                       4: tr.fec_inner, 5: tr.system, 6: tr.modulation,
+                                       7: tr.pls_mode, 8: tr.pls_code, 9: tr.is_id})
             else:
-                index = paths[0].get_indices()[0] + 1
-                tr_model.insert(index, tr)
-                transponders.insert(index, tr)
+                row = ["Transponder:", tr.frequency, tr.symbol_rate, tr.polarization, tr.fec_inner,
+                       tr.system, tr.modulation, tr.pls_mode, tr.pls_code, tr.is_id, None, None]
+                model, paths = view.get_selection().get_selected_rows()
+                itr = model.get_iter(paths[0])
+                view.expand_row(paths[0], 0)
+                # Get parent iter if selected transponder
+                parent_itr = model.iter_parent(itr)
+                if parent_itr:
+                    itr = parent_itr
+                freq = int(tr.frequency if tr.frequency else 0)
+                tr_itr = model.iter_children(itr)
+                # Inserting according to frequency value.
+                while tr_itr:
+                    cur_freq = int(model.get_value(tr_itr, 1))
+                    if freq <= cur_freq:
+                        path = model.get_path(tr_itr)
+                        index = path.get_indices()[1]
+                        model.insert(model.iter_parent(tr_itr), index, row)
+                        scroll_to(path, view)
+                        break
+                    else:
+                        tr_itr = model.iter_next(tr_itr)
+                else:
+                    itr = model.append(itr, row)
+                    scroll_to(model.get_path(itr), view)
+
+    def get_sat_position_index(self, pos, model):
+        """ Search and returns index after given position """
+        pos = int(pos)
+        row = next(filter(lambda r: int(r[-1]) >= pos, model), None)
+
+        return row.path[0] if row else len(model)
 
     def check_selection(self, view, message):
         """ Checks if any row is selected. Shows error dialog if selected more than one.
 
-            Returns selected path or None.
+        returns selected path or None
         """
         model, paths = view.get_selection().get_selected_rows()
         if len(paths) > 1:
-            self._app.show_error_message(message)
+            show_dialog(DialogType.ERROR, self._window, message)
             return
 
         return paths
 
+    @run_idle
     def on_remove(self, view):
-        """ Removes selected satellites and transponders. """
+        """ Removal of selected satellites and transponders.
+
+            The satellites are removed first! Then transponders.
+        """
         selection = view.get_selection()
         model, paths = selection.get_selected_rows()
-
-        if view is self._satellite_view:
-            list(map(model.remove, [model.get_iter(path) for path in paths]))
-        elif view is self._transponder_view:
-            if self._current_sat_path:
-                trs = self._satellite_view.get_model()[self._current_sat_path][-1]
-                list(map(trs.pop, sorted(map(lambda p: p.get_indices()[0], paths), reverse=True)))
-                list(map(model.remove, [model.get_iter(path) for path in paths]))
-            else:
-                self._app.show_error_message("No satellite is selected!")
-
-    def sat_pos_func(self, column, renderer, model, itr, data):
-        """ Converts and sets the satellite position value to a readable format. """
-        pos = int(model.get_value(itr, 2))
-        renderer.set_property("text", f"{abs(pos / 10):0.1f}{'W' if pos < 0 else 'E'}")
+        itrs = [model.get_iter(path) for path in paths]
+        satellites = list(filter(model.iter_has_child, itrs))
+        if len(satellites):
+            # Removing selected satellites.
+            list(map(model.remove, satellites))
+        else:
+            # Removing selected transponders.
+            list(map(model.remove, itrs))
 
     @run_idle
-    def on_save(self):
-        if show_dialog(DialogType.QUESTION, self._app.app_window) == Gtk.ResponseType.CANCEL:
+    def on_save(self, view):
+        if show_dialog(DialogType.QUESTION, self._window) == Gtk.ResponseType.CANCEL:
             return
 
-        write_satellites((Satellite(*r) for r in self._satellite_view.get_model()),
-                         self._settings.profile_data_path + "satellites.xml")
+        model = view.get_model()
+        satellites = []
+        model.foreach(self.parse_data, satellites)
+        write_satellites(satellites, self._data_path)
 
-    def on_save_as(self):
-        show_dialog(DialogType.ERROR, transient=self._app.app_window, text="Not implemented yet!")
+    def on_save_as(self, item):
+        response = self.get_file_dialog_response(Gtk.FileChooserAction.SAVE)
+        if response == Gtk.ResponseType.CANCEL:
+            return
+        show_dialog(DialogType.ERROR, transient=self._window, text="Not implemented yet!")
 
     @run_idle
     def on_update(self, item):
-        SatellitesUpdateDialog(self._app.get_active_window(), self._settings, self._satellite_view.get_model()).show()
+        SatellitesUpdateDialog(self._window, self._settings, self._sat_view.get_model()).show()
+
+    @staticmethod
+    def parse_data(model, path, itr, sats):
+        if model.iter_has_child(itr):
+            num_of_children = model.iter_n_children(itr)
+            transponders = []
+            num_columns = model.get_n_columns()
+
+            for num in range(num_of_children):
+                transponder_itr = model.iter_nth_child(itr, num)
+                transponder = model.get(transponder_itr, *[item for item in range(num_columns)])
+                transponders.append(Transponder(*transponder[1:-2]))
+
+            sat = model.get(itr, *[item for item in range(num_columns)])
+            satellite = Satellite(sat[0], sat[-2], sat[-1], transponders)
+            sats.append(satellite)
 
 
 # ***************** Transponder dialog *******************#
@@ -369,7 +394,7 @@ class TransponderDialog:
 class SatelliteDialog:
     """ Shows dialog for adding or edit satellite """
 
-    def __init__(self, transient, satellite=None):
+    def __init__(self, transient, satellite: Satellite = None):
         builder = get_builder(_UI_PATH, use_str=True, objects=("satellite_dialog", "side_store", "pos_adjustment"))
 
         self._dialog = builder.get_object("satellite_dialog")
@@ -377,12 +402,11 @@ class SatelliteDialog:
         self._sat_name = builder.get_object("sat_name_entry")
         self._sat_position = builder.get_object("sat_position_button")
         self._side = builder.get_object("side_box")
-        self._transponders = satellite.transponders if satellite else []
 
         if satellite:
-            self._sat_name.set_text(satellite.name)
+            self._sat_name.set_text(satellite.name[0:satellite.name.find("(")].strip())
             pos = satellite.position
-            pos = float(f"{pos[:-1]}.{pos[-1:]}")
+            pos = float("{}.{}".format(pos[:-1], pos[-1:]))
             self._sat_position.set_value(fabs(pos))
             self._side.set_active(0 if pos >= 0 else 1)  # E or W
 
@@ -399,9 +423,10 @@ class SatelliteDialog:
         name = self._sat_name.get_text()
         pos = round(self._sat_position.get_value(), 1)
         side = self._side.get_active()
+        name = "{} ({}{})".format(name, pos, self._side.get_active_id())
         pos = "{}{}{}".format("-" if side == 1 else "", *str(pos).split("."))
 
-        return Satellite(name=name, flags="0", position=pos, transponders=self._transponders)
+        return Satellite(name=name, flags="0", position=pos, transponders=None)
 
 
 # ********************** Update dialogs ************************ #
@@ -414,7 +439,6 @@ class UpdateDialog:
                     "on_receive_data": self.on_receive_data,
                     "on_cancel_receive": self.on_cancel_receive,
                     "on_satellite_toggled": self.on_satellite_toggled,
-                    "on_satellite_changed": self.on_satellite_changed,
                     "on_transponder_toggled": self.on_transponder_toggled,
                     "on_info_bar_close": self.on_info_bar_close,
                     "on_filter_toggled": self.on_filter_toggled,
@@ -423,41 +447,40 @@ class UpdateDialog:
                     "on_select_all": self.on_select_all,
                     "on_unselect_all": self.on_unselect_all,
                     "on_filter": self.on_filter,
+                    "on_search": self.on_search,
+                    "on_search_down": self.on_search_down,
+                    "on_search_up": self.on_search_up,
                     "on_quit": self.on_quit}
 
         self._settings = settings
         self._download_task = False
         self._parser = None
-        self._size_name = f"{'_'.join(re.findall('[A-Z][^A-Z]*', self.__class__.__name__))}_window_size".lower()
+        self._size_name = "{}_window_size".format("_".join(re.findall("[A-Z][^A-Z]*", self.__class__.__name__))).lower()
 
-        builder = get_builder(UI_RESOURCES_PATH + "satellites.glade", handlers,
+        builder = get_builder(UI_RESOURCES_PATH + "satellites_dialog.glade", handlers,
                               objects=("satellites_update_window", "update_source_store", "update_sat_list_store",
                                        "update_sat_list_model_filter", "update_sat_list_model_sort", "side_store",
                                        "pos_adjustment", "pos_adjustment2", "satellites_update_popup_menu",
                                        "remove_selection_image", "sat_update_cancel_image", "sat_receive_image",
-                                       "sat_update_image", "update_transponder_store", "update_service_store"))
+                                       "sat_update_filter_image", "sat_update_search_image", "sat_update_image",
+                                       "update_transponder_store", "update_service_store"))
 
         self._window = builder.get_object("satellites_update_window")
         self._window.set_transient_for(transient)
         if title:
             self._window.set_title(title)
 
-        self._transponder_frame = builder.get_object("sat_update_tr_frame")
+        self._transponder_paned = builder.get_object("sat_update_tr_paned")
         self._sat_view = builder.get_object("sat_update_tree_view")
         self._transponder_view = builder.get_object("sat_update_tr_view")
         self._service_view = builder.get_object("sat_update_srv_view")
         self._source_box = builder.get_object("source_combo_box")
+        self._sat_update_expander = builder.get_object("sat_update_expander")
         self._text_view = builder.get_object("text_view")
         self._receive_button = builder.get_object("receive_data_button")
         self._sat_update_info_bar = builder.get_object("sat_update_info_bar")
         self._info_bar_message_label = builder.get_object("info_bar_message_label")
         self._receive_button.bind_property("visible", builder.get_object("cancel_data_button"), "visible", 4)
-        update_button = builder.get_object("sat_update_button")
-        self._sat_view.bind_property("sensitive", update_button, "sensitive")
-        self._sat_view.bind_property("sensitive", self._source_box, "sensitive")
-        self._sat_view.bind_property("sensitive", self._source_box, "sensitive")
-        self._sat_view.bind_property("sensitive", self._receive_button, "sensitive")
-        self._receive_button.bind_property("visible", update_button, "visible")
         # Filter
         self._filter_bar = builder.get_object("sat_update_filter_bar")
         self._from_pos_button = builder.get_object("from_pos_button")
@@ -467,18 +490,11 @@ class UpdateDialog:
         self._filter_model = builder.get_object("update_sat_list_model_filter")
         self._filter_model.set_visible_func(self.filter_function)
         self._filter_positions = (0, 0)
-        self._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible")
-        # Log.
-        self._log_frame = builder.get_object("log_frame")
-        builder.get_object("log_info_bar").connect("response", lambda b, r: self._log_frame.set_visible(False))
-        # Search.
+        # Search
         self._search_bar = builder.get_object("sat_update_search_bar")
-        self._search_bar.bind_property("search-mode-enabled", self._search_bar, "visible")
-        search_provider = SearchProvider(self._sat_view,
-                                         builder.get_object("sat_update_search_entry"),
-                                         builder.get_object("sat_update_search_down_button"),
-                                         builder.get_object("sat_update_search_up_button"))
-        builder.get_object("sat_update_find_button").connect("toggled", search_provider.on_search_toggled)
+        self._search_provider = SearchProvider((self._sat_view,),
+                                               builder.get_object("sat_update_search_down_button"),
+                                               builder.get_object("sat_update_search_up_button"))
 
         window_size = self._settings.get(self._size_name)
         if window_size:
@@ -497,17 +513,14 @@ class UpdateDialog:
         self._receive_button.set_visible(not value)
 
     @run_idle
-    def on_update_satellites_list(self, item=None):
+    def on_update_satellites_list(self, item):
         if self.is_download:
             show_dialog(DialogType.ERROR, self._window, "The task is already running!")
             return
 
-        get_base_model(self._sat_view.get_model()).clear()
-        self._transponder_view.get_model().clear()
-        self._service_view.get_model().clear()
-
+        model = get_base_model(self._sat_view.get_model())
+        model.clear()
         self.is_download = True
-        self._sat_view.set_sensitive(False)
         src = self._source_box.get_active()
         if not self._parser:
             self._parser = SatellitesParser()
@@ -533,8 +546,6 @@ class UpdateDialog:
         for sat in sats:
             model.append(sat)
 
-        self._sat_view.set_sensitive(True)
-
     @run_idle
     def on_receive_data(self, item):
         if self.is_download:
@@ -542,8 +553,8 @@ class UpdateDialog:
             return
 
     @run_idle
-    def update_log_visibility(self):
-        self._log_frame.set_visible(True)
+    def update_expander(self):
+        self._sat_update_expander.set_expanded(True)
         self._text_view.get_buffer().set_text("", 0)
 
     def append_output(self):
@@ -558,9 +569,6 @@ class UpdateDialog:
     def on_cancel_receive(self, item=None):
         self._download_task = False
 
-    def on_satellite_changed(self, box):
-        self.on_update_satellites_list()
-
     def on_satellite_toggled(self, toggle, path):
         model = self._sat_view.get_model()
         self.update_state(model, path, not toggle.get_active())
@@ -612,6 +620,15 @@ class UpdateDialog:
         to_pos = round(self._to_pos_button.get_value(), 1) * (-1 if self._filter_to_combo_box.get_active() else 1)
         return from_pos, to_pos
 
+    def on_search(self, entry):
+        self._search_provider.search(entry.get_text())
+
+    def on_search_down(self, item):
+        self._search_provider.on_search_down()
+
+    def on_search_up(self, item):
+        self._search_provider.on_search_up()
+
     def on_select_all(self, view):
         self.update_selection(view, True)
 
@@ -640,7 +657,6 @@ class SatellitesUpdateDialog(UpdateDialog):
         super().__init__(transient=transient, settings=settings)
 
         self._main_model = main_model
-        self._source_box.connect("changed", self.on_update_satellites_list)
 
     @run_idle
     def on_receive_data(self, item):
@@ -653,7 +669,7 @@ class SatellitesUpdateDialog(UpdateDialog):
     @run_task
     def receive_satellites(self):
         self.is_download = True
-        self.update_log_visibility()
+        self.update_expander()
         model = self._sat_view.get_model()
         start = time.time()
 
@@ -676,29 +692,33 @@ class SatellitesUpdateDialog(UpdateDialog):
                 sats.append(data)
 
             appender.send("-" * 75 + "\n")
-            sat_count = len(sats)
+            appender.send("Consumed: {:0.0f}s, {} satellites received.".format(time.time() - start, len(sats)))
+            appender.close()
 
             sats = {s[2]: s for s in sats}  # key = position, v = satellite
 
             for row in self._main_model:
-                pos = row[2]
+                pos = row[-1]
                 if pos in sats:
                     sat = sats.pop(pos)
-                    appender.send(f"Updating satellite: {row[0]}\n")
-                    GLib.idle_add(self._main_model.set, row.iter, {i: v for i, v in enumerate(sat)})
+                    itr = row.iter
+                    self.update_satellite(itr, row, sat)
 
-            for p, s in sats.items():
-                appender.send(f"Adding satellite: {s.name}\n")
-                self.append_satellite(s)
+            for sat in sats.values():
+                append_satellite(self._main_model, sat)
 
-            appender.send("-" * 75 + "\n")
-            appender.send(f"Consumed: {time.time() - start:0.0f}s, {sat_count} satellites received.\n")
-            appender.close()
             self.is_download = False
 
     @run_idle
-    def append_satellite(self, sat):
-        self._main_model.append(sat)
+    def update_satellite(self, itr, row, sat):
+        if self._main_model.iter_has_child(itr):
+            children = row.iterchildren()
+            for ch in children:
+                self._main_model.remove(ch.iter)
+
+        for tr in sat[3]:
+            self._main_model.append(itr, ["Transponder:", tr.frequency, tr.symbol_rate, tr.polarization, tr.fec_inner,
+                                          tr.system, tr.modulation, tr.pls_mode, tr.pls_code, tr.is_id, None, None])
 
 
 class ServicesUpdateDialog(UpdateDialog):
@@ -713,6 +733,11 @@ class ServicesUpdateDialog(UpdateDialog):
         self._services = {}
         self._selected_transponders = set()
         self._services_parser = ServicesParser(source=SatelliteSource.LYNGSAT)
+
+        self._transponder_paned.set_visible(True)
+        self._source_box.remove(0)
+        self._source_box.remove(1)
+        self._source_box.set_active(0)
         # Transponder view popup menu
         tr_popup_menu = Gtk.Menu()
         select_all_item = Gtk.ImageMenuItem.new_from_stock("gtk-select-all")
@@ -729,11 +754,6 @@ class ServicesUpdateDialog(UpdateDialog):
         self._transponder_view.connect("button-press-event", lambda w, e: on_popup_menu(tr_popup_menu, e))
         self._transponder_view.connect("select_all", lambda w: self.update_transponder_selection(True))
 
-        self._transponder_frame.set_visible(True)
-        self._source_box.remove(0)
-        self._source_box.connect("changed", self.on_update_satellites_list)
-        self._source_box.set_active(0)
-
     @run_idle
     def on_receive_data(self, item):
         if self.is_download:
@@ -745,7 +765,7 @@ class ServicesUpdateDialog(UpdateDialog):
     @run_task
     def receive_services(self):
         self.is_download = True
-        self.update_log_visibility()
+        self.update_expander()
         model = self._sat_view.get_model()
         appender = self.append_output()
         next(appender)
@@ -781,13 +801,13 @@ class ServicesUpdateDialog(UpdateDialog):
                         self.is_download = False
                         return
 
-                    appender.send(f"Getting transponders for: {sat_names.get(futures[future])}.\n")
+                    appender.send("Getting transponders for: {}.\n".format(sat_names.get(futures[future])))
                     for t in future.result():
                         t_urls.append(t.url)
                         t_names[t.url] = t.text
 
                 appender.send("-" * 75 + "\n")
-                appender.send(f"{len(t_urls)} transponders received.\n\n")
+                appender.send("{} transponders received.\n\n".format(len(t_urls)))
 
         non_cached_ts = []
         for tr in t_urls:
@@ -803,11 +823,11 @@ class ServicesUpdateDialog(UpdateDialog):
                         self.is_download = False
                         return
 
-                    appender.send(f"Getting services for: {t_names.get(futures[future], '')}.\n")
+                    appender.send("Getting services for: {}.\n".format(t_names.get(futures[future], "")))
                     list(map(services.append, future.result()))
 
         appender.send("-" * 75 + "\n")
-        appender.send(f"Consumed: {time.time() - start:0.0f}s, {len(services)} services received.")
+        appender.send("Consumed: {:0.0f}s, {} services received.".format(time.time() - start, len(services)))
 
         try:
             from app.eparser.enigma.lamedb import LameDbReader
@@ -815,7 +835,7 @@ class ServicesUpdateDialog(UpdateDialog):
             reader = LameDbReader(path=None)
             srvs = reader.get_services_list("".join(reader.get_services_lines(services)))
         except ValueError as e:
-            log(f"ServicesUpdateDialog [on receive data] error: {e}")
+            log("ServicesUpdateDialog [on receive data] error: {}".format(e))
         else:
             self._callback(srvs)
 
@@ -823,12 +843,7 @@ class ServicesUpdateDialog(UpdateDialog):
 
     @run_task
     def get_sat_list(self, src, callback):
-        sat_src = SatelliteSource.LYNGSAT
-        if src == 1:
-            sat_src = SatelliteSource.KINGOFSAT
-            self._services_parser.source = sat_src
-
-        sats = self._parser.get_satellites_list(sat_src)
+        sats = self._parser.get_satellites_list(SatelliteSource.LYNGSAT)
         if sats:
             callback(sats)
         self.is_download = False
@@ -872,9 +887,6 @@ class ServicesUpdateDialog(UpdateDialog):
 
     @run_task
     def on_activate_satellite(self, view, path, column):
-        GLib.idle_add(self._transponder_view.get_model().clear)
-        GLib.idle_add(self._service_view.get_model().clear)
-
         model = view.get_model()
         itr = model.get_iter(path)
         url, selected = model.get_value(itr, 3), model.get_value(itr, 4)
@@ -926,5 +938,18 @@ class ServicesUpdateDialog(UpdateDialog):
             self.update_sat_state(m, s_path, select)
 
 
+# ************************* Commons ************************* #
+
+
+@run_idle
+def append_satellite(model, sat):
+    """ Common function for append satellite to the model """
+    name, flags, pos, transponders = sat
+    parent = model.append(None, [name, None, None, None, None, None, None, None, None, None, flags, pos])
+    for tr in transponders:
+        model.append(parent, ["Transponder:", tr.frequency, tr.symbol_rate, tr.polarization, tr.fec_inner, tr.system,
+                              tr.modulation, tr.pls_mode, tr.pls_code, tr.is_id, None, None])
+
+
 if __name__ == "__main__":
     pass

app/ui/search.py

@@ -1,41 +1,31 @@
 """ This is helper module for search features """
-from app.commons import run_with_delay
 
 
 class SearchProvider:
-    def __init__(self, view, entry, down_button, up_button, columns=None):
+    def __init__(self, views, down_button, up_button):
         self._paths = []
         self._current_index = -1
         self._max_indexes = 0
-        self._view = view
-        self._entry = entry
+        self._views = views
         self._up_button = up_button
         self._down_button = down_button
-        self._columns = columns
-
-        entry.connect("changed", self.on_search)
-        self._down_button.connect("clicked", self.on_search_down)
-        self._up_button.connect("clicked", self.on_search_up)
 
     def search(self, text):
         self._current_index = -1
         self._paths.clear()
-        model = self._view.get_model()
-        selection = self._view.get_selection()
-        if not selection:
-            return
+        for view in self._views:
+            model = view.get_model()
+            selection = view.get_selection()
+            selection.unselect_all()
+            if not text:
+                continue
 
-        selection.unselect_all()
-        if not text:
-            return
-
-        text = text.upper()
-        for r in model:
-            data = [r[i] for i in self._columns] if self._columns else r[:]
-            if next((s for s in data if text in str(s).upper()), False):
-                path = r.path
-                selection.select_path(r.path)
-                self._paths.append(path)
+            text = text.upper()
+            for r in model:
+                if text in str(r[:]).upper():
+                    path = r.path
+                    selection.select_path(r.path)
+                    self._paths.append((view, path))
 
         self._max_indexes = len(self._paths) - 1
         if self._max_indexes > 0:
@@ -44,15 +34,16 @@ class SearchProvider:
         self.update_navigation_buttons()
 
     def scroll_to(self, index):
-        self._view.scroll_to_cell(self._paths[index], None)
+        view, path = self._paths[index]
+        view.scroll_to_cell(path, None)
         self.update_navigation_buttons()
 
-    def on_search_down(self, button=None):
+    def on_search_down(self):
         if self._current_index < self._max_indexes:
             self._current_index += 1
             self.scroll_to(self._current_index)
 
-    def on_search_up(self, button=None):
+    def on_search_up(self):
         if self._current_index > -1:
             self._current_index -= 1
             self.scroll_to(self._current_index)
@@ -61,13 +52,6 @@ class SearchProvider:
         self._up_button.set_sensitive(self._current_index > 0)
         self._down_button.set_sensitive(self._current_index < self._max_indexes)
 
-    @run_with_delay(1)
-    def on_search(self, entry):
-        self.search(entry.get_text())
-
-    def on_search_toggled(self, action, value=None):
-        self._entry.grab_focus() if action.get_active() else self._entry.set_text("")
-
 
 if __name__ == "__main__":
     pass

app/ui/service_details_dialog.glade

@@ -275,38 +275,6 @@ Author: Dmitriy Yefremov
     <child type="titlebar">
       <placeholder/>
     </child>
-    <child type="action">
-      <object class="GtkButton" id="cancel_button">
-        <property name="label" translatable="yes">Cancel</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="valign">center</property>
-        <signal name="clicked" handler="on_cancel" swapped="no"/>
-      </object>
-    </child>
-    <child type="action">
-      <object class="GtkButton" id="apply_button">
-        <property name="label" translatable="yes">Apply</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Save current service</property>
-        <property name="valign">center</property>
-        <signal name="clicked" handler="on_save" swapped="no"/>
-        <accelerator key="Return" signal="activate"/>
-      </object>
-    </child>
-    <child type="action">
-      <object class="GtkButton" id="create_button">
-        <property name="label" translatable="yes">Create</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="tooltip_text" translatable="yes">Create and save as new service</property>
-        <property name="valign">center</property>
-        <signal name="clicked" handler="on_create_new" swapped="no"/>
-      </object>
-    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog_vbox">
         <property name="can_focus">False</property>
@@ -319,6 +287,53 @@ Author: Dmitriy Yefremov
             <property name="can_focus">False</property>
             <property name="valign">center</property>
             <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="cancel_button">
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="valign">center</property>
+                <signal name="clicked" handler="on_cancel" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="apply_button">
+                <property name="label" translatable="yes">Apply</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Save current service</property>
+                <property name="valign">center</property>
+                <signal name="clicked" handler="on_save" swapped="no"/>
+                <accelerator key="Return" signal="activate"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="create_button">
+                <property name="label" translatable="yes">Create</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Create and save as new service</property>
+                <property name="valign">center</property>
+                <signal name="clicked" handler="on_create_new" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -343,7 +358,7 @@ Author: Dmitriy Yefremov
                 <property name="margin_right">5</property>
                 <property name="margin_bottom">5</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">5</property>
+                <property name="spacing">2</property>
                 <child>
                   <object class="GtkGrid" id="srv_grid">
                     <property name="visible">True</property>
@@ -364,7 +379,6 @@ Author: Dmitriy Yefremov
                       <object class="GtkEntry" id="name_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -386,7 +400,7 @@ Author: Dmitriy Yefremov
                       <object class="GtkEntry" id="package_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -410,7 +424,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">10</property>
                         <property name="max_width_chars">10</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -455,7 +469,7 @@ Author: Dmitriy Yefremov
                             <property name="can_focus">True</property>
                             <property name="width_chars">7</property>
                             <property name="max_width_chars">7</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+
                             <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                             <signal name="changed" handler="update_reference" swapped="no"/>
                           </object>
@@ -805,14 +819,10 @@ Author: Dmitriy Yefremov
                   <object class="GtkBox" id="flags_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">10</property>
                     <child>
                       <object class="GtkGrid" id="flags_grid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="valign">center</property>
-                        <property name="margin_left">5</property>
-                        <property name="margin_right">10</property>
                         <property name="column_spacing">2</property>
                         <child>
                           <object class="GtkLabel" id="flags_label">
@@ -885,47 +895,6 @@ Author: Dmitriy Yefremov
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkBox" id="extra_flags_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">2</property>
-                        <child>
-                          <object class="GtkLabel" id="extra_pids_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Extra:</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="extra_pids_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="width_chars">20</property>
-                            <property name="max_width_chars">20</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
-                            <property name="placeholder_text">c:000000,etc.</property>
-                            <signal name="changed" handler="on_extra_pids_entry_changed" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="pack_type">end</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkGrid" id="caids_grid">
                         <property name="visible">True</property>
@@ -936,9 +905,9 @@ Author: Dmitriy Yefremov
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="tooltip_text">C:0000,C:a1b2,etc.</property>
-                            <property name="width_chars">20</property>
-                            <property name="max_width_chars">20</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+                            <property name="width_chars">15</property>
+                            <property name="max_width_chars">26</property>
+
                             <property name="placeholder_text" translatable="yes">C:0000,C:a1b2,etc.</property>
                             <signal name="changed" handler="on_cas_entry_changed" swapped="no"/>
                           </object>
@@ -963,7 +932,7 @@ Author: Dmitriy Yefremov
                         <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="pack_type">end</property>
-                        <property name="position">2</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
@@ -1041,7 +1010,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">12</property>
                         <property name="max_width_chars">12</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                       </object>
                       <packing>
@@ -1067,7 +1036,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">12</property>
                         <property name="max_width_chars">12</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                       </object>
                       <packing>
@@ -1146,7 +1115,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">12</property>
                         <property name="max_width_chars">12</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -1184,7 +1153,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">8</property>
                         <property name="max_width_chars">10</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -1211,7 +1180,7 @@ Author: Dmitriy Yefremov
                         <property name="can_focus">True</property>
                         <property name="width_chars">8</property>
                         <property name="max_width_chars">10</property>
-                        <property name="primary_icon_name">document-edit-symbolic</property>
+
                         <signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
                         <signal name="key-release-event" handler="update_reference" swapped="no"/>
                       </object>
@@ -1420,7 +1389,7 @@ Author: Dmitriy Yefremov
                             <property name="can_focus">True</property>
                             <property name="width_chars">8</property>
                             <property name="max_width_chars">10</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+
                             <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                           </object>
                           <packing>
@@ -1446,7 +1415,7 @@ Author: Dmitriy Yefremov
                             <property name="can_focus">True</property>
                             <property name="width_chars">8</property>
                             <property name="max_width_chars">10</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+
                             <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                           </object>
                           <packing>
@@ -1472,7 +1441,7 @@ Author: Dmitriy Yefremov
                             <property name="can_focus">True</property>
                             <property name="width_chars">8</property>
                             <property name="max_width_chars">10</property>
-                            <property name="primary_icon_name">document-edit-symbolic</property>
+
                             <signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
                           </object>
                           <packing>
@@ -1598,7 +1567,7 @@ Author: Dmitriy Yefremov
                     </child>
                     <child>
                       <object class="GtkImage" id="tr_edit_switch_image">
-                        <property name="visible">True</property>
+                        <property name="visible">False</property>
                         <property name="can_focus">False</property>
                         <property name="margin_left">10</property>
                         <property name="icon_name">document-edit-symbolic</property>
@@ -1629,9 +1598,6 @@ Author: Dmitriy Yefremov
         </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="-6">cancel_button</action-widget>
-    </action-widgets>
   </object>
   <object class="GtkListStore" id="transponder_services_liststore">
     <columns>
@@ -1664,24 +1630,6 @@ Author: Dmitriy Yefremov
     <child>
       <placeholder/>
     </child>
-    <child type="action">
-      <object class="GtkButton" id="tr_services_no_button">
-        <property name="label" translatable="yes">Cancel</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="valign">center</property>
-      </object>
-    </child>
-    <child type="action">
-      <object class="GtkButton" id="tr_services_ok_button">
-        <property name="label" translatable="yes">OK</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="valign">center</property>
-      </object>
-    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="tr_services_dialog_vbox">
         <property name="can_focus">False</property>
@@ -1691,6 +1639,34 @@ Author: Dmitriy Yefremov
           <object class="GtkButtonBox">
             <property name="can_focus">False</property>
             <property name="valign">center</property>
+            <child>
+              <object class="GtkButton" id="tr_services_no_button">
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="valign">center</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="tr_services_ok_button">
+                <property name="label" translatable="yes">OK</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="valign">center</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>

app/ui/service_details_dialog.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import os
 import re
 
@@ -35,7 +7,6 @@ from app.eparser.ecommons import (MODULATION, Inversion, ROLL_OFF, Pilot, Flag,
                                   get_value_by_name, FEC_DEFAULT, PLS_MODE, SERVICE_TYPE, T_MODULATION, C_MODULATION,
                                   TrType, SystemCable, T_SYSTEM, BANDWIDTH, TRANSMISSION_MODE, GUARD_INTERVAL, T_FEC,
                                   HIERARCHY, A_MODULATION)
-from app.eparser.neutrino import get_attributes, SP, KSP
 from app.settings import SettingsType
 from .dialogs import show_dialog, DialogType, Action, get_builder
 from .main_helper import get_base_model
@@ -53,6 +24,8 @@ class ServiceDetailsDialog:
 
     _NEUTRINO_FAV_ID = "{:x}:{:x}:{:x}"
 
+    _NEUTRINO_TRANSPONDER_DATA = "{:04x}:{:04x}:{}:{}:{}:{}:{}:{}:{}"
+
     _DIGIT_ENTRY_ELEMENTS = ("bitstream_entry", "pcm_entry", "video_pid_entry", "pcr_pid_entry", "srv_type_entry",
                              "ac3_pid_entry", "ac3plus_pid_entry", "acc_pid_entry", "he_acc_pid_entry",
                              "teletext_pid_entry", "pls_code_entry", "stream_id_entry", "tr_flag_entry",
@@ -69,7 +42,6 @@ class ServiceDetailsDialog:
                     "on_tr_edit_toggled": self.on_tr_edit_toggled,
                     "update_reference": self.update_reference,
                     "on_cas_entry_changed": self.on_cas_entry_changed,
-                    "on_extra_pids_entry_changed": self.on_extra_pids_entry_changed,
                     "on_digit_entry_changed": self.on_digit_entry_changed,
                     "on_non_empty_entry_changed": self.on_non_empty_entry_changed,
                     "on_cancel": lambda item: self._dialog.destroy()}
@@ -81,8 +53,8 @@ class ServiceDetailsDialog:
         self._dialog.set_transient_for(transient)
         self._s_type = settings.setting_type
         self._tr_type = TrType.Satellite
-        self._satellites_xml_path = settings.profile_data_path + "satellites.xml"
-        self._picons_path = settings.profile_picons_path
+        self._satellites_xml_path = settings.data_local_path + "satellites.xml"
+        self._picons_dir_path = settings.picons_local_path
         self._services_view = srv_view
         self._fav_view = fav_view
         self._action = action
@@ -97,7 +69,6 @@ class ServiceDetailsDialog:
         self._DIGIT_PATTERN = re.compile("\\D")
         self._NON_EMPTY_PATTERN = re.compile("(?:^[\\s]*$|\\D)")
         self._CAID_PATTERN = re.compile("(?:^[\\s]*$)|(C:[0-9a-fA-F]{1,4})(,C:[0-9a-fA-F]{1,4})*")
-        self._PIDS_PATTERN = re.compile("(?:^[\\s]*$)|(c:[0-9]{2}[0-9a-fA-F]{4})(,c:[0-9]{2}[0-9a-fA-F]{4})*")
         # Buttons
         self._apply_button = builder.get_object("apply_button")
         self._create_button = builder.get_object("create_button")
@@ -133,7 +104,6 @@ class ServiceDetailsDialog:
         self._stream_id_entry = self._digit_elements.get("stream_id_entry")
         self._tr_flag_entry = self._digit_elements.get("tr_flag_entry")
         self._namespace_entry = self._non_empty_elements.get("namespace_entry")
-        self._extra_pids_entry = builder.get_object("extra_pids_entry")
         # Service elements
         self._name_entry = builder.get_object("name_entry")
         self._package_entry = builder.get_object("package_entry")
@@ -222,7 +192,8 @@ class ServiceDetailsDialog:
         self._package_entry.set_text(srv.package)
         self._sid_entry.set_text(str(int(srv.ssid, 16)))
         # Transponder
-        self._tr_type = TrType(srv.transponder_type)
+        if self._s_type is SettingsType.ENIGMA_2:
+            self._tr_type = TrType(srv.transponder_type)
         self._freq_entry.set_text(srv.freq)
         self._rate_entry.set_text(srv.rate)
         self.select_active_text(self._pol_combo_box, srv.pol)
@@ -259,7 +230,7 @@ class ServiceDetailsDialog:
     def init_enigma2_flags(self, flags):
         f_flags = list(filter(lambda x: x.startswith("f:"), flags))
         if f_flags:
-            value = Flag.parse(f_flags[0])
+            value = int(f_flags[0][2:])
             self._keep_check_button.set_active(Flag.is_keep(value))
             self._hide_check_button.set_active(Flag.is_hide(value))
             self._use_pids_check_button.set_active(Flag.is_pids(value))
@@ -273,7 +244,6 @@ class ServiceDetailsDialog:
     def init_enigma2_pids(self, flags):
         pids = list(filter(lambda x: x.startswith("c:"), flags))
         if pids:
-            extra_pids = []
             for pid in pids:
                 if pid.startswith(Pids.VIDEO.value):
                     self._video_pid_entry.set_text(str(int(pid[4:], 16)))
@@ -286,19 +256,15 @@ class ServiceDetailsDialog:
                 elif pid.startswith(Pids.AC3.value):
                     self._ac3_pid_entry.set_text(str(int(pid[4:], 16)))
                 elif pid.startswith(Pids.VIDEO_TYPE.value):
-                    extra_pids.append(pid)
+                    pass
                 elif pid.startswith(Pids.AUDIO_CHANNEL.value):
-                    extra_pids.append(pid)
+                    pass
                 elif pid.startswith(Pids.BIT_STREAM_DELAY.value):
                     self._bitstream_entry.set_text(str(int(pid[4:], 16)))
                 elif pid.startswith(Pids.PCM_DELAY.value):
                     self._pcm_entry.set_text(str(int(pid[4:], 16)))
                 elif pid.startswith(Pids.SUBTITLE.value):
-                    extra_pids.append(pid)
-                else:
-                    extra_pids.append(pid)
-
-            self._extra_pids_entry.set_text(",".join(extra_pids))
+                    pass
 
     def init_enigma2_transponder_data(self, srv):
         """ Transponder data initialisation """
@@ -351,12 +317,10 @@ class ServiceDetailsDialog:
     # ***************** Init Neutrino data *********************#
 
     def init_neutrino_data(self, srv):
-        if self._tr_type is not TrType.Satellite:
-            return
-        tr_data = get_attributes(srv.transponder)
-        self._transponder_id_entry.set_text(str(int(tr_data.get("id", "0"), 16)))
-        self._network_id_entry.set_text(str(int(tr_data.get("on", "0"), 16)))
-        self.select_active_text(self._invertion_combo_box, Inversion(tr_data.get("inv", "2")).name)
+        tr_data = srv.transponder.split(":")
+        self._transponder_id_entry.set_text(str(int(tr_data[0], 16)))
+        self._network_id_entry.set_text(str(int(tr_data[1], 16)))
+        self.select_active_text(self._invertion_combo_box, Inversion(tr_data[3]).name)
         self.select_active_text(self._service_type_combo_box, srv.service_type)
         self.update_reference_entry()
 
@@ -368,7 +332,6 @@ class ServiceDetailsDialog:
         tr_grid.set_margin_bottom(5)
         self._builder.get_object("tr_extra_expander").set_visible(False)
         self._builder.get_object("srv_separator").set_visible(False)
-        self._package_entry.set_sensitive(False)
 
     # ***************** Init Sat positions *********************#
 
@@ -408,10 +371,6 @@ class ServiceDetailsDialog:
         self.save_data()
 
     def save_data(self):
-        if self._s_type is SettingsType.NEUTRINO_MP and self._tr_type is not TrType.Satellite:
-            show_dialog(DialogType.ERROR, transient=self._dialog, text="Not implemented yet!")
-            return
-
         if not self.is_data_correct():
             show_dialog(DialogType.ERROR, self._dialog, "Error. Verify the data!")
             return
@@ -424,7 +383,6 @@ class ServiceDetailsDialog:
 
     def on_new(self):
         """ Create new service. """
-        service = self.get_service(*self.get_srv_data(), self.get_satellite_transponder_data())
         show_dialog(DialogType.ERROR, transient=self._dialog, text="Not implemented yet!")
         return True
 
@@ -468,7 +426,7 @@ class ServiceDetailsDialog:
         extra_data = {Column.SRV_TOOLTIP: None, Column.SRV_BACKGROUND: None}
         if self._s_type is SettingsType.ENIGMA_2 and flags:
             f_flags = list(filter(lambda x: x.startswith("f:"), flags.split(",")))
-            if f_flags and Flag.is_new(Flag.parse(f_flags[0])):
+            if f_flags and Flag.is_new(int(f_flags[0][2:])):
                 extra_data[Column.SRV_BACKGROUND] = self._new_color
 
         self._current_model.set(self._current_itr, extra_data)
@@ -504,13 +462,13 @@ class ServiceDetailsDialog:
                             Column.FAV_PICON: new_service.picon})
 
     def update_picon_name(self, old_name, new_name):
-        if not os.path.isdir(self._picons_path):
+        if not os.path.isdir(self._picons_dir_path):
             return
 
-        for file_name in os.listdir(self._picons_path):
+        for file_name in os.listdir(self._picons_dir_path):
             if file_name == old_name:
-                old_file = os.path.join(self._picons_path, old_name)
-                new_file = os.path.join(self._picons_path, new_name)
+                old_file = os.path.join(self._picons_dir_path, old_name)
+                new_file = os.path.join(self._picons_dir_path, new_name)
                 os.rename(old_file, new_file)
                 break
 
@@ -543,9 +501,9 @@ class ServiceDetailsDialog:
         if self._s_type is SettingsType.ENIGMA_2:
             return self.get_enigma2_flags()
         elif self._s_type is SettingsType.NEUTRINO_MP:
-            flags = get_attributes(self._old_service.flags_cas)
-            flags["position"] = self.get_sat_position()
-            return SP.join("{}{}{}".format(k, KSP, v) for k, v in flags.items())
+            flags = self._old_service.flags_cas.split(":")
+            flags[1] = self.get_sat_position()
+            return ":".join(flags)
 
     def get_enigma2_flags(self):
         flags = ["p:{}".format(self._package_entry.get_text())]
@@ -575,9 +533,6 @@ class ServiceDetailsDialog:
         pcm_pid = self._pcm_entry.get_text()
         if pcm_pid:
             flags.append("{}{:04x}".format(Pids.PCM_DELAY.value, int(pcm_pid)))
-        extra_pids = self._extra_pids_entry.get_text()
-        if extra_pids:
-            flags.append(extra_pids)
         # flags
         f_flags = Flag.KEEP.value if self._keep_check_button.get_active() else 0
         f_flags = f_flags + Flag.HIDE.value if self._hide_check_button.get_active() else f_flags
@@ -599,12 +554,10 @@ class ServiceDetailsDialog:
             fav_id = self._ENIGMA2_FAV_ID.format(ssid, tr_id, net_id, namespace)
             return fav_id, data_id
         elif self._s_type is SettingsType.NEUTRINO_MP:
-            data = get_attributes(self._old_service.data_id)
-            data["n"] = self._name_entry.get_text()
-            data["t"] = "{:x}".format(int(service_type))
-            data["i"] = "{:04x}".format(ssid)
             fav_id = self._NEUTRINO_FAV_ID.format(tr_id, net_id, ssid)
-            return fav_id, SP.join("{}{}{}".format(k, KSP, v) for k, v in data.items())
+            data_id = self._old_service.data_id.split(":")
+            data_id[1] = "{:x}".format(int(service_type))
+            return fav_id, ":".join(data_id)
 
     # ***************** Transponder ********************* #
 
@@ -649,19 +602,12 @@ class ServiceDetailsDialog:
                 pls_code = self._pls_code_entry.get_text()
                 st_id = self._stream_id_entry.get_text()
                 pls = ":{}:{}:{}".format(st_id, pls_code, pls_mode) if pls_mode and pls_code and st_id else ""
-
                 return "{}:{}:{}:{}:{}{}".format(dvb_s_tr, flag, mod, roll_off, pilot, pls)
         elif self._s_type is SettingsType.NEUTRINO_MP:
-            tr_data = get_attributes(self._old_service.transponder)
-            tr_data["frq"] = freq
-            tr_data["sr"] = rate
-            tr_data["pol"] = pol
-            tr_data["fec"] = fec
-            tr_data["on"] = "{:04x}".format(int(self._network_id_entry.get_text()))
-            tr_data["id"] = "{:04x}".format(int(self._transponder_id_entry.get_text()))
-            tr_data["inv"] = inv
-
-            return SP.join("{}{}{}".format(k, KSP, v) for k, v in tr_data.items())
+            on_id, tr_id = int(self._network_id_entry.get_text()), int(self._transponder_id_entry.get_text())
+            mod = self.get_value_from_combobox_id(self._mod_combo_box, MODULATION) if sys == "DVB-S2" else None
+            srv_sys = None
+            return self._NEUTRINO_TRANSPONDER_DATA.format(tr_id, on_id, freq, inv, rate, fec, pol, mod, srv_sys)
 
     def get_sat_position(self):
         sat_pos = self._sat_pos_button.get_value() * (-1 if self._pos_side_box.get_active_id() == "W" else 1)
@@ -721,9 +667,9 @@ class ServiceDetailsDialog:
                 continue
 
             if self._s_type is SettingsType.NEUTRINO_MP:
-                flags = get_attributes(srv[Column.SRV_CAS_FLAGS])
-                flags["position"] = sat_pos
-                srv[Column.SRV_CAS_FLAGS] = SP.join("{}{}{}".format(k, KSP, v) for k, v in flags.items())
+                flags = srv[Column.SRV_CAS_FLAGS].split(":")
+                flags[1] = sat_pos
+                srv[Column.SRV_CAS_FLAGS] = ":".join(flags)
 
             self._services[fav_id] = Service(*srv[:Column.SRV_TOOLTIP])
             self._current_model.set_row(itr, srv)
@@ -746,9 +692,6 @@ class ServiceDetailsDialog:
     def on_cas_entry_changed(self, entry):
         entry.set_name("GtkEntry" if self._CAID_PATTERN.fullmatch(entry.get_text()) else self._DIGIT_ENTRY_NAME)
 
-    def on_extra_pids_entry_changed(self, entry):
-        entry.set_name("GtkEntry" if self._PIDS_PATTERN.fullmatch(entry.get_text()) else self._DIGIT_ENTRY_NAME)
-
     def get_value_from_combobox_id(self, box: Gtk.ComboBox, dc: dict):
         cb_id = box.get_active_id()
         return get_key_by_value(dc, cb_id)
@@ -781,8 +724,6 @@ class ServiceDetailsDialog:
                 return False
         if self._cas_entry.get_name() == self._DIGIT_ENTRY_NAME:
             return False
-        if self._extra_pids_entry.get_name() == self._DIGIT_ENTRY_NAME:
-            return False
         return True
 
     def update_reference(self, entry, event=None):

app/ui/settings_dialog.py

@@ -1,40 +1,12 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import os
 import re
 
 from app.commons import run_task, run_idle, log
 from app.connections import test_telnet, test_ftp, TestException, test_http, HttpApiException
-from app.settings import SettingsType, Settings, PlayStreamsMode, IS_LINUX, SEP, IS_WIN
+from app.settings import SettingsType, Settings, PlayStreamsMode, IS_WIN
 from app.ui.dialogs import show_dialog, DialogType, get_message, get_chooser_dialog, get_builder
 from .main_helper import update_entry_data, scroll_to, get_picon_pixbuf
-from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, FavClickMode, DEFAULT_ICON, APP_FONT, IS_GNOME_SESSION
+from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, FavClickMode, DEFAULT_ICON, APP_FONT
 
 
 def show_settings_dialog(transient, options):
@@ -50,6 +22,8 @@ class SettingsDialog:
                     "on_settings_type_changed": self.on_settings_type_changed,
                     "on_reset": self.on_reset,
                     "on_response": self.on_response,
+                    "apply_settings": self.apply_settings,
+                    "on_apply_profile_settings": self.on_apply_profile_settings,
                     "on_connection_test": self.on_connection_test,
                     "on_info_bar_close": self.on_info_bar_close,
                     "on_set_color_switch": self.on_set_color_switch,
@@ -58,6 +32,7 @@ class SettingsDialog:
                     "on_experimental_switch": self.on_experimental_switch,
                     "on_yt_dl_switch": self.on_yt_dl_switch,
                     "on_default_path_mode_switch": self.on_default_path_mode_switch,
+                    "on_default_data_path_changed": self.on_default_data_path_changed,
                     "on_profile_add": self.on_profile_add,
                     "on_profile_edit": self.on_profile_edit,
                     "on_profile_remove": self.on_profile_remove,
@@ -66,8 +41,6 @@ class SettingsDialog:
                     "on_profile_edited": self.on_profile_edited,
                     "on_profile_selected": self.on_profile_selected,
                     "on_profile_set_default": self.on_profile_set_default,
-                    "on_add_picon_path": self.on_add_picon_path,
-                    "on_remove_picon_path": self.on_remove_picon_path,
                     "on_lang_changed": self.on_lang_changed,
                     "on_main_settings_visible": self.on_main_settings_visible,
                     "on_http_use_ssl_toggled": self.on_http_use_ssl_toggled,
@@ -85,21 +58,19 @@ class SettingsDialog:
                     "on_icon_theme_add": self.on_icon_theme_add,
                     "on_icon_theme_remove": self.on_icon_theme_remove}
 
-        # Settings.
+        # Settings
         self._ext_settings = settings
         self._settings = Settings(settings.settings)
         self._profiles = self._settings.profiles
         self._s_type = self._settings.setting_type
-        self._updated = False
 
         builder = get_builder(UI_RESOURCES_PATH + "settings_dialog.glade", handlers)
 
         self._dialog = builder.get_object("settings_dialog")
         self._dialog.set_transient_for(transient)
-        self._dialog.set_border_width(0)
-        self._dialog.set_margin_left(0)
+        self._header_bar = builder.get_object("header_bar")
         self._main_stack = builder.get_object("main_stack")
-        # Network.
+        # Network
         self._host_field = builder.get_object("host_field")
         self._port_field = builder.get_object("port_field")
         self._login_field = builder.get_object("login_field")
@@ -108,34 +79,30 @@ class SettingsDialog:
         self._http_use_ssl_check_button = builder.get_object("http_use_ssl_check_button")
         self._telnet_port_field = builder.get_object("telnet_port_field")
         self._telnet_timeout_spin_button = builder.get_object("telnet_timeout_spin_button")
-        self._reset_button = builder.get_object("reset_button")
-        # Test.
+        # Test
         self._ftp_radio_button = builder.get_object("ftp_radio_button")
         self._http_radio_button = builder.get_object("http_radio_button")
-        # Network paths.
+        # Paths
         self._services_field = builder.get_object("services_field")
         self._user_bouquet_field = builder.get_object("user_bouquet_field")
         self._satellites_xml_field = builder.get_object("satellites_xml_field")
-        self._picons_paths_box = builder.get_object("picons_paths_box")
-        self._remove_picon_path_button = builder.get_object("remove_picon_path_button")
-        # Paths.
-        self._picons_path_field = builder.get_object("picons_path_field")
-        self._data_path_field = builder.get_object("data_path_field")
-        self._backup_path_field = builder.get_object("backup_path_field")
-        self._record_data_path_field = builder.get_object("record_data_path_field")
+        self._data_dir_field = builder.get_object("data_dir_field")
+        self._picons_field = builder.get_object("picons_field")
+        self._picons_dir_field = builder.get_object("picons_dir_field")
+        self._backup_dir_field = builder.get_object("backup_dir_field")
+        self._default_data_dir_field = builder.get_object("default_data_dir_field")
+        self._record_data_dir_field = builder.get_object("record_data_dir_field")
         self._default_data_paths_switch = builder.get_object("default_data_paths_switch")
-        self._default_data_paths_switch.bind_property("active", self._backup_path_field, "sensitive", 4)
-        self._default_data_paths_switch.bind_property("active", self._picons_path_field, "sensitive", 4)
-        # Info bar.
+        # Info bar
         self._info_bar = builder.get_object("info_bar")
         self._message_label = builder.get_object("info_bar_message_label")
         self._test_spinner = builder.get_object("test_spinner")
-        # Settings type.
+        # Settings type
         self._enigma_radio_button = builder.get_object("enigma_radio_button")
         self._neutrino_radio_button = builder.get_object("neutrino_radio_button")
         self._support_ver5_switch = builder.get_object("support_ver5_switch")
         self._force_bq_name_switch = builder.get_object("force_bq_name_switch")
-        # Streaming.
+        # Streaming
         self._apply_presets_button = builder.get_object("apply_presets_button")
         self._transcoding_switch = builder.get_object("transcoding_switch")
         self._edit_preset_switch = builder.get_object("edit_preset_switch")
@@ -157,14 +124,14 @@ class SettingsDialog:
         self._gst_lib_button = builder.get_object("gst_lib_button")
         self._vlc_lib_button = builder.get_object("vlc_lib_button")
         self._mpv_lib_button = builder.get_object("mpv_lib_button")
-        # Program.
+        # Program
         self._before_save_switch = builder.get_object("before_save_switch")
         self._before_downloading_switch = builder.get_object("before_downloading_switch")
         self._load_on_startup_switch = builder.get_object("load_on_startup_switch")
         self._bouquet_hints_switch = builder.get_object("bouquet_hints_switch")
         self._services_hints_switch = builder.get_object("services_hints_switch")
         self._lang_combo_box = builder.get_object("lang_combo_box")
-        # Appearance.
+        # Appearance
         self._list_font_button = builder.get_object("list_font_button")
         self._picons_size_button = builder.get_object("picons_size_button")
         self._tooltip_logo_size_button = builder.get_object("tooltip_logo_size_button")
@@ -172,7 +139,7 @@ class SettingsDialog:
         self._set_color_switch = builder.get_object("set_color_switch")
         self._new_color_button = builder.get_object("new_color_button")
         self._extra_color_button = builder.get_object("extra_color_button")
-        # Extra.
+        # Extra
         self._support_http_api_switch = builder.get_object("support_http_api_switch")
         self._enable_yt_dl_switch = builder.get_object("enable_yt_dl_switch")
         self._enable_update_yt_dl_switch = builder.get_object("enable_update_yt_dl_switch")
@@ -184,26 +151,25 @@ class SettingsDialog:
         self._click_mode_zap_and_play_button = builder.get_object("click_mode_zap_and_play_button")
         self._click_mode_zap_button.bind_property("sensitive", self._click_mode_play_button, "sensitive")
         self._click_mode_zap_button.bind_property("sensitive", self._click_mode_zap_and_play_button, "sensitive")
-        # EXPERIMENTAL.
+        # EXPERIMENTAL
         self._enable_exp_switch = builder.get_object("enable_experimental_switch")
         self._enable_exp_switch.bind_property("active", builder.get_object("yt_dl_box"), "sensitive")
         self._enable_yt_dl_switch.bind_property("active", builder.get_object("yt_dl_update_box"), "sensitive")
         self._enable_exp_switch.bind_property("active", builder.get_object("v5_support_box"), "sensitive")
         self._enable_exp_switch.bind_property("active", builder.get_object("enable_direct_playback_box"), "sensitive")
-        # Enigma2 only.
+        # Enigma2 only
         self._enigma_radio_button.bind_property("active", builder.get_object("bq_naming_grid"), "sensitive")
         self._enigma_radio_button.bind_property("active", builder.get_object("enable_http_box"), "sensitive")
         self._enigma_radio_button.bind_property("active", builder.get_object("enable_experimental_box"), "sensitive")
         self._enigma_radio_button.bind_property("active", builder.get_object("program_frame"), "sensitive")
         self._enigma_radio_button.bind_property("active", builder.get_object("experimental_box"), "sensitive")
-        # Profiles.
+        # Profiles
         self._profile_view = builder.get_object("profile_tree_view")
         self._profile_add_button = builder.get_object("profile_add_button")
         self._profile_remove_button = builder.get_object("profile_remove_button")
-        # Network.
-        # Separated due to a bug with response (presumably in the builder) in ubuntu 18.04 and derivatives.
-        builder.get_object("network_settings_frame").add(builder.get_object("network_box"))
-        # Style.
+        self._apply_profile_button = builder.get_object("apply_profile_button")
+        self._apply_profile_button.bind_property("visible", builder.get_object("reset_button"), "visible")
+        # Style
         self._style_provider = Gtk.CssProvider()
         self._style_provider.load_from_path(UI_RESOURCES_PATH + "style.css")
         self._digit_elems = (self._port_field, self._http_port_field, self._telnet_port_field, self._video_width_field,
@@ -211,40 +177,32 @@ class SettingsDialog:
         for el in self._digit_elems:
             el.get_style_context().add_provider_for_screen(Gdk.Screen.get_default(), self._style_provider,
                                                            Gtk.STYLE_PROVIDER_PRIORITY_USER)
-
-        if IS_GNOME_SESSION:
-            switcher = builder.get_object("main_stack_switcher")
-            switcher.set_margin_top(0)
-            switcher.set_margin_bottom(0)
-            builder.get_object("main_box").remove(switcher)
-            header_bar = Gtk.HeaderBar(visible=True, show_close_button=True)
-            header_bar.set_custom_title(switcher)
-            self._dialog.set_titlebar(header_bar)
-
-        self.init_ui_elements()
+        self.init_ui_elements(self._s_type)
         self.init_profiles()
 
-        if not IS_LINUX:
-            # Themes.
-            builder.get_object("style_frame").set_visible(IS_WIN)
-            builder.get_object("themes_support_frame").set_visible(True)
+        if IS_WIN or True:
+            self._gst_lib_button.set_visible(False)
+            self._vlc_lib_button.set_sensitive(self._settings.is_enable_experimental)
+            # Themes
+            enable_exp = self._settings.is_enable_experimental
+            builder.get_object("style_frame").set_visible(enable_exp)
+            builder.get_object("themes_support_frame").set_visible(enable_exp)
             self._layout_switch = builder.get_object("layout_switch")
             self._layout_switch.set_active(self._ext_settings.alternate_layout)
             self._theme_frame = builder.get_object("theme_frame")
-            self._theme_frame.set_visible(True)
+            self._theme_frame.set_visible(enable_exp)
             self._theme_thumbnail_image = builder.get_object("theme_thumbnail_image")
             self._theme_combo_box = builder.get_object("theme_combo_box")
             self._icon_theme_combo_box = builder.get_object("icon_theme_combo_box")
             self._dark_mode_switch = builder.get_object("dark_mode_switch")
-            self._dark_mode_switch.set_active(self._ext_settings.dark_mode)
             self._themes_support_switch = builder.get_object("themes_support_switch")
             self._themes_support_switch.bind_property("active", self._theme_frame, "sensitive")
             self.init_themes()
 
-    def init_ui_elements(self):
-        is_enigma_profile = self._s_type is SettingsType.ENIGMA_2
-        self._neutrino_radio_button.set_active(self._s_type is SettingsType.NEUTRINO_MP)
-        self.update_picon_paths()
+    @run_idle
+    def init_ui_elements(self, s_type):
+        is_enigma_profile = s_type is SettingsType.ENIGMA_2
+        self._neutrino_radio_button.set_active(s_type is SettingsType.NEUTRINO_MP)
         self.update_title()
         http_active = self._support_http_api_switch.get_active()
         self._click_mode_zap_button.set_sensitive(is_enigma_profile and http_active)
@@ -270,25 +228,15 @@ class SettingsDialog:
         elif self._s_type is SettingsType.NEUTRINO_MP:
             self._dialog.set_title(title.format(get_message("Options"), self._neutrino_radio_button.get_label()))
 
-    def update_picon_paths(self):
-        model = self._picons_paths_box.get_model()
-        model.clear()
-        list(map(lambda p: model.append((p, p)), self._settings.picons_paths))
-        if self._settings.picons_path in self._settings.picons_paths:
-            self._picons_paths_box.set_active_id(self._settings.picons_path)
-        else:
-            self._picons_paths_box.set_active(0)
-
     def show(self):
-        return self._dialog.run()
-
-    def is_updated(self):
-        return self._updated
+        self._dialog.run()
 
     def on_response(self, dialog, resp):
-        if resp == Gtk.ResponseType.ACCEPT:
-            self._updated = self.on_save_settings()
-        dialog.destroy()
+        if resp == Gtk.ResponseType.OK and not self.apply_settings():
+            return
+
+        self._dialog.destroy()
+        return resp
 
     def on_field_icon_press(self, entry, icon, event_button):
         update_entry_data(entry, self._dialog, self._settings)
@@ -299,7 +247,7 @@ class SettingsDialog:
             self._settings.setting_type = s_type
             self._s_type = s_type
             self.on_reset()
-        self.init_ui_elements()
+        self.init_ui_elements(s_type)
 
     def on_reset(self, item=None):
         self._settings.reset()
@@ -318,11 +266,12 @@ class SettingsDialog:
         self._services_field.set_text(self._settings.services_path)
         self._user_bouquet_field.set_text(self._settings.user_bouquet_path)
         self._satellites_xml_field.set_text(self._settings.satellites_xml_path)
-        self._picons_paths_box.set_active_id(self._settings.picons_path)
-        self._data_path_field.set_text(self._settings.default_data_path)
-        self._picons_path_field.set_text(self._settings.default_picon_path)
-        self._backup_path_field.set_text(self._settings.default_backup_path)
-        self._record_data_path_field.set_text(self._settings.records_path)
+        self._picons_field.set_text(self._settings.picons_path)
+        self._data_dir_field.set_text(self._settings.data_local_path)
+        self._picons_dir_field.set_text(self._settings.picons_local_path)
+        self._backup_dir_field.set_text(self._settings.backup_local_path)
+        self._default_data_dir_field.set_text(self._settings.default_data_path)
+        self._record_data_dir_field.set_text(self._settings.records_path)
         self._before_save_switch.set_active(self._settings.backup_before_save)
         self._before_downloading_switch.set_active(self._settings.backup_before_downloading)
         self.set_fav_click_mode(self._settings.fav_click_mode)
@@ -378,11 +327,14 @@ class SettingsDialog:
         self._settings.services_path = self._services_field.get_text()
         self._settings.user_bouquet_path = self._user_bouquet_field.get_text()
         self._settings.satellites_xml_path = self._satellites_xml_field.get_text()
-        self._settings.picons_path = self._picons_paths_box.get_active_id()
+        self._settings.picons_path = self._picons_field.get_text()
+        self._settings.data_local_path = self._data_dir_field.get_text()
+        self._settings.picons_local_path = self._picons_dir_field.get_text()
+        self._settings.backup_local_path = self._backup_dir_field.get_text()
 
-    def on_save_settings(self, item=None):
+    def apply_settings(self, item=None):
         if show_dialog(DialogType.QUESTION, self._dialog) != Gtk.ResponseType.OK:
-            return False
+            return
 
         self.on_apply_profile_settings()
         self._ext_settings.profiles = self._settings.profiles
@@ -396,18 +348,15 @@ class SettingsDialog:
         self._ext_settings.show_bq_hints = self._bouquet_hints_switch.get_active()
         self._ext_settings.show_srv_hints = self._services_hints_switch.get_active()
         self._ext_settings.profile_folder_is_default = self._default_data_paths_switch.get_active()
-        self._ext_settings.default_data_path = self._data_path_field.get_text()
-        self._ext_settings.default_backup_path = self._backup_path_field.get_text()
-        self._ext_settings.default_picon_path = self._picons_path_field.get_text()
-        self._ext_settings.records_path = self._record_data_path_field.get_text()
+        self._ext_settings.default_data_path = self._default_data_dir_field.get_text()
+        self._ext_settings.records_path = self._record_data_dir_field.get_text()
         self._ext_settings.activate_transcoding = self._transcoding_switch.get_active()
         self._ext_settings.active_preset = self._presets_combo_box.get_active_id()
         self._ext_settings.list_picon_size = int(self._picons_size_button.get_active_id())
         self._ext_settings.tooltip_logo_size = int(self._tooltip_logo_size_button.get_active_id())
         self._ext_settings.list_font = self._list_font_button.get_font()
 
-        if not IS_LINUX:
-            self._ext_settings.dark_mode = self._dark_mode_switch.get_active()
+        if IS_WIN:
             self._ext_settings.alternate_layout = self._layout_switch.get_active()
             self._ext_settings.is_themes_support = self._themes_support_switch.get_active()
             self._ext_settings.theme = self._theme_combo_box.get_active_id()
@@ -427,7 +376,6 @@ class SettingsDialog:
 
         self._ext_settings.default_profile = list(filter(lambda r: r[1], self._profile_view.get_model()))[0][0]
         self._ext_settings.save()
-
         return True
 
     @run_task
@@ -447,8 +395,7 @@ class SettingsDialog:
         host, port = self._host_field.get_text(), self._http_port_field.get_text()
         use_ssl = self._http_use_ssl_check_button.get_active()
         try:
-            self.show_info_message(test_http(host, port, user, password, use_ssl=use_ssl, s_type=self._s_type),
-                                   Gtk.MessageType.INFO)
+            self.show_info_message(test_http(host, port, user, password, use_ssl=use_ssl), Gtk.MessageType.INFO)
         except TestException as e:
             self.show_info_message(str(e), Gtk.MessageType.ERROR)
         except HttpApiException as e:
@@ -471,7 +418,7 @@ class SettingsDialog:
         host, port = self._host_field.get_text(), self._port_field.get_text()
         user, password = self._login_field.get_text(), self._password_field.get_text()
         try:
-            self.show_info_message(f"OK.  {test_ftp(host, port, user, password)}", Gtk.MessageType.INFO)
+            self.show_info_message("OK.  {}".format(test_ftp(host, port, user, password)), Gtk.MessageType.INFO)
         except TestException as e:
             self.show_info_message(str(e), Gtk.MessageType.ERROR)
         finally:
@@ -479,10 +426,9 @@ class SettingsDialog:
 
     @run_idle
     def show_info_message(self, text, message_type):
-        self._info_bar.set_visible(False)
+        self._info_bar.set_visible(True)
         self._info_bar.set_message_type(message_type)
         self._message_label.set_text(get_message(text))
-        self._info_bar.set_visible(True)
 
     @run_idle
     def show_spinner(self, show):
@@ -524,6 +470,9 @@ class SettingsDialog:
     def on_default_path_mode_switch(self, switch, state):
         self._settings.profile_folder_is_default = state
 
+    def on_default_data_path_changed(self, entry):
+        self._settings.default_data_path = entry.get_text()
+
     def on_profile_add(self, item):
         model = self._profile_view.get_model()
         count = 0
@@ -570,8 +519,29 @@ class SettingsDialog:
         if p_settings:
             row[0] = new_value
             self._profiles[new_value] = p_settings
+            self.update_local_paths(new_value, old_name)
         self.on_profile_selected(self._profile_view, False)
 
+    def update_local_paths(self, p_name, old_name, force_rename=False):
+        data_path = self._settings.data_local_path
+        picons_path = self._settings.picons_local_path
+        backup_path = self._settings.backup_local_path
+
+        self._settings.data_local_path = p_name.join(data_path.rsplit(old_name, 1))
+        self._settings.picons_local_path = p_name.join(picons_path.rsplit(old_name, 1))
+        self._settings.backup_local_path = p_name.join(backup_path.rsplit(old_name, 1))
+
+        if force_rename:
+            try:
+                if os.path.isdir(picons_path):
+                    os.rename(picons_path, self._settings.picons_local_path)
+                if os.path.isdir(data_path):
+                    os.rename(data_path, self._settings.data_local_path)
+                if os.path.isdir(backup_path):
+                    os.rename(backup_path, self._settings.backup_local_path)
+            except OSError as e:
+                self.show_info_message(str(e), Gtk.MessageType.ERROR)
+
     def on_profile_selected(self, view, force=True):
         if force:
             self.on_apply_profile_settings()
@@ -593,43 +563,14 @@ class SettingsDialog:
     def on_profile_inserted(self, model, path, itr):
         self._profile_remove_button.set_sensitive(len(model) > 1)
 
-    def on_add_picon_path(self, button):
-        response = show_dialog(DialogType.INPUT, self._dialog, self._settings.picons_path)
-        if response is Gtk.ResponseType.CANCEL:
-            return
-
-        if response in self._settings.picons_paths:
-            self.show_info_message("This path already exists!", Gtk.MessageType.ERROR)
-            return
-
-        path = response if response.endswith(SEP) else response + SEP
-        model = self._picons_paths_box.get_model()
-        model.append((path, path))
-        self._picons_paths_box.set_active_id(path)
-        self._ext_settings.picons_paths = tuple(r[0] for r in model)
-
-    def on_remove_picon_path(self, button):
-        msg = f"{get_message('This may change the settings of other profiles!')}\n\n\t\t{get_message('Are you sure?')}"
-        if show_dialog(DialogType.QUESTION, self._dialog, msg) != Gtk.ResponseType.OK:
-            return
-
-        model = self._picons_paths_box.get_model()
-        active = self._picons_paths_box.get_active_iter()
-        if active:
-            model.remove(active)
-
-        self._picons_paths_box.set_active(0)
-        self._remove_picon_path_button.set_sensitive(len(model) > 1)
-        self._ext_settings.picons_paths = tuple(r[0] for r in model)
-
     def on_lang_changed(self, box):
         if box.get_active_id() != self._settings.language:
             self.show_info_message("Save and restart the program to apply the settings.", Gtk.MessageType.WARNING)
 
     def on_main_settings_visible(self, stack, param):
         name = stack.get_visible_child_name()
+        self._apply_profile_button.set_visible(name == "profiles")
         self._apply_presets_button.set_visible(name == "streaming")
-        self._reset_button.set_visible(name == "profiles")
 
     def on_http_use_ssl_toggled(self, button):
         active = button.get_active()
@@ -770,7 +711,7 @@ class SettingsDialog:
 
     @run_idle
     def set_theme_thumbnail_image(self, theme_name):
-        img_path = "{}{}{}gtk-3.0{}thumbnail.png".format(self._ext_settings.themes_path, theme_name, SEP, SEP)
+        img_path = "{}{}/gtk-3.0/thumbnail.png".format(self._ext_settings.themes_path, theme_name)
         self._theme_thumbnail_image.set_from_pixbuf(get_picon_pixbuf(img_path, 96))
 
     def on_theme_add(self, button):

app/ui/style.css

@@ -3,10 +3,7 @@
 }
 
 #status-bar-button {
-  padding-top: 1px;
-  padding-bottom: 1px;
-  padding-left: 3px;
-  padding-right: 3px;
+  padding: 1px;
   margin: 1px;
 }
 
@@ -58,16 +55,4 @@ paned > separator {
   border-radius: 0;
   border-left-width: 0;
   border-right-width: 1px;
-}
-
-.stack-switcher > button > label {
-  padding-left: 5px;
-  padding-right: 5px;
-  min-width: 50px;
-}
-
-.stack-switcher > button.text-button {
-  padding-left: 5px;
-  padding-right: 5px;
-  min-width: 50px;
-}
+}

app/ui/telnet.glade

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 
+<!-- Generated with glade 3.22.1 
 
 The MIT License (MIT)
 
@@ -27,10 +27,10 @@ Author: Dmitriy Yefremov
 
 -->
 <interface domain="demon-editor">
-  <requires lib="gtk+" version="3.18"/>
+  <requires lib="gtk+" version="3.16"/>
   <!-- interface-license-type mit -->
   <!-- interface-name DemonEditor -->
-  <!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
+  <!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
   <!-- interface-authors Dmitriy Yefremov -->
   <object class="GtkTextTagTable" id="tag_table">
     <child type="tag">
@@ -43,99 +43,25 @@ Author: Dmitriy Yefremov
   <object class="GtkTextBuffer" id="text_buffer">
     <property name="tag_table">tag_table</property>
   </object>
-  <object class="GtkFrame" id="telnet_frame">
-    <property name="visible">True</property>
+  <object class="GtkWindow" id="dialog_window">
     <property name="can_focus">False</property>
-    <property name="label_xalign">0.49000000953674316</property>
-    <property name="shadow_type">in</property>
+    <property name="title" translatable="yes">DemonEditor [Telnet client]</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="icon_name">terminal</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <signal name="delete-event" handler="on_close" swapped="no"/>
     <child>
-      <object class="GtkBox" id="telnet_main_box">
+      <placeholder/>
+    </child>
+    <child>
+      <object class="GtkBox" id="main_box">
+        <property name="width_request">560</property>
+        <property name="height_request">320</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">5</property>
-        <property name="margin_right">5</property>
-        <property name="margin_bottom">5</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">5</property>
-        <child>
-          <object class="GtkBox" id="commands_entry">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">5</property>
-            <property name="margin_right">5</property>
-            <property name="margin_bottom">2</property>
-            <property name="spacing">5</property>
-            <child>
-              <object class="GtkButton" id="connect_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Connect</property>
-                <signal name="clicked" handler="on_connect" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="connect_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-connect</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="disconnect_button">
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Disconnect</property>
-                <signal name="clicked" handler="on_disconnect" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="disconnect_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-disconnect</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="clear_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="tooltip_text" translatable="yes">Clear</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="on_clear" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="clear_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-clear</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
+        <property name="spacing">2</property>
         <child>
           <object class="GtkScrolledWindow" id="telnet_scrolled_window">
             <property name="visible">True</property>
@@ -161,17 +87,164 @@ Author: Dmitriy Yefremov
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="commands_entry">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">5</property>
+            <property name="margin_bottom">2</property>
+            <property name="spacing">2</property>
+            <child>
+              <object class="GtkComboBoxText" id="profile_combo_box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">0</property>
+                <property name="has_frame">False</property>
+                <signal name="changed" handler="on_profile_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="connect_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Connect</property>
+                <signal name="clicked" handler="on_connect" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="connect_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-connect</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="disconnect_button">
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Disconnect</property>
+                <signal name="clicked" handler="on_disconnect" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="disconnect_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-disconnect</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child type="center">
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkButton" id="clear_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Clear</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <signal name="clicked" handler="on_clear" swapped="no"/>
+                <child>
+                  <object class="GtkImage" id="clear_button_image">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-clear</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkInfoBar" id="info_bar">
+            <property name="app_paintable">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+            <property name="show_close_button">True</property>
+            <signal name="response" handler="on_info_bar_close" swapped="no"/>
+            <child internal-child="action_area">
+              <object class="GtkButtonBox">
+                <property name="can_focus">False</property>
+                <property name="layout_style">end</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child internal-child="content_area">
+              <object class="GtkBox">
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkLabel" id="info_bar_message_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label">Info</property>
+                    <property name="justify">center</property>
+                    <property name="wrap">True</property>
+                    <property name="wrap_mode">word-char</property>
+                    <property name="lines">2</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </object>
     </child>
-    <child type="label">
-      <object class="GtkLabel">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Telnet</property>
-      </object>
-    </child>
   </object>
 </interface>

app/ui/telnet.py

@@ -1,31 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import re
 import selectors
 import socket
@@ -35,6 +7,7 @@ from telnetlib import Telnet
 from gi.repository import GLib
 
 from app.commons import run_task, run_idle, log
+from app.settings import Settings
 from app.ui.uicommons import Gtk, Gdk, UI_RESOURCES_PATH, KeyboardKey, MOD_MASK
 
 
@@ -45,7 +18,7 @@ class ExtTelnet(Telnet):
         self._output_callback = output_callback
 
     def interact(self):
-        """ Interaction function, emulates a very dumb telnet client. """
+        """Interaction function, emulates a very dumb telnet client."""
         with selectors.DefaultSelector() as selector:
             selector.register(self, selectors.EVENT_READ)
 
@@ -64,62 +37,90 @@ class ExtTelnet(Telnet):
                                 self._output_callback(text)
 
 
-class TelnetClient(Gtk.Box):
-    """ Very simple telnet client. """
+class TelnetDialog:
+    """ Dialog of very simple telnet client. """
     _COLOR_PATTERN = re.compile("\x1b.*?m")  # Color info
     _ERASING_PATTERN = re.compile("\x1b.*?K")  # Erase to right
     _APP_MODE_PATTERN = re.compile("\x1b.*?(1h)|(1l)")  # h - on, l - off
     _ALL_PATTERN = re.compile(r'(\x1b\[|\x9b)[0-?]*[@-~]')
     _NOT_SUPPORTED = {"mc", "mcedit", "vi", "nano"}
 
-    def __init__(self, app, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._app = app
-        self._app.connect("profile-changed", self.on_profile_changed)
-
-        self._tn = None
-        self._app_mode = False
-        self._commands = deque(maxlen=10)
-
-        self._handlers = {"on_clear": self.on_clear,
+    def __init__(self, transient, settings):
+        self._handlers = {"on_profile_changed": self.on_profile_changed,
+                          "on_clear": self.on_clear,
                           "on_text_view_realize": self.on_text_view_realize,
                           "on_view_key_press": self.on_view_key_press,
+                          "on_info_bar_close": self.on_info_bar_close,
                           "on_connect": self.on_connect,
-                          "on_disconnect": self.on_disconnect}
+                          "on_disconnect": self.on_disconnect,
+                          "on_close": self.on_close}
 
         builder = Gtk.Builder()
         builder.add_from_file(UI_RESOURCES_PATH + "telnet.glade")
         builder.connect_signals(self._handlers)
-
+        self._dialog_window = builder.get_object("dialog_window")
+        self._dialog_window.set_transient_for(transient)
+        self._profile_combo_box = builder.get_object("profile_combo_box")
+        self._info_bar = builder.get_object("info_bar")
+        self._info_message_label = builder.get_object("info_bar_message_label")
         self._text_view = builder.get_object("text_view")
         self._buf = builder.get_object("text_buffer")
         self._end_tag = builder.get_object("end_tag")
         self._connect_button = builder.get_object("connect_button")
         self._connect_button.bind_property("visible", builder.get_object("disconnect_button"), "visible", 4)
-
-        main_frame = builder.get_object("telnet_frame")
         provider = Gtk.CssProvider()
         provider.load_from_path(UI_RESOURCES_PATH + "style.css")
-        main_frame.get_style_context().add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
+        builder.get_object("main_box").get_style_context().add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
 
-        self.pack_start(main_frame, True, True, 0)
-        self.show()
+        window_size = settings.get("telnet_dialog_window_size")
+        if window_size:
+            self._dialog_window.resize(*window_size)
 
-    def on_profile_changed(self, app, data):
-        self.on_clear()
+        self._ext_settings = settings
+        self._settings = Settings(settings.settings)
+        self._tn = None
+        self._app_mode = False
+        self._commands = deque(maxlen=10)
+
+    def show(self):
+        self._dialog_window.show()
+
+    def on_close(self, window, event):
+        """  Performs shutdown tasks """
+        self._ext_settings.add("telnet_dialog_window_size", window.get_size())
         self.on_disconnect()
-        self.on_connect()
+
+    def on_info_bar_close(self, bar=None, resp=None):
+        self._info_bar.set_visible(False)
+
+    @run_idle
+    def show_info_message(self, text, message_type):
+        self._info_bar.set_visible(True)
+        self._info_bar.set_message_type(message_type)
+        self._info_message_label.set_text(text)
 
     def on_text_view_realize(self, view):
+        self.init_profiles()
         self.on_connect()
 
+    @run_idle
+    def init_profiles(self):
+        for p in self._settings.profiles:
+            self._profile_combo_box.append(p, p)
+        self._profile_combo_box.set_active_id(self._settings.current_profile)
+
     @run_task
     def on_connect(self, item=None):
         try:
             GLib.idle_add(self._connect_button.set_visible, False)
-            settings = self._app.app_settings
-            user, password, timeout = settings.user, settings.password, settings.telnet_timeout
-            self._tn = ExtTelnet(self.append_output, host=settings.host, port=settings.telnet_port, timeout=timeout)
+            GLib.idle_add(self.on_info_bar_close)
+            user, password = self._settings.user, self._settings.password
+            timeout = self._settings.telnet_timeout
+
+            self._tn = ExtTelnet(self.append_output,
+                                 host=self._settings.host,
+                                 port=self._settings.telnet_port,
+                                 timeout=timeout)
 
             if user != "":
                 self._tn.read_until(b"login: ")
@@ -130,8 +131,8 @@ class TelnetClient(Gtk.Box):
 
             self._tn.interact()
         except (OSError, EOFError, socket.timeout, ConnectionRefusedError) as e:
-            log(f"{self.__class__.__name__}: {e}")
-            self._app.show_info_message(str(e), Gtk.MessageType.ERROR)
+            log("{}: {}".format(self.__class__.__name__, e))
+            self.show_info_message(str(e), Gtk.MessageType.ERROR)
         finally:
             GLib.idle_add(self._connect_button.set_visible, True)
 
@@ -141,6 +142,9 @@ class TelnetClient(Gtk.Box):
             GLib.idle_add(self._connect_button.set_visible, True)
             self._tn.close()
 
+    def on_profile_changed(self, button):
+        self._settings.current_profile = button.get_active_id()
+
     def on_command_done(self, entry):
         command = entry.get_text()
         entry.set_text("")
@@ -151,7 +155,7 @@ class TelnetClient(Gtk.Box):
         self._buf.delete(self._buf.get_start_iter(), self._buf.get_end_iter())
 
     def on_view_key_press(self, view, event):
-        """ Handling  keystrokes on press. """
+        """  Handling  keystrokes on press """
         if event.keyval == Gdk.KEY_Return:
             self.do_command()
             return True
@@ -166,7 +170,7 @@ class TelnetClient(Gtk.Box):
             if self._tn and self._tn.sock:
                 self._tn.write(b"\x03")  # interrupt
 
-        # Last commands navigation.
+        # last commands navigation
         if key is KeyboardKey.UP:
             self.delete_last_command()
             if self._commands:
@@ -202,13 +206,13 @@ class TelnetClient(Gtk.Box):
         else:  # if buf is empty
             command.append(self._buf.get_text(begin, end, False))
 
-        # To preventing duplication of the command in the buf.
+        # to preventing duplication of the command in the buf
         self._buf.delete(end, begin)
 
         if command and self._tn.sock:
             cmd = command[0]
             if cmd in self._NOT_SUPPORTED:
-                self._app.show_info_message(f"'{cmd}' is not supported by this client.", Gtk.MessageType.ERROR)
+                self.show_info_message("'{}' is not supported by this client.".format(cmd), Gtk.MessageType.ERROR)
             else:
                 self._tn.write(cmd.encode("ascii") + b"\r")
                 self._commands.append(cmd)
@@ -226,7 +230,7 @@ class TelnetClient(Gtk.Box):
                 self._app_mode = False
                 self.on_clear()
 
-        t = re.sub(self._ALL_PATTERN, "", t)  # Removing [replacing] ascii escape sequences.
+        t = re.sub(self._ALL_PATTERN, "", t)  # removing [replacing] ascii escape sequences
 
         if self._app_mode:
             start, end = self._buf.get_start_iter(), self._buf.get_end_iter()

app/ui/timer_row.glade

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.2 -->
+<interface domain="demon-editor">
+  <requires lib="gtk+" version="3.16"/>
+  <object class="GtkBox" id="timer_row_box">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="margin_left">2</property>
+    <property name="margin_right">2</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">5</property>
+    <child>
+      <object class="GtkBox" id="timer_name_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="timer_name_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="ellipsize">end</property>
+            <attributes>
+              <attribute name="weight" value="semibold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="timer_description_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="timer_description_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="ellipsize">end</property>
+            <attributes>
+              <attribute name="style" value="italic"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="timer_service_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="spacing">5</property>
+        <child>
+          <object class="GtkLabel" id="timer_service_name_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="ellipsize">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="timer_time_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <attributes>
+              <attribute name="size" value="8000"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSeparator" id="timer_row_separator">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+  </object>
+</interface>

app/ui/transmitter.glade

@@ -42,7 +42,6 @@ Author: Dmitriy Yefremov
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="decorated">False</property>
-    <property name="gravity">center</property>
     <property name="has_resize_grip">True</property>
     <child>
       <placeholder/>

app/ui/transmitter.py

@@ -6,6 +6,7 @@ from gi.repository import GLib
 
 from app.commons import log
 from app.connections import HttpAPI
+from app.settings import IS_WIN
 from app.tools.yt import YouTube
 from app.ui.dialogs import get_builder
 from app.ui.iptv import get_yt_icon
@@ -13,7 +14,7 @@ from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH
 
 
 class LinksTransmitter:
-    """ The main class for the "send to" function.
+    """ The main media bar class for the "send to" function..
 
          It used for direct playback of media links by the enigma2 media player.
     """
@@ -46,16 +47,19 @@ class LinksTransmitter:
         self._status_passive = None
         self._yt = YouTube.get_instance(settings)
 
-        try:
-            gi.require_version("AppIndicator3", "0.1")
-            from gi.repository import AppIndicator3
-        except (ImportError, ValueError) as e:
-            log("{}: Load library error: {}".format(__class__.__name__, e))
+        if IS_WIN:
             self._tray = builder.get_object("status_icon")
         else:
-            self._is_status_icon = False
-            self._status_active = AppIndicator3.IndicatorStatus.ACTIVE
-            self._status_passive = AppIndicator3.IndicatorStatus.PASSIVE
+            try:
+                gi.require_version("AppIndicator3", "0.1")
+                from gi.repository import AppIndicator3
+            except (ImportError, ValueError) as e:
+                log("{}: Load library error: {}".format(__class__.__name__, e))
+                self._tray = builder.get_object("status_icon")
+            else:
+                self._is_status_icon = False
+                self._status_active = AppIndicator3.IndicatorStatus.ACTIVE
+                self._status_passive = AppIndicator3.IndicatorStatus.PASSIVE
 
             category = AppIndicator3.IndicatorCategory.APPLICATION_STATUS
             path = Path(UI_RESOURCES_PATH + "/icons/hicolor/scalable/apps/demon-editor.svg")

app/ui/uicommons.py

@@ -1,121 +1,63 @@
-# -*- coding: utf-8 -*-
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2018-2021 Dmitriy Yefremov
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Author: Dmitriy Yefremov
-#
-
-
 import locale
 import os
 from enum import Enum, IntEnum
 from functools import lru_cache
 
+from app.settings import Settings, SettingsException, IS_WIN, SEP
+
 import gi
 
 gi.require_version("Gtk", "3.0")
 gi.require_version("Gdk", "3.0")
-from gi.repository import Gtk, Gdk
-
-from app.settings import Settings, SettingsException, IS_DARWIN, GTK_PATH, IS_LINUX
+from gi.repository import Gtk, Gdk, GLib
 
 # Setting mod mask for keyboard depending on platform
-MOD_MASK = Gdk.ModifierType.MOD2_MASK if IS_DARWIN else Gdk.ModifierType.CONTROL_MASK
-# Paths.
-BASE_PATH = "app/ui/"
-EX_PATH = "/usr/share/demoneditor/app/ui/" if IS_LINUX else "ui/"
-# Path to *.glade files.
-UI_RESOURCES_PATH = BASE_PATH if os.path.exists(BASE_PATH) else EX_PATH
-# Translation.
+MOD_MASK = Gdk.ModifierType.CONTROL_MASK
+# Path to *.glade files
+UI_PATH = "app{}ui{}".format(SEP, SEP)
+UI_RESOURCES_PATH = UI_PATH if os.path.exists(UI_PATH) else "ui{}".format(SEP)
 LANG_PATH = UI_RESOURCES_PATH + "lang"
-TEXT_DOMAIN = "demon-editor"
-
+GTK_PATH = os.environ.get("GTK_PATH", None)
 NOTIFY_IS_INIT = False
-APP_FONT = None
 IS_GNOME_SESSION = int(bool(os.environ.get("GNOME_DESKTOP_SESSION_ID")))
+# Translation.
+TEXT_DOMAIN = "demon-editor"
+APP_FONT = None
 
 try:
     settings = Settings.get_instance()
 except SettingsException:
     pass
 else:
+    locale.setlocale(locale.LC_NUMERIC, "C")
     os.environ["LANGUAGE"] = settings.language
+
     st = Gtk.Settings().get_default()
     APP_FONT = st.get_property("gtk-font-name")
-    st.set_property("gtk-application-prefer-dark-theme", settings.dark_mode)
 
     if settings.is_themes_support:
         st.set_property("gtk-theme-name", settings.theme)
         st.set_property("gtk-icon-theme-name", settings.icon_theme)
-    else:
-        if not IS_LINUX:
-            if IS_DARWIN:
-                s_path = f"{GTK_PATH + '/' + UI_RESOURCES_PATH if GTK_PATH else UI_RESOURCES_PATH}mac_style.css"
-            else:
-                s_path = f"{UI_RESOURCES_PATH}win_style.css"
 
-            style_provider = Gtk.CssProvider()
-            style_provider.load_from_path(s_path)
-            Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), style_provider,
-                                                     Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
-
-if IS_LINUX:
-    if UI_RESOURCES_PATH == BASE_PATH:
-        locale.bindtextdomain(TEXT_DOMAIN, LANG_PATH)
-    # Init notify
-    try:
-        gi.require_version("Notify", "0.7")
-        from gi.repository import Notify
-    except ImportError:
-        pass
-    else:
-        NOTIFY_IS_INIT = Notify.init("DemonEditor")
-elif IS_DARWIN:
-    import gettext
-
-    if GTK_PATH:
-        LANG_PATH = GTK_PATH + "/share/locale"
-    gettext.bindtextdomain(TEXT_DOMAIN, LANG_PATH)
-    # For launching from the bundle.
-    if os.getcwd() == "/" and GTK_PATH:
-        os.chdir(GTK_PATH)
-else:
-    locale.setlocale(locale.LC_NUMERIC, "C")
-
-# Icons.
 theme = Gtk.IconTheme.get_default()
-theme.append_search_path(UI_RESOURCES_PATH + "icons")
+theme.append_search_path(GTK_PATH + "{}share{}icons".format(SEP, SEP) if GTK_PATH else UI_RESOURCES_PATH + "icons")
 
-_IMAGE_MISSING = theme.load_icon("image-missing", 16, 0) if theme.lookup_icon("image-missing", 16, 0) else None
-CODED_ICON = theme.load_icon("emblem-readonly", 16, 0) if theme.lookup_icon(
-    "emblem-readonly", 16, 0) else _IMAGE_MISSING
-LOCKED_ICON = theme.load_icon("changes-prevent-symbolic", 16, 0) if theme.lookup_icon(
-    "system-lock-screen", 16, 0) else _IMAGE_MISSING
-HIDE_ICON = theme.load_icon("go-jump", 16, 0) if theme.lookup_icon("go-jump", 16, 0) else _IMAGE_MISSING
-TV_ICON = theme.load_icon("tv-symbolic", 16, 0) if theme.lookup_icon("tv-symbolic", 16, 0) else _IMAGE_MISSING
-IPTV_ICON = theme.load_icon("emblem-shared", 16, 0) if theme.lookup_icon("emblem-shared", 16, 0) else None
-EPG_ICON = theme.load_icon("gtk-index", 16, 0) if theme.lookup_icon("gtk-index", 16, 0) else None
-DEFAULT_ICON = theme.load_icon("emblem-default", 16, 0) if theme.lookup_icon("emblem-default", 16, 0) else None
+
+def get_theme_icon(icon_theme, name, size):
+    try:
+        return icon_theme.load_icon(name, size, 0)
+    except GLib.Error:
+        pass
+
+
+_IMAGE_MISSING = get_theme_icon(theme, "image-missing", 16)
+CODED_ICON = get_theme_icon(theme, "emblem-readonly", 16) or _IMAGE_MISSING
+LOCKED_ICON = get_theme_icon(theme, "changes-prevent-symbolic", 16) or _IMAGE_MISSING
+HIDE_ICON = get_theme_icon(theme, "go-jump", 16) or _IMAGE_MISSING
+TV_ICON = get_theme_icon(theme, "tv-symbolic", 16) or _IMAGE_MISSING
+IPTV_ICON = get_theme_icon(theme, "emblem-shared", 16)
+EPG_ICON = get_theme_icon(theme, "gtk-index", 16)
+DEFAULT_ICON = get_theme_icon(theme, "emblem-default", 16)
 
 
 @lru_cache(maxsize=1)
@@ -129,14 +71,17 @@ def get_yt_icon(icon_name, size=24):
         return default_theme.load_icon(icon_name, size, 0)
 
     n_theme = Gtk.IconTheme.new()
+    p_path = "{}usr{}share{}icons{}*".format(SEP, SEP, SEP, SEP)
+
     import glob
 
-    for theme_name in map(os.path.basename, filter(os.path.isdir, glob.glob("/usr/share/icons/*"))):
-        n_theme.set_custom_theme(theme_name)
+    for theme_name in map(os.path.basename, filter(os.path.isdir, glob.glob(p_path))):
+        theme.set_custom_theme(theme_name)
         if n_theme.has_icon(icon_name):
             return n_theme.load_icon(icon_name, size, 0)
 
-    return default_theme.load_icon("emblem-important-symbolic", size, 0)
+    if default_theme.lookup_icon(Gtk.STOCK_APPLY, size, 0):
+        return default_theme.load_icon(Gtk.STOCK_APPLY, size, 0)
 
 
 def show_notification(message, timeout=10000, urgency=1):
@@ -146,27 +91,52 @@ def show_notification(message, timeout=10000, urgency=1):
         @param timeout: milliseconds
         @param urgency: 0 - low, 1 - normal, 2 - critical
     """
-    if IS_DARWIN:
-        # Since NSUserNotification has been deprecated, osascript will be used.
-        os.system("""osascript -e 'display notification "{}" with title "DemonEditor"'""".format(message))
-    elif NOTIFY_IS_INIT:
-        notify = Notify.Notification.new("DemonEditor", message, "demon-editor")
-        notify.set_urgency(urgency)
-        notify.set_timeout(timeout)
-        notify.show()
+    pass
 
 
-class Page(Enum):
-    """ Main stack widget page. """
-    INFO = "info"
-    SERVICES = "services"
-    SATELLITE = "satellite"
-    PICONS = "picons"
-    EPG = "epg"
-    TIMERS = "timers"
-    RECORDINGS = "recordings"
-    FTP = "ftp"
-    CONTROL = "control"
+class KeyboardKey(Enum):
+    """ The raw(hardware) codes of the keyboard keys. """
+    E = 69 if IS_WIN else 26
+    R = 82 if IS_WIN else 27
+    T = 84 if IS_WIN else 28
+    P = 80 if IS_WIN else 33
+    S = 83 if IS_WIN else 39
+    F = 70 if IS_WIN else 41
+    X = 88 if IS_WIN else 53
+    C = 67 if IS_WIN else 54
+    V = 86 if IS_WIN else 55
+    W = 87 if IS_WIN else 25
+    Z = 90 if IS_WIN else 52
+    INSERT = 45 if IS_WIN else 118
+    HOME = 36 if IS_WIN else 110
+    END = 35 if IS_WIN else 115
+    UP = 38 if IS_WIN else 111
+    DOWN = 40 if IS_WIN else 116
+    PAGE_UP = 33 if IS_WIN else 112
+    PAGE_DOWN = 34 if IS_WIN else 117
+    LEFT = 37 if IS_WIN else 113
+    RIGHT = 39 if IS_WIN else 114
+    F2 = 113 if IS_WIN else 68
+    F7 = 118 if IS_WIN else 73
+    SPACE = 32 if IS_WIN else 65
+    DELETE = 46 if IS_WIN else 119
+    BACK_SPACE = 8 if IS_WIN else 22
+    CTRL_L = 17 if IS_WIN else 37
+    CTRL_R = 163 if IS_WIN else 105
+    # Laptop codes
+    HOME_KP = 79
+    END_KP = 87
+    PAGE_UP_KP = 81
+    PAGE_DOWN_KP = 89
+
+    @classmethod
+    def value_exist(cls, value):
+        return value in (val.value for val in cls.__members__.values())
+
+
+# Keys for move in lists. KEY_KP_(NAME) for laptop!!!
+MOVE_KEYS = (KeyboardKey.UP, KeyboardKey.PAGE_UP, KeyboardKey.DOWN, KeyboardKey.PAGE_DOWN, KeyboardKey.HOME,
+             KeyboardKey.END, KeyboardKey.HOME_KP, KeyboardKey.END_KP, KeyboardKey.PAGE_UP_KP, KeyboardKey.PAGE_DOWN_KP)
 
 
 class FavClickMode(IntEnum):
@@ -246,149 +216,11 @@ class Column(IntEnum):
     ALT_FAV_ID = 5
     ALT_ID = 6
     ALT_ITER = 7
-    # Recordings view
-    REC_SERVICE = 0
-    REC_TITLE = 1
-    REC_TIME = 2
-    REC_LEN = 3
-    REC_FILE = 4
-    REC_DESC = 5
 
     def __index__(self):
         """ Overridden to get the index in slices directly """
         return self.value
 
 
-# *************** Keyboard keys *************** #
-
-class BaseKeyboardKey(Enum):
-    @classmethod
-    def value_exist(cls, value):
-        return value in (val.value for val in cls.__members__.values())
-
-
-if IS_LINUX:
-    class KeyboardKey(BaseKeyboardKey):
-        """ The raw(hardware) codes [Linux] of the keyboard keys. """
-        E = 26
-        R = 27
-        T = 28
-        P = 33
-        S = 39
-        F = 41
-        X = 53
-        C = 54
-        V = 55
-        W = 25
-        Z = 52
-        INSERT = 118
-        HOME = 110
-        END = 115
-        UP = 111
-        DOWN = 116
-        PAGE_UP = 112
-        PAGE_DOWN = 117
-        LEFT = 113
-        RIGHT = 114
-        F2 = 68
-        F5 = 71
-        F7 = 73
-        SPACE = 65
-        DELETE = 119
-        BACK_SPACE = 22
-        RETURN = 36
-        CTRL_L = 37
-        CTRL_R = 105
-        # Laptop codes
-        HOME_KP = 79
-        END_KP = 87
-        PAGE_UP_KP = 81
-        PAGE_DOWN_KP = 89
-
-elif IS_DARWIN:
-    class KeyboardKey(BaseKeyboardKey):
-        """ The raw(hardware) codes [macOS] of the keyboard keys. """
-        F = 3
-        E = 14
-        R = 15
-        T = 17
-        P = 35
-        S = 1
-        H = 4
-        L = 37
-        X = 7
-        C = 8
-        V = 9
-        W = 13
-        Z = 6
-        INSERT = -1
-        HOME = -1
-        END = -1
-        UP = 126
-        DOWN = 125
-        PAGE_UP = -1
-        PAGE_DOWN = -1
-        LEFT = 123
-        RIGHT = 123
-        F2 = 120
-        F5 = 96
-        F7 = 98
-        SPACE = 49
-        DELETE = 51
-        BACK_SPACE = 76
-        RETURN = 36
-        CTRL_L = 55
-        CTRL_R = 55
-        # Laptop codes.
-        HOME_KP = -1
-        END_KP = -1
-        PAGE_UP_KP = -1
-        PAGE_DOWN_KP = -1
-
-else:
-    class KeyboardKey(BaseKeyboardKey):
-        """ The raw(hardware) codes [Windows] of the keyboard keys. """
-        E = 69
-        R = 82
-        T = 84
-        P = 80
-        S = 83
-        F = 70
-        X = 88
-        C = 67
-        V = 86
-        W = 87
-        Z = 90
-        INSERT = 45
-        HOME = 36
-        END = 35
-        UP = 38
-        DOWN = 40
-        PAGE_UP = 33
-        PAGE_DOWN = 34
-        LEFT = 37
-        RIGHT = 39
-        F2 = 113
-        F5 = 116
-        F7 = 118
-        SPACE = 32
-        DELETE = 46
-        BACK_SPACE = 8
-        RETURN = 13
-        CTRL_L = 17
-        CTRL_R = 163
-        # Laptop codes.
-        HOME_KP = -1
-        END_KP = -1
-        PAGE_UP_KP = -1
-        PAGE_DOWN_KP = -1
-
-# Keys for move in lists. KEY_KP_(NAME) for laptop!
-MOVE_KEYS = {KeyboardKey.UP, KeyboardKey.PAGE_UP,
-             KeyboardKey.DOWN, KeyboardKey.PAGE_DOWN,
-             KeyboardKey.HOME, KeyboardKey.END,
-             KeyboardKey.HOME_KP, KeyboardKey.END_KP,
-             KeyboardKey.PAGE_UP_KP, KeyboardKey.PAGE_DOWN_KP}
-
 if __name__ == "__main__":
     pass

app/ui/win_style.css

@@ -1,8 +0,0 @@
-* {
-  -GtkDialog-action-area-border: 6;
-}
-
-button {
-  min-height: 24px;
-  min-width: 24px;
-}

build/BUILDING.md

@@ -1,7 +0,0 @@
-## Building DemonEditor
-This directory contains build scripts and additional files for various platforms and distributions. 
-
-### Supported platforms
- * GNU/Linux
- * macOS
- * MS Windows

build/linux/ALTLinux spec/demon-editor-2.0-development-startfix.patch

@@ -1,49 +0,0 @@
-diff -Nru demon-editor-2.0-development-orig/DemonEditor.desktop demon-editor-2.0-development/DemonEditor.desktop
---- demon-editor-2.0-development-orig/DemonEditor.desktop	2021-10-14 21:32:56.000000000 +0300
-+++ demon-editor-2.0-development/DemonEditor.desktop	2021-09-29 13:19:24.000000000 +0300
-@@ -6,8 +6,8 @@
- Comment[be]=Рэдактар спіса каналаў і спадарожнікаў для Enigma2
- Comment[de]=Programm- und Satellitenlisten-Editor für Enigma2
- Icon=demon-editor
--Exec=bash -c 'cd $(dirname %k) && ./start.py'
-+Exec=demon-editor
- Terminal=false
- Type=Application
--Categories=Utility;Application;
-+Categories=Utility;
- StartupNotify=false
-diff -Nru demon-editor-2.0-development-orig/start.py demon-editor-2.0-development/start.py
---- demon-editor-2.0-development-orig/start.py	2021-10-14 21:32:56.000000000 +0300
-+++ demon-editor-2.0-development/start.py	2021-09-29 13:19:24.000000000 +0300
-@@ -1,29 +1,4 @@
- #!/usr/bin/env python3
--import os
-+from app.ui.main import start_app
- 
--
--def update_icon():
--    need_update = False
--    icon_name = "DemonEditor.desktop"
--
--    with open(icon_name, "r") as f:
--        lines = f.readlines()
--        for i, line in enumerate(lines):
--            if line.startswith("Icon="):
--                icon_path = line.lstrip("Icon=")
--                current_path = "{}/app/ui/icons/hicolor/96x96/apps/demon-editor.png".format(os.getcwd())
--                if icon_path != current_path:
--                    need_update = True
--                    lines[i] = "Icon={}\n".format(current_path)
--                break
--
--    if need_update:
--        with open(icon_name, "w") as f:
--            f.writelines(lines)
--
--
--if __name__ == "__main__":
--    from app.ui.main import start_app
--
--    update_icon()
--    start_app()
-+start_app()

build/linux/ALTLinux spec/demon-editor.spec

@@ -1,86 +0,0 @@
-Name:  demon-editor
-Version: 2.0
-Release: slava0
-BuildArch: noarch
-Summary: Enigma2 channel and satellite list editor
-Url: https://github.com/DYefremov/DemonEditor
-License: MIT
-Group: Other
-Source: %name-%version-development.tar.gz
-Patch0: %name-%version-development-startfix.patch
-AutoReq: no
-Requires: python3 python3-module-requests python3-module-pygobject3 python3-module-chardet libmpv1 
-BuildRequires: python3-dev python3-module-mpl_toolkits
-
-%description
-Enigma2 channel and satellites list editor for GNU/Linux.
-
-Experimental support of Neutrino-MP or others on the same basis (BPanther, etc).
-Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc).
-
-Main features of the program:
-   Editing bouquets, channels, satellites.
-   Import function.
-   Backup function.
-   Support of picons.
-   Importing services, downloading picons and updating satellites from the Web.
-   Extended support of IPTV.
-   Import to bouquet(Neutrino WEBTV) from m3u.
-   Export of bouquets with IPTV services in m3u.
-   Assignment of EPGs from DVB or XML for IPTV services (only Enigma2, experimental).
-   Playback of IPTV or other streams directly from the bouquet list.
-   Control panel with the ability to view EPG and manage timers (via HTTP API, experimental).
-   Simple FTP client (experimental).
-
-%prep 
-%setup -n %name-%version-development
-%patch0 -p1
-
-%install
-%__install -d %buildroot%_datadir/demoneditor/app
- %__install -m644 app/*py %buildroot%_datadir/demoneditor/app
-%__install -d %buildroot%_datadir/demoneditor/app/eparser
- %__install -m644 app/eparser/*py %buildroot%_datadir/demoneditor/app/eparser
-%__install -d %buildroot%_datadir/demoneditor/app/eparser/enigma
- %__install -m644 app/eparser/enigma/*py %buildroot%_datadir/demoneditor/app/eparser/enigma
-%__install -d %buildroot%_datadir/demoneditor/app/eparser/neutrino
- %__install -m644 app/eparser/neutrino/*py %buildroot%_datadir/demoneditor/app/eparser/neutrino
-%__install -d %buildroot%_datadir/demoneditor/app/tools
- %__install -m644 app/tools/*py %buildroot%_datadir/demoneditor/app/tools
-%__install -d %buildroot%_datadir/demoneditor/app/ui
- %__install -m644 app/ui/*py %buildroot%_datadir/demoneditor/app/ui
- %__install -m644 app/ui/*glade %buildroot%_datadir/demoneditor/app/ui
- %__install -m644 app/ui/*css %buildroot%_datadir/demoneditor/app/ui
- %__install -m644 app/ui/*ui %buildroot%_datadir/demoneditor/app/ui
- %__install -m755 start.py %buildroot%_datadir/demoneditor
-
-%__install -d %buildroot%_iconsdir/hicolor/96x96/apps
-%__install -d %buildroot%_iconsdir/hicolor/scalable/apps
- %__install -m644 app/ui/icons/hicolor/96x96/apps/%name.* %buildroot%_iconsdir/hicolor/96x96/apps
- %__install -m644 app/ui/icons/hicolor/scalable/apps%name.* -d %buildroot%_iconsdir/hicolor/scalable/apps
-
-%__install -d %buildroot%_datadir/locale
-cp -r app/ui/lang/* %buildroot%_datadir/locale
-
-%__install -d %buildroot%_bindir
-echo "#!/bin/bash
-python3 %_datadir/demoneditor/start.py $1" > %buildroot%_bindir/%name
-chmod 755 %buildroot%_bindir/%name
-
-%__install -d %buildroot%_desktopdir
-%__install -m644 DemonEditor.desktop %buildroot%_desktopdir/DemonEditor.desktop
-
-%find_lang %name
-
-%files -f %name.lang
-%doc deb/DEBIAN/README.source
-%_bindir/%name
-%_datadir/demoneditor
-%_iconsdir/*/*/*/%name.*
-%_desktopdir/DemonEditor.desktop
-
-%changelog
-* Wed Sep 29 2021 Viacheslav Dikonov <sdiconov@mail.ru> 1.0.10-slava0
-- ALTLinux package
-
-

build/linux/build-deb.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-VER="2.0.0_Beta"
-B_PATH="dist/DemonEditor"
-DEB_PATH="$B_PATH/usr/share/demoneditor"
-
-mkdir -p $B_PATH
-cp -TRv deb $B_PATH
-rsync --exclude=app/ui/lang --exclude=app/ui/icons --exclude=__pycache__ -arv ../../app $DEB_PATH
-
-cd dist
-fakeroot dpkg-deb --build DemonEditor
-mv DemonEditor.deb DemonEditor_$VER.deb
-
-rm -R DemonEditor
-
-
-
-

build/linux/deb/DEBIAN/README.source

@@ -1,62 +0,0 @@
-demon-editor for Debian
-----------------------
-DemonEditor
-Enigma2 channel and satellite list editor for GNU/Linux.
-
-Experimental support of Neutrino-MP or others on the same basis (BPanther, etc).
-Focused on the convenience of working in lists from the keyboard. The mouse is also fully supported (Drag and Drop etc).
-
-Main features of the program:
-   Editing bouquets, channels, satellites.
-   Import function.
-   Backup function.
-   Support of picons.
-   Importing services, downloading picons and updating satellites from the Web.
-   Extended support of IPTV.
-   Import to bouquet(Neutrino WEBTV) from m3u.
-   Export of bouquets with IPTV services in m3u.
-   Assignment of EPGs from DVB or XML for IPTV services (only Enigma2, experimental).
-   Playback of IPTV or other streams directly from the bouquet list.
-   Control panel with the ability to view EPG and manage timers (via HTTP API, experimental).
-   Simple FTP client (experimental).
-
-Keyboard shortcuts:
-    Ctrl + Insert - copies the selected channels from the main list to the the bouquet beginning or inserts (creates) a new bouquet.
-    Ctrl + BackSpace - copies the selected channels from the main list to the bouquet end.
-    Ctrl + X - only in bouquet list. Ctrl + C - only in services list.
-    Clipboard is "rubber". There is an accumulation before the insertion!
-    Ctrl + E - edit.
-    Ctrl + R, F2 - rename.
-    Ctrl + S, T in Satellites edit tool for create satellite or transponder.
-    Ctrl + L - parental lock.
-    Ctrl + H - hide/skip.
-    Ctrl + P - start play IPTV or other stream in the bouquet list.
-    Ctrl + Z - switch (zap) the channel (works when the HTTP API is enabled, Enigma2 only).
-    Ctrl + W - switch to the channel and watch in the program.
-    Space - select/deselect.
-    Left/Right - remove selection.
-    Ctrl + Up, Down, PageUp, PageDown, Home, End - move selected items in the list.
-    Ctrl + O - (re)load user data from current dir.
-    Ctrl + D - load data from receiver.
-    Ctrl + U/B upload data/bouquets to receiver.
-    Ctrl + F - show/hide search bar.
-    Ctrl + Shift + F - show/hide filter bar.
-
-    For multiple selection with the mouse, press and hold the Ctrl key!
-
-Minimum requirements:
-    Python >= 3.6, GTK+ >= 3.22, python3-gi, python3-gi-cairo, python3-requests.
-
-Important:
-    Terrestrial(DVB-T/T2) and cable(DVB-C) channels are only supported for Enigma2!
-    Main supported *lamedb* format is version **4**. Versions **3** and **5** has only **experimental** support!
-    For version **3** is only read mode available. When saving, version **4** format is used instead!
-
-    When using the multiple import feature, from *lamedb* will be taken data **only for channels that are in the
-    selected bouquets!** If you need full set of the data, including *[satellites, terrestrial, cables].xml* (current files will be overwritten),
-    just load your data via *"File/Open"* and press *"Save"*. When importing separate bouquet files, only those services
-    (excluding IPTV) that are in the **current open lamedb** (main list of services) will be imported.
-
-    For streams playback, this app supports VLC, MPV and GStreamer.
-    Depending on your distro, you may need to install additional packages and libraries.
-

build/linux/deb/DEBIAN/control

@@ -1,15 +0,0 @@
-Package: demon-editor
-Version: 2.0.0-Beta
-Section: utils
-Priority: optional
-Architecture: all
-Essential: no
-Depends: python3 (>= 3.6),
-         python3-requests,
-         python3-gi,
-         python3-gi-cairo,
-         gir1.2-notify-0.7
-Recommends: libmpv1,
-            python3-chardet
-Maintainer: Dmitriy Yefremov <dmitry.v.yefremov@gmail.com>
-Description: Enigma2 channel and satellite list editor

build/linux/deb/DEBIAN/copyright

@@ -1,26 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Contact: Dmitriy Yefremov <dmitry.v.yefremov@gmail.com>
-Source: https://github.com/DYefremov/DemonEditor
-
-Files: *
-MIT License
-
-Copyright (c) 2018-2021 Dmitriy Yefremov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

build/linux/deb/DEBIAN/demon-editor-docs.docs

@@ -1 +0,0 @@
-README.source

build/linux/deb/usr/bin/demon-editor

@@ -1,2 +0,0 @@
-#!/bin/bash
-python3 /usr/share/demoneditor/start.py $1

build/linux/deb/usr/share/applications/DemonEditor.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=DemonEditor
-Comment=Channel and satellite list editor for Enigma2
-Comment[ru]=Редактор списка каналов и спутников для Enigma2
-Comment[be]=Рэдактар спіса каналаў і спадарожнікаў для Enigma2
-Comment[de]=Programm- und Satellitenlisten-Editor für Enigma2
-Icon=demon-editor
-Exec=/usr/bin/demon-editor
-Terminal=false
-Type=Application
-Categories=Utility;Application;
-StartupNotify=false

build/linux/deb/usr/share/demoneditor/start.py

@@ -1,4 +0,0 @@
-#!/usr/bin/env python3
-from app.ui.main import start_app
-
-start_app()

build/linux/deb/usr/share/icons/hicolor/scalable/apps/demon-editor.svg

@@ -1,634 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1541"
-   version="1.1"
-   viewBox="0 0 16.743339 16.72816"
-   height="63.224556"
-   width="63.281971"
-   sodipodi:docname="demon-editor.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="716"
-     id="namedview127"
-     showgrid="true"
-     fit-margin-left="0"
-     inkscape:zoom="6.1714295"
-     inkscape:cx="40.088627"
-     inkscape:cy="31.742631"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1541"
-     fit-margin-top="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid128"
-       originx="-10.604603"
-       originy="-1.1727724" />
-  </sodipodi:namedview>
-  <title
-     id="title1088">DeamonEditor Icons</title>
-  <defs
-     id="defs1535">
-    <linearGradient
-       id="linearGradient2198">
-      <stop
-         id="stop2194"
-         style="stop-color:#ffb320;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2196"
-         style="stop-color:#e7ff00;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2192">
-      <stop
-         offset="0"
-         style="stop-color:#ffb320;stop-opacity:1"
-         id="stop2188" />
-      <stop
-         offset="1"
-         style="stop-color:#b3c54c;stop-opacity:1"
-         id="stop2190" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3700-8">
-      <stop
-         offset="0"
-         style="stop-color:#2e4f84;stop-opacity:1"
-         id="stop2183" />
-      <stop
-         offset="1"
-         style="stop-color:#4c77c5;stop-opacity:1"
-         id="stop2185" />
-    </linearGradient>
-    <linearGradient
-       x1="0"
-       y1="0"
-       x2="1"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
-       spreadMethod="pad"
-       id="linearGradient1844">
-      <stop
-         style="stop-opacity:1;stop-color:#29282b"
-         offset="0"
-         id="stop1826" />
-      <stop
-         id="stop1828"
-         offset="0.13293758"
-         style="stop-color:#b5bdcf;stop-opacity:1" />
-      <stop
-         style="stop-opacity:1;stop-color:#92979f"
-         offset="0.21261224"
-         id="stop1832" />
-      <stop
-         style="stop-opacity:1;stop-color:#737881"
-         offset="0.29780689"
-         id="stop1834" />
-      <stop
-         style="stop-opacity:1;stop-color:#70757e"
-         offset="0.29780689"
-         id="stop1836" />
-      <stop
-         style="stop-opacity:1;stop-color:#e4e6e8"
-         offset="0.45395693"
-         id="stop1838" />
-      <stop
-         style="stop-opacity:1;stop-color:#696c76"
-         offset="0.71871042"
-         id="stop1840" />
-      <stop
-         style="stop-opacity:1;stop-color:#29282b"
-         offset="1"
-         id="stop1842" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1754"
-       spreadMethod="pad"
-       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
-       gradientUnits="userSpaceOnUse"
-       y2="0"
-       x2="1"
-       y1="0"
-       x1="0">
-      <stop
-         id="stop1736"
-         offset="0"
-         style="stop-opacity:1;stop-color:#29282b" />
-      <stop
-         style="stop-color:#b5bdcf;stop-opacity:1"
-         offset="0.02582242"
-         id="stop1738" />
-      <stop
-         id="stop1740"
-         offset="0.14669065"
-         style="stop-opacity:1;stop-color:#868c95" />
-      <stop
-         id="stop1742"
-         offset="0.21261224"
-         style="stop-opacity:1;stop-color:#92979f" />
-      <stop
-         id="stop1744"
-         offset="0.29780689"
-         style="stop-opacity:1;stop-color:#737881" />
-      <stop
-         id="stop1746"
-         offset="0.29780689"
-         style="stop-opacity:1;stop-color:#70757e" />
-      <stop
-         id="stop1748"
-         offset="0.45395693"
-         style="stop-opacity:1;stop-color:#e4e6e8" />
-      <stop
-         id="stop1750"
-         offset="0.71871042"
-         style="stop-opacity:1;stop-color:#ffffff" />
-      <stop
-         id="stop1752"
-         offset="1"
-         style="stop-opacity:1;stop-color:#1d191a" />
-    </linearGradient>
-    <linearGradient
-       x1="0"
-       y1="0"
-       x2="1"
-       y2="0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
-       spreadMethod="pad"
-       id="linearGradient1606">
-      <stop
-         style="stop-opacity:1;stop-color:#29282b"
-         offset="0"
-         id="stop1590" />
-      <stop
-         id="stop1608"
-         offset="0.03065561"
-         style="stop-color:#b5bdcf;stop-opacity:1" />
-      <stop
-         style="stop-opacity:1;stop-color:#868c95"
-         offset="0.1125849"
-         id="stop1592" />
-      <stop
-         style="stop-opacity:1;stop-color:#92979f"
-         offset="0.13955873"
-         id="stop1594" />
-      <stop
-         style="stop-opacity:1;stop-color:#737881"
-         offset="0.1915853"
-         id="stop1596" />
-      <stop
-         style="stop-opacity:1;stop-color:#70757e"
-         offset="0.25400829"
-         id="stop1598" />
-      <stop
-         style="stop-opacity:1;stop-color:#e4e6e8"
-         offset="0.45395693"
-         id="stop1600" />
-      <stop
-         style="stop-opacity:1;stop-color:#ffffff"
-         offset="0.71871042"
-         id="stop1602" />
-      <stop
-         style="stop-opacity:1;stop-color:#1d191a"
-         offset="1"
-         id="stop1604" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient886-0">
-      <stop
-         style="stop-color:#535353;stop-opacity:1"
-         offset="0"
-         id="stop888" />
-      <stop
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="1"
-         id="stop890" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1473">
-      <stop
-         id="stop1469"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0" />
-      <stop
-         id="stop1471"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.96088022" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2447-35">
-      <stop
-         id="stop2449"
-         offset="0"
-         style="stop-color:#00c62e;stop-opacity:1" />
-      <stop
-         id="stop2451"
-         offset="1"
-         style="stop-color:#136100;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3795-1">
-      <stop
-         id="stop3797-1"
-         offset="0"
-         style="stop-color:#803400;stop-opacity:1" />
-      <stop
-         id="stop3799-3"
-         offset="1"
-         style="stop-color:#c87137;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2447-3">
-      <stop
-         style="stop-color:#c60300;stop-opacity:1"
-         offset="0"
-         id="stop2443" />
-      <stop
-         style="stop-color:#c40e00;stop-opacity:1"
-         offset="1"
-         id="stop2445" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2458">
-      <stop
-         id="stop2454"
-         offset="0"
-         style="stop-color:#c60300;stop-opacity:1" />
-      <stop
-         id="stop2456"
-         offset="1"
-         style="stop-color:#ee6000;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3519">
-      <stop
-         id="stop3521"
-         offset="0"
-         style="stop-color:#1d2120;stop-opacity:1" />
-      <stop
-         id="stop3523"
-         offset="1"
-         style="stop-color:#545d5d;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1446">
-      <stop
-         id="stop1442"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop1444"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1547"
-       spreadMethod="pad"
-       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
-       gradientUnits="userSpaceOnUse"
-       y2="0"
-       x2="1"
-       y1="0"
-       x1="0">
-      <stop
-         id="stop1529"
-         offset="0"
-         style="stop-opacity:1;stop-color:#ffffff" />
-      <stop
-         id="stop1531"
-         offset="0.0263736"
-         style="stop-opacity:1;stop-color:#29282b" />
-      <stop
-         id="stop1533"
-         offset="0.263736"
-         style="stop-opacity:1;stop-color:#868c95" />
-      <stop
-         id="stop1535"
-         offset="0.395604"
-         style="stop-opacity:1;stop-color:#92979f" />
-      <stop
-         id="stop1537"
-         offset="0.39560401"
-         style="stop-opacity:1;stop-color:#737881" />
-      <stop
-         id="stop1539"
-         offset="0.42333773"
-         style="stop-opacity:1;stop-color:#70757e" />
-      <stop
-         id="stop1541"
-         offset="0.56268591"
-         style="stop-opacity:1;stop-color:#e4e6e8" />
-      <stop
-         id="stop1543"
-         offset="0.62400264"
-         style="stop-opacity:1;stop-color:#ffffff" />
-      <stop
-         id="stop1545"
-         offset="1"
-         style="stop-opacity:1;stop-color:#1d191a" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1527"
-       spreadMethod="pad"
-       gradientTransform="matrix(13.526835,20.525875,20.525875,-13.526835,19.18986,1021.0543)"
-       gradientUnits="userSpaceOnUse"
-       y2="0"
-       x2="1"
-       y1="0"
-       x1="0">
-      <stop
-         id="stop1509"
-         offset="0"
-         style="stop-opacity:1;stop-color:#ffffff" />
-      <stop
-         id="stop1511"
-         offset="0.0527472"
-         style="stop-opacity:1;stop-color:#29282b" />
-      <stop
-         id="stop1513"
-         offset="0.142147"
-         style="stop-opacity:1;stop-color:#868c95" />
-      <stop
-         id="stop1515"
-         offset="0.19700864"
-         style="stop-opacity:1;stop-color:#92979f" />
-      <stop
-         id="stop1517"
-         offset="0.25031137"
-         style="stop-opacity:1;stop-color:#737881" />
-      <stop
-         id="stop1519"
-         offset="0.3710371"
-         style="stop-opacity:1;stop-color:#70757e" />
-      <stop
-         id="stop1521"
-         offset="0.53961843"
-         style="stop-opacity:1;stop-color:#e4e6e8" />
-      <stop
-         id="stop1523"
-         offset="0.76283824"
-         style="stop-opacity:1;stop-color:#ffffff" />
-      <stop
-         id="stop1525"
-         offset="1"
-         style="stop-opacity:1;stop-color:#1d191a" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.26458333,0,0,0.26458333,-5.8254634,-78.732754)"
-       y2="1179.7145"
-       x2="66.791626"
-       y1="1188.7661"
-       x1="99.044022"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1485"
-       xlink:href="#linearGradient1473" />
-    <linearGradient
-       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.2733744,-70.526334)"
-       gradientUnits="userSpaceOnUse"
-       y2="1155.8046"
-       x2="67.311417"
-       y1="1161.6112"
-       x1="77.19442"
-       id="linearGradient1448"
-       xlink:href="#linearGradient1446" />
-    <linearGradient
-       gradientTransform="matrix(0.26458333,0,0,0.26458333,-18.198747,-79.859424)"
-       gradientUnits="userSpaceOnUse"
-       y2="1186.8096"
-       x2="146.16808"
-       y1="1186.8096"
-       x1="131.86871"
-       id="linearGradient2180"
-       xlink:href="#linearGradient886-0" />
-    <linearGradient
-       gradientTransform="matrix(0.20863982,0,0,0.20863982,-0.63935937,-13.031239)"
-       gradientUnits="userSpaceOnUse"
-       y2="1184.73"
-       x2="101.19952"
-       y1="1184.73"
-       x1="83.066002"
-       id="linearGradient2160"
-       xlink:href="#linearGradient886-0" />
-    <linearGradient
-       gradientTransform="matrix(0.26458333,0,0,0.26458333,-6.2370714,-102.12414)"
-       gradientUnits="userSpaceOnUse"
-       y2="1267.1335"
-       x2="117.99127"
-       y1="1267.1335"
-       x1="75.853806"
-       id="linearGradient2131"
-       xlink:href="#linearGradient886-0" />
-    <linearGradient
-       id="linearGradient3700-8-3">
-      <stop
-         id="stop3702-1"
-         style="stop-color:#2e4f84;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3704-8"
-         style="stop-color:#4c77c5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <defs
-       id="defs4922">
-      <filter
-         style="color-interpolation-filters:sRGB"
-         id="Adobe_OpacityMaskFilter"
-         filterUnits="userSpaceOnUse"
-         x="3.7850001"
-         y="4.6750002"
-         width="5.8829999"
-         height="73.013">
-        <feColorMatrix
-           type="matrix"
-           values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"
-           id="feColorMatrix4925" />
-      </filter>
-    </defs>
-    <mask
-       maskUnits="userSpaceOnUse"
-       x="3.785"
-       y="4.675"
-       width="5.883"
-       height="73.013"
-       id="SVGID_2_">
-      <g
-         style="filter:url(#Adobe_OpacityMaskFilter)"
-         id="g4928">
-        <linearGradient
-           id="SVGID_3_"
-           gradientUnits="userSpaceOnUse"
-           x1="3.7852001"
-           y1="41.181198"
-           x2="9.6680002"
-           y2="41.181198">
-          <stop
-             offset="0"
-             style="stop-color:#FFFFFF"
-             id="stop4931" />
-          <stop
-             offset="0.0029"
-             style="stop-color:#FAFBFB"
-             id="stop4933" />
-          <stop
-             offset="0.0756"
-             style="stop-color:#BBBDBF"
-             id="stop4935" />
-          <stop
-             offset="0.1438"
-             style="stop-color:#898B8E"
-             id="stop4937" />
-          <stop
-             offset="0.2053"
-             style="stop-color:#646567"
-             id="stop4939" />
-          <stop
-             offset="0.259"
-             style="stop-color:#444446"
-             id="stop4941" />
-          <stop
-             offset="0.3028"
-             style="stop-color:#1D1C1D"
-             id="stop4943" />
-          <stop
-             offset="0.3313"
-             style="stop-color:#000000"
-             id="stop4945" />
-        </linearGradient>
-        <rect
-           style="fill:url(#SVGID_3_)"
-           x="3.7850001"
-           y="4.6750002"
-           width="5.8829999"
-           height="73.013"
-           id="rect4947" />
-      </g>
-    </mask>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter1268"
-       filterUnits="userSpaceOnUse"
-       x="3.7850001"
-       y="4.6750002"
-       width="5.8829999"
-       height="73.013">
-      <feColorMatrix
-         type="matrix"
-         values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 1 0"
-         id="feColorMatrix1266" />
-    </filter>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="203.22046"
-       x2="23.551136"
-       y1="203.22046"
-       x1="13.487289"
-       id="linearGradient1160"
-       xlink:href="#linearGradient3519" />
-    <clipPath
-       id="clipPath1890"
-       clipPathUnits="userSpaceOnUse">
-      <circle
-         style="opacity:1;fill:#2d2d2d;fill-opacity:1;stroke:#434242;stroke-width:0.0575568;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="circle1892"
-         cx="78.548424"
-         cy="-31.019459"
-         r="6.4721422"
-         transform="scale(1,-1)" />
-    </clipPath>
-    <linearGradient
-       gradientTransform="translate(-0.24389927,14.877856)"
-       y2="27.314217"
-       x2="84.864914"
-       y1="27.314217"
-       x1="72.164909"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient2134"
-       xlink:href="#linearGradient3700-8-3" />
-  </defs>
-  <metadata
-     id="metadata1538">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>DeamonEditor Icons</dc:title>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>mfgeg</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:date>7.1.2020</dc:date>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="matrix(1.1690805,0,0,1.1690805,-14.929261,-167.45253)"
-     id="layer1">
-    <g
-       transform="translate(0.86526724,-82.691658)"
-       id="g1351">
-      <path
-         d="m 13.715358,227.65981 h 2.97616 v 12.57332 h -2.97616 z m 5.79826,-1.73376 -0.327076,0.42227 c -0.179879,0.23226 -0.586303,0.67932 -0.903223,0.99412 -0.480677,0.47726 -0.640897,0.57235 -0.967777,0.57235 -0.223557,0 -0.380895,-0.0584 -0.624024,-0.25067 v 3.18307 c 0.172884,-0.0214 0.359647,-0.0333 0.575071,-0.0352 0.68403,-0.006 0.91815,0.0416 1.436333,0.29581 1.14586,0.56274 1.762492,1.5589 1.768251,2.8566 0.0094,2.10836 -1.870896,3.55161 -3.779655,3.16529 v 3.10345 c 4.345352,0.0758 4.093104,-2.37537 6.573781,-2.25837 1.486139,0.0748 1.333421,0.16555 1.796225,-1.064 l 0.259834,-0.6913 -0.803704,-0.66493 c -0.960855,-0.79478 -1.303983,-1.29079 -1.205013,-1.74132 0.06631,-0.30189 1.20818,-1.50093 1.779011,-1.86778 0.240181,-0.1543 0.244255,-0.17878 0.09575,-0.59661 -0.08522,-0.23979 -0.259522,-0.65746 -0.386789,-0.92744 l -0.23132,-0.49115 h -1.412666 c -1.868582,0 -1.802386,0.068 -1.805368,-1.82472 l -0.0021,-1.43582 -0.917745,-0.37171 z"
-         style="opacity:1;fill:#000000;fill-opacity:0.5372549;stroke:none;stroke-width:0.18460207;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
-         id="path2133"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path2106"
-         style="opacity:1;fill:url(#linearGradient2131);fill-opacity:1;stroke:none;stroke-width:0.17733108;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
-         d="m 13.832581,227.93117 h 2.858936 v 12.07807 h -2.858936 z m 5.569881,-1.6655 -0.314194,0.40566 c -0.172793,0.22309 -0.563209,0.65257 -0.867647,0.95496 -0.46174,0.45847 -0.615654,0.5498 -0.929658,0.5498 -0.214752,0 -0.365893,-0.056 -0.599446,-0.24079 v 3.05768 c 0.166077,-0.0206 0.345483,-0.0319 0.55242,-0.0338 0.657089,-0.006 0.881987,0.0399 1.379764,0.28416 1.100724,0.54057 1.693073,1.49747 1.698606,2.74408 0.009,2.02535 -1.797211,3.41174 -3.63079,3.04061 v 2.98122 c 4.174205,0.0728 3.931888,-2.28179 6.314859,-2.1694 1.427604,0.0718 1.2809,0.15902 1.725477,-1.02213 l 0.249597,-0.66408 -0.772046,-0.63871 c -0.923009,-0.76345 -1.252622,-1.23996 -1.157552,-1.67277 0.0637,-0.29001 1.160592,-1.44177 1.708939,-1.79419 0.230721,-0.14825 0.234635,-0.17174 0.09198,-0.57312 -0.08187,-0.23032 -0.249296,-0.63156 -0.371555,-0.89088 l -0.222207,-0.4718 h -1.357022 c -1.794983,0 -1.731396,0.0653 -1.734262,-1.75284 l -0.0021,-1.3793 -0.881603,-0.35705 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path2151"
-         d="m 17.266983,230.95755 c -0.215637,0.003 -0.402408,0.014 -0.575465,0.0354 v 6.28854 c 1.910653,0.38671 3.792716,-1.05815 3.783336,-3.16865 -0.0058,-1.29897 -0.623064,-2.29597 -1.770059,-2.85927 -0.518699,-0.25451 -0.753103,-0.30234 -1.437812,-0.29607 z m 0.482341,1.17002 c 0.433747,-0.004 0.582202,0.0265 0.910784,0.18761 0.726595,0.35682 1.117604,0.98848 1.121256,1.81134 0.0059,1.33694 -1.186343,2.25211 -2.396695,2.00715 v -3.98359 c 0.109628,-0.0135 0.228054,-0.0214 0.364655,-0.0225 z"
-         style="opacity:1;fill:url(#linearGradient2160);fill-opacity:1;stroke:none;stroke-width:0.18478528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient2180);stroke-width:0.18478528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5012225"
-         d="m 17.266981,230.95753 c -0.215636,0.003 -0.402408,0.014 -0.575464,0.0354 v 6.28853 c 1.910652,0.38672 3.792715,-1.05815 3.783336,-3.16865 -0.0057,-1.29897 -0.623065,-2.29597 -1.77006,-2.85927 -0.518697,-0.2545 -0.753103,-0.30234 -1.437812,-0.29607 z m 0.482343,1.17001 c 0.433747,-0.004 0.5822,0.0265 0.910783,0.18762 0.726594,0.35681 1.117605,0.98848 1.121257,1.81133 0.006,1.33694 -1.186344,2.25211 -2.396697,2.00716 v -3.98359 c 0.109628,-0.0135 0.228055,-0.0214 0.364657,-0.0225 z"
-         id="path2170"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1422"
-         d="m 17.266983,230.95755 c -0.215637,0.003 -0.402408,0.014 -0.575464,0.0354 v 6.28854 c 1.910652,0.38671 3.792715,-1.05815 3.783335,-3.16865 -0.0057,-1.29897 -0.623064,-2.29597 -1.770059,-2.85927 -0.518699,-0.25451 -0.753103,-0.30234 -1.437812,-0.29607 z m 0.482342,1.17002 c 0.433748,-0.004 0.582201,0.0265 0.910784,0.18761 0.726594,0.35682 1.117605,0.98848 1.121257,1.81134 0.006,1.33694 -1.186344,2.25211 -2.396697,2.00715 v -3.98359 c 0.109628,-0.0135 0.228054,-0.0214 0.364656,-0.0225 z"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient1448);stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1454"
-         d="m 19.402462,226.26149 -0.314194,0.40566 c -0.172793,0.22309 -0.563209,0.65259 -0.867644,0.95499 -0.461741,0.45847 -0.615657,0.54983 -0.929661,0.54983 -0.214752,0 -0.365893,-0.056 -0.599446,-0.2408 v -0.004 h -2.858741 v 12.0783 h 2.858741 c 4.174205,0.0728 3.931888,-2.28177 6.314861,-2.16937 1.427604,0.0718 1.280898,0.15899 1.725475,-1.02217 l 0.249597,-0.66402 -0.772046,-0.63873 c -0.923009,-0.76346 -1.252622,-1.23997 -1.157552,-1.67278 0.0637,-0.29001 1.160595,-1.44176 1.708939,-1.79419 0.230721,-0.14825 0.234635,-0.17171 0.09198,-0.57309 -0.08187,-0.23032 -0.249296,-0.63158 -0.371555,-0.8909 l -0.222207,-0.47181 h -1.357025 c -1.794983,0 -1.731393,0.0653 -1.734259,-1.75286 l -0.0021,-1.37925 -0.8816,-0.35708 z"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#linearGradient1485);stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="translate(63.49728,-55.136805)"
-       id="g1174" />
-    <g
-       transform="translate(50.48327,11.624037)"
-       id="g1812" />
-  </g>
-</svg>

build/mac/DemonEditor.spec

@@ -1,75 +0,0 @@
-import os
-import datetime
-import distutils.util
-
-EXE_NAME = 'start.py'
-DIR_PATH = os.getcwd()
-COMPILING_PLATFORM = distutils.util.get_platform()
-PATH_EXE = [os.path.join(DIR_PATH, EXE_NAME)]
-STRIP = True
-BUILD_DATE = datetime.datetime.now().strftime("%y%m%d")
-
-block_cipher = None
-
-excludes = ['app.tools.mpv',
-            'gi.repository.Gst',
-            'gi.repository.GstBase',
-            'gi.repository.GstVideo',
-            'youtube_dl',
-            'tkinter']
-
-ui_files = [('app/ui/*.glade', 'ui'),
-            ('app/ui/*.css', 'ui'),
-            ('app/ui/*.ui', 'ui'),
-            ('app/ui/lang*', 'share/locale'),
-            ('app/ui/icons*', 'share/icons')
-            ]
-
-a = Analysis([EXE_NAME],
-             pathex=PATH_EXE,
-             binaries=None,
-             datas=ui_files,
-             hiddenimports=['fileinput', 'uuid'],
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=excludes,
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher)
-
-pyz = PYZ(a.pure,
-          a.zipped_data,
-          cipher=block_cipher)
-
-exe = EXE(pyz,
-          a.scripts,
-          exclude_binaries=True,
-          name='DemonEditor',
-          debug=False,
-          strip=STRIP,
-          upx=True,
-          console=False)
-
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=STRIP,
-               upx=True,
-               name='DemonEditor')
-
-app = BUNDLE(coll,
-             name='DemonEditor.app',
-             icon='icon.icns',
-             bundle_identifier=None,
-             info_plist={
-                 'NSPrincipalClass': 'NSApplication',
-                 'CFBundleName': 'DemonEditor',
-                 'CFBundleDisplayName': 'DemonEditor',
-                 'CFBundleGetInfoString': "Enigma2 channel and satellite editor",
-                 'LSApplicationCategoryType': 'public.app-category.utilities',
-                 'LSMinimumSystemVersion': '10.13',
-                 'CFBundleShortVersionString': f"2.0.0.{BUILD_DATE} Beta",
-                 'NSHumanReadableCopyright': u"Copyright © 2021, Dmitriy Yefremov",
-                 'NSRequiresAquaSystemAppearance': 'false'
-             })

build/mac/start.py

@@ -1,8 +0,0 @@
-#!/usr/bin/env python3
-
-if __name__ == "__main__":
-    from multiprocessing import set_start_method
-    from app.ui.main import start_app
-
-    set_start_method("fork")  # For compatibility [Python > 3.7]
-    start_app()

build/win/start.py

@@ -1,8 +0,0 @@
-#!/usr/bin/env python3
-
-if __name__ == "__main__":
-    from multiprocessing import freeze_support
-    from app.ui.main import start_app
-
-    freeze_support()
-    start_app()

po/be/demon-editor.po

@@ -203,8 +203,8 @@ msgstr "Цякучы шлях да дадзеных:"
 msgid "Data:"
 msgstr "Дадзеныя:"
 
-msgid "Enigma2 channel and satellite list editor."
-msgstr "Рэдактар спіса каналаў і спадарожнікаў Enigma2."
+msgid "Enigma2 channel and satellite list editor for GNU/Linux."
+msgstr "Рэдактар спіса каналаў і спадарожнікаў Enigma2\n для GNU/Linux."
 
 msgid "Host:"
 msgstr "Адрас рэсівера:"
@@ -296,8 +296,8 @@ msgstr "Фармат імя піконаў:"
 msgid "Resize:"
 msgstr "Змяніць памер:"
 
-msgid "Current picons path"
-msgstr "Цякучы шлях да піконаў"
+msgid "Current picons path:"
+msgstr "Цякучы шлях да піконаў:"
 
 msgid "Receiver picons path:"
 msgstr "Шлях да піконаў рэсівера:"
@@ -1228,75 +1228,3 @@ msgstr "Памер пiконаў у спісах:"
 
 msgid "Logo size in tooltips:"
 msgstr "Памер лагатыпа ва ўсплыўных падказках:"
-
-msgid "Save as"
-msgstr "Захаваць як"
-
-msgid "Mark duplicates"
-msgstr "Адзначыць дублікаты"
-
-msgid "Load only for selected bouquet"
-msgstr "Загрузіць толькі для абранага букета"
-
-msgid "The task is canceled!"
-msgstr "Заданне скасавана!"
-
-msgid "Data loading in progress!"
-msgstr "Выконваецца загрузка дадзеных!"
-
-msgid "Recordings"
-msgstr "Запісы"
-
-msgid "Help"
-msgstr "Даведка"
-
-msgid "HTTP API is not activated. Check your settings!"
-msgstr "HTTP API не актывавана. Праверце налады!"
-
-msgid "Add picons"
-msgstr "Дадаць піконы"
-
-msgid "Logs"
-msgstr "Логі"
-
-msgid "Title"
-msgstr "Назва"
-
-msgid "Time"
-msgstr "Час"
-
-msgid "Length"
-msgstr "Працягласць"
-
-msgid "Additional source"
-msgstr "Дадатковая крыніца"
-
-msgid "Automatically set the name selected in the favorites list."
-msgstr "Аўтаматычная ўсталёўка імя са спіса абранага."
-
-msgid "Playback"
-msgstr "Прайграванне"
-
-msgid "Audio"
-msgstr "Аўдыё"
-
-msgid "Audio Track"
-msgstr "Аўдыёдарожка"
-
-msgid "Subtitle"
-msgstr "Субтытры"
-
-msgid "Subtitle Track"
-msgstr "Дарожка субтытраў"
-
-msgid "Aspect ratio"
-msgstr "Стасунак бакоў"
-
-msgid "This may change the settings of other profiles!"
-msgstr "Гэта можа змяніць налады іншых профіляў!"
-
-msgid "Drag the services to the desired picon or picon to the list of selected services."
-msgstr "Перацягніце сэрвісы на патрэбны пікон ці пікон на спіс абраных сэрвісаў."
-
-msgid "Sets the profile folder as default to store picons, backups, etc."
-msgstr "Усталёўвае тэчку профілю па змаўчанні для захоўвання  піконаў, рэзервовых копій і т. п."

po/de/demon-editor.po

@@ -3,10 +3,9 @@
 #
 # Charly, 2019.
 # Dmitriy Yefremov, 2020-2021.
-# Thomas Schmidt, 2021
 msgid ""
 msgstr ""
-"Last-Translator: Dmitriy Yefremov\n"
+"Last-Translator: Thomas Schmidt\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -205,8 +204,8 @@ msgstr "Aktueller Datenpfad:"
 msgid "Data:"
 msgstr "Daten:"
 
-msgid "Enigma2 channel and satellite list editor."
-msgstr "Enigma2 Kanal- und Satellitenlisteneditor."
+msgid "Enigma2 channel and satellite list editor for GNU/Linux."
+msgstr "Enigma2 Kanal- und Satellitenlisteneditor für GNU/Linux."
 
 msgid "Host:"
 msgstr "Host:"
@@ -298,8 +297,8 @@ msgstr "Picon Namens-Format:"
 msgid "Resize:"
 msgstr "Größe ändern:"
 
-msgid "Current picons path"
-msgstr "Aktueller Piconspfad"
+msgid "Current picons path:"
+msgstr "Aktueller Piconspfad:"
 
 msgid "Receiver picons path:"
 msgstr "Receiver Piconspfad:"
@@ -1242,75 +1241,3 @@ msgstr "Picons Größe in den Listen:"
 
 msgid "Logo size in tooltips:"
 msgstr "Logo-Größe in Tooltips:"
-
-msgid "Save as"
-msgstr "Speichern als"
-
-msgid "Mark duplicates"
-msgstr "Duplikate markieren"
-
-msgid "Load only for selected bouquet"
-msgstr "Nur für ausgewähltes Bouquet laden"
-
-msgid "The task is canceled!"
-msgstr "Der Task wird abgebrochen!"
-
-msgid "Data loading in progress!"
-msgstr "Daten werden geladen!"
-
-msgid "Recordings"
-msgstr "Aufnahmen"
-
-msgid "Help"
-msgstr "Hilfe"
-
-msgid "HTTP API is not activated. Check your settings!"
-msgstr "HTTP API ist nicht aktiviert. Überprüfe deine Einstellungen!"
-
-msgid "Add picons"
-msgstr "Picons hinzufügen"
-
-msgid "Logs"
-msgstr "Logs"
-
-msgid "Title"
-msgstr "Titel"
-
-msgid "Time"
-msgstr "Zeit"
-
-msgid "Length"
-msgstr "Dauer"
-
-msgid "Additional source"
-msgstr "Zusätzliche Quelle"
-
-msgid "Automatically set the name selected in the favorites list."
-msgstr "Automatisch den in der Favoritenliste ausgewählten Namen einstellen."
-
-msgid "Playback"
-msgstr "Wiedergabe"
-
-msgid "Audio"
-msgstr ""
-
-msgid "Audio Track"
-msgstr "Audio"
-
-msgid "Subtitle"
-msgstr "Untertitel"
-
-msgid "Subtitle Track"
-msgstr "Untertitelspur"
-
-msgid "Aspect ratio"
-msgstr "Seitenverhältnis"
-
-msgid "This may change the settings of other profiles!"
-msgstr "Dadurch können sich die Einstellungen anderer Profile ändern!"
-
-msgid "Drag the services to the desired picon or picon to the list of selected services."
-msgstr "Ziehe die Dienste auf das gewünschte Picon oder Picon in die Liste der ausgewählten Dienste."
-
-msgid "Sets the profile folder as default to store picons, backups, etc."
-msgstr "Legt den Profilordner als Standardordner zum Speichern von Piconen, Backups usw. fest."