redmine_apijs 6.5.0 → 6.6.0

data/config/locales/es.yml

@@ -1,5 +1,6 @@
 es:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "Se borró la memoria caché de la imagen."
   apijs_browser_warning: "<strong>Atención:</strong> su navegador <strong>%{n} %{v}</strong> es obsoleto, por favor <a %{l}>actualice su navegador</a>."
   apijs_title_album: "Galería de fotográfias"
   apijs_title_download: "Descargar (%{v})"
@@ -14,11 +15,12 @@ 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 31+, Opera 19+, Edge 16+, Safari 9+ (verifica incluso si el apijs esta desactivado)."
+  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"
   apijs_config_directories: "Tamaño de las carpetas"
+  apijs_config_clearcache: "vaciar la caché"
   apijs_config_album: "Álbumes de fotografías"
   apijs_config_show_album: "Mostrar los álbumes"
   apijs_config_show_album_infos: "Mostrar todas las informaciones"

data/config/locales/fr.yml

@@ -1,5 +1,6 @@
 fr:
   apijs_check_extension: "L'extension du fichier ne peut pas être modifiée."
+  apijs_clearcache_done: "Le cache des images a été nettoyé."
   apijs_browser_warning: "<strong>Attention :</strong> votre navigateur <strong>%{n} %{v}</strong> n'est plus à jour, veuillez <a %{l}>mettre à jour votre navigateur</a>."
   apijs_title_album: "Galerie photos"
   apijs_title_download: "Télécharger (%{v})"
