redmine_apijs 6.9.5 → 6.9.7

data/config/locales/cs.yml

@@ -6,7 +6,6 @@ cs:
   apijs_title_download: "Stáhnout (%{v})"
   apijs_title_files: "Files list"
   apijs_config_apijs: "Obecné"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "PHP manual"
   apijs_example1_text: "It is important to note that just because the mail was accepted for delivery, it doesn't mean the mail will actually reach the intended destination."
   apijs_example: "Například %{v}"
@@ -15,7 +14,6 @@ cs:
   apijs_example2_link: "Webové stránky: %{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/de.yml

@@ -6,7 +6,6 @@ de:
   apijs_title_download: "Download (%{v})"
   apijs_title_files: "Liste der Dateien"
   apijs_config_apijs: "Allgemein"
-  apijs_config_enable: "Apijs aktivieren"
   apijs_example1_title: "PHP-Handbuch"
   apijs_example1_text: "Dass eine E-Mail für den Versand akzeptiert wurde, bedeutet nicht, dass sie auch wirklich den gewünschten Empfänger erreichen wird."
   apijs_example: "Beispiel %{v}"
@@ -15,7 +14,6 @@ de:
   apijs_example2_link: "Website: %{v}"
   apijs_config_sort_order: "Dateien alphabetisch sortieren"
   apijs_config_browser: "Browser Version überprüfen"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (überprüft ebenfalls ob apijs aktiviert ist)."
   permission_edit_attachments: "(apijs) Beschreibung der Datei bearbeiten"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Datei löschen"

data/config/locales/el.yml

@@ -6,7 +6,6 @@ el:
   apijs_title_download: "Λήψη Αρχείου (%{v})"
   apijs_title_files: "Files list"
   apijs_config_apijs: "Γενικά"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "PHP manual"
   apijs_example1_text: "It is important to note that just because the mail was accepted for delivery, it doesn't mean the mail will actually reach the intended destination."
   apijs_example: "Example %{v}"
@@ -15,7 +14,6 @@ el:
   apijs_example2_link: "Ιστότοπος: %{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/en.yml

@@ -6,7 +6,6 @@ en:
   apijs_title_download: "Download (%{v})"
   apijs_title_files: "Files list"
   apijs_config_apijs: "General"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "PHP manual"
   apijs_example1_text: "It is important to note that just because the mail was accepted for delivery, it doesn't mean the mail will actually reach the intended destination."
   apijs_example: "Example %{v}"
@@ -15,7 +14,6 @@ en:
   apijs_example2_link: "Website: %{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/es.yml

@@ -6,7 +6,6 @@ es:
   apijs_title_download: "Descargar (%{v})"
   apijs_title_files: "Listar archivos"
   apijs_config_apijs: "General"
-  apijs_config_enable: "Activar apijs"
   apijs_example1_title: "Manual de PHP"
   apijs_example1_text: "Es importante tener en cuenta que si el correo es aceptado para su envío, no quiere decir que el correo haya alcanzado el destino indicado."
   apijs_example: "Ejemplo %{v}"
@@ -15,7 +14,6 @@ es:
   apijs_example2_link: "Sitio Web: %{v}"
   apijs_config_sort_order: "Ordenar archivos alfabéticamente"
   apijs_config_browser: "Comprobar la versión del navegador"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (verifica incluso si el apijs esta desactivado)."
   permission_edit_attachments: "(apijs) Editar descripción de archivos"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Borrar los archivos"

data/config/locales/fr.yml

@@ -6,7 +6,6 @@ fr:
   apijs_title_download: "Télécharger (%{v})"
   apijs_title_files: "Liste des fichiers"
   apijs_config_apijs: "Général"
-  apijs_config_enable: "Activer l'apijs"
   apijs_example1_title: "Manuel PHP"
   apijs_example1_text: "Il est important de noter que ce n'est pas parce que l'email a été accepté pour livraison, qu'il arrivera à destination."
   apijs_example: "Exemple %{v}"
