Refactor code to improve readability and remove redundant lines

gautam-404 · Mar 20, 2024 · eeea97e · eeea97e
1 parent f416def
commit eeea97e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/mesaport/Installer/choice.py b/mesaport/Installer/choice.py
@@ -54,13 +54,11 @@ def choose_ver(ostype, ver=''):
 
     if ostype == "Linux":
         sdk = mesaurls.linux_sdk_urls.get(ver).split('-')[-1][:-7]
-        mesa = mesaurls.mesa_urls.get(ver).split('-')[-1][:-4]
     elif ostype == "macOS-Intel":
         sdk = mesaurls.mac_intel_sdk_urls.get(ver).split('-')[-1][:-4]
-        mesa = mesaurls.mesa_urls.get(ver).split('-')[-1][:-4]
     elif ostype == "macOS-ARM":
         sdk = mesaurls.mac_arm_sdk_urls.get(ver).split('-')[-1][:-4]
-        mesa = mesaurls.mesa_urls.get(ver).split('-')[-1][:-4]
+    mesa = mesaurls.mesa_urls.get(ver).split('/')[-1].split('r')[-1][:-4]
     print("The following will be installed:")
     print(f"MESA SDK version: [green b]{sdk}[/green b]")
     print(f"MESA version: [green b]{mesa}[/green b]\n")

diff --git a/mesaport/Installer/downloader.py b/mesaport/Installer/downloader.py
@@ -60,7 +60,7 @@ def check_n_download(self, filepath, url, text="Downloading..."):
         headers = {
                         "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:88.0) Gecko/20100101 Firefox/88.0",
                     }
-        response = requests.get(url, headers=headers, stream=True, timeout=10)
+        response = requests.get(url, headers=headers, stream=True)
         response.raise_for_status()
         total = float(response.headers.get('content-length', 0))    
         if os.path.exists(filepath) and total == os.path.getsize(filepath):