Merge pull request #130 from kloptops/main

Updated translations, fixed port metadata/images on muOS v12.
PortsMaster · May 2, 2024 · e817e28 · e817e28
2 parents 298a215 + 70a2679
commit e817e28
Show file tree

Hide file tree

Showing 12 changed files with 1,981 additions and 1,775 deletions.
diff --git a/PortMaster/muos/image_smash.txt b/PortMaster/muos/image_smash.txt
@@ -4,4 +4,7 @@ if [ -f "/opt/graphicsmagick/activate.sh" ]; then
     source /opt/graphicsmagick/activate.sh
 
     find "/mnt/mmc/MUOS/info/catalogue/External - Ports" -type f \( -iname "*.jpg" -o -iname "*.png" \) -exec sh -c 'input="{}"; output="$(echo "$input" | sed "s/\(.*\)\..*/\1/").png"; gm convert "$input" -resize "320x240>" "$output"' \;
+elif [ -e "/usr/bin/mogrify" ]; then
+    find "/mnt/mmc/MUOS/info/catalogue/External - Ports" -type f -iname "*.png" -exec sh -c 'mogrify -verbose -resize "320x240>" -format png "{}"' \;
+    find "/mnt/mmc/MUOS/info/catalogue/External - Ports" -type f -iname "*.jpg" -exec sh -c 'mogrify -verbose -resize "320x240>" -format png "{}"; rm -v "{}"' \;
 fi
diff --git a/PortMaster/pylibs/harbourmaster/platform.py b/PortMaster/pylibs/harbourmaster/platform.py
@@ -448,7 +448,9 @@ def gamelist_add(self, gameinfo_file):
         if not gameinfo_file.is_file():
             return
 
-        if not Path("/opt/graphicsmagick").is_dir():
+        if not any((
+                Path("/opt/graphicsmagick").is_dir(),
+                Path("/usr/bin/magick").is_file())):
             return
 
         INFO_CATALOG = Path("/mnt/mmc/MUOS/info/catalogue/External - Ports")