@@ -15,7 +14,6 @@ fr:
   apijs_example2_link: "Site internet : %{v}"
   apijs_config_sort_order: "Trier les fichiers par ordre alphabétique"
   apijs_config_browser: "Vérifier la version du navigateur"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (vérifie même si l'apijs est désactivé)."
   permission_edit_attachments: "(apijs) Modifier la description des fichiers"
   permission_rename_attachments: "(apijs) Renommer les fichiers"
   permission_delete_attachments: "(apijs) Supprimer les fichiers"

data/config/locales/hu.yml

@@ -6,7 +6,6 @@ hu:
   apijs_title_download: "Letöltés (%{v})"
   apijs_title_files: "Files list"
   apijs_config_apijs: "Általános"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "PHP manual"
   apijs_example1_text: "It is important to note that just because the mail was accepted for delivery, it doesn't mean the mail will actually reach the intended destination."
   apijs_example: "Ppéldául %{v}"
@@ -15,7 +14,6 @@ hu:
   apijs_example2_link: "Weboldal: %{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/it.yml

@@ -6,7 +6,6 @@ it:
   apijs_title_download: "Scaricare (%{v})"
   apijs_title_files: "Lista dei file"
   apijs_config_apijs: "Generale"
-  apijs_config_enable: "Attivare l'apijs"
   apijs_example1_title: "Manuale PHP"
   apijs_example1_text: "È importante notare che il fatto che la mail sia stata accettata, non significa che arriverà a destinazione."
   apijs_example: "Esempio %{v}"
@@ -15,7 +14,6 @@ it:
   apijs_example2_link: "Sito internet: %{v}"
   apijs_config_sort_order: "Ordinare i file in ordine alfabetico"
   apijs_config_browser: "Verificare la versione del browser"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (verificare se l'apijs é disattivato)."
   permission_edit_attachments: "(apijs) Modificare la descrizione dei file"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Eliminare i file"

data/config/locales/ja.yml

@@ -6,7 +6,6 @@ ja:
   apijs_title_download: "ダウンロード（%{v}）"
   apijs_title_files: "Files list"
   apijs_config_apijs: "全般"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "PHP マニュアル"
   apijs_example1_text: "メールの配送が受け入れられたかどうかが基準であることに注意しましょう。メールが実際にあて先に届いたかどうかでは「ありません」。"
   apijs_example: "例%{v}"
@@ -15,7 +14,6 @@ ja:
   apijs_example2_link: "ウェブサイト：%{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/nl.yml

@@ -6,7 +6,6 @@ nl:
   apijs_title_download: "Download (%{v})"
   apijs_title_files: "Files list"
   apijs_config_apijs: "Algemeen"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "PHP manual"
   apijs_example1_text: "It is important to note that just because the mail was accepted for delivery, it doesn't mean the mail will actually reach the intended destination."
   apijs_example: "Voorbeeld %{v}"
@@ -15,7 +14,6 @@ nl:
   apijs_example2_link: "Website: %{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/pl.yml

@@ -6,7 +6,6 @@ pl:
   apijs_title_download: "Pobierz (%{v})"
   apijs_title_files: "Files list"
   apijs_config_apijs: "Ogólne"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "Podręcznik PHP"
   apijs_example1_text: "Ważną informacją jest to, że pomimo iż e-mail został zaakceptowany do wysłania, to nie oznacza, że będzie on już w tej chwili wysyłany do odbiorców."
   apijs_example: "Przykład %{v}"
@@ -15,7 +14,6 @@ pl:
   apijs_example2_link: "Witryna: %{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/pt-BR.yml

@@ -6,7 +6,6 @@ pt-BR:
   apijs_title_download: "Baixar (%{v})"
   apijs_title_files: "Files list"
   apijs_config_apijs: "Geral"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "Manual do PHP"
   apijs_example1_text: "É importante notar que somente pelo o e-mail ser aceito para entrega, não significa que o e-mail alcancará o destino esperado."
   apijs_example: "Exemplo %{v}"
@@ -15,7 +14,6 @@ pt-BR:
   apijs_example2_link: "Sítio Web: %{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/pt.yml

@@ -6,7 +6,6 @@ pt:
   apijs_title_download: "Descarregar (%{v})"
   apijs_title_files: "Lista dos ficheiros"
   apijs_config_apijs: "Geral"
-  apijs_config_enable: "Ativar apijs"
   apijs_example1_title: "Manual do PHP"
   apijs_example1_text: "É importante notar que somente pelo o e-mail ser aceito para entrega, não significa que o e-mail alcancará o destino esperado."
   apijs_example: "Exemplo %{v}"
@@ -15,7 +14,6 @@ pt:
   apijs_example2_link: "Sítio Web: %{v}"
   apijs_config_sort_order: "Ordenar os ficheiros por ordem alfabética"
   apijs_config_browser: "Verificar a versão do navegador"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (verifica mesmo que apijs esteja desativado)."
   permission_edit_attachments: "(apijs) Modificar a descrição dos ficheiros"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Suprimir os ficheiros"

data/config/locales/ro.yml

@@ -6,7 +6,6 @@ ro:
   apijs_title_download: "Descarcă (%{v})"
   apijs_title_files: "Files list"
   apijs_config_apijs: "General"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "Manualul PHP"
   apijs_example1_text: "Este important să știți că cu toate că mesajul a fost acceptat spre trimitere, aceasta NU înseamnă că mesajul într-adevăr va ajunge la destinație."
   apijs_example: "Exemplu %{v}"
@@ -15,7 +14,6 @@ ro:
   apijs_example2_link: "Site: %{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/ru.yml

@@ -6,7 +6,6 @@ ru:
   apijs_title_download: "Скачать (%{v})"
   apijs_title_files: "Список файлов"
   apijs_config_apijs: "Основная"
-  apijs_config_enable: "Включить apijs"
   apijs_example1_title: "Руководство по PHP"
   apijs_example1_text: "Важно заметить, что то что письмо было принято для передачи вовсе не означает что оно достигло получателя."
   apijs_example: "Пример %{v}"
@@ -15,7 +14,6 @@ ru:
   apijs_example2_link: "Вебсайт: %{v}"
   apijs_config_sort_order: "Сортировать файлы в алфавитном порядке"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Редактировать описание файла"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Удалить файлы"

data/config/locales/sk.yml

@@ -6,7 +6,6 @@ sk:
   apijs_title_download: "Prevziať (%{v})"
   apijs_title_files: "Files list"
   apijs_config_apijs: "Všeobecné"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "PHP manual"
   apijs_example1_text: "It is important to note that just because the mail was accepted for delivery, it doesn't mean the mail will actually reach the intended destination."
   apijs_example: "Example %{v}"
@@ -15,7 +14,6 @@ sk:
   apijs_example2_link: "Webstránka: %{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/tr.yml

@@ -1,12 +1,11 @@
 tr:
   apijs_check_extension: "Dosya uzantısı değiştirilemez."
   apijs_clearcache_done: "Resim ön belleği temizlendi."
-  apijs_browser_warning: "<strong>UYARI :</strong> tarayıcınız <strong>%{n} %{v}</strong> eski, lütfen <a %{l}>güncelleyiniz</a>."
+  apijs_browser_warning: "<strong>Uyari :</strong> tarayıcınız <strong>%{n} %{v}</strong> eski, lütfen <a %{l}>güncelleyiniz</a>."
   apijs_title_album: "Fotoğraf Galerisi"
   apijs_title_download: "İndir (%{v})"
   apijs_title_files: "Eklenti listesi"
   apijs_config_apijs: "Genel"
-  apijs_config_enable: "Apijs etkinleştir"
   apijs_example1_title: "PHP Kılavuzu"
   apijs_example1_text: "Yalnız şuna dikkat edin : Epostanın sunucu tarafından teslim alınması, epostanın alıcısına ulaştığı anlamına gelmez."
   apijs_example: "Örnek %{v}"
@@ -15,7 +14,6 @@ tr:
   apijs_example2_link: "Web sitesi : %{v}"
   apijs_config_sort_order: "Eklentileri alfabetik olarak sırala"
   apijs_config_browser: "Tarayıcı versiyonunu kontrol et"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (apijs etkin değilken de kontrol edilir)."
   permission_edit_attachments: "(apijs) Açıklama düzenle"
   permission_rename_attachments: "(apijs) Dosya adı değiştir"
   permission_delete_attachments: "(apijs) Dosya Sil"

data/config/locales/uk.yml

@@ -6,7 +6,6 @@ uk:
   apijs_title_download: "Завантажити (%{v})"
   apijs_title_files: "Files list"
   apijs_config_apijs: "Загальні"
-  apijs_config_enable: "Enable apijs"
   apijs_example1_title: "PHP manual"
   apijs_example1_text: "It is important to note that just because the mail was accepted for delivery, it doesn't mean the mail will actually reach the intended destination."
   apijs_example: "Example %{v}"
@@ -15,7 +14,6 @@ uk:
   apijs_example2_link: "Вебсайт: %{v}"
   apijs_config_sort_order: "Sort files alphabetically"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) Edit files description"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Remove files"

data/config/locales/zh.yml

@@ -6,7 +6,6 @@ zh:
   apijs_title_download: "下载（%{v}）"
   apijs_title_files: "文件列表"
   apijs_config_apijs: "一般"
-  apijs_config_enable: "启用 apijs"
   apijs_example1_title: "PHP手册"
   apijs_example1_text: "值得注意的是，邮件发送完成并不意味着邮件将实际到达预定的目的地。"
   apijs_example: "Example %{v}"
@@ -15,7 +14,6 @@ zh:
   apijs_example2_link: "网站：%{v}"
   apijs_config_sort_order: "按字母顺序排序文件"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
   permission_edit_attachments: "(apijs) 编辑文件说明"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) 删除文件"

