update

add translate
use Poetry instead
fix magisk module template fetch
fix line break error in WIN

Author: Zarcher

.gitignore

@@ -102,3 +102,11 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# IDE
+.vscode
+.idea
+
+# peotry
+
+poetry.lock

ConfigCheck.py

@@ -5,7 +5,6 @@
 import platform
 import shutil
 import subprocess
-from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 from colorama import Fore
@@ -14,33 +13,6 @@
 from tqdm import tqdm
 
 
-def check_env() -> bool:
-    """
-    check the system environment, tool's Availability such as 'gifsicle', 'pngquant'
-    :return: bool
-    """
-    e = platform.uname()
-
-    if e.system == 'Linux':
-        cmds = ['gifsicle', 'pngquant']
-        for cmd in cmds:
-            if shutil.which(cmd) is None:
-                print(f'<{cmd}> doesn\'t seem to be installed, please check!')
-                return False
-
-    elif e.system == 'Windows':
-        cmds = ['.\\bin\\gifsicle\\gifsicle.exe', '.\\bin\\pngquant\\pngquant.exe']
-        for cmd in cmds:
-            if shutil.which(cmd) is None:
-                print(f'<{cmd}> doesn\'t seem to exist, please check!')
-                return False
-    else:
-        print(f'Platform <{e.system}> has not been supported!')
-        return False
-
-    return True
-
-
 def gif2png(gif_path: str, to_dir_path: str, temp_im_path: str = './temp.gif') -> None:
     """
     Iterate the GIF, extracting each frame.
@@ -199,17 +171,17 @@ def auto_bg_color(im_path: str):
     return (0, 0, 0, 255)
 
 
-@dataclass
-class PasteConf:
+class PasteConf():
     """
     paste configuration class
     """
-    im_path: Optional[str]
-    resize_mode: str
-    target_w: int
-    target_h: int
-    c_pos_x: int
-    c_pos_y: int
+    def __init__(self, im_path: Optional[str], resize_mode: str, target_w: int, target_h: int, c_pos_x: int, c_pos_y: int):
+        self.im_path = im_path
+        self.resize_mode = resize_mode
+        self.target_w = target_w
+        self.target_h = target_h
+        self.c_pos_x = c_pos_x
+        self.c_pos_y = c_pos_y
 
 
 def _paste(bg: Image, p_conf: PasteConf) -> None:

ImgProcess.py

@@ -26,7 +26,7 @@ def desc_file_creat(desc_path: str, desc_conf: Dict) -> IO:
     height = desc_conf.get('height')
     fps = desc_conf.get('fps')
 
-    with open(desc_path, mode="w+") as desc_f:
+    with open(desc_path, mode="w+", newline='\n') as desc_f:
         content = "{} {} {}\n".format(width, height, fps)
         for part in desc_conf.get('parts'):
             content += "{} {} {} {}\n".format(part['type'], part['count'], part['pause'], part['path'])
@@ -54,12 +54,18 @@ def template_prepare(template_dir_path: str, template_file_name: str, download_u
     :param unzip_dir_path: path to unzip
     :return: None
     """
+    # TODO: 更新 updater-binary
     template_file_path = os.path.join(template_dir_path, template_file_name)
     if not os.path.exists(template_file_path):
         utils.download_file(download_url, template_file_path)
     utils.unzipfile(template_file_path, unzip_dir_path)
 
 
+def update_binary_modify(update_binary_file_path: str, module_installer_sh_url: str):
+    utils.download_file(module_installer_sh_url, update_binary_file_path)
+    pass
+
+
 def module_prop_modify(module_prop_file_path: str, module_prop_conf: Dict) -> None:
     """
     <module.prop> modify
@@ -72,7 +78,6 @@ def module_prop_modify(module_prop_file_path: str, module_prop_conf: Dict) -> No
     'versionCode': '2018103101'
     'author': 'Zarcher'
     'description': 'A Boot Animation Magisk Module'
-    'minMagisk': '17000'
     }
     :return: None
     """
