Update R2S Flasher

add progress bar and auto redirect when success

features.seed

@@ -117,7 +117,6 @@ CONFIG_PACKAGE_luci-app-vlmcsd=y
 CONFIG_PACKAGE_luci-app-wol=y
 CONFIG_PACKAGE_luci-app-wrtbwmon=y
 CONFIG_PACKAGE_luci-app-serverchan=y
-CONFIG_PACKAGE_luci-app-filebrowser=y
 CONFIG_PACKAGE_luci-app-r2sflasher=y
 CONFIG_PACKAGE_luci-app-passwall=y
 CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Brook=y

luci-app-r2sflasher/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-r2sflasher
 PKG_VERSION:=1.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_DATE:=20200416
 
 include $(INCLUDE_DIR)/package.mk

luci-app-r2sflasher/luasrc/view/r2sflasher/log.htm

@@ -4,12 +4,24 @@ local dsp = require "luci.dispatcher"
 
 <script type="text/javascript">
 	//<![CDATA[
+	var rebooting = false;
 	XHR.poll(1, '<%=dsp.build_url("admin/system/r2sflasher/get_log")%>', null,
 		function(x, data) {
-			if(x && x.status == 200) {
-				var log_textarea = document.getElementById('log_textarea');
-				log_textarea.innerHTML = x.responseText;
-				log_textarea.scrollTop = log_textarea.scrollHeight;
+			if(x) {
+				if (!rebooting) {
+					if (x.status == 200) {
+						var log_textarea = document.getElementById('log_textarea');
+						log_textarea.innerHTML = x.responseText;
+						log_textarea.scrollTop = log_textarea.scrollHeight;
+					}
+					if (x.status == 0) {
+						rebooting = true;
+					}
+				} else {
+					if (x.status == 200 || x.status == 403) {
+						window.location.href = '<%=dsp.build_url("admin")%>'
+					}
+				}
 			}
 		}
 	);

luci-app-r2sflasher/root/usr/bin/rom_flash

@@ -99,7 +99,7 @@ fi
 if ! [ "$gzfile" == "" ]; then
     echo "开始解压 gz 文件......"
     imgfile="rom.img"
-    pv "$gzfile" | gunzip -dc > "$imgfile"
+    pv -f -F "%e %p" -i 1 "$gzfile" | gunzip -dc > "$imgfile"
     if [ -f "$imgfile" ]; then
         echo "gz 固件已解压至 $imgfile"
         rm $gzfile
@@ -181,8 +181,9 @@ if [ -f "$zstfile" ]; then
     fi
 
     echo "开始刷机, 请不要断电或关机, 如果刷机失败请取出 SD 卡用电脑重新写入 ROM"
-    pv "$zstfile" | zstdcat | dd of=/dev/mmcblk0 conv=fsync
-    echo "刷机完毕, 正在重启..."
+    pv -f -F "刷机中请不要断电或关机 %e %p" -i 1 "$zstfile" | zstdcat | dd of=/dev/mmcblk0 conv=fsync
+    echo "刷机完毕, 正在重启, 请稍候..."
+    sleep 5
     echo o > /proc/sysrq-trigger
 else
     echo "压缩出错"

minimal_config.seed

@@ -117,7 +117,6 @@ CONFIG_PACKAGE_luci-app-vlmcsd=y
 CONFIG_PACKAGE_luci-app-wol=y
 CONFIG_PACKAGE_luci-app-wrtbwmon=y
 CONFIG_PACKAGE_luci-app-serverchan=y
-CONFIG_PACKAGE_luci-app-filebrowser=y
 CONFIG_PACKAGE_luci-app-r2sflasher=y
 CONFIG_PACKAGE_luci-app-passwall=y
 CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Brook=y