up

Author: oneui

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
       - main
   workflow_dispatch:
 env: 
-  VERSION: '12.1.0'  # Update version number to 12
+  VERSION: '12.2.0'  # Update version number to 12
 jobs: 
   build: 
     runs-on: ubuntu-latest
@@ -39,6 +39,7 @@ jobs:
             2. **vbmeta 校验移除改进，现在，在小米 14 之后的任何小米机型必须修改 vbmeta，否则会不开机，在之前只需 fastboot 刷入时禁用即可，现在在小米新机型中不再有任何效果**
             3. **移除应用大部分修改为基于包名**
             4. **修改 apk 的功能已被隐藏，由于 apktool 不修复，你只能手动通过 MT 管理器修改 apk，但是你可以参考这些修改的代码，它们还在，只是不调用**
+            5. ext4 格式打包现在默认会保持原始大小了，如果你原本镜像提取从ext格式提取，那么便会保留原始大小，同时再次打包ext4时优先采取原始大小，如果没有，则动态计算
 
             ## Release Notes
 
@@ -47,6 +48,7 @@ jobs:
             2. **Improvement in vbmeta verification removal: Now, for any Xiaomi model after Xiaomi 14, vbmeta must be modified; otherwise, it will not boot. Previously, it was sufficient to disable it during fastboot flashing, but this is no longer effective on new Xiaomi models.**
             3. **Most application removals have been modified to be based on package names.**
             4. **The functionality to modify APKs has been hidden. Due to the lack of fixes in apktool, you can only manually modify APKs using MT Manager. However, you can refer to the modification codes, which are still present but not invoked.**
+            5. The ext4 format packaging now retains the original size by default. If you originally extracted the image from the ext format, the original size will be retained. At the same time, the original size will be given priority when packaging ext4 again. If not, it will be dynamically calculated
 
       - name: Archive project
         run: zip -r UY-Sct_${{ env.VERSION }}.zip .

resources/module_codes/cn/extract.sh

@@ -67,6 +67,10 @@ function extract_single_img {
 	ext)
 		echo "正在提取分区 ${single_file_name}，请稍等..."
 		PYTHONDONTWRITEBYTECODE=1 python3 "$TOOL_DIR/ext4_info_get.py" "$single_file" "$WORK_DIR/$current_workspace/Extracted-files/config"
+		partition_size=$(stat -c%s "$single_file")
+		
+		mkdir -p "$WORK_DIR/$current_workspace/Extracted-files/config"
+		echo "$partition_size" > "$WORK_DIR/$current_workspace/Extracted-files/config/original_${base_name}_size_for_ext4"
 
 		mkdir -p "$WORK_DIR/$current_workspace/Extracted-files/${base_name}"
 

resources/module_codes/cn/make_img.sh

@@ -55,12 +55,13 @@ function package_single_partition {
 		fs_type="ext4"
 		mke2fs_tool_path="$(dirname "$0")/resources/my_tools/mke2fs"
 		e2fsdroid_tool_path="$(dirname "$0")/resources/my_tools/e2fsdroid"
-		size=$(du -sb "$dir" | cut -f1)
-
-		if [ "$size" -lt $((1 * 1024 * 1024)) ]; then
-			size=$((15 * 1024 * 1024))
+		size_file="$WORK_DIR/$current_workspace/Extracted-files/config/original_$(basename "$dir")_size_for_ext4"
+		
+		if [ -f "$size_file" ]; then
+			size=$(cat "$size_file")
 		else
-			size=$((size * 101 / 100 + 4 * 1024 * 1024))
+			size=$(du -sb "$dir" | cut -f1)
+			size=$((size * 102 / 100))
 		fi
 
 		echo "正在打包分区 $(basename "$dir") ..."

resources/module_codes/en/extract.sh

@@ -60,6 +60,10 @@ function extract_single_img {
 	ext)
 		echo "Extracting partition ${single_file_name}, please wait..."
 		PYTHONDONTWRITEBYTECODE=1 python3 "$TOOL_DIR/ext4_info_get.py" "$single_file" "$WORK_DIR/$current_workspace/Extracted-files/config"
+		partition_size=$(stat -c%s "$single_file")
+		
+		mkdir -p "$WORK_DIR/$current_workspace/Extracted-files/config"
+		echo "$partition_size" > "$WORK_DIR/$current_workspace/Extracted-files/config/original_${base_name}_size_for_ext4"
 		mkdir -p "$WORK_DIR/$current_workspace/Extracted-files/${base_name}"
 		echo "rdump / \"$WORK_DIR/${current_workspace}/Extracted-files/${base_name}\"" | sudo debugfs "$single_file" >/dev/null 2>&1
 		sudo chmod -R a+rwx "$WORK_DIR/$current_workspace/Extracted-files/${base_name}"

resources/module_codes/en/make_img.sh

@@ -55,12 +55,13 @@ function package_single_partition {
 		fs_type="ext4"
 		mke2fs_tool_path="$(dirname "$0")/resources/my_tools/mke2fs"
 		e2fsdroid_tool_path="$(dirname "$0")/resources/my_tools/e2fsdroid"
-		size=$(du -sb "$dir" | cut -f1)
-
-		if [ "$size" -lt $((1 * 1024 * 1024)) ]; then
-			size=$((15 * 1024 * 1024))
+		size_file="$WORK_DIR/$current_workspace/Extracted-files/config/original_$(basename "$dir")_size_for_ext4"
+		
+		if [ -f "$size_file" ]; then
+			size=$(cat "$size_file")
 		else
-			size=$((size * 101 / 100 + 4 * 1024 * 1024))
+			size=$(du -sb "$dir" | cut -f1)
+			size=$((size * 102 / 100))
 		fi
 
 		echo "Packing partition $(basename "$dir") ..."