Skip to content
This repository has been archived by the owner on Feb 22, 2025. It is now read-only.

Commit

Permalink
Merge pull request #809 from rix1337/dev
Browse files Browse the repository at this point in the history
Advanced logging for #803
  • Loading branch information
rix1337 authored Sep 29, 2024
2 parents c8b667b + ccf0310 commit cc4aa0b
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 16 deletions.
2 changes: 1 addition & 1 deletion feedcrawler/providers/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


def get_version():
return "20.1.7"
return "20.1.8"


def create_version_file():
Expand Down
33 changes: 21 additions & 12 deletions feedcrawler/web_interface/serve/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -1679,7 +1679,7 @@ def to_download(payload):
try:
payload = decode_base64(payload.replace("%3D", "=")).split("|")
except:
return abort(400, "Failed")
return abort(400, f"Failed to decode payload: {payload}")
if payload:
links = clean_links(payload[0])

Expand All @@ -1697,32 +1697,41 @@ def to_download(payload):

result = attempt_download(package_name, links, password, ids)
return result
return abort(400, "Failed")
return abort(400, "Request was missing payload")

@app.post(prefix + "/sponsors_helper/to_download/")
def to_download():
try:
data = request.body.read().decode("utf-8")
except:
abort(400, "Could not get data from request body")
try:
payload = json.loads(data)
except:
abort(400, "Could not decode payload from request data")

try:
package_name = payload["package_name"] \
.encode("ascii", errors="ignore").decode().replace("/", "").replace(" ", ".")
links = clean_links(payload["links"])
except:
abort(400, f"Request payload missing package_name or links: {payload}")

try:
password = payload["password"]
except:
password = ""
try:
password = payload["password"]
except:
password = ""

try:
ids = payload["ids"]
except:
ids = False
try:
ids = payload["ids"]
except:
ids = False

try:
result = attempt_download(package_name, links, password, ids)
return result
except:
pass
return abort(400, "Failed")
abort(400, f"Download attempt failed for payload: {payload}")
return abort(400, "Request failed for unknown reason")

Server(app, listen='0.0.0.0', port=shared_state.values["port"]).serve_forever()
4 changes: 2 additions & 2 deletions feedcrawler/web_interface/vuejs_frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion feedcrawler/web_interface/vuejs_frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "feedcrawler-web",
"version": "20.1.7",
"version": "20.1.8",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down

0 comments on commit cc4aa0b

Please sign in to comment.