Store: fix NPS refresh, scan race, thread cleanup, and matching perf
This commit is contained in:
+28
-10
@@ -131,22 +131,40 @@ def parse_tsv(text: str, content_type: str) -> List[dict]:
|
||||
return items
|
||||
|
||||
|
||||
def fetch_items(content_type: str, url: str = "", timeout: int = 60) -> List[dict]:
|
||||
"""Download (and cache) a TSV, returning parsed item dicts."""
|
||||
def fetch_items(content_type: str, url: str = "", timeout: int = 60, force: bool = False) -> List[dict]:
|
||||
"""Download (and cache) a TSV, returning parsed item dicts.
|
||||
|
||||
``force`` re-downloads the TSV (used by the Store's Refresh button); the
|
||||
local cache is only used as a fallback when the network fails.
|
||||
"""
|
||||
url = url or tsv_url(content_type)
|
||||
name = _TSV_NAMES.get(content_type, "PSP_GAMES.tsv")
|
||||
cache = _tsv_dir() / name
|
||||
if cache.is_file():
|
||||
|
||||
def read_cache():
|
||||
try:
|
||||
return parse_tsv(cache.read_text(encoding="utf-8", errors="replace"), content_type)
|
||||
except OSError:
|
||||
pass
|
||||
req = urllib.request.Request(url, headers={"User-Agent": "psp-preserve/0.1"})
|
||||
with urllib.request.urlopen(req, timeout=timeout) as resp:
|
||||
data = resp.read()
|
||||
text = data.decode("utf-8", errors="replace")
|
||||
cache.write_text(text, encoding="utf-8")
|
||||
return parse_tsv(text, content_type)
|
||||
return None
|
||||
|
||||
if not force and cache.is_file():
|
||||
items = read_cache()
|
||||
if items is not None:
|
||||
return items
|
||||
|
||||
try:
|
||||
req = urllib.request.Request(url, headers={"User-Agent": "psp-preserve/0.1"})
|
||||
with urllib.request.urlopen(req, timeout=timeout) as resp:
|
||||
data = resp.read()
|
||||
text = data.decode("utf-8", errors="replace")
|
||||
cache.write_text(text, encoding="utf-8")
|
||||
return parse_tsv(text, content_type)
|
||||
except Exception: # noqa: BLE001 - fall back to the cached list on failure
|
||||
items = read_cache()
|
||||
if items is not None:
|
||||
log.warning("could not refresh %s TSV; using cached copy", content_type)
|
||||
return items
|
||||
raise
|
||||
|
||||
|
||||
def find_pkg2zip(configured_path: str = "") -> Optional[Path]:
|
||||
|
||||
Reference in New Issue
Block a user