@@ -14,11 +15,12 @@ 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 31+, Opera 19+, Edge 16+, Safari 9+ (vérifie même si l'apijs est désactivé)."
+  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"
   apijs_config_directories: "Taille des dossiers"
+  apijs_config_clearcache: "vider le cache"
   apijs_config_album: "Albums photos"
   apijs_config_show_album: "Afficher les albums"
   apijs_config_show_album_infos: "Afficher toutes les informations"

data/config/locales/it.yml

@@ -1,5 +1,6 @@
 it:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "La cache delle immagini è stata pulita."
   apijs_browser_warning: "<strong>Attenzione:</strong> il vostro browser <strong>%{n} %{v}</strong> è obsoleto, vi preghiamo di <a %{l}>aggiornare il vostro browser</a>."
   apijs_title_album: "Galleria fotografica"
   apijs_title_download: "Scaricare (%{v})"
@@ -14,11 +15,12 @@ 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 31+, Opera 19+, Edge 16+, Safari 9+ (verificare se l'apijs é disattivato)."
+  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"
   apijs_config_directories: "Dimensione file"
+  apijs_config_clearcache: "clear cache"
   apijs_config_album: "Album fotografico"
   apijs_config_show_album: "Visualizzare l'album"
   apijs_config_show_album_infos: "Visualizzare tutte le informazioni"

data/config/locales/ja.yml

@@ -1,5 +1,6 @@
 ja:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "The image cache was cleaned."
   apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
   apijs_title_album: "Photo gallery"
   apijs_title_download: "ダウンロード（%{v}）"
@@ -14,11 +15,12 @@ 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 31+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
+  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"
   apijs_config_directories: "Directories size"
+  apijs_config_clearcache: "clear cache"
   apijs_config_album: "Photo albums"
   apijs_config_show_album: "Display albums"
   apijs_config_show_album_infos: "Display all information"

data/config/locales/nl.yml

@@ -1,5 +1,6 @@
 nl:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "The image cache was cleaned."
   apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
   apijs_title_album: "Photo gallery"
   apijs_title_download: "Download (%{v})"
@@ -14,11 +15,12 @@ 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 31+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
+  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"
   apijs_config_directories: "Directories size"
+  apijs_config_clearcache: "clear cache"
   apijs_config_album: "Photo albums"
   apijs_config_show_album: "Display albums"
   apijs_config_show_album_infos: "Display all information"

data/config/locales/pl.yml

@@ -1,5 +1,6 @@
 pl:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "The image cache was cleaned."
   apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
   apijs_title_album: "Photo gallery"
   apijs_title_download: "Pobierz (%{v})"
@@ -14,11 +15,12 @@ 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 31+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
+  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"
   apijs_config_directories: "Directories size"
+  apijs_config_clearcache: "clear cache"
   apijs_config_album: "Photo albums"
   apijs_config_show_album: "Display albums"
   apijs_config_show_album_infos: "Display all information"

data/config/locales/pt-BR.yml

@@ -1,5 +1,6 @@
 pt-BR:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "A cache de imagem foi limpa."
   apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
   apijs_title_album: "Photo gallery"
   apijs_title_download: "Baixar (%{v})"
@@ -14,11 +15,12 @@ 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 31+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
+  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"
   apijs_config_directories: "Directories size"
+  apijs_config_clearcache: "clear cache"
   apijs_config_album: "Photo albums"
   apijs_config_show_album: "Display albums"
   apijs_config_show_album_infos: "Display all information"

data/config/locales/pt.yml

@@ -1,5 +1,6 @@
 pt:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "The image cache was cleaned."
   apijs_browser_warning: "<strong>Cuidado:</strong> o seu navegador <strong>%{n} %{v}</strong> está desatualizado, por favor <a %{l}>atualize o seu navegador</a>."
   apijs_title_album: "Galeria de fotos"
   apijs_title_download: "Descarregar (%{v})"
@@ -14,11 +15,12 @@ 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 31+, Opera 19+, Edge 16+, Safari 9+ (verifica mesmo que apijs esteja desativado)."
+  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"
   apijs_config_directories: "Tamanho dos diretórios"
+  apijs_config_clearcache: "clear cache"
   apijs_config_album: "Álbuns de fotos"
   apijs_config_show_album: "Afixar os álbuns"
   apijs_config_show_album_infos: "Afixar todas as informações"

data/config/locales/ru.yml

@@ -1,5 +1,6 @@
 ru:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "The image cache was cleaned."
   apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
   apijs_title_album: "Фото галлерея"
   apijs_title_download: "Скачать (%{v})"
@@ -14,11 +15,12 @@ ru:
   apijs_example2_link: "Вебсайт: %{v}"
   apijs_config_sort_order: "Сортировать файлы в алфавитном порядке"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 31+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
+  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) Удалить файлы"
   apijs_config_directories: "Directories size"
+  apijs_config_clearcache: "clear cache"
   apijs_config_album: "Фото альбомы"
   apijs_config_show_album: "Отображать фото альбомы"
   apijs_config_show_album_infos: "Display all information"

data/config/locales/sk.yml

@@ -1,5 +1,6 @@
 sk:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "The image cache was cleaned."
   apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
   apijs_title_album: "Photo gallery"
   apijs_title_download: "Prevziať (%{v})"
@@ -14,11 +15,12 @@ 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 31+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
+  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"
   apijs_config_directories: "Directories size"
+  apijs_config_clearcache: "clear cache"
   apijs_config_album: "Photo albums"
   apijs_config_show_album: "Display albums"
   apijs_config_show_album_infos: "Display all information"

data/config/locales/tr.yml

@@ -1,5 +1,6 @@
 tr:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "The image cache was cleaned."
   apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
   apijs_title_album: "Fotoğraf Galerisi"
   apijs_title_download: "İndir (%{v})"
@@ -14,11 +15,12 @@ tr:
   apijs_example2_link: "Web sitesi : %{v}"
   apijs_config_sort_order: "Eklentileri alfabetik olarak sırala"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 31+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
+  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) Eklenti açıklamalarını düzenle"
   permission_rename_attachments: "(apijs) Rename files"
   permission_delete_attachments: "(apijs) Eklenti Sil"
   apijs_config_directories: "Directories size"
+  apijs_config_clearcache: "clear cache"
   apijs_config_album: "Fotoğraf Albümü"
   apijs_config_show_album: "Fotoğraf albümünü görüntüle"
   apijs_config_show_album_infos: "Display all information"

