内容后台:能原样接住线上真实画展(文件名带空格、本站 mp4 视频 + 网页版、作品外链、离线缩略图索引、世界线主色),不再在校验时丢数据
- 站内路径允许普通空格,多认 exhibition_web/、thumbs/;制表符/换行/引号/尖括号/?#/.. 照旧拒 - 视频:本站 .mp4/.webm 不用填 B 站链接;web / link / links 保留 - 离线媒体索引 media 保留并写进 site.js(以前发布一次就丢缩略图,画展会直接拉几百张原图) - 世界线 tone/sector/media 保留并带进星系图数据 - 后台:本站视频的预览图走缩略图索引;编辑本站视频不再强制 B 站链接 - 测试 +8(86 条全过) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -50,7 +50,8 @@ SLUG = re.compile(r"^[a-z0-9][a-z0-9_-]{0,31}$")
|
|||||||
DATE = re.compile(r"^\d{4}-\d{2}-\d{2}$")
|
DATE = re.compile(r"^\d{4}-\d{2}-\d{2}$")
|
||||||
HEX = re.compile(r"^#[0-9A-Fa-f]{6}$")
|
HEX = re.compile(r"^#[0-9A-Fa-f]{6}$")
|
||||||
# 站内相对路径:只许 exhibition/ 和 uploads/ 下面,不许 .. / 协议 / 开头斜杠
|
# 站内相对路径:只许 exhibition/ 和 uploads/ 下面,不许 .. / 协议 / 开头斜杠
|
||||||
PATH_RE = re.compile(r"^(exhibition|uploads)/[^\s<>\"'\\?#]{1,240}$")
|
# 文件名里允许普通空格(真实作品名大量带空格,如「明介 (1).webp」);制表符 / 换行、引号、尖括号、? # \ 一律不收
|
||||||
|
PATH_RE = re.compile(r"^(exhibition|exhibition_web|uploads|thumbs)/[^\t\n\r\f\v<>\"'\\?#]{1,240}$")
|
||||||
BVID = re.compile(r"^BV[0-9A-Za-z]{10}$")
|
BVID = re.compile(r"^BV[0-9A-Za-z]{10}$")
|
||||||
|
|
||||||
_SCHEMA = """
|
_SCHEMA = """
|
||||||
@@ -158,7 +159,7 @@ def _path(v, where, allow_empty=True):
|
|||||||
return ""
|
return ""
|
||||||
raise Bad("%s 不能空" % where)
|
raise Bad("%s 不能空" % where)
|
||||||
if not PATH_RE.match(v) or ".." in v or "//" in v:
|
if not PATH_RE.match(v) or ".." in v or "//" in v:
|
||||||
raise Bad("%s 不是站内图片路径(只认 exhibition/… 或 uploads/…)" % where)
|
raise Bad("%s 不是站内文件路径(只认 exhibition/…、exhibition_web/…、uploads/…、thumbs/…)" % where)
|
||||||
return v
|
return v
|
||||||
|
|
||||||
|
|
||||||
@@ -300,19 +301,42 @@ def normalize_site(d):
|
|||||||
m = re.search(r"(BV[0-9A-Za-z]{10})", e["url"])
|
m = re.search(r"(BV[0-9A-Za-z]{10})", e["url"])
|
||||||
if m and "bvid" not in e:
|
if m and "bvid" not in e:
|
||||||
e["bvid"] = m.group(1)
|
e["bvid"] = m.group(1)
|
||||||
if not e["url"] and "bvid" not in e:
|
if g.get("web"):
|
||||||
raise Bad("%s 是视频,要填 B 站链接" % w)
|
e["web"] = _path(g["web"], w + " 的网页版视频")
|
||||||
|
local = bool(re.search(r"\.(mp4|webm)$", e.get("src", ""), re.I))
|
||||||
|
if not e["url"] and "bvid" not in e and not local:
|
||||||
|
raise Bad("%s 是视频,要填 B 站链接(或用本站的 .mp4 文件)" % w)
|
||||||
elif not e.get("src") and t != "wall":
|
elif not e.get("src") and t != "wall":
|
||||||
raise Bad("%s 还没有图片" % w)
|
raise Bad("%s 还没有图片" % w)
|
||||||
if g.get("frames"):
|
if g.get("frames"):
|
||||||
e["frames"] = [{"src": _path((f or {}).get("src"), w + " 的帧", allow_empty=False),
|
e["frames"] = [{"src": _path((f or {}).get("src"), w + " 的帧", allow_empty=False),
|
||||||
"label": _s((f or {}).get("label"), 20, w + " 的帧标签")}
|
"label": _s((f or {}).get("label"), 20, w + " 的帧标签")}
|
||||||
for f in _list(g["frames"], w + " 的帧", 60)]
|
for f in _list(g["frames"], w + " 的帧", 60)]
|
||||||
|
if g.get("link"):
|
||||||
|
e["link"] = _url(g["link"], w + " 的外链")
|
||||||
|
if g.get("links"):
|
||||||
|
e["links"] = [x for x in (_url(u, w + " 的外链") for u in _list(g["links"], w + " 的外链", 8)) if x]
|
||||||
if t == "wall" and not e.get("frames") and not e.get("src"):
|
if t == "wall" and not e.get("frames") and not e.get("src"):
|
||||||
raise Bad("%s 是动态壁纸,至少要有一帧" % w)
|
raise Bad("%s 是动态壁纸,至少要有一帧" % w)
|
||||||
gal.append(e)
|
gal.append(e)
|
||||||
out["gallery"] = gal
|
out["gallery"] = gal
|
||||||
|
|
||||||
|
media = {}
|
||||||
|
md = d.get("media") if isinstance(d.get("media"), dict) else {}
|
||||||
|
if len(md) > 5000:
|
||||||
|
raise Bad("媒体索引太大了(超过 5000 条)")
|
||||||
|
for k, v in md.items():
|
||||||
|
v = v if isinstance(v, dict) else {}
|
||||||
|
m = {}
|
||||||
|
if v.get("t"):
|
||||||
|
m["t"] = _path(v["t"], "媒体索引(%s)的缩略图" % str(k)[:40])
|
||||||
|
if v.get("r") not in (None, ""):
|
||||||
|
m["r"] = _num(v["r"], 0.05, 20, "媒体索引(%s)的宽高比" % str(k)[:40])
|
||||||
|
if m:
|
||||||
|
media[_path(k, "媒体索引的文件")] = m
|
||||||
|
if media:
|
||||||
|
out["media"] = media
|
||||||
|
|
||||||
apps = []
|
apps = []
|
||||||
for i, a in enumerate(_list(d.get("apps"), "工具与开源", 100)):
|
for i, a in enumerate(_list(d.get("apps"), "工具与开源", 100)):
|
||||||
a = a if isinstance(a, dict) else {}
|
a = a if isinstance(a, dict) else {}
|
||||||
@@ -371,6 +395,14 @@ def normalize_site(d):
|
|||||||
items.append({"no": no, "name": _s(u.get("name"), 12, w + " 的名字", required=True), "kind": kind,
|
items.append({"no": no, "name": _s(u.get("name"), 12, w + " 的名字", required=True), "kind": kind,
|
||||||
"tag": _s(u.get("tag"), 24, w + " 的一句话"), "desc": _s(u.get("desc"), 600, w + " 的简介"),
|
"tag": _s(u.get("tag"), 24, w + " 的一句话"), "desc": _s(u.get("desc"), 600, w + " 的简介"),
|
||||||
"tags": [t for t in tags if t], "look": _look(u.get("look"), w)})
|
"tags": [t for t in tags if t], "look": _look(u.get("look"), w)})
|
||||||
|
tone = str(u.get("tone") or "").strip() # 卡片 / 首页小机架上的主色(老数据带的,保留)
|
||||||
|
if tone:
|
||||||
|
if not HEX.match(tone):
|
||||||
|
raise Bad("%s 的主色要写成 #RRGGBB" % w)
|
||||||
|
items[-1]["tone"] = tone
|
||||||
|
for k, lim, nm in (("sector", 12, "扇区"), ("media", 24, "介质")):
|
||||||
|
if u.get(k):
|
||||||
|
items[-1][k] = _s(u.get(k), lim, w + " 的" + nm)
|
||||||
items.sort(key=lambda x: x["no"])
|
items.sort(key=lambda x: x["no"])
|
||||||
out["universe"] = {"items": items, "empty": _num(un.get("empty", 6), 0, 20, "空槽数", integer=True)}
|
out["universe"] = {"items": items, "empty": _num(un.get("empty", 6), 0, 20, "空槽数", integer=True)}
|
||||||
return out
|
return out
|
||||||
@@ -480,13 +512,14 @@ def site_payload(site):
|
|||||||
items = u.get("items") or []
|
items = u.get("items") or []
|
||||||
nos = [int(x["no"]) for x in items]
|
nos = [int(x["no"]) for x in items]
|
||||||
nxt = (max(nos) + 1) if nos else 0
|
nxt = (max(nos) + 1) if nos else 0
|
||||||
UNIVERSES = [{"no": x["no"], "name": x["name"], "kind": x["kind"], "tag": x["tag"], "desc": x["desc"], "tags": x["tags"]} for x in items]
|
UNIVERSES = [dict({"no": x["no"], "name": x["name"], "kind": x["kind"], "tag": x["tag"], "desc": x["desc"], "tags": x["tags"]},
|
||||||
|
**{k: x[k] for k in ("tone", "sector", "media") if x.get(k)}) for x in items]
|
||||||
UNIVERSES += [{"no": "%04d" % (nxt + k), "empty": True} for k in range(int(u.get("empty") or 0))]
|
UNIVERSES += [{"no": "%04d" % (nxt + k), "empty": True} for k in range(int(u.get("empty") or 0))]
|
||||||
LOOKS = {x["no"]: x["look"] for x in items}
|
LOOKS = {x["no"]: x["look"] for x in items}
|
||||||
media = {}
|
media = {k: dict(v) for k, v in (site.get("media") or {}).items()} # 离线索引打底,作品自带的宽高比 / 缩略图覆盖上去
|
||||||
for g in site.get("gallery") or []:
|
for g in site.get("gallery") or []:
|
||||||
if g.get("src") and (g.get("thumb") or g.get("r")):
|
if g.get("src") and (g.get("thumb") or g.get("r")):
|
||||||
m = {}
|
m = media.get(g["src"], {})
|
||||||
if g.get("r"):
|
if g.get("r"):
|
||||||
m["r"] = g["r"]
|
m["r"] = g["r"]
|
||||||
if g.get("thumb"):
|
if g.get("thumb"):
|
||||||
|
|||||||
Reference in New Issue
Block a user