[screensaver.picture.slideshow] 7.0.3 (#2552)

Co-authored-by: ronie <[email protected]>
xbmc · Dec 2, 2023 · 9bb482a · 9bb482a
1 parent 011ab51
commit 9bb482a
Show file tree

Hide file tree

Showing 16 changed files with 137 additions and 115 deletions.
diff --git a/screensaver.picture.slideshow/addon.xml b/screensaver.picture.slideshow/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="screensaver.picture.slideshow" name="Picture Slideshow Screensaver" version="7.0.0" provider-name="Team Kodi">
+<addon id="screensaver.picture.slideshow" name="Picture Slideshow Screensaver" version="7.0.3" provider-name="Team Kodi">
 	<requires>
 		<import addon="xbmc.python" version="3.0.1" />
 		<import addon="script.module.exifread" version="2.1.2+matrix.0" />
@@ -117,6 +117,6 @@
 			<icon>resources/icon.png</icon>
 			<fanart>resources/fanart.jpg</fanart>
 		</assets>
-		<news>- first version for Kodi Nexus</news>
+		<news>- add support for image types provided by imagedecoder addons</news>
 	</extension>
 </addon>
diff --git a/screensaver.picture.slideshow/changelog.txt b/screensaver.picture.slideshow/changelog.txt
@@ -1,3 +1,12 @@
+v7.0.3
+- bump for release
+
+v7.0.2
+- fix encoding
+
+v7.0.1
+- add support for image types provided by imagedecoder addons
+
 v7.0.0
 - update for kodi nexus
 

diff --git a/screensaver.picture.slideshow/lib/gui.py b/screensaver.picture.slideshow/lib/gui.py
@@ -213,8 +213,8 @@ def _start_show(self, items):
                         iptcfile = BinaryFile(img[0])
                         try:
                             iptc = IPTCInfo(iptcfile)
-                            if iptc['headline']:
-                                title = bytes(iptc['headline']).decode('utf-8')
+                            if iptc['object name']:
+                                title = bytes(iptc['object name']).decode('utf-8')
                                 iptc_ti = True
                             if iptc['caption/abstract']:
                                 description = bytes(iptc['caption/abstract']).decode('utf-8')
@@ -237,15 +237,15 @@ def _start_show(self, items):
                                 if xmpdata:
                                     titlematch = re.search(r'<dc:title.*?rdf:Alt.*?rdf:li.*?>(.*?)<', xmpdata.group(1), flags=re.DOTALL)
                                     if titlematch and not iptc_ti:
-                                        title = titlematch.group(1)
+                                        title = titlematch.group(1).encode('cp437').decode('utf-8')
                                         iptc_ti = True
                                     descmatch = re.search(r'<dc:description.*?rdf:Alt.*?rdf:li.*?>(.*?)<', xmpdata.group(1), flags=re.DOTALL)
                                     if descmatch and not iptc_de:
-                                        description = descmatch.group(1)
+                                        description = descmatch.group(1).encode('cp437').decode('utf-8')
                                         iptc_de = True
                                     subjmatch = re.search(r'<dc:subject.*?rdf:Bag.*?>(.*?)</rdf:Bag', xmpdata.group(1), flags=re.DOTALL)
                                     if subjmatch and not iptc_ke:
-                                        keywords = ', '.join(subjmatch.group(1).split()).replace('<rdf:li>', '').replace('</rdf:li>', '')
+                                        keywords = ', '.join(subjmatch.group(1).encode('cp437').decode('utf-8').split()).replace('<rdf:li>', '').replace('</rdf:li>', '')
                                         iptc_ke = True
                             except:
                                 pass

diff --git a/screensaver.picture.slideshow/lib/utils.py b/screensaver.picture.slideshow/lib/utils.py
@@ -14,7 +14,10 @@
 LANGUAGE = ADDON.getLocalizedString
 
 # supported image types by the screensaver
-IMAGE_TYPES = ('.jpg', '.jpeg', '.png', '.tif', '.tiff', '.gif', '.pcx', '.bmp', '.tga', '.ico', '.nef', '.webp', '.jp2', '.apng')
+IMAGE_TYPES = ['.jpg', '.jpeg', '.png', '.tif', '.tiff', '.gif', '.pcx', '.bmp', '.tga', '.ico', '.nef', '.webp', '.jp2', '.apng']
+HEIF_TYPES = ['.heic', '.heif']
+MPO_TYPES = ['.mpo']
+RAW_TYPES = ['.3fr', '.arw', '.cr2', '.crw', '.dcr', '.dng', '.erf', '.kdc', '.mdc', '.mef', '.mos', '.mrw', '.nef', '.nrw', '.orf', '.pef', '.ppm', '.raf', '.raw', '.rw2', '.srw', '.x3f']
 CACHEFOLDER = xbmcvfs.translatePath(ADDON.getAddonInfo('profile'))
 CACHEFILE = os.path.join(CACHEFOLDER, 'cache_%s')
 RESUMEFILE = os.path.join(CACHEFOLDER, 'offset')
@@ -75,6 +78,12 @@ def walk(path):
         if xbmcvfs.exists(xbmcvfs.translatePath(folder)):
             dirs = []
             files = []
+            if xbmc.getCondVisibility('System.HasAddon(imagedecoder.heif)'):
+                IMAGE_TYPES.extend(HEIF_TYPES)
+            if xbmc.getCondVisibility('System.HasAddon(imagedecoder.mpo)'):
+                IMAGE_TYPES.extend(MPO_TYPES)
+            if xbmc.getCondVisibility('System.HasAddon(imagedecoder.raw)'):
+                IMAGE_TYPES.extend(RAW_TYPES)
             # get all files and subfolders
             if folder.startswith('plugin://'):
                 getroot = xbmc.executeJSONRPC('{"jsonrpc":"2.0", "method":"Files.GetDirectory", "params":{"directory":"%s", "sort":{"method":"label"}}, "id":1 }' % folder)

diff --git a/screensaver.picture.slideshow/resources/language/resource.language.da_dk/strings.po b/screensaver.picture.slideshow/resources/language/resource.language.da_dk/strings.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: XBMC Addons\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2021-07-28 18:29+0000\n"
+"PO-Revision-Date: 2022-07-13 13:14+0000\n"
 "Last-Translator: Christian Gade <[email protected]>\n"
 "Language-Team: Danish <https://kodi.weblate.cloud/projects/kodi-add-ons-look-and-feel/screensaver-picture-slideshow/da_dk/>\n"
 "Language: da_dk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.7.2\n"
+"X-Generator: Weblate 4.13\n"
 
 msgctxt "Addon Summary"
 msgid "Screensaver that displays an image slideshow"
@@ -134,4 +134,4 @@ msgstr "Vis baggrundsbillede"
 
 msgctxt "#30030"
 msgid "Use vignette overlay"
-msgstr ""
+msgstr "Brug vignette øverst"
diff --git a/screensaver.picture.slideshow/resources/language/resource.language.de_de/strings.po b/screensaver.picture.slideshow/resources/language/resource.language.de_de/strings.po
@@ -7,39 +7,39 @@ msgstr ""
 "Project-Id-Version: XBMC Addons\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2021-07-22 14:29+0000\n"
-"Last-Translator: Christian Gade <[email protected]>\n"
+"PO-Revision-Date: 2023-01-31 22:15+0000\n"
+"Last-Translator: Demian <[email protected]>\n"
 "Language-Team: German <https://kodi.weblate.cloud/projects/kodi-add-ons-look-and-feel/screensaver-picture-slideshow/de_de/>\n"
 "Language: de_de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.7.2\n"
+"X-Generator: Weblate 4.15.2\n"
 
 msgctxt "Addon Summary"
 msgid "Screensaver that displays an image slideshow"
 msgstr "Bildschirmschoner, der eine Bilder-Diashow anzeigt"
 
 msgctxt "Addon Description"
 msgid "The Slideshow screensaver will show you a slide show of images using various transition effects. It can be configured to show your libraries music or video fanart, or a custom folder of images"
-msgstr "Der Slideshow-Bildschirmschoner zeigt eine Bilder-Slideshow mit verschiedenen Übergangseffekten. Er kann so konfiguriert werden, dass Musik oder Video Fanarts aus der Bibliothek, oder Bilder eines bestimmten Ordners angezeigt werden."
+msgstr "Der Slideshow-Bildschirmschoner zeigt eine Bilder-Diashow mit verschiedenen Übergangseffekten. Er kann so konfiguriert werden, dass Musik- oder Videofanart aus der Bibliothek oder Bilder eines bestimmten Ordners angezeigt werden"
 
 msgctxt "#30000"
 msgid "Source of slideshow images"
-msgstr "Quelle der Diashow-Bilder"
+msgstr "Quelle der Diashowbilder"
 
 msgctxt "#30001"
 msgid "Folder"
 msgstr "Ordner"
 
 msgctxt "#30002"
 msgid "Video Fanart"
-msgstr "Video-Fankunst"
+msgstr "Videofanart"
 
 msgctxt "#30003"
 msgid "Music Fanart"
-msgstr "Musik-Fankunst"
+msgstr "Musikfanart"
 
 msgctxt "#30004"
 msgid "Image Folder"
@@ -95,7 +95,7 @@ msgstr "Bilder in zufälliger Reihenfolge anzeigen"
 
 msgctxt "#30017"
 msgid "Use full path"
-msgstr ""
+msgstr "Vollständigen Pfad verwenden"
 
 # empty string with id 30017
 msgctxt "#30018"
@@ -125,7 +125,7 @@ msgstr "Zusätzlich"
 
 msgctxt "#30026"
 msgid "Resume slideshow from last position"
-msgstr ""
+msgstr "Diashow von letzter Position vorsetzen"
 
 # empty strings from id 30027 to 30028
 msgctxt "#30029"
@@ -134,4 +134,4 @@ msgstr "Hintergrundbild anzeigen"
 
 msgctxt "#30030"
 msgid "Use vignette overlay"
-msgstr ""
+msgstr "Vignettenoverlay verwenden"
diff --git a/screensaver.picture.slideshow/resources/language/resource.language.es_es/strings.po b/screensaver.picture.slideshow/resources/language/resource.language.es_es/strings.po
@@ -7,27 +7,27 @@ msgstr ""
 "Project-Id-Version: XBMC Addons\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2022-06-21 07:14+0000\n"
-"Last-Translator: Alfonso Cachero <alfonso.cachero@gmail.com>\n"
+"PO-Revision-Date: 2023-06-20 15:42+0000\n"
+"Last-Translator: José Antonio Alvarado <jalvarado0.eses@gmail.com>\n"
 "Language-Team: Spanish (Spain) <https://kodi.weblate.cloud/projects/kodi-add-ons-look-and-feel/screensaver-picture-slideshow/es_es/>\n"
 "Language: es_es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.13\n"
+"X-Generator: Weblate 4.18\n"
 
 msgctxt "Addon Summary"
 msgid "Screensaver that displays an image slideshow"
-msgstr "Un salvapantallas que muestra una presentación de imágenes"
+msgstr "Salvapantallas que muestra una presentación de imágenes"
 
 msgctxt "Addon Description"
 msgid "The Slideshow screensaver will show you a slide show of images using various transition effects. It can be configured to show your libraries music or video fanart, or a custom folder of images"
 msgstr "El salvapantallas Slideshow mostrará una presentación de imágenes usando varios efectos de transición. Puede ser configurado para mostrar los fanart de tus colecciones de música o video, o las imágenes de una carpeta"
 
 msgctxt "#30000"
 msgid "Source of slideshow images"
-msgstr "Origen de las imágenes"
+msgstr "Fuente de la presentación de imágenes"
 
 msgctxt "#30001"
 msgid "Folder"
@@ -79,7 +79,7 @@ msgstr "Mostrar nombre de la imágen"
 
 msgctxt "#30013"
 msgid "Disabled"
-msgstr "Deshabilitado"
+msgstr "Desactivado"
 
 msgctxt "#30014"
 msgid "Use filename"
@@ -125,7 +125,7 @@ msgstr "Adicional"
 
 msgctxt "#30026"
 msgid "Resume slideshow from last position"
-msgstr "Continuar presentación desde la última posición"
+msgstr "Reanudar la presentación de imágenes desde la última posición"
 
 # empty strings from id 30027 to 30028
 msgctxt "#30029"
@@ -134,4 +134,4 @@ msgstr "Mostrar imágen de fondo"
 
 msgctxt "#30030"
 msgid "Use vignette overlay"
-msgstr "Usar capa viñeteado"
+msgstr "Usar superposición de viñeta"
diff --git a/screensaver.picture.slideshow/resources/language/resource.language.et_ee/strings.po b/screensaver.picture.slideshow/resources/language/resource.language.et_ee/strings.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: XBMC Addons\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2021-09-13 13:30+0000\n"
+"PO-Revision-Date: 2022-08-22 10:14+0000\n"
 "Last-Translator: rimasx <[email protected]>\n"
 "Language-Team: Estonian <https://kodi.weblate.cloud/projects/kodi-add-ons-look-and-feel/screensaver-picture-slideshow/et_ee/>\n"
 "Language: et_ee\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.8\n"
+"X-Generator: Weblate 4.13\n"
 
 msgctxt "Addon Summary"
 msgid "Screensaver that displays an image slideshow"
@@ -100,7 +100,7 @@ msgstr ""
 # empty string with id 30017
 msgctxt "#30018"
 msgid "Use folder- and filename"
-msgstr ""
+msgstr "Kasuta kausta- ja failinime"
 
 # empty strings from id 30019 to 30020
 msgctxt "#30021"
@@ -125,12 +125,12 @@ msgstr "Täiendav"
 
 msgctxt "#30026"
 msgid "Resume slideshow from last position"
-msgstr ""
+msgstr "Jätka slaidiseanssi poolelijäänud kohast"
 
 # empty strings from id 30027 to 30028
 msgctxt "#30029"
 msgid "Display background picture"
-msgstr ""
+msgstr "Kuva taustapilt"
 
 msgctxt "#30030"
 msgid "Use vignette overlay"