data/config/locales/uk.yml

@@ -0,0 +1,34 @@
+uk:
+  apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "The image cache was cleaned."
+  apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
+  apijs_title_album: "Photo gallery"
+  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}"
+  apijs_example2_title: "Surprise!"
+  apijs_example2_text: "You are watching this video without proprietary extension thanks to the new [em]video[/em] tag included in the [strong]HTML 5[/strong] language."
+  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"
+  apijs_config_directories: "Directories size"
+  apijs_config_clearcache: "clear cache"
+  apijs_config_album: "Photo albums"
+  apijs_config_show_album: "Display albums"
+  apijs_config_show_album_infos: "Display all information"
+  apijs_config_show_filename: "Display the name in the slide show"
+  apijs_config_show_exifdate: "Display the date in the slide show"
+  apijs_config_mimetypes: "Use the following files"
+  apijs_config_album_exclude_name: "Exclude photos from album<br />whose name begins with"
+  apijs_config_album_exclude_desc: "Exclude photos from album<br />whose description begins with"
+  apijs_config_create_all: "Generate the three images"
+  apijs_config_create_all_info: "Generates thumbnails and image preview at the same time, it slows the first display, but accelerates the first display of the slide show."
+  apijs_config_programs: "Programs version"

data/config/locales/zh.yml

@@ -1,5 +1,6 @@
 zh:
   apijs_check_extension: "The file extension can not be changed."
+  apijs_clearcache_done: "The image cache was cleaned."
   apijs_browser_warning: "<strong>Warning:</strong> your browser <strong>%{n} %{v}</strong> is outdated, please <a %{l}>upgrade your browser</a>."
   apijs_title_album: "照片库"
   apijs_title_download: "下载（%{v}）"
@@ -14,11 +15,12 @@ zh:
   apijs_example2_link: "网站：%{v}"
   apijs_config_sort_order: "按字母顺序排序文件"
   apijs_config_browser: "Check browser version"
-  apijs_config_browser_help: "Firefox 36+, Chrome 31+, Opera 19+, Edge 16+, Safari 9+ (checks even if the apijs is disabled)."
+  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) 删除文件"
   apijs_config_directories: "Directories size"
+  apijs_config_clearcache: "clear cache"
   apijs_config_album: "相册"
   apijs_config_show_album: "显示相册"
   apijs_config_show_album_infos: "显示所有信息"

data/config/routes.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 # Created J/12/12/2013
-# Updated J/20/08/2020
+# Updated S/16/01/2021
 #
-# Copyright 2008-2020 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2021 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://www.luigifab.fr/redmine/apijs
 #
 # This program is free software, you can redistribute it or modify
@@ -44,6 +44,9 @@ if Redmine::VERSION::MAJOR >= 2
 
     match 'apijs/delete', to: 'apijs#delete',
       via: :post
+
+    match 'apijs/clearcache', to: 'apijs#clearcache',
+      via: :get
   end
 else
   ActionController::Routing::Routes.draw do |map|
@@ -89,5 +92,9 @@ else
     map.connect 'apijs/delete',
       controller: 'apijs', action: 'delete',
       conditions: {method: :post}
+
+    map.connect 'apijs/clearcache',
+      controller: 'apijs', action: 'clearcache',
+      conditions: {method: :get}
   end
 end

data/init.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 # Created L/21/05/2012
-# Updated S/10/10/2020
+# Updated S/12/12/2020
 #
-# Copyright 2008-2020 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2021 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://www.luigifab.fr/redmine/apijs
 #
 # This program is free software, you can redistribute it or modify
@@ -26,7 +26,7 @@ Redmine::Plugin.register :redmine_apijs do
   name 'Redmine Apijs plugin'
   author 'Fabrice Creuzot'
   description 'Integrate the apijs javascript library into Redmine.'