data/config/routes.rb

@@ -2,7 +2,7 @@
 # Created J/12/12/2013
 # Updated S/16/01/2021
 #
-# Copyright 2008-2023 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2025 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://github.com/luigifab/redmine-apijs
 #
 # This program is free software, you can redistribute it or modify

data/init.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 # Created L/21/05/2012
-# Updated L/24/04/2023
+# Updated D/09/03/2025
 #
-# Copyright 2008-2023 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2025 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://github.com/luigifab/redmine-apijs
 #
 # This program is free software, you can redistribute it or modify
@@ -46,7 +46,7 @@ Redmine::Plugin.register :redmine_apijs do
   name 'Redmine Apijs plugin'
   author 'Fabrice Creuzot'
   description 'Integrate the apijs JavaScript library into Redmine. Provides a gallery for image and video attachments.'
-  version '6.9.5-gem'
+  version '6.9.7-gem'
   url 'https://www.luigifab.fr/redmine/apijs'
   author_url 'https://www.luigifab.fr/'
 

data/lib/apijs_attachment.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 # Created V/27/12/2013
-# Updated V/02/09/2022
+# Updated M/11/03/2025
 #
-# Copyright 2008-2023 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2025 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://github.com/luigifab/redmine-apijs
 #
 # This program is free software, you can redistribute it or modify
