chore: dependencies updated, pillow fixed

Author: danila-schelkov

.github/workflows/lint.yml

@@ -1,27 +1,38 @@
-name: Lint
+name: Lint and test
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{matrix.os}}
+    strategy:
+      matrix:
+        python: ["3.11", "3.12"]
+        os: ["ubuntu-latest", "windows-latest"]
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.11
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{matrix.python}}
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: ${{matrix.python}}
 
-      - name: Install requirements
+      - name: Install poetry
         run: |
-          pip install flake8 pyright
-          pip install -r requirements.txt
+          pip install pipx
+          pipx install poetry
 
-      - name: Linting code by flake8
+      - name: Install dependencies
         run: |
-          flake8 --show-source --statistics
+          poetry install
+
+      - name: Linting code by ruff
+        run: |
+          poetry run ruff check .
 
       - name: Check types by pyright
         run: |
-          pyright
+          poetry run pyright .
+
+      - name: Run unit-tests
+        run: poetry run python -m unittest

README.md

@@ -15,51 +15,34 @@ Supercell\`s games.
 ### How to install and use
 
 - On Windows:
-    - Download Python 3.7 or newer version
+    - Download Python 3.10 or newer version
       from [official page](https://www.python.org/downloads/);
     - Install Python. While Installing, enable such parameters as "Add Python to
-      PATH", "Install pip", "Install py launcher", "Associate files with Python" and "
-      Add Python to environment variables";
+      PATH", "Install pip", "Install py launcher", "Associate files with Python" and "Add Python to environment variables";
     - Download XCoder from
       the [releases page](https://github.com/Vorono4ka/XCoder/releases) and extract it;
     - Locate the extracted directory and install required modules:
-      ```pip install -r requirements.txt```;
+      ```cmd
+      poetry install
+      ```
     - Execute "main.py" file.
 
 - On Linux:
     - Open Terminal and install Python by executing following command:
-      ```sudo apt-get update && sudo apt-get install python3 python3-pip```;
+      ```sudo apt-get update && sudo apt-get install python3 python3-poetry```;
     - Download XCoder from
       the [releases page](https://github.com/Vorono4ka/XCoder/releases) and extract it;
     - Locate the extracted directory and install required modules by executing following
       command:
-      ```sudo pip3 install -r requirements.txt```;
+      ```sh
+      poetry install
+      ```
     - Execute "main.py" file.
 
-- On Android:
-    - Download and install PyDroid app
-      from [Google Play](https://play.google.com/store/apps/details?id=ru.iiec.pydroid3);
-    - Open PyDroid and wait until Python installs;
-    - Download XCoder from
-      the [releases page](https://github.com/Vorono4ka/XCoder/releases) and extract it;
-    - Install loguru using pip;
-    - In PyDroid open and execute "main.py" file.
-
 ### Testing
 
-The project supports unit-testing using the unittest module. To run tests by yourself, you can use the command:
-
-```cmd
-python -m unittest
-```
-
-or
-
-```sh
-python3 -m unittest
-```
-
-or using the poetry
+The project supports unit-testing using the unittest module. To run tests by yourself,
+use the command:
 
 ```sh
 poetry run python -m unittest

poetry.lock

@@ -7,18 +7,19 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.11"
-sc-compression = "^0.6.1"
-colorama = "^0.4.6"
+sc-compression = "0.6.5"
+colorama = "0.4.6"
 pylzham = "^0.1.3"
 zstandard = "^0.23.0"
-pillow = "^10.4.0"
-loguru = "^0.7.2"
+pillow = "11.2.0"
+loguru = "0.7.3"
 
 
 [tool.poetry.group.dev.dependencies]
 pyright = "^1.1.376"
 black = "^24.8.0"
 pre-commit = "^3.8.0"
+ruff = "^0.11.2"
 
 [build-system]
 requires = ["poetry-core"]

pyproject.toml

@@ -0,0 +1,3 @@
+from system.exceptions.tool_not_found import ToolNotFoundException
+
+__all__ = ["ToolNotFoundException"]

requirements.txt

@@ -42,7 +42,6 @@
 
     "other_features_label": "OTHER",
     "check_update": "Check for updates",
-    "check_for_outdated": "Check for outdated packages",
     "reinit": "Repeat init",
     "change_language": "Select another language",
     "clear_directories": "Clear workspace dirs",
@@ -64,7 +63,6 @@
     "join_pic": "Joining picture...",
     "png_save": "Saving to png...",
     "saved": "Saving completed!",
-    "xcod_not_found": "File '%s.xcod' doesn't exist!",
     "illegal_size": "Illegal image size! Expected %sx%s but we got %sx%s",
     "resize_qu": "Would you like to resize an image?",
     "resizing": "Resizing...",
