From c5c88a8958066f9031df2ef28d5dba5dda7196e8 Mon Sep 17 00:00:00 2001
From: Dmitriy Yefremov <dmitry.v.yefremov@gmail.com>
Date: Thu, 18 Jan 2018 12:38:58 +0300
Subject: [PATCH] telnet options

---
 app/eparser/neutrino/bouquets.py |  2 ++
 app/ftp.py                       |  3 ++-
 app/ui/main_app_window.py        | 20 ++++++++++++--------
 build-deb.sh                     |  0
 4 files changed, 16 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 build-deb.sh

diff --git a/app/eparser/neutrino/bouquets.py b/app/eparser/neutrino/bouquets.py
index e27e2fb1..69de606a 100644
--- a/app/eparser/neutrino/bouquets.py
+++ b/app/eparser/neutrino/bouquets.py
@@ -87,6 +87,8 @@ def write_bouquet(file, bouquet):
         root.appendChild(bq_elem)
 
         for srv in bq.services:
+            if srv is None:  # temporary !!!! (Unknown Provider on 75.0E)
+                continue
             on, sep, ssid = srv.fav_id.partition(":")
             srv_elem = doc.createElement("S")
             srv_elem.setAttribute("i", ssid)
diff --git a/app/ftp.py b/app/ftp.py
index a541cb0c..59a8906c 100644
--- a/app/ftp.py
+++ b/app/ftp.py
@@ -88,7 +88,8 @@ def upload_data(*, properties, download_type=DownloadDataType.ALL, remove_unused
             for file_name in os.listdir(data_path):
                 if file_name == "satellites.xml":
                     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:
             picons_path = properties.get("picons_dir_path")
diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index 500a845b..88405512 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -2,7 +2,7 @@ import os
 from contextlib import suppress
 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_services, get_bouquets, write_bouquets, write_services, Bouquets, Bouquet, Service
 from app.eparser.ecommons import CAS, FLAG
@@ -495,14 +495,18 @@ class MainAppWindow:
                 self.__bouquets["{}:{}".format(name, bt_type)] = services
 
     def append_services(self, data_path):
-        services = get_services(data_path, Profile(self.__profile))
-        if services:
-            for srv in services:
-                #  adding channels to dict with fav_id as keys
-                self.__services[srv.fav_id] = srv
-                self.__services_model.append(srv)
-        else:
+        try:
+            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:
+                for srv in services:
+                    #  adding channels to dict with fav_id as keys
+                    self.__services[srv.fav_id] = srv
+                    self.__services_model.append(srv)
 
     def clear_current_data(self):
         """ Clearing current data from lists """
diff --git a/build-deb.sh b/build-deb.sh
old mode 100644
new mode 100755