PaiGramTeam/FixMiYouShe
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/FixMiYouShe.git synced 2024-11-16 04:45:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Fix photo invalid dimensions

Browse Source
This commit is contained in:
xtaodada 2023-08-24 11:33:16 +08:00
parent 673026c9cf
commit 4be1f7c455
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/models.py
View File

@ -57,7 +57,11 @@ class PostInfo(BaseModel):
post_id = post["post_id"] post_id = post["post_id"]
subject = post["subject"] subject = post["subject"]
image_list = _data_post["image_list"] image_list = _data_post["image_list"]
image_urls = [image["url"] for image in image_list] image_urls = [
image["url"]
for image in image_list
if abs(image["width"] - image["height"]) < 1300
]
vod_list = _data_post["vod_list"] vod_list = _data_post["vod_list"]
video_urls = [vod["resolutions"][-1]["url"] for vod in vod_list] video_urls = [vod["resolutions"][-1]["url"] for vod in vod_list]
created_at = post["created_at"] created_at = post["created_at"]

23
src/render/article.py
View File

@ -43,7 +43,7 @@ def format_image_url(url: str) -> str:
return f'<img src="{url}"/>' return f'<img src="{url}"/>'
def parse_tag(tag: Union[Tag, PageElement]) -> str: def parse_tag(tag: Union[Tag, PageElement], post_info: PostInfo) -> str:
if tag.name == "a": if tag.name == "a":
href = tag.get("href") href = tag.get("href")
if href and href.startswith("/"): if href and href.startswith("/"):
@ -52,7 +52,7 @@ def parse_tag(tag: Union[Tag, PageElement]) -> str:
return f'<a href="{href}">{tag.get_text()}</a>' return f'<a href="{href}">{tag.get_text()}</a>'
elif tag.name == "img": elif tag.name == "img":
src = tag.get("src") src = tag.get("src")
if src and "upload-bbs.miyoushe.com" in src: if src and "upload-bbs.miyoushe.com" in src and src in post_info.image_urls:
return format_image_url(src) return format_image_url(src)
return "" return ""
elif tag.name == "p": elif tag.name == "p":
@ -61,25 +61,25 @@ def parse_tag(tag: Union[Tag, PageElement]) -> str:
return "" return ""
post_text = [] post_text = []
for tag_ in tag.children: for tag_ in tag.children:
if text := parse_tag(tag_): if text := parse_tag(tag_, post_info):
post_text.append(text) post_text.append(text)
return "<p>" + "\n".join(post_text) + "</p>" return "<p>" + "\n".join(post_text) + "</p>"
elif tag.name == "div": elif tag.name == "div":
post_text = [] post_text = []
for tag_ in tag.children: for tag_ in tag.children:
if text := parse_tag(tag_): if text := parse_tag(tag_, post_info):
post_text.append(text) post_text.append(text)
return "\n".join(post_text) return "\n".join(post_text)
return replace_br(tag.get_text().strip()) return replace_br(tag.get_text().strip())
def parse_content(soup: BeautifulSoup, title: str, video_urls: List[str]) -> str: def parse_content(soup: BeautifulSoup, post_info: PostInfo) -> str:
post_text = f"<h1>{title}</h1>\n" post_text = f"<h1>{post_info.subject}</h1>\n"
if video_urls: if post_info.video_urls:
for url in video_urls: for url in post_info.video_urls:
post_text += f'<video controls="controls" src="{url}"></video>\n' post_text += f'<video controls="controls" src="{url}"></video>\n'
for tag in soup.find("body").children: for tag in soup.find("body").children:
if text := parse_tag(tag): if text := parse_tag(tag, post_info):
post_text += f"{text}\n" post_text += f"{text}\n"
return post_text return post_text
@ -127,7 +127,7 @@ async def process_article_text(game_id: str, post_id: int, post_info: PostInfo)
post_soup = BeautifulSoup(post_info.content, features="lxml") post_soup = BeautifulSoup(post_info.content, features="lxml")
return template.render( return template.render(
description=get_description(post_soup), description=get_description(post_soup),
article=parse_content(post_soup, post_info.subject, post_info.video_urls), article=parse_content(post_soup, post_info),
**get_public_data(game_id, post_id, post_info), **get_public_data(game_id, post_id, post_info),
) )
@ -137,7 +137,8 @@ async def process_article_image(game_id: str, post_id: int, post_info: PostInfo)
description = json_data.get("describe", "") description = json_data.get("describe", "")
article = "" article = ""
for image in json_data.get("imgs", []): for image in json_data.get("imgs", []):
article += format_image_url(image) if image in post_info.image_urls:
article += format_image_url(image)
if description: if description:
article += f"<p>{description}</p>\n" article += f"<p>{description}</p>\n"
return template.render( return template.render(