From dbfa40901dac928272e3c19641bd3c330eae9d86 Mon Sep 17 00:00:00 2001 From: ForgQi <34411314+ForgQi@users.noreply.github.com> Date: Fri, 24 Jun 2022 02:12:07 +0800 Subject: [PATCH] Bumping version --- biliup/__init__.py | 2 +- biliup/engine/download.py | 4 ++-- biliup/engine/upload.py | 2 +- pyproject.toml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/biliup/__init__.py b/biliup/__init__.py index 7049f25..6e5acdd 100644 --- a/biliup/__init__.py +++ b/biliup/__init__.py @@ -1,7 +1,7 @@ import logging import sys -__version__ = "0.2.15" +__version__ = "0.2.16" LOG_CONF = { 'version': 1, diff --git a/biliup/engine/download.py b/biliup/engine/download.py index c881519..6c17095 100644 --- a/biliup/engine/download.py +++ b/biliup/engine/download.py @@ -49,7 +49,7 @@ class DownloadBase: def download(self, filename): if self.downloader == 'stream-gears': - stream_gears_download(self.raw_stream_url, self.fake_headers, filename, config.get('segment_time'), config.get('file_size')) + stream_gears_download(self.raw_stream_url, self.fake_headers, self.fname, config.get('segment_time'), config.get('file_size')) else: self.ffmpeg_download(filename) @@ -101,7 +101,7 @@ class DownloadBase: self.close() if ret is False: break - elif ret == 1: + elif ret == 1 or self.downloader == 'stream-gears': time.sleep(45) i += 1 logger.info(f'退出下载{i}: {self.fname}') diff --git a/biliup/engine/upload.py b/biliup/engine/upload.py index 9b0dcc9..69406c7 100644 --- a/biliup/engine/upload.py +++ b/biliup/engine/upload.py @@ -37,7 +37,7 @@ class UploadBase: return False for r in file_list: file_size = os.path.getsize(r) / 1024 / 1024 - threshold = self.data.get('threshold') if self.data.get('threshold') else 20 + threshold = self.data.get('threshold') if self.data.get('threshold') else 2 if file_size <= threshold: os.remove(r) logger.info('过滤删除-' + r) diff --git a/pyproject.toml b/pyproject.toml index 8523483..620d893 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ keywords = ["bilibili douyu huya"] urls = {Homepage = "https://github.com/ForgQi/bilibiliupload"} requires-python = ">= 3.7" dependencies = [ - "stream-gears >= 0.1.2", + "stream-gears >= 0.1.3", "psutil >= 5.4.6", "yt_dlp >= 2022.3.8.2", "Pillow >= 5.2.0",