Upload file

Author: Zenlua

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

@@ -160,25 +160,23 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
       progress -1/0
       break
       fi
-      [ "$number_kk" ] && progress $number_kk/100
-      if [ -z "$number_kk" ]; then
-         iv=$((iv+1))
-      elif [ "${number_kk:-0}" == "${save_num:-1}" ]; then
+      if [ -z "$number_kk" ] || [ "${number_kk:-0}" == "${save_num:-1}" ]; then
          iv=$((iv+1))
       else
          iv=0
+         [ "$number_kk" ] && progress $number_kk/100
       fi
       save_num="$number_kk"
-      [ "$iv" -ge 10 ] && echo "Warning: Possible extraction error (erofs), check log: $TMP/extract_erofs.log" >&2 && break
+      if [ "$iv" -ge 40 ];then
+      echo "Warning: Slow erofs extraction speed, Stop checking the percentage to avoid an endless loop." >> $TMP/extract_erofs.log
+      progress -1/0
+      break
+      fi
       sleep 1
       done
       fi
       wait
-      if [ -f $TMP/extract_erofs.log ];then
-      sed -i 's/\x1b\[[^m]*m//g' $TMP/extract_erofs.log
-      sed '/Extract: \[.*.\]/d' $TMP/extract_erofs.log
-      echo
-      fi
+      [ -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
       rm -fr "$OUTPUT/${namepv##*/}"

pio/src/main/assets/module/termux/py/contextpatch.py

@@ -4,6 +4,7 @@
 import os
 import sys
 from re import sub
+from re import escape
 
 fix_permission = {
     "system/app/*/.apk": "u:object_r:system_file:s0",
@@ -18,20 +19,23 @@
     "/vendor/bin/hw/android.hardware.wifi@1.0": "u:object_r:hal_wifi_default_exec:s0"
 }
 
+def str_to_selinux(s: str) -> str:
+    return escape(s).replace('\\-', '-')
 
 def scan_context(file) -> dict:
     context = {}
     with open(file, "r", encoding='utf-8') as file_:
         for i in file_.readlines():
             line = i.strip().replace('\\', '')
             if not line:
-                continue  # Bỏ qua dòng trống
+                continue
             if line.startswith('#'):
                 continue
             parts = line.split()
             if not parts:
-                continue  # An toàn thêm 1 lần
+                continue
             filepath, *other = parts
+            filepath = filepath.replace(r'\@', '@')
             context[filepath] = other
     return context
 
@@ -54,32 +58,33 @@ def scan_dir(folder) -> list:
 
 def context_patch(fs_file, filename) -> dict:
     new_fs = {}
-    permission_d = fs_file.get(list(fs_file)[0])
+    # Giữ logic cũ: lấy permission mặc định từ entry đầu
+    permission_d = fs_file.get(next(iter(fs_file)))
     if not permission_d:
         permission_d = ['u:object_r:system_file:s0']
     for i in filename:
+        selinux_path = str_to_selinux(i)
         if fs_file.get(i):
-            new_fs[sub(r'([^-_/a-zA-Z0-9])', r'\\\1', i)] = fs_file[i]
-        else:
-            permission = permission_d
-            if i:
-                if not i.isprintable():
-                    tmp = ''
-                    for c in i:
-                        tmp += c if c.isprintable() else '*'
-                    i = tmp
-                if i in fix_permission.keys():
-                    permission = fix_permission[i]
-                else:
-                    # Tìm context từ thư mục gần nhất có trong fs_file
-                    tmp_path = os.path.dirname(i)
-                    while tmp_path != "/" and tmp_path:
-                        if tmp_path in fs_file:
-                            permission = fs_file[tmp_path]
-                            break
-                        tmp_path = os.path.dirname(tmp_path)
-            print(f"ADD [{i}:{permission}]")
-            new_fs[sub(r'([^-_/a-zA-Z0-9])', r'\\\1', i)] = permission
+            new_fs[selinux_path] = fs_file[i]
+            continue
+        permission = permission_d
+        if i:
+            # giữ logic cũ: thay ký tự không printable bằng '*'
+            if not i.isprintable():
+                i = ''.join(c if c.isprintable() else '*' for c in i)
+            # giữ logic cũ: fix_permission
+            if i in fix_permission:
+                permission = fix_permission[i]
+            else:
+                # giữ nguyên logic tìm thư mục cha
+                tmp_path = os.path.dirname(i)
+                while tmp_path and tmp_path != "/":
+                    if tmp_path in fs_file:
+                        permission = fs_file[tmp_path]
+                        break
+                    tmp_path = os.path.dirname(tmp_path)
+        print(f"ADD [{i}:{permission}]")
+        new_fs[selinux_path] = permission
     return new_fs