@@ -20,7 +20,9 @@ module ApijsAttachment
   def self.included(base)
     base.send(:include, InstanceMethods)
     base.class_eval do
-      unloadable
+      if Rails::VERSION::MAJOR < 7
+        unloadable
+      end
       if Rails::VERSION::MAJOR >= 3
         include Rails.application.routes.url_helpers
         before_create :update_date

data/lib/apijs_files.rb

@@ -2,7 +2,7 @@
 # Created L/21/05/2012
 # Updated D/03/05/2020
 #
-# Copyright 2008-2023 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2025 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://github.com/luigifab/redmine-apijs
 #
 # This program is free software, you can redistribute it or modify

data/lib/image.py

@@ -1,9 +1,9 @@
 #!/usr/bin/python3
 # -*- coding: utf8 -*-
 # Created J/26/12/2013
-# Updated J/05/10/2023
+# Updated J/19/10/2023
 #
-# Copyright 2008-2023 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2025 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # Copyright 2020-2023 | Fabrice Creuzot <fabrice~cellublue~com>
 # https://github.com/luigifab/redmine-apijs https://github.com/luigifab/openmage-apijs
 #
@@ -30,7 +30,7 @@ except:
 	print('source: all supported format by python-pil (including animated gif/png/webp),')
 	print('     or all supported format by ffmpegthumbnailer,')
 	print('     or svg')
