From e3334c9d0ee71ea5e0d26063bc0f147033905ddb Mon Sep 17 00:00:00 2001
From: Xpl0itU <24777100+Xpl0itU@users.noreply.github.com>
Date: Wed, 3 Apr 2024 18:38:09 +0200
Subject: [PATCH] Fix database fetching

---
 .github/workflows/macos.yml   |  1 +
 .github/workflows/windows.yml |  2 +-
 Dockerfile.linux              |  2 +-
 grabTitles.py                 | 23 +++++++++++++----------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 31e388c..6ff953e 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -18,6 +18,7 @@ jobs:
       - name: Install Dependencies
         run: |
           brew install create-dmg dylibbundler gtk+3
+          python3 -m pip install requests
       - name: Build
         run: |
           python3 grabTitles.py
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 46ad6e5..d72e618 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -25,7 +25,7 @@ jobs:
           msystem: UCRT64
           release: true
           update: true
-          install: zip git mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-python mingw-w64-ucrt-x86_64-gtk3 mingw-w64-ucrt-x86_64-pkg-config mingw-w64-ucrt-x86_64-go mingw-w64-ucrt-x86_64-ntldd-git
+          install: zip git mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-python mingw-w64-ucrt-x86_64-gtk3 mingw-w64-ucrt-x86_64-pkg-config mingw-w64-ucrt-x86_64-go mingw-w64-ucrt-x86_64-ntldd-git mingw-w64-ucrt-x86_64-python-requests
       - name: Build
         run: |
           python3 grabTitles.py
diff --git a/Dockerfile.linux b/Dockerfile.linux
index 9b45ab1..03b0556 100644
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -13,7 +13,7 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man2 && \
 
 RUN apt-fast -y --no-install-recommends update && \
     apt-fast -y --no-install-recommends upgrade && \
-    apt-fast install -y --no-install-recommends build-essential libgcrypt20-dev libgtk-3-dev libfuse2 libtool librsvg2-dev && \
+    apt-fast install -y --no-install-recommends build-essential libgcrypt20-dev libgtk-3-dev libfuse2 libtool librsvg2-dev python3-requests && \
     wget https://go.dev/dl/go1.22.1.linux-amd64.tar.gz && \
     tar -C /usr/local -xzf go*.linux-amd64.tar.gz && \
     chmod +x /usr/local/go/bin/go* && \
diff --git a/grabTitles.py b/grabTitles.py
index a89e930..3e8dfac 100644
--- a/grabTitles.py
+++ b/grabTitles.py
@@ -1,24 +1,27 @@
 #!/bin/env python
 
 import os
-import urllib.request
-import ssl
+import requests
 
 # Don't edit below this line
 
+
 def checkAndDeleteFile(file):
     if os.path.exists(file):
         print(f"Deleting {file}")
         os.remove(file)
 
-# Disable certificate verification
-ssl_context = ssl.create_default_context()
-ssl_context.check_hostname = False
-ssl_context.verify_mode = ssl.CERT_NONE
 
-opener = urllib.request.build_opener(urllib.request.HTTPSHandler(context=ssl_context))
-opener.addheaders = [("User-agent", "NUSspliBuilder/2.2"), ("Accept-Encoding", "gzip, deflate, br")]
-urllib.request.install_opener(opener)
+def downloadFile(url, file, headers={}):
+    print(f"Downloading {file}")
+    with requests.get(url, headers=headers) as r:
+        with open(file, "wb") as f:
+            f.write(r.content)
+
 
 checkAndDeleteFile("db.go")
-urllib.request.urlretrieve("https://napi.v10lator.de/db?t=go", "db.go")
\ No newline at end of file
+downloadFile(
+    "https://napi.v10lator.de/db?t=go",
+    "db.go",
+    {"User-Agent": "NUSspliBuilder/2.2", "Accept-Encoding": "br, gzip, deflate"},
+)