Merge pull request #18 from gorouflex/sourcery/main

Sourcery refactored main branch

Author: oxGorou

AFKBot-Beta/AFKBot.py

@@ -27,11 +27,13 @@ def get_latest_version():
 def get_latest_beta_version():
     response = http.request('GET', 'https://github.com/gorouflex/afkbot/releases')
     soup = BeautifulSoup(response.data, 'html.parser')
-    beta_tags = soup.find_all('a', class_='Link--primary', href=lambda x: x and '/tag/' in x)
-    if beta_tags:
+    if beta_tags := soup.find_all(
+        'a', class_='Link--primary', href=lambda x: x and '/tag/' in x
+    ):
         beta_versions = [tag.text.strip() for tag in beta_tags]
-        beta_versions_with_beta = [ver for ver in beta_versions if 'Beta' in ver]
-        if beta_versions_with_beta:
+        if beta_versions_with_beta := [
+            ver for ver in beta_versions if 'Beta' in ver
+        ]:
             return beta_versions_with_beta[0]
     return None
 
@@ -98,20 +100,24 @@ def __init__(self, main_window):
         self.title('Settings')
         self.geometry("520x290")
         self.resizable(False, False)
-        
+
         self.logo_label = customtkinter.CTkLabel(self, text="Settings", font=("", 19, "bold"))
         self.logo_label.pack(pady=5)
 
         self.keys_label = customtkinter.CTkLabel(self, text="Keys:", font=("", 14, "bold"))
         self.keys_label.pack(pady=5)
 
-        self.keys_entry = customtkinter.CTkEntry(self, placeholder_text=f"Keys", font=("", 15))
+        self.keys_entry = customtkinter.CTkEntry(
+            self, placeholder_text="Keys", font=("", 15)
+        )
         self.keys_entry.pack(pady=5)
 
         self.sleep_label = customtkinter.CTkLabel(self, text="Sleep time:", font=("", 14, "bold"))
         self.sleep_label.pack(pady=5)
 
-        self.sleep_entry = customtkinter.CTkEntry(self, placeholder_text=f"Sleep time", font=("", 15))
+        self.sleep_entry = customtkinter.CTkEntry(
+            self, placeholder_text="Sleep time", font=("", 15)
+        )
         self.sleep_entry.pack(pady=5)
 
         self.config_label = customtkinter.CTkLabel(

AFKBot-Beta/Updater.py

@@ -18,11 +18,13 @@ def get_latest_version():
 def get_latest_beta_version():
     response = http.request('GET', BETA_RELEASE_URL)
     soup = BeautifulSoup(response.data, 'html.parser')
-    beta_tags = soup.find_all('a', class_='Link--primary', href=lambda x: x and '/tag/' in x)
-    if beta_tags:
+    if beta_tags := soup.find_all(
+        'a', class_='Link--primary', href=lambda x: x and '/tag/' in x
+    ):
         beta_versions = [tag.text.strip() for tag in beta_tags]
-        beta_versions_with_beta = [ver for ver in beta_versions if 'Beta' in ver]
-        if beta_versions_with_beta:
+        if beta_versions_with_beta := [
+            ver for ver in beta_versions if 'Beta' in ver
+        ]:
             return beta_versions_with_beta[0]
     return None
 
@@ -39,8 +41,7 @@ def update_afkbot():
     caution_label.configure(text="Stable update successfully!")
 
 def update_beta_afkbot():
-    beta_version = get_latest_beta_version()
-    if beta_version:
+    if beta_version := get_latest_beta_version():
         beta_version_url = beta_version.replace(" ", "-")
         beta_download_url = f"https://github.com/gorouflex/AFKBot/releases/download/{beta_version_url}/AFKBot-Beta.zip"
         print(f"Downloading from: {beta_download_url}")

AFKBot/AFKBot.py

@@ -27,11 +27,13 @@ def get_latest_version():
 def get_latest_beta_version():
     response = http.request('GET', 'https://github.com/gorouflex/afkbot/releases')
     soup = BeautifulSoup(response.data, 'html.parser')
-    beta_tags = soup.find_all('a', class_='Link--primary', href=lambda x: x and '/tag/' in x)
-    if beta_tags:
+    if beta_tags := soup.find_all(
+        'a', class_='Link--primary', href=lambda x: x and '/tag/' in x
+    ):
         beta_versions = [tag.text.strip() for tag in beta_tags]
-        beta_versions_with_beta = [ver for ver in beta_versions if 'Beta' in ver]
-        if beta_versions_with_beta:
+        if beta_versions_with_beta := [
+            ver for ver in beta_versions if 'Beta' in ver
+        ]:
             return beta_versions_with_beta[0]
     return None
 
@@ -98,20 +100,24 @@ def __init__(self, main_window):
         self.title('Settings')
         self.geometry("520x290")
         self.resizable(False, False)
-        
+
         self.logo_label = customtkinter.CTkLabel(self, text="Settings", font=("", 19, "bold"))
         self.logo_label.pack(pady=5)
 
         self.keys_label = customtkinter.CTkLabel(self, text="Keys:", font=("", 14, "bold"))
         self.keys_label.pack(pady=5)
 
-        self.keys_entry = customtkinter.CTkEntry(self, placeholder_text=f"Keys", font=("", 15))
+        self.keys_entry = customtkinter.CTkEntry(
+            self, placeholder_text="Keys", font=("", 15)
+        )
         self.keys_entry.pack(pady=5)
 
         self.sleep_label = customtkinter.CTkLabel(self, text="Sleep time:", font=("", 14, "bold"))
         self.sleep_label.pack(pady=5)
 
-        self.sleep_entry = customtkinter.CTkEntry(self, placeholder_text=f"Sleep time", font=("", 15))
+        self.sleep_entry = customtkinter.CTkEntry(
+            self, placeholder_text="Sleep time", font=("", 15)
+        )
         self.sleep_entry.pack(pady=5)
 
         self.config_label = customtkinter.CTkLabel(

AFKBot/Updater.py

@@ -18,11 +18,13 @@ def get_latest_version():
 def get_latest_beta_version():
     response = http.request('GET', BETA_RELEASE_URL)
     soup = BeautifulSoup(response.data, 'html.parser')
-    beta_tags = soup.find_all('a', class_='Link--primary', href=lambda x: x and '/tag/' in x)
-    if beta_tags:
+    if beta_tags := soup.find_all(
+        'a', class_='Link--primary', href=lambda x: x and '/tag/' in x
+    ):
         beta_versions = [tag.text.strip() for tag in beta_tags]
-        beta_versions_with_beta = [ver for ver in beta_versions if 'Beta' in ver]
-        if beta_versions_with_beta:
+        if beta_versions_with_beta := [
+            ver for ver in beta_versions if 'Beta' in ver
+        ]:
             return beta_versions_with_beta[0]
     return None
 
@@ -39,8 +41,7 @@ def update_afkbot():
     caution_label.configure(text="Stable update successfully!")
 
 def update_beta_afkbot():
-    beta_version = get_latest_beta_version()
-    if beta_version:
+    if beta_version := get_latest_beta_version():
         beta_version_url = beta_version.replace(" ", "-")
         beta_download_url = f"https://github.com/gorouflex/AFKBot/releases/download/{beta_version_url}/AFKBot-Beta.zip"
         print(f"Downloading from: {beta_download_url}")