-	print('destination: jpg,gif,png,webp or svg')
+	print('destination: jpg,png,gif,webp or svg')
 	exit(-1)
 
 # https://stackoverflow.com/a/273227/2980105
@@ -44,7 +44,7 @@ if os.path.isfile(fileout):
 os.close(os.open(fileout, os.O_CREAT))
 
 
-# tools
+# Tools
 def versionTuple(v):
 	return tuple(map(int, (v.split('.'))))
 
@@ -260,104 +260,113 @@ def saveJpg(dest, fileout, quality):
 	dest.convert('RGB').save(fileout, 'JPEG', optimize=True, subsampling=0, quality=quality)
 
 
-# python-scour
-if '.svg' in fileout:
-	from scour.scour import sanitizeOptions, start
-	options = sanitizeOptions()
-	options.strip_xml_prolog = True # --strip-xml-prolog
-	options.remove_metadata = True  # --remove-metadata
-	options.strip_comments = True   # --enable-comment-stripping
-	options.strip_ids = True        # --enable-id-stripping
-	options.indent_type = None      # --indent=none
-	start(options, open(filein, 'rb'), open(fileout, 'wb'))
-# python-pil
-else:
-	from PIL import Image, ImageSequence
-
-	if '.ogv' in filein or '.webm' in filein or '.mp4' in filein:
-		# from video
-		source = videoToImage(filein, fileout, size)
-		imgext = 'VIDEO'
-	else:
-		# from image
-		source = Image.open(filein)
-		imgext = source.format
-		size   = calcSize(source, size)
-
-	# filein = fileout = /tmp/phpA5kbkc  when replace tmp image with re-sampled copy to exclude images with malicious data
-	# @todo for animated GIF to animated GIF (or PNG), sadly, result file is not optimized, the idea is to reprocess the file to not replace each frames by another one
-	# for my test image, https://github.com/kohler/gifsicle, don't do it, but https://kraken.io/web-interface do it
-	if   imgext == 'GIF'  and (same or '.gif'  in fileout):
-		dest = resizeAnimatedGif(source, size, fixed)
-		saveGif(dest, fileout, quality)
-	elif imgext == 'GIF'  and (        '.png'  in fileout): # @todo
-		dest = resizeAnimatedGif(source, size, fixed)
-		savePng(dest, fileout, quality)
-	elif imgext == 'GIF'  and (        '.webp' in fileout):
-		dest = resizeAnimatedGif(source, size, fixed)
-		saveWebp(dest, fileout, quality)
-	elif imgext == 'PNG'  and (same or '.png'  in fileout):
-		dest = resizeAnimatedPng(source, size, fixed)
-		savePng(dest, fileout, quality)
-	elif imgext == 'PNG'  and (        '.gif'  in fileout):
-		dest = resizeAnimatedPng(source, size, fixed)
-		saveGif(dest, fileout, quality)
-	elif imgext == 'PNG'  and (        '.webp' in fileout):
-		dest = resizeAnimatedPng(source, size, fixed)
-		saveWebp(dest, fileout, quality)
-	elif imgext == 'WEBP' and (same or '.webp' in fileout):
-		dest = resizeAnimatedWebp(source, size, fixed)
-		saveWebp(dest, fileout, quality)
+# action
+# drop fileout on error (and filein if same)
+try:
+	# python-scour
+	if '.svg' in fileout:
+		from scour.scour import sanitizeOptions, start
+		options = sanitizeOptions()
+		options.strip_xml_prolog = True # --strip-xml-prolog
+		options.remove_metadata = True  # --remove-metadata
+		options.strip_comments = True   # --enable-comment-stripping
+		options.strip_ids = True        # --enable-id-stripping
+		options.indent_type = None      # --indent=none
+		start(options, open(filein, 'rb'), open(fileout, 'wb'))
+	# python-pil
 	else:
