Skip to content

Commit

Permalink
Revert pycurl and add Accept-Encoding to build script
Browse files Browse the repository at this point in the history
  • Loading branch information
Xpl0itU committed Apr 3, 2024
1 parent d5efd04 commit 8e49371
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 18 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -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* && \
Expand Down
23 changes: 11 additions & 12 deletions grabTitles.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/env python

import os
import pycurl
import urllib.request
import ssl

# Don't edit below this line

Expand All @@ -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")

0 comments on commit 8e49371

Please sign in to comment.