replace zip with run script

Dockerfile

@@ -1,19 +1,34 @@
 FROM python:3.12-slim
 
+# Install dependencies + locales
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
     libgl1 \
     libglib2.0-0 \
-    zip \
+    p7zip-full \
+    locales \
+    fonts-noto-cjk \
  && rm -rf /var/lib/apt/lists/*
 
+# Generate Japanese UTF-8 locale
+RUN sed -i '/ja_JP.UTF-8/s/^# //g' /etc/locale.gen \
+ && locale-gen
+
+# Set environment variables for locale
+ENV LANG=ja_JP.UTF-8 \
+    LANGUAGE=ja_JP:ja \
+    LC_ALL=ja_JP.UTF-8 \
+    LC_CTYPE=ja_JP.UTF-8
+
 RUN pip install --no-cache-dir --upgrade torch torchvision mokuro
 
 # create a user to run the application
 RUN useradd -m mokurouser \
- && mkdir -p /home/mokurouser/mokuro \
+ && mkdir -p /mokuro \
- && chown -R mokurouser:mokurouser /home/mokurouser
+ && chown -R mokurouser:mokurouser /mokuro
 
-WORKDIR /home/mokurouser/mokuro
+WORKDIR /mokuro
+
+USER mokurouser
 
 COPY . .

compose.yaml

@@ -1,15 +1,15 @@
 ---
 services:
   mokuro:
-    image: gitea.suda.codes/sudacode/mokuro-docker:latest
+    image: mokuro
     build:
       context: .
       dockerfile: Dockerfile
     container_name: mokuro
     user: 1000:1000
     volumes:
-      - ~/S/japanese/manga:/home/mokurouser/mokuro
+      - ~/S/japanese/manga:/mokuro/manga
-    command: mokuro --parent_dir One\ Piece\ Color --disable_confirmation && ./zip.sh "One Piece Color"
+    command: ./run.sh "manga/One Piece Color"
     runtime: nvidia
     restart: no
     network_mode: host

run.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+export LANG=ja_JP.UTF-8
+export LANGUAGE=ja_JP:ja
+export LC_ALL=ja_JP.UTF-8
+export LC_CTYPE=ja_JP.UTF-8
+
+DIR="${1:-.}"
+
+if [[ ! -d "$DIR" ]]; then
+    echo "Error: Directory '$DIR' does not exist."
+    exit 1
+fi
+
+if ! mokuro --parent_dir "$DIR" --disable_confirmation; then
+    echo "Error: mokuro command failed."
+    exit 1
+fi
+
+cd "$DIR" || exit
+
+for f in *.mokuro; do
+    [[ -e "$f" ]] || continue
+    base="${f%.mokuro}"
+    dir="$base"
+    zipfile="$base.zip"
+    if [[ -f "$zipfile" ]]; then
+        echo "Warning: Zip file $zipfile already exists, skipping."
+    elif [[ -d "$dir" ]]; then
+        echo "Zipping: $zipfile <- $f $dir/"
+        7z a -tzip "$zipfile" "$f" "$dir"
+    else
+        echo "Warning: Directory '$dir' not found for '$f', skipping."
+    fi
+done
+
+rm -rf ./*.html

zip.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Usage: ./zip.sh [directory]
-# Default is current directory
-set -Eeuo pipefail
-
-DIR="${1:-.}"
-
-cd "$DIR" || exit
-
-for f in *.mokuro; do
-    [ -e "$f" ] || continue # skip if no .mokuro files
-    base="${f%.mokuro}"
-    dir="$base"
-    zipfile="$base.zip"
-    if [ -d "$dir" ]; then
-        echo "Zipping: $zipfile <- $f $dir/"
-        zip -qr "$zipfile" "$f" "$dir"
-    else
-        echo "Warning: Directory '$dir' not found for '$f', skipping."
-    fi
-done