-		if imgext == 'VIDEO':
-			# from video
-			offset_x = max(int((size[0] - source.size[0]) / 2), 0)
-			offset_y = max(int((size[1] - source.size[1]) / 2), 0)
-			# Color detection
-			# white background black player OR black background white player
-			pixels = source.getcolors(size[0] * size[1])
-			pixels = sorted(pixels, key=lambda t: t[0])
-			if (pixels[-1][1] > (127,127,127)):
-				dest = Image.new('RGBA', size, (255,255,255,0))
-				dest.paste(source, (offset_x, offset_y))
-				# https://stackoverflow.com/a/59082116 (replace only last lib)
-				# /var/lib/gems/xyz/gems/redmine_apijs-xyz/lib » /var/lib/gems/xyz/gems/redmine_apijs-xyz/assets/images/...
-				path = os.path.dirname(__file__)
-				path = ('/assets/images/apijs/player-black-' + str(size[0]) + '.png').join(path.rsplit('/lib', 1))
-				play = Image.open(path)
-				dest.paste(play, (0, 0), play)
-			else:
-				dest = Image.new('RGBA', size, (0,0,0,0))
-				dest.paste(source, (offset_x, offset_y))
-				# https://stackoverflow.com/a/59082116 (replace only last lib)
-				# /var/lib/gems/xyz/gems/redmine_apijs-xyz/lib » /var/lib/gems/xyz/gems/redmine_apijs-xyz/assets/images/...
-				path = os.path.dirname(__file__)
-				path = ('/assets/images/apijs/player-white-' + str(size[0]) + '.png').join(path.rsplit('/lib', 1))
-				play = Image.open(path)
-				dest.paste(play, (0, 0), play)
+		from PIL import Image, ImageSequence
+
+		# from video or image
+		if '.ogv' in filein or '.webm' in filein or '.mp4' in filein:
+			source = videoToImage(filein, fileout, size)
+			imgext = 'VIDEO'
 		else:
-			# from image
-			# Auto rotate image
-			# https://github.com/python-pillow/Pillow/commit/1ba774ae7faf93355b85c7b005fbaf0b0e66d426
-			if hasattr(Image, '__version__') and versionTuple(Image.__version__) >= (6,0,0) and source.getexif().get(0x0112):
-				from PIL import ImageOps
-				source = ImageOps.exif_transpose(source)
-			# create thumbnail
-			dest = createThumb(source, size, fixed, True)
-
-		if hasTransparency(source) is False:
-			dest = dest.convert('RGB')
-
-		if   '.gif'  in fileout or (same and imgext == 'GIF'):
+			source = Image.open(filein)
+			imgext = source.format
+			size   = calcSize(source, size)
+
+		# filein = fileout = /tmp/phpA5kbkc  when replace tmp image with re-sampled copy to exclude images with malicious data
+		# @todo for animated GIF to animated GIF (or PNG), sadly, result file is not optimized, the idea is to reprocess the file to not replace each frames by another one
+		# for my test image, https://github.com/kohler/gifsicle, don't do it, but https://kraken.io/web-interface do it
+		if   imgext == 'GIF'  and (same or '.gif'  in fileout):
+			dest = resizeAnimatedGif(source, size, fixed)
 			saveGif(dest, fileout, quality)
-		elif '.png'  in fileout or (same and imgext == 'PNG'):
+		elif imgext == 'GIF'  and (        '.png'  in fileout): # @todo
+			dest = resizeAnimatedGif(source, size, fixed)
 			savePng(dest, fileout, quality)
