From 8e49371c8419fa93e7c091946c9e44bebd05c5f9 Mon Sep 17 00:00:00 2001
From: Xpl0itU <24777100+Xpl0itU@users.noreply.github.com>
Date: Wed, 3 Apr 2024 18:17:27 +0200
Subject: [PATCH] Revert pycurl and add Accept-Encoding to build script

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

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 4e2e8b5..31e388c 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -17,10 +17,7 @@ jobs:
           submodules: 'recursive'
       - name: Install Dependencies
         run: |
-          brew uninstall --ignore-dependencies curl
-          brew uninstall --ignore-dependencies openssl
-          brew install create-dmg dylibbundler gtk+3 openssl curl
-          python3 -m pip install --compile --ignore-installed pycurl
+          brew install create-dmg dylibbundler gtk+3
       - name: Build
         run: |
           python3 grabTitles.py
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8484cad..46ad6e5 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-python-pycurl 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
       - name: Build
         run: |
           python3 grabTitles.py
diff --git a/Dockerfile.linux b/Dockerfile.linux
index f83907b..9b45ab1 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 python3-pycurl && \
+    apt-fast install -y --no-install-recommends build-essential libgcrypt20-dev libgtk-3-dev libfuse2 libtool librsvg2-dev && \
     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 ca688e0..a89e930 100644
--- a/grabTitles.py
+++ b/grabTitles.py
@@ -1,7 +1,8 @@
 #!/bin/env python
 
 import os
-import pycurl
+import urllib.request
+import ssl
 
 # Don't edit below this line
 
@@ -10,16 +11,14 @@ def checkAndDeleteFile(file):
         print(f"Deleting {file}")
         os.remove(file)
 
-def cDownload(url, file):
-    with open(file, 'wb') as f:
-        c = pycurl.Curl()
-        c.setopt(c.URL, url)
-        c.setopt(c.WRITEDATA, f)
-        c.setopt(c.FOLLOWLOCATION, True)
-        c.setopt(c.USERAGENT, "NUSspliBuilder/2.2")
-        c.setopt(c.ACCEPT_ENCODING, "")
-        c.perform()
-        c.close()
+# 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)
 
 checkAndDeleteFile("db.go")
-cDownload("https://napi.v10lator.de/db?t=go", "db.go")
+urllib.request.urlretrieve("https://napi.v10lator.de/db?t=go", "db.go")
\ No newline at end of file