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

telnet options

Browse Source
This commit is contained in:
Dmitriy Yefremov
2018-01-18 12:38:58 +03:00
parent 24c064b450
commit c5c88a8958
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/eparser/neutrino/bouquets.py
View File

@@ -87,6 +87,8 @@ def write_bouquet(file, bouquet):
root.appendChild(bq_elem) root.appendChild(bq_elem)
for srv in bq.services: for srv in bq.services:
if srv is None: # temporary !!!! (Unknown Provider on 75.0E)
continue
on, sep, ssid = srv.fav_id.partition(":") on, sep, ssid = srv.fav_id.partition(":")
srv_elem = doc.createElement("S") srv_elem = doc.createElement("S")
srv_elem.setAttribute("i", ssid) srv_elem.setAttribute("i", ssid)

3
app/ftp.py
View File

@@ -88,7 +88,8 @@ def upload_data(*, properties, download_type=DownloadDataType.ALL, remove_unused
for file_name in os.listdir(data_path): for file_name in os.listdir(data_path):
if file_name == "satellites.xml": if file_name == "satellites.xml":
continue continue
file_name, send_file(file_name, data_path, ftp) if file_name in __DATA_FILES_LIST:
send_file(file_name, data_path, ftp)
if download_type is DownloadDataType.PICONS: if download_type is DownloadDataType.PICONS:
picons_path = properties.get("picons_dir_path") picons_path = properties.get("picons_dir_path")

10
app/ui/main_app_window.py
View File

@@ -2,7 +2,7 @@ import os
from contextlib import suppress from contextlib import suppress
from functools import lru_cache from functools import lru_cache
from app.commons import run_idle from app.commons import run_idle, log
from app.eparser import get_blacklist, write_blacklist, parse_m3u from app.eparser import get_blacklist, write_blacklist, parse_m3u
from app.eparser import get_services, get_bouquets, write_bouquets, write_services, Bouquets, Bouquet, Service from app.eparser import get_services, get_bouquets, write_bouquets, write_services, Bouquets, Bouquet, Service
from app.eparser.ecommons import CAS, FLAG from app.eparser.ecommons import CAS, FLAG
@@ -495,14 +495,18 @@ class MainAppWindow:
self.__bouquets["{}:{}".format(name, bt_type)] = services self.__bouquets["{}:{}".format(name, bt_type)] = services
def append_services(self, data_path): def append_services(self, data_path):
try:
services = get_services(data_path, Profile(self.__profile)) services = get_services(data_path, Profile(self.__profile))
except Exception as e:
print(e)
log("Append services error: " + str(e))
show_dialog(DialogType.ERROR, self.__main_window, "Error opening data!")
else:
if services: if services:
for srv in services: for srv in services:
# adding channels to dict with fav_id as keys # adding channels to dict with fav_id as keys
self.__services[srv.fav_id] = srv self.__services[srv.fav_id] = srv
self.__services_model.append(srv) self.__services_model.append(srv)
else:
show_dialog(DialogType.ERROR, self.__main_window, "Error opening data!")
def clear_current_data(self): def clear_current_data(self):
""" Clearing current data from lists """ """ Clearing current data from lists """

0
build-deb.sh Normal file → Executable file
View File