-  version '6.5.0-gem'
+  version '6.6.0-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 S/07/11/2020
+# Updated J/18/02/2021
 #
-# Copyright 2008-2020 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2021 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://www.luigifab.fr/redmine/apijs
 #
 # This program is free software, you can redistribute it or modify
@@ -90,9 +90,9 @@ module ApijsAttachment
 
     def getShowButton(setting_show_filename, setting_show_exifdate, description)
       if self.isImage?
-        return "apijs.dialog.dialogPhoto('" + self.getShowUrl + "', '" + ((setting_show_filename) ? self.filename : 'false') + "', '" + ((setting_show_exifdate) ? format_time(self.created_on) : 'false') + "', '" + description + "');"
+        return "apijs.dialog.dialogPhoto('" + self.getShowUrl + "', '" + (setting_show_filename ? self.filename : 'false') + "', '" + (setting_show_exifdate ? format_time(self.created_on) : 'false') + "', '" + description + "');"
       elsif self.isVideo?
-        return "apijs.dialog.dialogVideo('" + self.getDownloadUrl + "', '" + ((setting_show_filename) ? self.filename : 'false') + "', '" + ((setting_show_exifdate) ? format_time(self.created_on) : 'false') + "', '" + description + "');"
+        return "apijs.dialog.dialogVideo('" + self.getDownloadUrl + "', '" + (setting_show_filename ? self.filename : 'false') + "', '" + (setting_show_exifdate ? format_time(self.created_on) : 'false') + "', '" + description + "');"
       elsif self.is_text?
         return "self.location.href = '" + self.getUrl('redmineshow', false) + "';"
       end
@@ -280,13 +280,16 @@ module ApijsAttachment
         pil = pyt
         sco = pyt
       else
-        pyt = `#{cmd} --version 2>&1`.gsub('Python ', '').strip!
+        pyt = `#{cmd} --version 2>&1`.gsub('Python', '').strip!
+        pyt = pyt.split(/\D/).slice(0, 3).join('.')
 
         pil = `#{cmd} -c "from PIL import Image; print(Image.__version__)" 2>&1`.strip!
         if pil.include? "o module named"
           pil = 'not available'
         elsif pil.include? "__version__"
           pil = 'available'
+        else
+          pil = pil.split(/\D/).slice(0, 3).join('.')
         end
 
         sco = `#{cmd} -c "import scour; print(scour.__version__)" 2>&1`.strip!
@@ -294,6 +297,8 @@ module ApijsAttachment
           sco = 'not available'
         elsif sco.include? "__version__"
           sco = 'available'
+        else
+          sco = sco.split(/\D/).slice(0, 3).join('.')
         end
       end
 

data/lib/apijs_const.rb

@@ -2,7 +2,7 @@
 # Created L/01/09/2014
 # Updated J/23/07/2020
 #
-# Copyright 2008-2020 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2021 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
 # https://www.luigifab.fr/redmine/apijs
 #
 # This program is free software, you can redistribute it or modify

data/lib/apijs_files.rb

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

data/lib/image.py

@@ -1,9 +1,10 @@
 #!/usr/bin/python3
 # -*- coding: utf8 -*-
 # Created J/26/12/2013
-# Updated S/07/11/2020
+# Updated J/18/02/2021
 #
-# Copyright 2008-2020 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2008-2021 | Fabrice Creuzot (luigifab) <code~luigifab~fr>
+# Copyright 2020-2021 | Fabrice Creuzot <fabrice~cellublue~com>
 # https://www.luigifab.fr/openmage/apijs
 #
 # This program is free software, you can redistribute it or modify
@@ -18,7 +19,6 @@
 
 import os
 import sys
-from PIL import Image, ImageSequence
 
 try:
 	filein  = str(sys.argv[1])
@@ -35,166 +35,209 @@ except:
 if not os.path.exists(os.path.dirname(fileout)):
 	os.makedirs(os.path.dirname(fileout))
 
-# 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'))
-	exit(0)
 