-		elif '.webp' in fileout or (same and imgext == 'WEBP'):
+		elif imgext == 'GIF'  and (        '.webp' in fileout):
+			dest = resizeAnimatedGif(source, size, fixed)
+			saveWebp(dest, fileout, quality)
+		elif imgext == 'PNG'  and (same or '.png'  in fileout):
+			dest = resizeAnimatedPng(source, size, fixed)
+			savePng(dest, fileout, quality)
+		elif imgext == 'PNG'  and (        '.gif'  in fileout):
+			dest = resizeAnimatedPng(source, size, fixed)
+			saveGif(dest, fileout, quality)
+		elif imgext == 'PNG'  and (        '.webp' in fileout):
+			dest = resizeAnimatedPng(source, size, fixed)
+			saveWebp(dest, fileout, quality)
+		elif imgext == 'WEBP' and (same or '.webp' in fileout):
+			dest = resizeAnimatedWebp(source, size, fixed)
 			saveWebp(dest, fileout, quality)
 		else:
-			saveJpg(dest, fileout, quality)
+			if imgext == 'VIDEO':
+				# from video
+				offset_x = max(int((size[0] - source.size[0]) / 2), 0)
+				offset_y = max(int((size[1] - source.size[1]) / 2), 0)
+				# Color detection
+				# white background black player OR black background white player
+				pixels = source.getcolors(size[0] * size[1])
+				pixels = sorted(pixels, key=lambda t: t[0])
+				if (pixels[-1][1] > (127,127,127)):
+					dest = Image.new('RGBA', size, (255,255,255,0))
+					dest.paste(source, (offset_x, offset_y))
+					# https://stackoverflow.com/a/59082116 (replace only last lib)
+					# /var/lib/gems/xyz/gems/redmine_apijs-xyz/lib » /var/lib/gems/xyz/gems/redmine_apijs-xyz/assets/images/...
+					path = os.path.dirname(__file__)
+					path = ('/assets/images/apijs/player-black-' + str(size[0]) + '.png').join(path.rsplit('/lib', 1))
+					play = Image.open(path)
+					dest.paste(play, (0, 0), play)
+				else:
+					dest = Image.new('RGBA', size, (0,0,0,0))
+					dest.paste(source, (offset_x, offset_y))
+					# https://stackoverflow.com/a/59082116 (replace only last lib)
+					# /var/lib/gems/xyz/gems/redmine_apijs-xyz/lib » /var/lib/gems/xyz/gems/redmine_apijs-xyz/assets/images/...
+					path = os.path.dirname(__file__)
+					path = ('/assets/images/apijs/player-white-' + str(size[0]) + '.png').join(path.rsplit('/lib', 1))
+					play = Image.open(path)
+					dest.paste(play, (0, 0), play)
+			else:
+				# from image
+				# Auto rotate image
+				# https://github.com/python-pillow/Pillow/commit/1ba774ae7faf93355b85c7b005fbaf0b0e66d426
+				if hasattr(Image, '__version__') and versionTuple(Image.__version__) >= (6,0,0) and source.getexif().get(0x0112):
+					from PIL import ImageOps
+					source = ImageOps.exif_transpose(source)
+				# create thumbnail
+				dest = createThumb(source, size, fixed, True)
+
+			if hasTransparency(source) is False:
+				dest = dest.convert('RGB')
+
+			if   '.gif'  in fileout or (same and imgext == 'GIF'):
+				saveGif(dest, fileout, quality)
+			elif '.png'  in fileout or (same and imgext == 'PNG'):
+				savePng(dest, fileout, quality)
+			elif '.webp' in fileout or (same and imgext == 'WEBP'):
+				saveWebp(dest, fileout, quality)
+			else:
+				saveJpg(dest, fileout, quality)
 
-if os.path.isfile(fileout):
-	os.rename(fileout, fileout.replace('.save', ''))
+	if os.path.isfile(fileout):
+		os.rename(fileout, fileout.replace('.save', ''))
+
+	exit(0)
+except Exception as e:
+	if same and os.path.isfile(filein):
+		os.remove(filein)
+	if os.path.isfile(fileout):
+		os.remove(fileout)
+	raise e
 
-exit(0)

data/lib/redmine_apijs.rb

@@ -2,7 +2,7 @@
 # Created L/13/07/2020
 # Updated V/05/08/2022
 #
-# Copyright 2008-2023 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2025 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://github.com/luigifab/redmine-apijs
 #
 # This program is free software, you can redistribute it or modify