Merge pull request #97 from MercurySeven/develop

Fix ultimi bug

Author: Edivad99

.gitignore

@@ -149,4 +149,7 @@ tests/*.txt
 
 # Per deploy
 /linux/*
-/macOS/*
+/macOS/*
+/linuxDist/*
+/appimagetool-x86_64.AppImage
+/linux_deploy.sh

src/__main__.py

@@ -37,6 +37,9 @@
     logging.getLogger("gql.transport.requests").setLevel(logging.WARNING)
 
     env_settings = QSettings()
+    # env_settings.setValue("sync_path", None)
+    # env_settings.setValue("Credentials/user", None)
+    # env_settings.setValue("Credentials/password", None)
 
     # Controlliamo se l'utente ha già settato il PATH della cartella
     check_path = env_settings.value("sync_path")

src/algorithm/decision_engine.py

@@ -12,7 +12,7 @@
 from src.model.algorithm.tree_node import TreeNode
 from src.model.main_model import MainModel
 from src.model.settings_model import SettingsModel
-from src.network.api_exceptions import APIException, LoginError
+from src.network.api_exceptions import APIException, LoginError, ServerError
 from . import tree_builder, tree_comparator, os_handler
 from .compare_snap_client import CompareSnapClient
 from .strategy.client_strategy import ClientStrategy
@@ -103,15 +103,15 @@ def check(self) -> None:
             tree_builder.dump_client_filesystem(path)
             self.logger.info("Eseguito snapshot dell'albero locale")
             self.notification_controller.send_best_message()
-        except APIException as e:
-            if isinstance(e, LoginError):
-                self.notification_controller.send_message(
-                    "Credenziali errate. Eseguire logout e riprovare",
-                    icon=QSystemTrayIcon.Critical)
-                self.main_model.sync_model.set_state(False)
-            else:
-                self.notification_controller.send_message(
-                    "Errore di connessione al drive Zextras", icon=QSystemTrayIcon.Warning)
+
+        except LoginError:
+            self.notification_controller.send_message(
+                "Credenziali errate. Eseguire logout e riprovare", icon=QSystemTrayIcon.Critical)
+            self.main_model.sync_model.set_state(False)
+        except (ServerError, APIException):
+            self.notification_controller.send_message(
+                "Errore di connessione al drive Zextras", icon=QSystemTrayIcon.Warning)
+            self.main_model.sync_model.set_state(False)
 
     def compute_decision(self,
                          client_tree: TreeNode,

src/assets/style.qss

@@ -70,7 +70,7 @@ QWidget[accessibleName='Stacked'] QWidget[accessibleName='InfoBox'] > QComboBox:
 }
 
 QWidget[accessibleName='Stacked'] QWidget[accessibleName='InfoBox'] > QComboBox::down-arrow {
-    border-image: url(assets/icons/down-arrow.png);
+    border-image: url(src/assets/icons/down-arrow.png);
 }
 
 QWidget[accessibleName='Stacked'] QWidget[accessibleName='InfoBox'] > QComboBox::drop-down:hover {

src/assets_path.py

@@ -1,9 +1,10 @@
 import os
-__DEPLOY_MACOS = False
+import platform
 
-if __DEPLOY_MACOS:
+if platform.system() == 'Windows':
+    file_name = "./src/assets"
+else:
     dir_name = os.path.dirname(__file__)
     file_name = os.path.join(dir_name, "./assets")
-    ASSETS_PATH = file_name
-else:
-    ASSETS_PATH = "./src/assets"
+
+ASSETS_PATH = file_name

src/model/network_model.py

@@ -35,8 +35,13 @@ def handle(self, *args, **kwargs):
             # e' possibile che sia scaduto il login provo a rifarlo
             # e ritento la chiamata
             logger.debug(f"retry {func.__name__} with new login")
+
+            env_settings = QSettings()
+            user = env_settings.value("Credentials/user")
+            password = env_settings.value("Credentials/password")
             api_impl = ApiImplementation()
-            api_impl.login()
+            api_impl.login(user, password)
+
             return func(self, *args, **kwargs)
 
     return handle

src/settings.py

@@ -1,14 +1,14 @@
 import configparser
 import logging
 import os.path
+import platform
 from typing import Optional
 
-__DEPLOY_MACOS = False
-if __DEPLOY_MACOS:
+if platform.system() == 'Windows':
+    file_name = "config.ini"
+else:
     dir_name = os.path.dirname(__file__)
     file_name = os.path.join(dir_name, "config.ini")
-else:
-    file_name = "config.ini"
 
 
 def __read_from_file() -> None: