Clean code

mak448a · Jun 12, 2024 · 51299bf · 51299bf
1 parent 160ae66
commit 51299bf
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/src/discord_integration.py b/src/discord_integration.py
@@ -124,17 +124,17 @@ def get_guilds() -> dict:
  if os.path.exists(f"{platformdirs.user_config_dir('QTCord')}/servers/{server['id']}.png"):
  continue
 
- print(f"https://cdn.discordapp.com/icons/{server['id']}/{server['icon']}")
- test = requests.get(f"https://cdn.discordapp.com/icons/{server['id']}/{server['icon']}")
+ # print(f"https://cdn.discordapp.com/icons/{server['id']}/{server['icon']}")
+ server_icon = requests.get(f"https://cdn.discordapp.com/icons/{server['id']}/{server['icon']}")
 
  # Handle no image servers
- if test.status_code == 404:
+ if server_icon.status_code == 404:
  continue
  if not os.path.exists(f"{platformdirs.user_config_dir('QTCord')}/servers"):
  os.makedirs(f"{platformdirs.user_config_dir('QTCord')}/servers")
 
  with open(f"{platformdirs.user_config_dir('QTCord')}/servers/{server['id']}.png", "wb") as f:
- for chunk in test.iter_content():
+ for chunk in server_icon.iter_content():
  f.write(chunk)
 
  # print(f"https://cdn.discordapp.com/icons/{r.json()[1]["id"]}/{r.json()[1]["icon"]}")
@@ -178,11 +178,11 @@ def login(email: str, password: str):
  r = requests.post(f"{api_base}/auth/login",
  json=payload)
 
- # print(r.json())
-
+ # Check for errors
  if r.json().get("errors", False):
  return None
 
+ # Return token if it succeeds, otherwise, return nothing.
  if r.json().get("token", False):
  return r.json()["token"]
  else:

diff --git a/src/login.py b/src/login.py
@@ -25,7 +25,7 @@ def switch(self):
 
  if valid:
  _token = login(email, password)
- print(_token, "is our token")
+ # print(_token, "is our token")
 
  if _token:
  with open(platformdirs.user_config_dir("QTCord") + "/discordauth.txt", "w") as f:

diff --git a/src/main.py b/src/main.py
@@ -7,7 +7,7 @@
 
 # Regenerate ui from ui files
 if os.path.exists(f"{os.path.expanduser('~/Documents/regenerate_ui_files_indicator.txt')}"): # NOQA
- print("Regenerating ui files...")
+ print("Regenerating ui files")
  os.system(f"pyside6-uic {current_dir}/ui/main.ui -o {current_dir}/ui/main_ui.py") # NOQA
  os.system(f"pyside6-uic {current_dir}/ui/login.ui -o {current_dir}/ui/login_ui.py") # NOQA
  os.system(f"pyside6-uic {current_dir}/ui/licenses.ui -o {current_dir}/ui/licenses_ui.py") # NOQA

diff --git a/src/ui/licenses_ui.py b/src/ui/licenses_ui.py
@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'licenses.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.6.1
+## Created by: Qt User Interface Compiler version 6.7.1
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################

diff --git a/src/ui/login_ui.py b/src/ui/login_ui.py
@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'login.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.6.1
+## Created by: Qt User Interface Compiler version 6.7.1
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -28,7 +28,7 @@ def setupUi(self, MainWindow):
  self.centralwidget.setObjectName(u"centralwidget")
  self.verticalLayout = QVBoxLayout(self.centralwidget)
  self.verticalLayout.setObjectName(u"verticalLayout")
- self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
+ self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
  self.verticalLayout.addItem(self.verticalSpacer)
 
@@ -47,7 +47,7 @@ def setupUi(self, MainWindow):
  self.verticalLayout_3.setContentsMargins(-1, 50, -1, -1)
  self.horizontalLayout_3 = QHBoxLayout()
  self.horizontalLayout_3.setObjectName(u"horizontalLayout_3")
- self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+ self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
  self.horizontalLayout_3.addItem(self.horizontalSpacer)
 
@@ -63,7 +63,7 @@ def setupUi(self, MainWindow):
 
  self.horizontalLayout_3.addWidget(self.email)
 
- self.horizontalSpacer_3 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+ self.horizontalSpacer_3 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
  self.horizontalLayout_3.addItem(self.horizontalSpacer_3)
 
@@ -75,7 +75,7 @@ def setupUi(self, MainWindow):
 
  self.horizontalLayout_6 = QHBoxLayout()
  self.horizontalLayout_6.setObjectName(u"horizontalLayout_6")
- self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+ self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
  self.horizontalLayout_6.addItem(self.horizontalSpacer_2)
 
@@ -92,7 +92,7 @@ def setupUi(self, MainWindow):
 
  self.horizontalLayout_6.addWidget(self.password)
 
- self.horizontalSpacer_4 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+ self.horizontalSpacer_4 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
  self.horizontalLayout_6.addItem(self.horizontalSpacer_4)
 
@@ -102,7 +102,7 @@ def setupUi(self, MainWindow):
  self.horizontalLayout_4 = QHBoxLayout()
  self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
  self.horizontalLayout_4.setContentsMargins(-1, 10, -1, -1)
- self.horizontalSpacer_5 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+ self.horizontalSpacer_5 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
  self.horizontalLayout_4.addItem(self.horizontalSpacer_5)
 
@@ -111,14 +111,14 @@ def setupUi(self, MainWindow):
 
  self.horizontalLayout_4.addWidget(self.pushButton)
 
- self.horizontalSpacer_6 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+ self.horizontalSpacer_6 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
  self.horizontalLayout_4.addItem(self.horizontalSpacer_6)
 
 
  self.verticalLayout.addLayout(self.horizontalLayout_4)
 
- self.verticalSpacer_4 = QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding)
+ self.verticalSpacer_4 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
  self.verticalLayout.addItem(self.verticalSpacer_4)
 

diff --git a/src/ui/main_ui.py b/src/ui/main_ui.py
@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'main.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.6.1
+## Created by: Qt User Interface Compiler version 6.7.1
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -165,7 +165,7 @@ def setupUi(self, MainWindow):
  self.verticalLayout_3.addWidget(self.tabWidget)
 
  self.dockWidget.setWidget(self.dockWidgetContents)
- MainWindow.addDockWidget(Qt.LeftDockWidgetArea, self.dockWidget)
+ MainWindow.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.dockWidget)
 
  self.menubar.addAction(self.menuFile.menuAction())
  self.menubar.addAction(self.menuHelp.menuAction())

diff --git a/src/ui/no_internet.py b/src/ui/no_internet.py
@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'no_internet.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.6.1
+## Created by: Qt User Interface Compiler version 6.7.1
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################