@@ -74,7 +72,8 @@
     "compression_error": "Compression failed",
     "compression_done": "Compression done!",
     "dir_empty": "Dir '%s' is empty!",
-    "not_found": "File '%s' not found!",
+    "texture_not_found": "Texture file for '%s' not found!",
+    "file_not_found": "File '%s' not found!",
     "cut_sprites_process": "Cutting sprites... (%d/%d)",
     "place_sprites_process": "Placing sprites... (%d/%d)",
     "not_implemented": "This feature will be added in future updates.\nYou can follow XCoder updates here: https://github.com/Vorono4ka/XCoder",

system/exceptions/__init__.py

@@ -42,7 +42,6 @@
 
     "other_features_label": "ПРОЧЕЕ",
     "check_update": "Проверить обновления",
-    "check_for_outdated": "Проверка устаревших модулей",
     "reinit": "Повторная инициализация",
     "change_language": "Выбрать другой язык",
     "clear_directories": "Очистить рабочие папки",
@@ -64,7 +63,6 @@
     "join_pic": "Соединяем картинку...",
     "png_save": "Сохраняем в png...",
     "saved": "Сохранение прошло успешно!",
-    "xcod_not_found": "Файл '%s.xcod' не обнаружен!",
     "illegal_size": "Размер картинки не совпадает с оригиналом! Ожидалось %sx%s, но мы получили %sx%s",
     "resize_qu": "Хотите изменить размер?",
     "resizing": "Изменяем размер...",
@@ -74,7 +72,8 @@
     "compression_error": "Сжатие не удалось",
     "compression_done": "Сжатие прошло успешно!",
     "dir_empty": "Папка '%s' пуста!",
-    "not_found": "Файл '%s' не найден!",
+    "texture_not_found": "Текстуры для '%s' не найдена!",
+    "file_not_found": "Файл '%s' не найден!",
     "cut_sprites_process": "Вырезаем спрайты... (%d/%d)",
     "place_sprites_process": "Ставим спрайты на место... (%d/%d)",
     "not_implemented": "Данная возможность будет добавлена в будущих обновлениях.\nЗа обновлениями XCoder вы можете следить здесь: https://github.com/Vorono4ka/XCoder",

system/languages/en-EU.json

@@ -42,7 +42,6 @@
 
     "other_features_label": "ІНШЕ",
     "check_update": "Шукати оновлення",
-    "check_for_outdated": "Шукати застарілі пакети",
     "reinit": "Повторити налаштування",
     "change_language": "Вибрати іншу мову",
     "clear_directories": "Очистити робочі папки",
@@ -64,7 +63,6 @@
     "join_pic": "З'єднуємо зоображення...",
     "png_save": "Зберігаємо PNG...",
     "saved": "Збереження Виконано!",
-    "xcod_not_found": "Файл '%s.xcod' не існує!",
     "illegal_size": "Неможливий розмір картинки! Очікували %sx%s але отримали %sx%s",
     "resize_qu": "Ти хочеш змінити розмір картинки?",
     "resizing": "змінюємо розмір...",
@@ -74,7 +72,8 @@
     "compression_error": "Запаковування не вдалося",
     "compression_done": "Запаковування виконане!",
     "dir_empty": "Папка '%s' порожня!",
-    "not_found": "Файл '%s' не знайдено!",
+    "texture_not_found": "Текстури для '%s' не знайдено!",
+    "file_not_found": "Файл '%s' не знайдено!",
     "cut_sprites_process": "Обрізаємо спрайти... (%d/%d)",
     "place_sprites_process": "Вставляємо спрайти... (%d/%d)",
     "not_implemented": "Ця функція буде додана у наступних оновленнях.\nТи можеш сладкувати за оновленнями тут: https://github.com/Vorono4ka/XCoder",

system/languages/ru-RU.json

@@ -2,10 +2,10 @@
 
 from loguru import logger
 
-from system import clear, run
+from system import clear
 from system.lib.config import config
 from system.lib.features.directories import create_directories
-from system.lib.features.update.check import get_pip_info, get_tags
+from system.lib.features.update.check import get_tags
 from system.localization import locale
 
 
@@ -17,18 +17,6 @@ def initialize(first_init=False):
     logger.info(locale.detected_os % platform.system())
     logger.info(locale.installing)
 
-    required_packages = [
-        pkg.rstrip("\n").lower() for pkg in open("requirements.txt").readlines()
-    ]
-    installed_packages = [pkg[0].lower() for pkg in get_pip_info()]
-    for package in required_packages:
-        if package in installed_packages:
-            continue
-
-        if run(f"pip3 install {package}") == 0:
-            logger.info(locale.installed % package)
-        else:
-            logger.info(locale.not_installed % package)
     logger.info(locale.crt_workspace)
     create_directories()
     logger.info(locale.verifying)