diff --git a/biliup/__init__.py b/biliup/__init__.py index d61dcf4..fde7948 100644 --- a/biliup/__init__.py +++ b/biliup/__init__.py @@ -6,7 +6,7 @@ from .common.timer import Timer from .engine.event import Event from .engine import config -__version__ = "0.2.5" +__version__ = "0.2.6" async def main(): diff --git a/biliup/plugins/bili_webup.py b/biliup/plugins/bili_webup.py index ee4f338..537a3cd 100644 --- a/biliup/plugins/bili_webup.py +++ b/biliup/plugins/bili_webup.py @@ -241,14 +241,20 @@ class BiliBili: if lines == 'qn': self._auto_os = {"os": "upos", "query": "upcdn=qn&probe_version=20200810", "probe_url": "//upos-sz-upcdnqn.bilivideo.com/OK"} - if lines == 'cos-internal': + if lines == 'cos': self._auto_os = {"os": "cos", "query": "", "probe_url": ""} + if lines == 'cos-internal': + self._auto_os = {"os": "cos-internal", "query": "", + "probe_url": ""} logger.info(f"线路选择 => {self._auto_os['os']}: {self._auto_os['query']}. time: {self._auto_os.get('cost')}") if self._auto_os['os'] == 'upos': upload = self.upos elif self._auto_os['os'] == 'cos': upload = self.cos + elif self._auto_os['os'] == 'cos-internal': + self._auto_os['os'] = 'cos' + upload = lambda *args, **kwargs: self.cos(*args, **kwargs, internal=True) elif self._auto_os['os'] == 'kodo': upload = self.kodo elif self._auto_os['os'] == "gcs": @@ -274,9 +280,11 @@ class BiliBili: timeout=5) return asyncio.run(upload(f, total_size, ret.json(), tasks=tasks)) - async def cos(self, file, total_size, ret, chunk_size=10485760, tasks=3): + async def cos(self, file, total_size, ret, chunk_size=10485760, tasks=3, internal=False): filename = file.name - url = ret["url"].replace("accelerate", "ap-shanghai") + url = ret["url"] + if internal: + url = url.replace("cos.accelerate", "cos-internal.ap-shanghai") biz_id = ret["biz_id"] post_headers = { "Authorization": ret["post_auth"], diff --git a/config(demo).yaml b/config(demo).yaml index 3c286dc..278fd7d 100644 --- a/config(demo).yaml +++ b/config(demo).yaml @@ -14,7 +14,7 @@ user: # 在填了cookies的情况下优先使用cookies上传,如需使用用 # 选择全局默认上传插件,Noop为不上传,但会执行后处理 #uploader: Noop -# b站上传线路选择,默认为自动模式,目前可手动切换为bda2, kodo, ws, qn, cos-internal(支持腾讯云内网免流+提速) +# b站上传线路选择,默认为自动模式,目前可手动切换为bda2, kodo, ws, qn, cos, cos-internal(支持腾讯云内网免流+提速) lines: AUTO # b站提交接口,默认自动选择,可选web,client submit_api: client diff --git a/setup.cfg b/setup.cfg index 3bc57fa..fc3dbbd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,7 +23,6 @@ install_requires = streamlink >= 0.14.2 ykdl >= 1.7.1 rsa >= 4.6 - quickjs >= 1.17.0 [options.package_data] biliup = common/*.ini