From e8589083e59e2759ac3d24412a39bf9d573535e4 Mon Sep 17 00:00:00 2001 From: ElonH Date: Fri, 3 Jul 2020 18:07:34 +0800 Subject: [PATCH 1/3] RcloneNg: bump version from 0.3.2 to 0.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [0.4.0](https://github.com/ElonH/RcloneNg/compare/v0.3.2...v0.4.0) (2020-07-03) ⚠ BREAKING CHANGES * **tasks:** remove tasks viewer * **list-view:** In Mobile View, double click to open directory, lomg press it to popup detail log. * **home-mode:** In Mobile View, double click remote item to enter file system,and long press it to popup detail dialog. Features * **dashboard:** add version card ([a36fcbe](https://github.com/ElonH/RcloneNg/commit/a36fcbe91912a1f35c9c84693b4c96647d72d268)) * **home-mode:** support remote detail on mobile view ([2015e2f](https://github.com/ElonH/RcloneNg/commit/2015e2fea6db9fa7eb2adc3b3b5f755c33a52031)) * **jobs-manager:** clean finished groups ([188fcdf](https://github.com/ElonH/RcloneNg/commit/188fcdf56cc00ab0f9be5520714ea09677c15259)) * **jobs-manager:** enable reset stats ([ec025bd](https://github.com/ElonH/RcloneNg/commit/ec025bd8d4a0322f7bcf3b1bfd7cf1f4303f9e1a)) * **list-view:** support file detail on mobile view ([ce36cf2](https://github.com/ElonH/RcloneNg/commit/ce36cf25cff32627041d2899af7a4dcce303191d)) * **pages:** show response time ([9a02b22](https://github.com/ElonH/RcloneNg/commit/9a02b22ea56d46ce3be11407c5f32b73221c5534)) Bug Fixes * **file-manager:** footer over main sidebar in mobile view ([48b855a](https://github.com/ElonH/RcloneNg/commit/48b855a7f434573a45d671dfcc2f5609a151e10a)), closes [#2](https://github.com/ElonH/RcloneNg/issues/2) * **jobs-manager:** no animation on refresh button in mobile view ([b0d21d7](https://github.com/ElonH/RcloneNg/commit/b0d21d74161a45847b461fe763b23dd701a0e746)) * **list-view:** prevent showing detail when checking item ([a2a4fa2](https://github.com/ElonH/RcloneNg/commit/a2a4fa2c5dbe532cf224bdc030bf579bf3a591bd)) * avoid duration format error on other page ([a1c4f75](https://github.com/ElonH/RcloneNg/commit/a1c4f7521a69c80b30abffe424785a2e1f681215)) * cancel underline in ([6c179fa](https://github.com/ElonH/RcloneNg/commit/6c179fa3e7a7d26042dfbbf28d97e9f4462629e9)) * **tasks:** paste again not work around ([c339dfa](https://github.com/ElonH/RcloneNg/commit/c339dfa07fb7f99a6ccf62ac64f6b5398e9e2185)) --- package/lean/rclone-ng/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/rclone-ng/Makefile b/package/lean/rclone-ng/Makefile index a5e9468ff..4ac036072 100644 --- a/package/lean/rclone-ng/Makefile +++ b/package/lean/rclone-ng/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone-ng -PKG_VERSION:=0.3.2 +PKG_VERSION:=0.4.0 PKG_RELEASE:=1 @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_HASH:=441fdfa577bdda7f58f62f6e75174a4a48e44d7c1361f7123d9699d791c08b5a +PKG_HASH:=d974d5476b89281dcc14b0081e26f286041dd799898bc6b163d349d504056bd1 define Package/$(PKG_NAME) SECTION:=net From 4746841d0ffcbbcdf837971f13de97070575358e Mon Sep 17 00:00:00 2001 From: ElonH Date: Fri, 3 Jul 2020 18:14:22 +0800 Subject: [PATCH 2/3] luci-app-rclone: bump version from 1.4.0 to 1.4.1 set web client and fuse packages as optional --- package/lean/luci-app-rclone/Makefile | 25 ++++++++++- .../luasrc/model/cbi/rclone.lua | 41 +++++++++++++++++++ .../lean/luci-app-rclone/po/zh-cn/rclone.po | 1 + .../po/{zh-cn => zh_Hans}/luci-app-rclone.po | 10 ++--- 4 files changed, 70 insertions(+), 7 deletions(-) create mode 120000 package/lean/luci-app-rclone/po/zh-cn/rclone.po rename package/lean/luci-app-rclone/po/{zh-cn => zh_Hans}/luci-app-rclone.po (95%) diff --git a/package/lean/luci-app-rclone/Makefile b/package/lean/luci-app-rclone/Makefile index 15e63a994..a51546bb3 100644 --- a/package/lean/luci-app-rclone/Makefile +++ b/package/lean/luci-app-rclone/Makefile @@ -10,10 +10,13 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for Rclone -LUCI_DEPENDS:=+rclone +rclone-webui-react +fuse-utils +rclone-ng +LUCI_DEPENDS:=+rclone \ + +PACKAGE_luci-app-rclone_INCLUDE_rclone-webui:rclone-webui-react \ + +PACKAGE_luci-app-rclone_INCLUDE_rclone-ng:rclone-ng \ + +PACKAGE_luci-app-rclone_INCLUDE_fuse-utils:fuse-utils LUCI_PKGARCH:=all PKG_NAME:=luci-app-rclone -PKG_VERSION:=1.4.0 +PKG_VERSION:=1.4.1 PKG_RELEASE:=1 PKG_LICENSE:=GPLv3.0+ PKG_MAINTAINER:=ElonH @@ -32,6 +35,24 @@ define Package/luci-app-rclone/description Yandex Disk, The local root/usr/binystem. endef +define Package/luci-app-rclone/conffiles +/etc/config/rclone +endef + +define Package/luci-app-rclone/config +config PACKAGE_luci-app-rclone_INCLUDE_rclone-webui + bool "Include rclone-webui" + default y + +config PACKAGE_luci-app-rclone_INCLUDE_rclone-ng + bool "Include rclone-ng (another webui)" + default y + +config PACKAGE_luci-app-rclone_INCLUDE_fuse-utils + bool "Include fuse-utils (mount cloud storage)" + default y +endef + include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/package/lean/luci-app-rclone/luasrc/model/cbi/rclone.lua b/package/lean/luci-app-rclone/luasrc/model/cbi/rclone.lua index cd11dd047..c8b77cf76 100644 --- a/package/lean/luci-app-rclone/luasrc/model/cbi/rclone.lua +++ b/package/lean/luci-app-rclone/luasrc/model/cbi/rclone.lua @@ -1,6 +1,8 @@ require('luci.sys') require('luci.util') +local ipkg = require('luci.model.ipkg') + local fs = require 'nixio.fs' local uci = require 'luci.model.uci'.cursor() @@ -31,6 +33,7 @@ else address_msg = '' end +if ipkg.installed("rclone-webui-react") and ipkg.installed("rclone-ng") then m = Map( 'rclone', @@ -46,6 +49,44 @@ m = translate('RcloneNg') .. " \" onclick=\"window.open('http://'+window.location.hostname+'/RcloneNg')\"/>

" ) +elseif ipkg.installed("rclone-webui-react") then +m = + Map( + 'rclone', + translate('Rclone'), + translate('Rclone ("rsync for cloud storage") is a command line program to sync root/usr/bin and directories to and from different cloud storage providers.') .. + '

' .. translate('rclone state') .. ' : ' .. state_msg .. '

' + .. address_msg .. + translate('Installed Web Interface') .. + + '      " +) +elseif ipkg.installed("rclone-ng") then +m = + Map( + 'rclone', + translate('Rclone'), + translate('Rclone ("rsync for cloud storage") is a command line program to sync root/usr/bin and directories to and from different cloud storage providers.') .. + '

' .. translate('rclone state') .. ' : ' .. state_msg .. '

' + .. address_msg .. + translate('Installed Web Interface') .. + + '      

" +) +else +m = + Map( + 'rclone', + translate('Rclone'), + translate('Rclone ("rsync for cloud storage") is a command line program to sync root/usr/bin and directories to and from different cloud storage providers.') .. + '

' .. translate('rclone state') .. ' : ' .. state_msg .. '

' + .. address_msg +) +end s = m:section(TypedSection, 'global', translate('global')) s.addremove = false diff --git a/package/lean/luci-app-rclone/po/zh-cn/rclone.po b/package/lean/luci-app-rclone/po/zh-cn/rclone.po new file mode 120000 index 000000000..b08e41a9d --- /dev/null +++ b/package/lean/luci-app-rclone/po/zh-cn/rclone.po @@ -0,0 +1 @@ +../zh_Hans/luci-app-rclone.po \ No newline at end of file diff --git a/package/lean/luci-app-rclone/po/zh-cn/luci-app-rclone.po b/package/lean/luci-app-rclone/po/zh_Hans/luci-app-rclone.po similarity index 95% rename from package/lean/luci-app-rclone/po/zh-cn/luci-app-rclone.po rename to package/lean/luci-app-rclone/po/zh_Hans/luci-app-rclone.po index 846c1e7c9..3e515c529 100644 --- a/package/lean/luci-app-rclone/po/zh-cn/luci-app-rclone.po +++ b/package/lean/luci-app-rclone/po/zh_Hans/luci-app-rclone.po @@ -2,14 +2,14 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: \n" -"Last-Translator: dingpengyu \n" +"Last-Translator: ElonH \n" "Language-Team: none\n" -"Language: zh_CN\n" +"Language: zh-Hans\n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "POT-Creation-Date: \n" "PO-Revision-Date: \n" -"X-Generator: Poedit 2.3.1\n" +"X-Generator: Poedit 2.0.6\n" #: luasrc/model/cbi/rclone.lua:121 msgid "FAQ" @@ -48,7 +48,7 @@ msgid "" "commonly either http or socks5." msgstr "" "内容格式为: protocol://server:port\n" -"protocol 通常为 http 或者 socks5。" +"protocol 通常为 http 或者 socks5" #: luasrc/model/cbi/rclone.lua:43 msgid "Webui React" @@ -140,7 +140,7 @@ msgstr "启动 rclone 后台服务" #: luasrc/model/cbi/rclone.lua:80 msgid "than updaload configuration to here." -msgstr "然后上传配置文件到这里。" +msgstr "然后上传配置文件到这里" #: luasrc/model/cbi/rclone.lua:80 msgid "to setup configuration on pc," From 6e98ad5339ac4fa12c913c8683fcb130cb4c4b61 Mon Sep 17 00:00:00 2001 From: ElonH Date: Fri, 3 Jul 2020 18:18:48 +0800 Subject: [PATCH 3/3] Rclone: bump version from 1.52.1 to 1.52.2 v1.52.2 - 2020-06-24 [See commits](https://github.com/rclone/rclone/compare/v1.52.1...v1.52.2) * Bug Fixes * build * Fix docker release build action (Nick Craig-Wood) * Fix custom timezone in Docker image (NoLooseEnds) * check: Fix misleading message which printed errors instead of differences (Nick Craig-Wood) * errors: Add WSAECONNREFUSED and more to the list of retriable Windows errors (Nick Craig-Wood) * rcd: Fix incorrect prometheus metrics (Gary Kim) * serve restic: Fix flags so they use environment variables (Nick Craig-Wood) * serve webdav: Fix flags so they use environment variables (Nick Craig-Wood) * sync: Fix --track-renames-strategy modtime (Nick Craig-Wood) * Drive * Fix not being able to delete a directory with a trashed shortcut (Nick Craig-Wood) * Fix creating a directory inside a shortcut (Nick Craig-Wood) * Fix --drive-impersonate with cached root_folder_id (Nick Craig-Wood) * SFTP * Fix SSH key PEM loading (Zac Rubin) * Swift * Speed up deletes by not retrying segment container deletes (Nick Craig-Wood) * Tardigrade * Upgrade to uplink v1.1.1 (Caleb Case) * WebDAV * Fix free/used display for rclone about/df for certain backends (Nick Craig-Wood) --- package/lean/rclone/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/lean/rclone/Makefile b/package/lean/rclone/Makefile index ab7e30b84..8b73ddd03 100644 --- a/package/lean/rclone/Makefile +++ b/package/lean/rclone/Makefile @@ -10,16 +10,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone -PKG_VERSION:=1.52.1 +PKG_VERSION:=1.52.2 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/rclone/rclone.git -PKG_SOURCE_DATE:=2020-06-10 -PKG_SOURCE_VERSION:=31dc78905ea8dfb22c43724527b19e097e05c26a +PKG_SOURCE_DATE:=2020-06-24 +PKG_SOURCE_VERSION:=d8144a7e84dc3fb4975adf1bce707a5be672fada PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_HASH:=fa79f62babc2f42691c9ad83ef906e90061d4ca6adcc97150c2906605312db66 +PKG_MIRROR_HASH:=8a6f3fd465e57f5f3b9cfe3958eeb020f72b4940bfbf4993b9580659041c3735 PKG_LICENSE:=GPLv3 PKG_MAINTAINER:=ElonH