From 1670c00a2c2c9dfdbdc41ed5d6880a218d6ca6e5 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Wed, 24 Jun 2020 18:48:30 +0800
Subject: [PATCH] luci-app-rclone: sync with upstream source

---
 package/ctcgfw/luci-app-rclone/Makefile       | 20 ++++++++-
 .../luasrc/model/cbi/rclone.lua               | 41 +++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/package/ctcgfw/luci-app-rclone/Makefile b/package/ctcgfw/luci-app-rclone/Makefile
index 7b0698839a..c3d9ef6e06 100644
--- a/package/ctcgfw/luci-app-rclone/Makefile
+++ b/package/ctcgfw/luci-app-rclone/Makefile
@@ -10,11 +10,13 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for Rclone
-LUCI_DEPENDS:=+rclone +rclone-webui-react +rclone-ng +fuse-utils
+LUCI_DEPENDS:=+rclone +rclone-webui-react +rclone-ng +fuse-utils \
+              +PACKAGE_luci-app-rclone_INCLUDE_rclone-webui:rclone-webui-react \
+              +PACKAGE_luci-app-rclone_INCLUDE_rclone-ng:rclone-ng
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-rclone
 PKG_VERSION:=1.4.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPLv3.0+
 PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>
 
@@ -32,6 +34,20 @@ 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"
+	default y
+endef
+
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua b/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua
index cd11dd0476..c8b77cf764 100644
--- a/package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua
+++ b/package/ctcgfw/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')\"/> <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