-# python-pil
-source = Image.open(filein)
-if size[1] == 0 and size[0] == 0:
-	size = (source.size[0], source.size[1])
-elif size[1] == 0:
-	size = (size[0], int(size[0] / (source.size[0] / source.size[1])))
-elif size[0] == 0:
-	size = (int(size[1] * (source.size[0] / source.size[1])), size[1])
-
-# (Animated) PNG resizing (since PIL 7.1.0)
+def versiontuple(v):
+	return tuple(map(int, (v.split('.'))))
+
+def calcsize(source, size):
+
+	if size[1] == 0 and size[0] == 0:
+		return source.size
+	if size[1] == 0:
+		return (size[0], int(size[0] / (source.size[0] / source.size[1])))
+	if size[0] == 0:
+		return (int(size[1] * (source.size[0] / source.size[1])), size[1])
+
+	return size
+
+def createthumb(source, size, fixed, new=False):
+
+	# https://pillow.readthedocs.io/en/latest/reference/Image.html#PIL.Image.Image.thumbnail
+	# https://pillow.readthedocs.io/en/latest/handbook/concepts.html#filters-comparison-table
+	# https://pillow.readthedocs.io/en/latest/reference/Image.html#PIL.Image.Image.paste
+	if hasattr(Image, '__version__') and versiontuple(Image.__version__) > (7,0,0):
+		source.thumbnail(size, Image.LANCZOS, 4)
+	else:
+		source.thumbnail(size, Image.ANTIALIAS)
+
+	if fixed:
+		offset_x = max(int((size[0] - source.size[0]) / 2), 0)
+		offset_y = max(int((size[1] - source.size[1]) / 2), 0)
+		dest = Image.new('RGBA', size, (255,255,255,1))
+		dest.paste(source, (offset_x, offset_y))
+	elif new:
+		if (source.size < size):
+			dest = Image.new('RGBA', source.size, (255,255,255,1))
+			dest.paste(source)
+		else:
+			dest = Image.new('RGBA', size, (255,255,255,1))
+			dest.paste(source)
+	else:
+		dest = source
+
+	return dest
+
+
+# Animated resizing
 # based on https://stackoverflow.com/a/41827681/2980105
-if source.format == 'PNG' and ".png" in fileout:
+def resizeAnimatedGif(source, size, fixed):
+
+	# Animated GIF resizing
+	# https://pillow.readthedocs.io/en/latest/handbook/image-file-formats.html#gif
+	colors = source.getpalette()
+	dest = []
 
-	frames = []
 	try:
 		while True:
-			new_frame = Image.new('RGBA', source.size, (255,255,255,1))
-			new_frame.paste(source, (0,0), source.convert('RGBA'))
-			new_frame.thumbnail(size, Image.ANTIALIAS)
-
-			if fixed:
-				offset_x = int(max((size[0] - new_frame.size[0]) / 2, 0))
-				offset_y = int(max((size[1] - new_frame.size[1]) / 2, 0))
-				final_frame = Image.new('RGBA', size, (255,255,255,1))
-				final_frame.paste(new_frame, (offset_x, offset_y))
-				frames.append(final_frame)
-			else:
-				frames.append(new_frame)
-
-			b = source.tell()
-			source.seek(b + 1)
-			if b == source.tell():
+			# If the GIF uses local colour tables, each frame will have its own palette.
+			# If not, we need to apply the global palette to the new frame.
+			if not source.getpalette():
+				source.putpalette(colors)
+
+			frame = Image.new('RGBA', source.size, (255,255,255,1))
+			frame.paste(source, (0,0), source.convert('RGBA'))
+			dest.append(createthumb(frame, size, fixed))
+
+			idx = source.tell()
+			source.seek(idx + 1)
+			if idx == source.tell():
 				break
 	except EOFError:
 		pass
-# Animated GIF resizing
-# based on https://stackoverflow.com/a/41827681/2980105
-elif source.format == 'GIF' and source.is_animated and ".gif" in fileout:
 
