Merge branch 'master' of https://github.com/coolsnowwolf/lede

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 <elonhhuang@gmail.com>
@@ -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

package/lean/luci-app-rclone/luasrc/model/cbi/rclone.lua

 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')\"/> <br/><br/>"  
 )
+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.') ..
+        ' <br/> <br/> ' .. translate('rclone state') .. ' : ' .. state_msg .. '<br/> <br/>'
+        .. address_msg ..
+        translate('Installed Web Interface') ..   
+	
+        '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="cbi-button" style="margin: 0 5px;" value=" ' ..                                            
+        translate('Webui React') ..                                                                                                                                 
+        " \" onclick=\"window.open('http://'+window.location.hostname+'/rclone-webui-react')\"/>" 
+)
+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.') ..
+        ' <br/> <br/> ' .. translate('rclone state') .. ' : ' .. state_msg .. '<br/> <br/>'
+        .. address_msg ..
+        translate('Installed Web Interface') ..     
+	
+        '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="cbi-button" style="margin: 0 5px;" value=" ' ..                                            
+        translate('RcloneNg') ..                                                                                                                                    
+        " \" onclick=\"window.open('http://'+window.location.hostname+'/RcloneNg')\"/> <br/><br/>"  
+)
+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.') ..
+        ' <br/> <br/> ' .. translate('rclone state') .. ' : ' .. state_msg .. '<br/> <br/>'
+        .. address_msg
+)
+end
 
 s = m:section(TypedSection, 'global', translate('global'))
 s.addremove = false

package/lean/luci-app-rclone/po/zh-cn/rclone.po

+../zh_Hans/luci-app-rclone.po
\ No newline at end of file

package/lean/luci-app-rclone/po/zh-cn/luci-app-rclone.po → 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 <dingpengyu06@gmail.com>\n"
+"Last-Translator: ElonH <elonhhuang@gmail.com>\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,"

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

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 <elonhhuang@gmail.com>