fixed logo timeout

This commit is contained in:
2025-03-31 20:24:27 +02:00
parent bce51dc3d6
commit 7e23b3625a
3 changed files with 17 additions and 10 deletions

View File

@@ -1 +1 @@
2.6.1 2.6.2

View File

@@ -40,6 +40,7 @@
"--reverse-sort", "--reverse-sort",
"--regenerate-thumbnails", "--regenerate-thumbnails",
"--reread-metadata", "--reread-metadata",
"--folderthumbnails",
], ],
"console": "integratedTerminal", "console": "integratedTerminal",
"name": "Testfolder", "name": "Testfolder",
@@ -64,6 +65,7 @@
"-m", "-m",
// "--regenerate-thumbnails", // "--regenerate-thumbnails",
// "--reread-metadata", // "--reread-metadata",
"--folderthumbnails",
], ],
"console": "integratedTerminal", "console": "integratedTerminal",
"name": "woek", "name": "woek",
@@ -99,7 +101,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode", "editor.defaultFormatter": "esbenp.prettier-vscode",
}, },
"[python]": { "[python]": {
"editor.defaultFormatter": "ms-python.black-formatter", "editor.defaultFormatter": "charliermarsh.ruff",
}, },
"black-formatter.args": [ "black-formatter.args": [
"-l 260", "-l 260",
@@ -151,6 +153,7 @@
"yaml.schemas": { "yaml.schemas": {
"https://raw.githubusercontent.com/pamburus/hl/master/schema/json/config.schema.json": "file:///home/user/git/github.com/greflm13/StaticGalleryBuilder/hl_config.yaml" "https://raw.githubusercontent.com/pamburus/hl/master/schema/json/config.schema.json": "file:///home/user/git/github.com/greflm13/StaticGalleryBuilder/hl_config.yaml"
}, },
"ruff.lineLength": 180,
}, },
"tasks": { "tasks": {
"version": "2.0.0", "version": "2.0.0",

View File

@@ -3,6 +3,7 @@ import os
import re import re
import sys import sys
import shutil import shutil
import urllib.error
import urllib.parse import urllib.parse
import urllib.request import urllib.request
from multiprocessing import Pool, freeze_support from multiprocessing import Pool, freeze_support
@@ -174,7 +175,8 @@ def main(args) -> None:
logger.info("getting logo from sorogon.eu") logger.info("getting logo from sorogon.eu")
req = urllib.request.Request("https://files.sorogon.eu/logo.svg") req = urllib.request.Request("https://files.sorogon.eu/logo.svg")
with urllib.request.urlopen(req) as res: try:
with urllib.request.urlopen(req, timeout=10) as res:
logo = res.read().decode() logo = res.read().decode()
if logo.startswith("<?xml"): if logo.startswith("<?xml"):
@@ -183,6 +185,8 @@ def main(args) -> None:
logo = re.sub(r"<!--.+-->", "", logo).strip() logo = re.sub(r"<!--.+-->", "", logo).strip()
logo = logo.replace("\n", " ") logo = logo.replace("\n", " ")
logo = " ".join(logo.split()) logo = " ".join(logo.split())
except urllib.error.URLError:
logo = "&lt;/srgn&gt;"
if args.reread_metadata: if args.reread_metadata:
logger.warning("reread metadata flag is set to true, all image metadata will be reread") logger.warning("reread metadata flag is set to true, all image metadata will be reread")