Upload file

Author: Zenlua

krscript/src/main/java/com/omarea/krscript/model/ShellHandlerBase.java

@@ -90,8 +90,7 @@ protected void onReaderMsg(Object msg) {
         if (msg == null) return;
 
         // KHÔNG trim để giữ newline
-        // String log = msg.toString();
-        String log = msg.toString().replaceAll("\\[[0-9;]*m", "");
+        String log = msg.toString();
 
         // progress:[x/y]
         if (Pattern.matches("^progress:\\[[\\-0-9]+/[0-9]+]$", log.trim())) {

pio/src/main/assets/home/bin/unpak_img

@@ -149,7 +149,25 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
       echo "$dang_file" > "$OUTPUT/config/${namepv##*/}_info"
       echo "$(fsck.f2fs "$file_img" | grep 'superblock features' | grep -cm1 ro)" > "$OUTPUT/config/${namepv##*/}_f2fs_ro"
     elif [ "$dang_file" == 'erofs' ];then
-      extract.erofs -T$threads -x -i "$file_img" -o "$OUTPUT" >$TMP/extract_erofs.log || killtree "\nextract.erofs error: ${namepv##*/}" "$OUTPUT/${namepv##*/}"
+      extract.erofs -T$threads -x -i "$file_img" -o "$OUTPUT" >$TMP/extract_erofs.log || killtree "\nextract.erofs error: ${namepv##*/}" "$OUTPUT/${namepv##*/}" &
+      if [ -f $TMP/extract_erofs.log ];then
+      while true; do
+      number_kk="$(sed -E 's/\x1b\[[0-9;]*m//g; s/[\r\t]/\n/g' "$TMP/extract_erofs.log" | grep -E 'Extract: \[[^]]+\]' | tail -n 1 | awk '{print $3}' | cut -d\. -f1)"
+      if [ -z "$number_kk" ];then
+      number_kk=0
+      iv=$((iv+1))
+      [ "$iv" -ge 10 ] && break
+      fi
+      if [ $number_kk -ge 98 ] || [ "$(grep -cm1 "100.00%" $TMP/extract_erofs.log)" == 1 ];then
+      progress -1/0
+      break
+      else
+      [ "$number_kk" ] && progress $number_kk/100
+      sleep 0.5
+      fi
+      done
+      fi
+      wait
       [ -f $TMP/extract_erofs.log ] && sed -i 's/\x1b\[[^m]*m//g' $TMP/extract_erofs.log
       echo "$dang_file" > "$OUTPUT/config/${namepv##*/}_info"
       if [ -f $OUTPUT/config/exception.log ];then