diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index e3f0dc1..d33920a 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -26,12 +26,11 @@ jobs: python -m pip install --upgrade pip pip install setuptools wheel twine npm install - npm install -g rollup - rollup -c - name: Build and publish env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | + npm run build python -m build twine upload dist/* diff --git a/README.md b/README.md index 3eeba89..b3810a8 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,11 @@ sudo docker exec -it imageId /bin/bash ## 调试源码 * 下载源码: git clone https://github.com/ForgQi/bilibiliupload.git -* 安装: `pip3 install -e .` 或者 `pip3 install -r requirements.txt` +* 安装: `pip3 install -e .` * 启动: `python3 -m biliup` +* 构建 `python3 -m build` ## 最小配置文件示例 +以下为必填项，可选项见完整配置文件, tid投稿分区见[Wiki](https://github.com/ForgQi/biliup/wiki) ```yaml user: diff --git a/biliup/public/config.yaml b/biliup/public/config.yaml deleted file mode 100644 index 7d8a696..0000000 --- a/biliup/public/config.yaml +++ /dev/null @@ -1,108 +0,0 @@ -user: # 在填了cookies的情况下优先使用cookies上传，如需使用用户名密码上传请注释掉cookies - cookies: - SESSDATA: your SESSDATA - bili_jct: your bili_jct - DedeUserID__ckMd5: your ckMd5 - DedeUserID: your DedeUserID - access_token: your access_key - # account: - # username: your usrname - # password: your password -# app_key: bca7e84c2d947ac6 # 若账号密码方式无法登录可尝试更改此值 -# appsec: 60698ba2f68e01ce44738920a0ffe768 - -# 选择全局默认上传插件，Noop为不上传，但会执行后处理 -#uploader: Noop - -# b站上传线路选择，默认为自动模式，目前可手动切换为bda2, kodo, ws, qn, cos, cos-internal(支持腾讯云内网免流+提速) -lines: AUTO -# b站提交接口，默认自动选择，可选web，client -submit_api: client -# 单文件并发上传数，未达到带宽上限时增大此值可提高上传速度 -threads: 3 -# 录像单文件大小限制，单位Byte，超过此大小分段下载 -file_size: 2621440000 -# 录像单文件时间限制，格式'00:00:00'（时分秒），超过此大小分段下载，如需使用大小分段请注释此字段 -#segment_time: '00:50:00' -filtering_threshold: 20 # 小于此大小的视频文件将会被过滤删除，单位MB -# 如遇到斗鱼录制卡顿可以尝试切换线路，tct-h5（备用线路5），ali-h5（备用线路6），akm-h5（主线路1） -#douyucdn: tct-h5 -# 如遇到虎牙录制卡顿可以尝试切换线路，AL（阿里），BD（百度），TX（腾讯） -#huyacdn: AL -# 如遇到哔哩哔哩录制跳帧可以尝试修改platform值，web（flv），h5（m3u8） -#biliplatform: web -# 如需要录制抖音请在此填入cookie需要__ac_nonce与__ac_signature的值 -#douyin_cookie: '__ac_nonce=123456; __ac_signature=123456;' -# Netscape 格式的 Cookies 文本路径 -#youtube_cookie: 'cookiejar.txt' - -streamers: - 星际2Stats拔本神族天梯第一视角: # 最小配置示例 - url: - - https://www.twitch.tv/kimdaeyeob3 - 星际2INnoVation吕布卫星人族天梯第一视角: # 完整可选配置示例 - url: - - https://www.twitch.tv/innovation_s2 - - https://www.panda.tv/1160340 - title: "{title}第一视角%Y-%m-%d" # 自定义标题的时间格式, {title}代表直播间标题 - tid: 171 # 投稿分区码,171为电子竞技分区 - copyright: 2 # 1为自制 - cover_path: /cover/up.jpg - description: "视频简介: {title} %Y-%m-%d %H:%M:%S" # 支持strftime, {title}占位符 - dynamic: '#空间动态#' - dtime: 14400 # 设置延时发布时间，距离提交大于2小时，格式为时间戳 - # 覆盖全局默认上传插件，Noop为不上传，但会执行后处理 - uploader: bili_web - postprocessor: # 上传完成后，将按自定义顺序执行自定义操作 - - run: echo hello! # 执行任意命令，等同于在shell中运行,视频文件路径作为标准输入传入 - - mv: backup/ # 移动文件到backup目录下 -# - rm # 删除文件，为默认操作 - tags: - - 星际争霸2 - - 电子竞技 - format: mp4 # 视频保存格式 - opt_args: # ffmpeg参数 - - '-ss' # 跳过开始的16秒 - - '00:00:16' - -# 检测间隔时间，单位：秒 -event_loop_interval: 40 -# 相同平台检测间隔，单位：秒。不同平台的链接是并发的，不受此参数影响 -checker_sleep: 15 -# 线程池1大小，负责download事件 -pool1_size: 3 -# 线程池2大小，处理除download事件外所有其他事件 -pool2_size: 3 -# 检测源码文件变化间隔，单位：秒，检测源码到变化后，程序会在空闲时自动重启 -check_sourcecode: 15 -# 日志输出配置 -LOGGING: - formatters: - verbose: - format: '%(asctime)s %(filename)s[line:%(lineno)d](Pid:%(process)d Tname:%(threadName)s) %(levelname)s %(message)s' - datefmt: '%Y-%m-%d %H:%M:%S' - simple: - format: '%(filename)s%(lineno)d[%(levelname)s]Tname:%(threadName)s %(message)s' - handlers: - console: - level: DEBUG - class: logging.StreamHandler - formatter: simple - stream: ext://sys.stdout - file: - level: DEBUG - class: biliup.common.log.SafeRotatingFileHandler - when: W0 - interval: 1 - backupCount: 1 - filename: ds_update.log - formatter: verbose - root: - handlers: [ console ] - level: INFO - loggers: - biliup: - handlers: [ file ] - level: INFO -# 默认通过网页接口上传,可选通过操作chrome上传,此时需要填写chromedriver路径 -#chromedriver_path: /usr/local/bin/chromedriver diff --git a/package.json b/package.json index 0d26b3e..f962771 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "private": true, "scripts": { - "build": "rollup -c", + "build": "rollup -c && cp -r ./public ./biliup/public", "dev": "rollup -c -w", "start": "sirv public --no-clear", "check": "svelte-check --tsconfig ./tsconfig.json" diff --git a/biliup/public/favicon.png b/public/favicon.png similarity index 100% rename from biliup/public/favicon.png rename to public/favicon.png diff --git a/biliup/public/global.css b/public/global.css similarity index 93% rename from biliup/public/global.css rename to public/global.css index ce7905a..553418e 100644 --- a/biliup/public/global.css +++ b/public/global.css @@ -1,31 +1,31 @@ -/* width */ -::-webkit-scrollbar { - width: 0.5rem; - /*height: 5px;*/ -} - -/* Track */ -::-webkit-scrollbar-track { - border-radius: 100vh; - background: #ffffff00; -} - -/* Handle */ -::-webkit-scrollbar-thumb { - background: #cbd5e0; - border-radius: 100vh; - border: 1px solid #edf2f7; -} - -/* Handle on hover */ -::-webkit-scrollbar-thumb:hover { - background: #a0aec0; -} - -body { - overflow-x: hidden; -} - -.tippy-content{ - padding: 0 !important; -} +/* width */ +::-webkit-scrollbar { + width: 0.5rem; + /*height: 5px;*/ +} + +/* Track */ +::-webkit-scrollbar-track { + border-radius: 100vh; + background: #ffffff00; +} + +/* Handle */ +::-webkit-scrollbar-thumb { + background: #cbd5e0; + border-radius: 100vh; + border: 1px solid #edf2f7; +} + +/* Handle on hover */ +::-webkit-scrollbar-thumb:hover { + background: #a0aec0; +} + +body { + overflow-x: hidden; +} + +.tippy-content{ + padding: 0 !important; +} diff --git a/biliup/public/index.html b/public/index.html similarity index 95% rename from biliup/public/index.html rename to public/index.html index 0d032c1..943e7a2 100644 --- a/biliup/public/index.html +++ b/public/index.html @@ -1,17 +1,17 @@ - - - - - - - Svelte app - - - - - - - - - - + + + + + + + Svelte app + + + + + + + + + + diff --git a/biliup/public/noface.jpg b/public/noface.jpg similarity index 100% rename from biliup/public/noface.jpg rename to public/noface.jpg diff --git a/rollup.config.js b/rollup.config.js index babb272..7fad607 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -37,7 +37,7 @@ export default { sourcemap: true, format: 'iife', name: 'app', - file: 'biliup/public/build/bundle.js' + file: 'public/build/bundle.js' }, plugins: [ svelte({ diff --git a/tsconfig.json b/tsconfig.json index 26a9856..896efc5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,5 +2,5 @@ "extends": "@tsconfig/svelte/tsconfig.json", "include": ["src/**/*"], - "exclude": ["node_modules/*", "__sapper__/*", "biliup/public/*"] + "exclude": ["node_modules/*", "__sapper__/*", "public/*"] } \ No newline at end of file