From ed9f9acb1178c33e7a50fa130e3dc1d307d425f3 Mon Sep 17 00:00:00 2001
From: Lukas <m@hler.eu>
Date: Mon, 27 Sep 2021 13:46:06 +0200
Subject: [PATCH] make connection and login more robust

---
 myTS3.py | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/myTS3.py b/myTS3.py
index f02b88b..0f4d552 100644
--- a/myTS3.py
+++ b/myTS3.py
@@ -48,17 +48,26 @@ class TSbot:
 
         self.pipeOut(f"Trying to connect to: {self.host}:{self.port}")
 
-        with ts3.query.TS3Connection(self.host, self.port) as self.bot:
-            self.bot.login(client_login_name=self.user, client_login_password=self.pwd)
-            self.bot.use(sid=self.sid)
-            try:
-                self.bot.clientupdate(client_nickname=self.nickname)
-            except ts3.query.TS3QueryError:
-                pass
-            self.pipeOut(f"Successfully connected as: {self.nickname}")
+        try:
+            with ts3.query.TS3Connection(self.host, self.port) as self.bot:
+                try:
+                    self.bot.login(client_login_name=self.user, client_login_password=self.pwd)
+                    self.bot.use(sid=self.sid)
+                except ts3.query.TS3QueryError:
+                    self.pipeOut("Invalid login credentials, please check your '.toml' file.", lvl="CRITICAL")
+                try:
+                    self.bot.clientupdate(client_nickname=self.nickname)
+                except ts3.query.TS3QueryError:
+                    self.pipeOut("Nickname already in use", lvl="WARNING")
+                    pass
 
-            # Start the Bot
-            self.loop()
+                self.pipeOut(f"Successfully connected as: {self.nickname}")
+
+                # Start the Bot
+                self.loop()
+
+        except ts3.query.TS3QueryError:
+            self.pipeOut("Connection can't be established, check your '.toml' file.", lvl="CRITICAL")
 
     def loop(self):
         """
@@ -181,11 +190,15 @@ class TSbot:
         or run in silent log mode. [set reprint to False]
         """
 
-        lvln = int(getattr(util.logging, lvl.upper()))
+        lvl = lvl.upper()
+        lvln = int(getattr(util.logging, lvl))
         self.log.log(lvln, msg)
 
         if reprint:
-            print(f"[{time.strftime('%H:%M:%S')}][{lvl.upper()}] {msg}")
+            print(f"[{time.strftime('%H:%M:%S')}][{lvl}] {msg}")
+
+        if lvl == "CRITICAL" or lvl == "ERROR":
+            exit(1)
 
     def stop(self, invkr_id):
         """