@@ -82,11 +87,10 @@ def module_prop_modify(module_prop_file_path: str, module_prop_conf: Dict) -> No
         f"version={module_prop_conf.get('version')}\n",
         f"versionCode={module_prop_conf.get('versionCode')}\n",
         f"author={module_prop_conf.get('author')}\n",
-        f"description={module_prop_conf.get('description')}\n",
-        f"minMagisk={module_prop_conf.get('minMagisk')}\n"
+        f"description={module_prop_conf.get('description')}\n"
     ]
     content = ''.join(content_list)
-    with open(module_prop_file_path, 'w+') as mp_f:
+    with open(module_prop_file_path, 'w+', newline='\n') as mp_f:
         mp_f.write(content)
 
 
@@ -117,9 +121,9 @@ def module_config_modify(module_config_file_path: str, module_config_conf: Optio
         re.compile('REPLACE="\n"')
     ]
 
-    with open(module_config_file_path, 'r') as f:
+    with open(module_config_file_path, 'r', newline='\n') as f:
         content = f.read()
-    with open(module_config_file_path, 'w') as f:
+    with open(module_config_file_path, 'w', newline='\n') as f:
         for patt, sub_content in zip(patts, sub_contents):
             # print(re.findall(patt, content))
             content = re.sub(patt, sub_content, content)

PackageMake.py

@@ -8,20 +8,19 @@ A tool to combine the images (png, jpg ...) and motion images (gif) to make Andr
 
 ### Python and Python Dependencies
 
-Please ensure that **Python version >= 3.7** because new features such as dataclass are used.
-
-```txt
-# Python dependencies
-
-pillow   >= 5.3.0
-tqdm     >= 4.28.1
-requests >= 2.20.1
-colorama >= 0.4.1
-click    >= 7.0
-pyyaml   >= 3.13
+```auto
+python    >= 3.6
+
+pillow    >= 5.3.0
+tqdm      >= 4.28.1
+requests  >= 2.20.1
+colorama  >= 0.4.1
+click     >= 7.0
+pyyaml    >= 3.13
+printtags >= 1.4
 ```
 
-Please check these dependencies, or install them using `pip install-r requirements.txt`.
+This project uses `poetry` for dependency management. Run `poetry install` in the script root directory to install the virtual environment and dependencies, and run `poetry run python run.py` to run the script.
 
 ### Other Dependencies
 
@@ -43,35 +42,29 @@ This script also uses third-party software such as [gifsicle](https://www.lcdf.o
 
 ## Getting Started
 
-Get the script. Download or use `git`
-
-```sh
-git clone https://github.com/Zarcher0/BootAnimationMaker.git
-```
-
-Open Terminal(PowerShell) in the script folder
+* Get the script. Download or use `git clone`
 
-Prepare the images witch to be made into animations. Then it is suggested to place them in a subfolder under the script folder, and create a new `config.yml` file in it. Its format refers to [config_template.yml](config_template.yml).
+    ```sh
+    git clone https://github.com/Zarcher0/BootAnimationMaker.git
+    ```
 
-Then run `run.py'.
+* Prepare the material which to made animations. Put them into a subfolder(new) under the script root directory, and create a new `config.yml` file in it. Its format refers to [config_template.yml](config_template_CN.yml).
 
-```sh
-python run.py # The default configuration file path is "./config.yml"
+* In root folder of the script, Then run `python run.py --config xxxx` or `poetry run python run.py --config xxxx` (if uses poetry).
 
-# Or use "--config" to specify a configuration path
+> when run `python run.py`, the default configuration file path is `./config.yml`，use `--config` to specify a configuration path `python run.py --config xxxxx`
 
-python run.py --config xxxxx
-```
-
-See the `example` folder for several reference examples.
+Look at the `example` folder for several reference examples.
 
 For example, to run `example/1`
 
 ```sh
 python run.py --config ./example/1/config.yml
 ```
 
-After generating you can find the Magisk module and preview gif in `./export` directory.
+After generating you can find the Magisk module and its preview gif in `./export` directory.
+
+![Screenshot0](./example/Screenshot0.png)
 
 > Note: If the image path in the `config.yml` file is a relative path, the default is relative to the running environment. It is recommended to use an absolute path to avoid errors.