Upload file

Author: Zenlua

pio/src/main/assets/home/bin/listpayload

@@ -1,9 +1,13 @@
 # kakathic
 
-if [ "$1" == "-h" ] || [ "$1" == "--help" ] || [ ! -f "$1" ];then
+if [ "$1" == "-h" ] || [ "$1" == "--help" ];then
 echo "listpayload path/payload.[bin/zip]"
 exit 1
 fi
-(
-payload_dumper --out $TMP --list "$1" | sed "1,/-----/d" | awk '{print $1" ("$2$3")"}'
-) 2>/dev/null
+
+if [ "$1" == "-b" ] || [ "$1" == "--byte" ];then
+    shift
+    payload_extract -p -i "$1" | awk '/^name:/{n=$2;s=$4;printf "%s|%s (%sB)\n",n,n,s}'
+else
+    payload_extract -p -i "$1" | awk '/^name:/{n=$2;s=$4;cmd="coverbyte "s;cmd|getline r;close(cmd);printf "%s|%s (%s)\n",n,n,r}'
+fi

pio/src/main/assets/home/bin/unpack_img

@@ -69,6 +69,22 @@ done
 progress -1/0
 }
 
+process_payload(){
+PIDK=$!
+num1="$1";
+while kill -0 $PIDK 2>/dev/null; do
+if [ -f "$num1" ];then
+    num3=$(tr '\r' '\n' < "$num1" | grep -o '[0-9]\+%' | tail -n1 | tr -d '%')
+    if [ "$num3" ];then
+    [ "${num3:-0}" == "${num4:-1}" ] || progress "$num3/100"
+    num4="$num3"
+    fi
+fi
+sleep 1
+done
+progress -1/0
+}
+
 # xử lý zip
 if [ "$dang_tep" == 'zip' ];then
 xacnhatpay="$(listpayload "$INPUT")"
@@ -105,7 +121,7 @@ elif [ "$dang_tep" == 'sparse' ];then
     simg2img "$INPUT" "$file_img"
 elif [ "$dang_tep" == 'payload' ] || [ -n "$xacnhatpay" ];then
     echo -e "$unpack_text_1 (${INPUT##*/}) ➠ ($PVUGBIN)...\n"
-    payload_dumper --no-parallel --out "$TMP" --images "$PVUGBIN" "$INPUT" >/dev/null || killtree "Payload unpack error"
+    payload_extract -i "$INPUT" -X "$PVUGBIN" -o "$TMP" &>"$TMP/payload_extract.log" || killtree "Payload unpack error" & process_payload "$TMP/payload_extract.log"
     file_img="$TMP/$PVUGBIN.img"
 elif [ "$dang_tep" == 'super' ];then
     echo -e "$unpack_text_1 (${INPUT##*/}) ➠ ($PVUGBIN)...\n"