-	p = source.getpalette()
-	frames = []
+	return dest
+
+def resizeAnimatedPng(source, size, fixed):
+
+	# Animated PNG resizing (since PIL 7.1.0)
+	# https://pillow.readthedocs.io/en/latest/handbook/image-file-formats.html#apng-sequences
+	dest = []
+
 	try:
 		while True:
-			# If the GIF uses local colour tables, each frame will have its own palette.
-			# If not, we need to apply the global palette to the new frame.
-			if not source.getpalette():
-				source.putpalette(p)
-
-			new_frame = Image.new('RGBA', source.size, (255,255,255,1))
-			new_frame.paste(source, (0,0), source.convert('RGBA'))
-			new_frame.thumbnail(size, Image.ANTIALIAS)
-
-			if fixed:
-				offset_x = int(max((size[0] - new_frame.size[0]) / 2, 0))
-				offset_y = int(max((size[1] - new_frame.size[1]) / 2, 0))
-				final_frame = Image.new('RGBA', size, (255,255,255,1))
-				final_frame.paste(new_frame, (offset_x, offset_y))
-				frames.append(final_frame)
-			else:
-				frames.append(new_frame)
-
-			b = source.tell()
-			source.seek(b + 1)
-			if b == source.tell():
+			frame = Image.new('RGBA', source.size, (255,255,255,1))
+			frame.paste(source, (0,0), source.convert('RGBA'))
+			dest.append(createthumb(frame, size, fixed))
+
+			idx = source.tell()
+			source.seek(idx + 1)
+			if idx == source.tell():
 				break
 	except EOFError:
 		pass
-# Animated WEBP resizing (since PIL 5.0.0)
-# based on https://stackoverflow.com/a/41827681/2980105
-elif source.format == 'WEBP' and ".webp" in fileout:
 
-	frames = []
+	return dest
+
+def resizeAnimatedWebp(source, size, fixed):
+
+	# Animated WEBP resizing (since PIL 5.0.0)
+	# https://pillow.readthedocs.io/en/latest/handbook/image-file-formats.html#webp
+	dest = []
+
 	try:
 		while True:
-			new_frame = Image.new('RGBA', source.size, (255,255,255,1))
-			new_frame.paste(source, (0,0), source.convert('RGBA'))
-			new_frame.thumbnail(size, Image.ANTIALIAS)
-
-			if fixed:
-				offset_x = int(max((size[0] - new_frame.size[0]) / 2, 0))
-				offset_y = int(max((size[1] - new_frame.size[1]) / 2, 0))
-				final_frame = Image.new('RGBA', size, (255,255,255,1))
-				final_frame.paste(new_frame, (offset_x, offset_y))
-				frames.append(final_frame)
-			else:
-				frames.append(new_frame)
-
-			b = source.tell()
-			source.seek(b + 1)
-			if b == source.tell():
+			frame = Image.new('RGBA', source.size, (255,255,255,1))
+			frame.paste(source, (0,0), source.convert('RGBA'))
+			dest.append(createthumb(frame, size, fixed))
+
+			idx = source.tell()
+			source.seek(idx + 1)
+			if idx == source.tell():
 				break
 	except EOFError:
 		pass
-# Standard resizing
-elif fixed:
-	source.thumbnail(size, Image.ANTIALIAS)
-	offset_x = int(max((size[0] - source.size[0]) / 2, 0))
-	offset_y = int(max((size[1] - source.size[1]) / 2, 0))
-	dest = Image.new('RGBA', size, (255,255,255,1))
-	dest.paste(source, (offset_x, offset_y))
-else:
-	source.thumbnail(size, Image.ANTIALIAS)
-	dest = Image.new('RGBA', (source.size[0], source.size[1]), (255,255,255,1))
-	dest.paste(source)
 
+	return dest
+
+
+# File saving
 # https://pillow.readthedocs.io/en/latest/handbook/image-file-formats.html
