peter
fa35925cc6
Follow-up to user prod testing of 0.51.0: - re-download now clears job.display_name so the card title + Content-Disposition filename are re-derived from the freshly-cleaned title (previously an auto-name from an older un-cleaned title — still carrying a "… views · … reactions |" prefix — survived the rebuild). - on-disk AND served names are now a strict shell-safe slug: only [A-Za-z0-9._-] survive; every other char (the "!" the user saw, plus ( ) [ ] & $ ' " ; | ? * …) collapses to "_". The id no longer uses [brackets] (glob metacharacters). Shared _slug helper for sanitize + display_filename. - GC gains a 5th pass: sweep on-disk files/dirs no ready asset owns (old accented channel dirs, a poster from a superseded naming scheme left after a re-download), skipping the dot system trees and anything newer than an hour so an in-flight download is never touched. - Tests: slug strips !/$/()[]; rel_path is bracket-free; orphan-sweep keeps owned/system/fresh files.
90 lines
3.6 KiB
Python
90 lines
3.6 KiB
Python
"""ASCII-slug naming (no spaces, no accents) for on-disk paths and served filenames, and the
|
|
social engagement-prefix strip in title normalization."""
|
|
from app.downloads import storage
|
|
from app.titles import normalize_title
|
|
|
|
|
|
def _is_ascii_slug(s: str) -> bool:
|
|
return s.isascii() and " " not in s
|
|
|
|
|
|
def test_sanitize_folds_accents_to_ascii():
|
|
assert storage.sanitize("Barnabás Skriván") == "Barnabas_Skrivan"
|
|
assert storage.sanitize("Comedy Central Magyarország") == "Comedy_Central_Magyarorszag"
|
|
assert storage.sanitize("Marco Mobili Bútoráruház Veszprém") == "Marco_Mobili_Butoraruhaz_Veszprem"
|
|
# Hungarian double-acute (ő/ű) and German ß.
|
|
assert storage.sanitize("Előző Műsor") == "Elozo_Musor"
|
|
assert storage.sanitize("Straße") == "Strasse"
|
|
|
|
|
|
def test_sanitize_output_is_pure_ascii_without_spaces():
|
|
for name in ("Poénbomba", "Mágáné Zsuzsanna", "café déjà vu", "naïve œuvre"):
|
|
out = storage.sanitize(name)
|
|
assert _is_ascii_slug(out), out
|
|
|
|
|
|
def test_sanitize_non_latin_falls_back_not_crashes():
|
|
# A title with no ASCII base collapses to the untitled fallback rather than an empty name.
|
|
assert storage.sanitize("日本語") == "untitled"
|
|
|
|
|
|
def test_display_filename_uses_underscores_and_ascii():
|
|
out = storage.display_filename("Amikor a férfi éhesen ér haza")
|
|
assert out == "Amikor_a_ferfi_ehesen_er_haza"
|
|
assert _is_ascii_slug(out)
|
|
|
|
|
|
def test_download_filename_appends_single_extension():
|
|
from pathlib import Path
|
|
|
|
assert storage.download_filename("Szép Videó", "mp4", Path("x.mp4")) == "Szep_Video.mp4"
|
|
|
|
|
|
def test_rel_path_is_ascii_everywhere():
|
|
meta = storage.MediaMeta(
|
|
video_id="abc123", title="Áristom Ödön", uploader="Hajdú Balázs", upload_date=None
|
|
)
|
|
rel = storage.rel_path(meta, "mp4", "plex", asset_id=7)
|
|
assert _is_ascii_slug(rel.replace("/", ""))
|
|
assert "Hajdu_Balazs" in rel and "Aristom_Odon" in rel
|
|
# Shell-unpleasant chars (incl. the id brackets) never appear in a generated path.
|
|
for bad in "[]!?*&$()'\"; |":
|
|
assert bad not in rel
|
|
|
|
|
|
def test_rel_path_strips_exclamation_and_other_shell_chars():
|
|
meta = storage.MediaMeta(
|
|
video_id="abc123", title="Rovinjból! A vihar (2026) $$$", uploader="Chan", upload_date=None
|
|
)
|
|
rel = storage.rel_path(meta, "mp4", "plex", asset_id=1)
|
|
assert "!" not in rel and "$" not in rel and "(" not in rel
|
|
|
|
|
|
def test_engagement_prefix_stripped():
|
|
assert normalize_title(
|
|
"1.6M views · 66K reactions | Amikor a férfi éhesen ér haza"
|
|
) == "Amikor a férfi éhesen ér haza"
|
|
assert normalize_title("13M views · 162K reactions |Valami cím") == "Valami cím"
|
|
assert normalize_title("500 views | Rövid") == "Rövid"
|
|
|
|
|
|
def test_engagement_prefix_does_not_touch_normal_titles():
|
|
# A pipe that isn't an engagement prefix must survive.
|
|
assert normalize_title("Vlog 12 | A nagy nap") == "Vlog 12 | A nagy nap"
|
|
assert normalize_title("How I built a boat") == "How I built a boat"
|
|
|
|
|
|
def test_engagement_only_title_does_not_resurrect_the_stats():
|
|
# A title that is ONLY the stats prefix must not fall back to the raw (stats-bearing) string.
|
|
out = normalize_title("1.6M views · 66K reactions |")
|
|
assert out == ""
|
|
assert "views" not in (out or "") and "reactions" not in (out or "")
|
|
|
|
|
|
def test_prefix_plus_only_hashtags_resurrects_neither_stats_nor_hashtags():
|
|
# stats prefix + trailing SEO hashtags → both are removed; the fallback must not bring back the
|
|
# hashtags that rule 2 strips (nor the stats prefix).
|
|
out = normalize_title("5 views | #foo #bar")
|
|
assert out == ""
|
|
assert "#foo" not in (out or "") and "views" not in (out or "")
|