Skip to content

Commit

Permalink
Merge branch 'main' into docs
Browse files Browse the repository at this point in the history
  • Loading branch information
SigureMo committed Oct 2, 2024
2 parents 5e55cde + a6f6f13 commit 8fb24ca
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.20
LABEL maintainer="siguremo" \
version="2.0.0-beta.43" \
version="2.0.0-rc.1" \
description="light-weight container based on alpine for yutto"

RUN set -x \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ yutto 添加任何特性都需要以保证可维护性为前提,因此 yutto

### yutto 会替代 bilili 吗

yutto 自诞生以来已经过去三年多了,功能上基本可以替代 bilili 了,因此 bilili 将会在 yutto 正式版发布后正式停止维护~(咳,正式版早着呢,我现在都懒得 RC,一直 beta 下去挺好的 ξ( ✿ > ◡❛)
yutto 自诞生以来已经过去三年多了,功能上基本可以替代 bilili 了,因此 bilili 将会在 yutto 正式版发布后正式停止维护~(咳,正式版还要再过段时间~ ○ω●

## 其他应用

Expand All @@ -732,7 +732,7 @@ yutto 自诞生以来已经过去三年多了,功能上基本可以替代 bili
- [x] feat: 投稿视频描述文件支持
- [x] refactor: 整理路径变量名
- [x] feat: 视频合集选集支持(合集貌似有取代分 p 的趋势,需要对其进行合适的处理)
- [ ] refactor: 重写 biliass
- [x] refactor: 重写 biliass

### 2.0.0

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "yutto"
version = "2.0.0-beta.43"
version = "2.0.0-rc.1"
description = "🧊 一个可爱且任性的 B 站视频下载器"
readme = "README.md"
requires-python = ">=3.9"
Expand Down
2 changes: 1 addition & 1 deletion src/yutto/__version__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 发版需要同时改这里和 pyproject.toml
from __future__ import annotations

VERSION = "2.0.0-beta.43"
VERSION = "2.0.0-rc.1"
8 changes: 7 additions & 1 deletion src/yutto/extractor/ugc_video_batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ class UgcVideoBatchExtractor(BatchExtractor):
REGEX_AV_ID = re.compile(r"av(?P<aid>\d+)(\?p=(?P<page>\d+))?")
REGEX_BV_ID = re.compile(r"(?P<bvid>(bv|BV)\w+)(\?p=(?P<page>\d+))?")

REGEX_BV_SPECIAL_PAGE = re.compile(r"https?://www\.bilibili\.com/festival/.+(?P<bvid>(bv|BV)\w+)")

avid: AvId

def resolve_shortcut(self, id: str) -> tuple[bool, str]:
Expand All @@ -47,7 +49,11 @@ def resolve_shortcut(self, id: str) -> tuple[bool, str]:
return matched, url

def match(self, url: str) -> bool:
if (match_obj := self.REGEX_AV.match(url)) or (match_obj := self.REGEX_BV.match(url)):
if (
(match_obj := self.REGEX_AV.match(url))
or (match_obj := self.REGEX_BV.match(url))
or (match_obj := self.REGEX_BV_SPECIAL_PAGE.match(url))
):
if "aid" in match_obj.groupdict().keys():
self.avid = AId(match_obj.group("aid"))
else:
Expand Down
4 changes: 2 additions & 2 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8fb24ca

Please sign in to comment.