-# source.info.get('loop')=None
-if ".png" in fileout:
+# todo: source.info.get('loop')=None
+def saveGif(dest, fileout, quality):
+
+	try:
+		if len(dest) == 1:
+			dest[0].save(fileout, 'GIF', optimize=True)
+		else:
+			dest[0].save(fileout, 'GIF', optimize=True, save_all=True, append_images=dest[1:],
+				loop=0, duration=source.info.get('duration'), default_image=source.info.get('default_image'))
+	except:
+		dest.save(fileout, 'GIF', optimize=True)
+
+def savePng(dest, fileout, quality):
+
 	# The image quality, on a scale from 0 (best-speed) to 9 (best-compression), the default is 6
 	# but when optimize option is True compress_level has no effect
+	if quality < 1:
+		quality = 6
+	elif quality > 9:
+		quality = 9
+
 	try:
-		if len(frames) == 1:
-			frames[0].save(fileout, 'PNG', optimize=True, compress_level=9)
+		if len(dest) == 1:
+			dest[0].save(fileout, 'PNG', optimize=True, compress_level=9)
 		else:
-			frames[0].save(fileout, 'PNG', optimize=True, compress_level=9, save_all=True, append_images=frames[1:],
+			dest[0].save(fileout, 'PNG', optimize=True, compress_level=9, save_all=True, append_images=dest[1:],
 				loop=0, duration=source.info.get('duration'))
 	except:
 		dest.save(fileout, 'PNG', optimize=True, compress_level=9)
-elif ".gif" in fileout:
-	try:
-		if len(frames) == 1:
-			frames[0].save(fileout, 'GIF', optimize=True)
-		else:
-			frames[0].save(fileout, 'GIF', optimize=True, save_all=True, append_images=frames[1:],
-				loop=0, duration=source.info.get('duration'), default_image=source.info.get('default_image'))
-	except:
-		dest.save(fileout, 'GIF', optimize=True)
-elif ".webp" in fileout:
+
+def saveWebp(dest, fileout, quality):
+
 	# The image quality, on a scale from 0 (worst) to 100 (best), the default is 80 (lossy, 0 gives the smallest size and 100 the largest)
 	# The method, on a scale from 0 (fast) to 6 (slower-better), the default is 0
 	if quality < 1:
 		quality = 80
 	elif quality > 100:
 		quality = 100
+
 	try:
-		if len(frames) == 1:
-			frames[0].save(fileout, 'WEBP', method=5, quality=quality)
+		if len(dest) == 1:
+			dest[0].save(fileout, 'WEBP', method=5, quality=quality)
 		else:
-			frames[0].save(fileout, 'WEBP', method=5, quality=quality, save_all=True, append_images=frames[1:],
+			dest[0].save(fileout, 'WEBP', method=5, quality=quality, save_all=True, append_images=dest[1:],
 				loop=0, duration=source.info.get('duration'))
 	except:
 		dest.save(fileout, 'WEBP', method=5, quality=quality)
-else:
+
+def saveJpg(dest, fileout, quality):
+
 	# The image quality, on a scale from 0 (worst) to 95 (best), the default is 75
 	if quality < 1:
 		quality = 75
 	elif quality > 95:
 		quality = 95
-	dest.convert('RGB').save(fileout, 'JPEG', optimize=True, quality=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
+	source = Image.open(filein)
+	size   = calcsize(source, size)
+
+	if   source.format == 'GIF'  and ".gif"  in fileout:
+		dest = resizeAnimatedGif(source, size, fixed)
+		saveGif(dest, fileout, quality)
+	elif source.format == 'PNG'  and ".png"  in fileout:
+		dest = resizeAnimatedPng(source, size, fixed)
+		savePng(dest, fileout, quality)
+	elif source.format == 'WEBP' and ".webp" in fileout:
+		dest = resizeAnimatedWeb(source, size, fixed)
+		saveWebp(dest, fileout, quality)
+	else:
+		dest = createthumb(source, size, fixed, True)
+		saveJpg(dest, fileout, quality)
 
 exit(0)