From 3a6a6d10f2c231f952c1ed72ed1ba5b7795f59cb Mon Sep 17 00:00:00 2001 From: messense Date: Sat, 16 Jul 2022 20:57:34 +0800 Subject: [PATCH] Bump version to 1.8.0 --- .bumpversion.cfg | 2 +- CHANGELOG.md | 5 ++ Cargo.lock | 2 +- Cargo.toml | 2 +- README.md | 64 +++++++++++--------- merlin/config.json.js | 2 +- openwrt/aliyundrive-webdav/Makefile | 2 +- openwrt/luci-app-aliyundrive-webdav/Makefile | 2 +- snap/snapcraft.yaml | 2 +- 9 files changed, 48 insertions(+), 35 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 00d9dd0331..978a01f7b7 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -2,4 +2,4 @@ files = Cargo.toml README.md openwrt/aliyundrive-webdav/Makefile openwrt/luci-app-aliyundrive-webdav/Makefile merlin/config.json.js snap/snapcraft.yaml commit = False tag = False -current_version = 1.7.4 +current_version = 1.8.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 111096f2e1..50045b5258 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. +## 1.8.0 + +* 增加配置上传文件缓冲区大小参数 `--upload-buffer-size` +* 增加配置跳过上传相同大小同名文件参数 `--skip-upload-same-size`, 注意启用该选项虽然能加速上传但可能会导致修改过的同样大小的文件不会被上传 + ## 1.7.4 * 删除文件时忽略 404 和 400 状态码 diff --git a/Cargo.lock b/Cargo.lock index aa7419cab0..932bda6e62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,7 +19,7 @@ dependencies = [ [[package]] name = "aliyundrive-webdav" -version = "1.7.4" +version = "1.8.0" dependencies = [ "anyhow", "atty", diff --git a/Cargo.toml b/Cargo.toml index 19451fdb4a..5fc613fb55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aliyundrive-webdav" -version = "1.7.4" +version = "1.8.0" edition = "2021" description = "WebDAV server for AliyunDrive" license = "MIT" diff --git a/README.md b/README.md index ea8db8a92c..687b62746f 100644 --- a/README.md +++ b/README.md @@ -45,12 +45,12 @@ sudo snap install aliyundrive-webdav aarch64/arm/mipsel/x86_64/i686 等架构的版本，可以下载后使用 opkg 安装，以 nanopi r4s 为例： ```bash -wget https://github.com/messense/aliyundrive-webdav/releases/download/v1.7.4/aliyundrive-webdav_1.7.4-1_aarch64_generic.ipk -wget https://github.com/messense/aliyundrive-webdav/releases/download/v1.7.4/luci-app-aliyundrive-webdav_1.7.4_all.ipk -wget https://github.com/messense/aliyundrive-webdav/releases/download/v1.7.4/luci-i18n-aliyundrive-webdav-zh-cn_1.7.4-1_all.ipk -opkg install aliyundrive-webdav_1.7.4-1_aarch64_generic.ipk -opkg install luci-app-aliyundrive-webdav_1.7.4_all.ipk -opkg install luci-i18n-aliyundrive-webdav-zh-cn_1.7.4-1_all.ipk +wget https://github.com/messense/aliyundrive-webdav/releases/download/v1.8.0/aliyundrive-webdav_1.8.0-1_aarch64_generic.ipk +wget https://github.com/messense/aliyundrive-webdav/releases/download/v1.8.0/luci-app-aliyundrive-webdav_1.8.0_all.ipk +wget https://github.com/messense/aliyundrive-webdav/releases/download/v1.8.0/luci-i18n-aliyundrive-webdav-zh-cn_1.8.0-1_all.ipk +opkg install aliyundrive-webdav_1.8.0-1_aarch64_generic.ipk +opkg install luci-app-aliyundrive-webdav_1.8.0_all.ipk +opkg install luci-i18n-aliyundrive-webdav-zh-cn_1.8.0-1_all.ipk ``` 其它 CPU 架构的路由器可在 [GitHub Releases](https://github.com/messense/aliyundrive-webdav/releases) 页面中查找对应的架构的主程序 ipk 文件下载安装， 常见 @@ -126,7 +126,7 @@ services: ```bash $ aliyundrive-webdav --help -aliyundrive-webdav 1.7.4 +aliyundrive-webdav 1.8.0 WebDAV server for AliyunDrive USAGE: @@ -134,35 +134,43 @@ USAGE: aliyundrive-webdav OPTIONS: - --cache-size Directory entries cache size [default: 1000] - --cache-ttl Directory entries cache expiration time in seconds [default: 600] - --debug Enable debug log - --domain-id Aliyun PDS domain id - -h, --help Print help information - --host Listen host [env: HOST=] [default: 0.0.0.0] - -I, --auto-index Automatically generate index.html - --no-self-upgrade Disable self auto upgrade - --no-trash Delete file permanently instead of trashing it - -p, --port Listen port [env: PORT=] [default: 8080] - -r, --refresh-token Aliyun drive refresh token [env: REFRESH_TOKEN=] - --read-only Enable read only mode - --root Root directory path [default: /] - -S, --read-buffer-size Read/download buffer size in bytes, defaults to 10MB [default: 10485760] - --strip-prefix Prefix to be stripped off when handling request [env: WEBDAV_STRIP_PREFIX=] - --tls-cert TLS certificate file path [env: TLS_CERT=] - --tls-key TLS private key file path [env: TLS_KEY=] - -U, --auth-user WebDAV authentication username [env: WEBDAV_AUTH_USER=] - -V, --version Print version information - -w, --workdir Working directory, refresh_token will be stored in there if specified - -W, --auth-password WebDAV authentication password [env: WEBDAV_AUTH_PASSWORD=] + --cache-size Directory entries cache size [default: 1000] + --cache-ttl Directory entries cache expiration time in seconds [default: 600] + --debug Enable debug log + --domain-id Aliyun PDS domain id + -h, --help Print help information + --host Listen host [env: HOST=] [default: 0.0.0.0] + -I, --auto-index Automatically generate index.html + --no-self-upgrade Disable self auto upgrade + --no-trash Delete file permanently instead of trashing it + -p, --port Listen port [env: PORT=] [default: 8080] + -r, --refresh-token Aliyun drive refresh token [env: REFRESH_TOKEN=] + --read-only Enable read only mode + --root Root directory path [default: /] + -S, --read-buffer-size Read/download buffer size in bytes, defaults to 10MB [default: 10485760] + --skip-upload-same-size Skip uploading same size file + --strip-prefix Prefix to be stripped off when handling request [env: WEBDAV_STRIP_PREFIX=] + --tls-cert TLS certificate file path [env: TLS_CERT=] + --tls-key TLS private key file path [env: TLS_KEY=] + -U, --auth-user WebDAV authentication username [env: WEBDAV_AUTH_USER=] + --upload-buffer-size Upload buffer size in bytes, defaults to 16MB [default: 16777216] + -V, --version Print version information + -w, --workdir Working directory, refresh_token will be stored in there if specified + -W, --auth-password WebDAV authentication password [env: WEBDAV_AUTH_PASSWORD=] SUBCOMMANDS: help Print this message or the help of the given subcommand(s) qr Scan QRCode ``` +> **Note** +> > 注意：TLS/HTTPS 暂不支持 MIPS 架构。 +> **Note** +> +> 注意：启用 `--skip-upload-same-size` 选项虽然能加速上传但可能会导致修改过的同样大小的文件不会被上传 + ### 获取 refresh_token * 自动获取: 登录[阿里云盘](https://www.aliyundrive.com/drive/)后，控制台粘贴 `JSON.parse(localStorage.token).refresh_token` diff --git a/merlin/config.json.js b/merlin/config.json.js index 652ce8ec14..2e1ecd4998 100644 --- a/merlin/config.json.js +++ b/merlin/config.json.js @@ -4,5 +4,5 @@ "md5": "c0bac93db83f87293a1e4efb7aa5a97c", "module": "aliyundrivewebdav", "title": "阿里云盘 WebDAV", - "version": "1.7.4" + "version": "1.8.0" } diff --git a/openwrt/aliyundrive-webdav/Makefile b/openwrt/aliyundrive-webdav/Makefile index c0a1b174a0..4d439131cf 100644 --- a/openwrt/aliyundrive-webdav/Makefile +++ b/openwrt/aliyundrive-webdav/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aliyundrive-webdav -PKG_VERSION:=1.7.4 +PKG_VERSION:=1.8.0 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=MIT diff --git a/openwrt/luci-app-aliyundrive-webdav/Makefile b/openwrt/luci-app-aliyundrive-webdav/Makefile index bdd83e5299..30ff2e18a8 100644 --- a/openwrt/luci-app-aliyundrive-webdav/Makefile +++ b/openwrt/luci-app-aliyundrive-webdav/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-aliyundrive-webdav -PKG_VERSION:=1.7.4 +PKG_VERSION:=1.8.0 PKG_RELEASE:=1 PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e77cf32417..f195625a74 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: aliyundrive-webdav -version: '1.7.4' +version: '1.8.0' summary: 阿里云盘 WebDAV description: | 阿里云盘 WebDAV 服务