8.1.5

dream-alpha · Jan 17, 2024 · c3cac51 · c3cac51
1 parent 612ac51
commit c3cac51
Show file tree

Hide file tree

Showing 80 changed files with 288 additions and 231 deletions.
diff --git a/CONTROL/control b/CONTROL/control
@@ -1,6 +1,8 @@
-Description: tmdb
+Description: TMDBCockpit
 Maintainer: dream-alpha
-Package: enigma2-plugin-extensions-tmdb
-Version: 7.0.8
+Package: enigma2-plugin-extensions-tmdbcockpit
+Version: 8.1.5
 Architecture: all
 Depends: python-requests
+Conflicts: enigma2-plugin-extensions-tmdb
+Replaces: enigma2-plugin-extensions-tmdb
diff --git a/CONTROL/postrm b/CONTROL/postrm
@@ -1,8 +1,8 @@
 #!/bin/sh
 if [ "$1" = "remove" ]; then
-	rm -rf /usr/lib/enigma2/python/Plugins/Extensions/tmdb > /dev/null 2>&1
-	echo "tmdb plugin removed successfully."
+	rm -rf /usr/lib/enigma2/python/Plugins/Extensions/TMDBCockpit > /dev/null 2>&1
+	echo "TMDBCockpit plugin removed successfully."
 else
-	find /usr/lib/enigma2/python/Plugins/Extensions/tmdb -type f -name "*.pyo" -exec rm -f {} \; > /dev/null 2>&1
+	find /usr/lib/enigma2/python/Plugins/Extensions/TMDBCockpit -type f -name "*.pyo" -exec rm -f {} \; > /dev/null 2>&1
 fi
 exit 0
diff --git a/README.md b/README.md
@@ -1,20 +1,21 @@
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/495cf6fc5be8434ca7b493ff88724433)](https://www.codacy.com/gh/dream-alpha/TMDBCockpit/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=dream-alpha/tmdb&amp;utm_campaign=Badge_Grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/495cf6fc5be8434ca7b493ff88724433)](https://www.codacy.com/gh/dream-alpha/TMDBCockpit/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=dream-alpha/TMDBCockpit&amp;utm_campaign=Badge_Grade)
 [![Gemfury](https://badge.fury.io/fp/gemfury.svg)](https://gemfury.com/f/partner)
 
 # The Movie Database plugin TMDBCockpit
-![Screenshot](tmdb.png)
+![Screenshot](TMDBCockpit.png)
 ## Features
 - Shows detailed movie/tv show information provided by TMDB.
 - Can be invoked thru movie lists (standard, EMC, etc.) or thru yellow key in the EPG list.
 - Provides an interface for other plugins to access TMDB data without opening TMDBCockpit screens.
 - Allows to save movie as well as series episode covers and descriptions and backdrops.
 - Allows unique tmdb api key in /etc/enigma2/tmdb_key.txt
+- Allows playback of trailer with either MediaPortal or MyTube
 - Supports HD, FHD, and WQHD skin resolutions.
 
 ## Installation
 To install the TMDBCockpit plugin execute the following command in a console on your dreambox:
 - apt-get install wget (required the first time only)
-- wget https://dream-alpha.github.io/TMDBCockpit/tmdb.sh -O - | /bin/sh
+- wget https://dream-alpha.github.io/TMDBCockpit/tmdbcockpit.sh -O - | /bin/sh
 
 The installation script will also install a feed source that enables a convenient upgrade to the latest version with the following commands or automatically as part of a DreamOS upgrade:
 - apt-get update

diff --git a/tmdb.png → TMDBCockpit.png b/tmdb.png → TMDBCockpit.png
diff --git a/docs/index.html b/docs/index.html
@@ -1,8 +1,8 @@
 <html>
 	<body>
-		<h1>tmdb Installation</h1>
-                To install tmdb execute the following command in a telnet console on your dreambox:
+		<h1>TMDBCockpit Installation</h1>
+                To install TMDBCockpit execute the following command in a telnet console on your dreambox:
 		<p>		
-		wget https://dream-alpha.github.io/TMDBCockpit/tmdb.sh -O - | /bin/sh
+		wget https://dream-alpha.github.io/TMDBCockpit/tmdbcockpit.sh -O - | /bin/sh
 	</body>
 </html>
diff --git a/docs/tmdb.sh → docs/tmdbcockpit.sh b/docs/tmdb.sh → docs/tmdbcockpit.sh
@@ -4,5 +4,5 @@ apt-get update
 apt-get install -y apt-transport-https
 echo deb [trusted=yes] https://apt.fury.io/dream-alpha ./ > /etc/apt/sources.list.d/cockpit.list
 apt-get update
-apt-get install -y enigma2-plugin-extensions-tmdb
+apt-get install -y enigma2-plugin-extensions-tmdbcockpit
 systemctl restart enigma2
diff --git a/po/Makefile.am b/po/Makefile.am
@@ -5,7 +5,7 @@
 # the directory name of the plugin.
 #
 
-DOMAIN = tmdb
+DOMAIN = TMDBCockpit
 installdir = $(libdir)/enigma2/python/Plugins/Extensions/$(DOMAIN)
 #GETTEXT=./pygettext.py
 GETTEXT=xgettext

diff --git a/po/tmdb.pot → po/TMDBCockpit.pot b/po/tmdb.pot → po/TMDBCockpit.pot
@@ -2,27 +2,29 @@ msgid ""
 msgstr ""
 "#-#-#-#-#  de.po  #-#-#-#-#\n"
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"POT-Creation-Date: 2024-01-06 11:48+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: dream-alpha\n"
 "Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.1\n"
+"X-Generator: Poedit 3.4.1\n"
+"X-Poedit-Basepath: ../src\n"
+"X-Poedit-SearchPath-0: .\n"
 "#-#-#-#-#  de.po (tmdb)  #-#-#-#-#\n"
 "Project-Id-Version: tmdb\n"
-"POT-Creation-Date: 2023-08-27 11:26+0200\n"
-"PO-Revision-Date: 2023-08-27 11:27+0200\n"
+"POT-Creation-Date: 2024-01-04 15:14+0100\n"
+"PO-Revision-Date: 2024-01-04 15:14+0100\n"
 "Last-Translator: dream-alpha\n"
 "Language-Team: \n"
 "Language: 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: Poedit 3.3.2\n"
+"X-Generator: Poedit 3.4.1\n"
 "X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
 "X-Poedit-Basepath: ../src\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -43,21 +45,12 @@ msgstr ""
 msgid "End"
 msgstr ""
 
-msgid "Stop playback"
-msgstr ""
-
 msgid "Skip forward"
 msgstr ""
 
 msgid "Skip backward"
 msgstr ""
 
-msgid "EPG Info"
-msgstr ""
-
-msgid "Do you want to resume playback at position: %d:%02d:%02d?"
-msgstr ""
-
 msgid "Cancel"
 msgstr ""
 
@@ -67,10 +60,10 @@ msgstr ""
 msgid "Defaults"
 msgstr ""
 
-msgid "Really close without saving settings?"
+msgid "Setup"
 msgstr ""
 
-msgid "Setup"
+msgid "Really close without saving settings?"
 msgstr ""
 
 msgid "Loading default settings will overwrite all settings, really load them?"
@@ -91,6 +84,27 @@ msgstr ""
 msgid "Path does not exist"
 msgstr ""
 
+msgid "File Task"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "Deleting"
+msgstr ""
+
+msgid "Moving"
+msgstr ""
+
+msgid "Copying"
+msgstr ""
+
+msgid "FSTrim"
+msgstr ""
+
 msgid "Close"
 msgstr ""
 
@@ -115,9 +129,6 @@ msgstr ""
 msgid "Please wait"
 msgstr ""
 
-msgid "min"
-msgstr ""
-
 msgid "TMDB Infos ..."
 msgstr ""
 
@@ -181,7 +192,7 @@ msgstr ""
 msgid "divers"
 msgstr ""
 
-msgid "None"
+msgid "not specified"
 msgstr ""
 
 msgid "OK"
@@ -202,6 +213,9 @@ msgstr ""
 msgid "Backdrop resolution:"
 msgstr ""
 
+msgid "Player for trailers:"
+msgstr ""
+
 msgid "Overview"
 msgstr ""
 
@@ -340,6 +354,9 @@ msgstr ""
 msgid "Person"
 msgstr ""
 
+msgid "min"
+msgstr ""
+
 msgid "TMDBCockpit"
 msgstr ""
 

diff --git a/po/de.po b/po/de.po
@@ -2,27 +2,29 @@ msgid ""
 msgstr ""
 "#-#-#-#-#  de.po  #-#-#-#-#\n"
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"POT-Creation-Date: 2024-01-06 11:48+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: dream-alpha\n"
 "Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.1\n"
+"X-Generator: Poedit 3.4.1\n"
+"X-Poedit-Basepath: ../src\n"
+"X-Poedit-SearchPath-0: .\n"
 "#-#-#-#-#  de.po (tmdb)  #-#-#-#-#\n"
 "Project-Id-Version: tmdb\n"
-"POT-Creation-Date: 2023-08-27 11:26+0200\n"
-"PO-Revision-Date: 2023-08-27 11:27+0200\n"
+"POT-Creation-Date: 2024-01-04 15:14+0100\n"
+"PO-Revision-Date: 2024-01-04 15:14+0100\n"
 "Last-Translator: dream-alpha\n"
 "Language-Team: \n"
 "Language: 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: Poedit 3.3.2\n"
+"X-Generator: Poedit 3.4.1\n"
 "X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
 "X-Poedit-Basepath: ../src\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -43,21 +45,12 @@ msgstr "Lizenz"
 msgid "End"
 msgstr "Ende"
 
-msgid "Stop playback"
-msgstr "Stoppe Wiedergabe"
-
 msgid "Skip forward"
 msgstr "Springe vorwärts"
 
 msgid "Skip backward"
 msgstr "Springe zurück"
 
-msgid "EPG Info"
-msgstr "EPG Info"
-
-msgid "Do you want to resume playback at position: %d:%02d:%02d?"
-msgstr "Soll die Wiedergabe an Position: %d:%02d:%02d fortgesetzt werden?"
-
 msgid "Cancel"
 msgstr "Abbruch"
 
@@ -67,12 +60,12 @@ msgstr "Speichern"
 msgid "Defaults"
 msgstr "Standard"
 
-msgid "Really close without saving settings?"
-msgstr "Fortfahren ohne Speichern der Einstellungen?"
-
 msgid "Setup"
 msgstr "Einstellungen"
 
+msgid "Really close without saving settings?"
+msgstr "Fortfahren ohne Speichern der Einstellungen?"
+
 msgid "Loading default settings will overwrite all settings, really load them?"
 msgstr ""
 "Das Laden der Standardeinstellungen überschreibt alle aktuellen "
@@ -94,6 +87,27 @@ msgstr "Verzeichnis-Auswahl"
 msgid "Path does not exist"
 msgstr "Verzeichnis existiert nicht"
 
+msgid "File Task"
+msgstr "Datei-Operation"
+
+msgid "None"
+msgstr "Nichts"
+
+msgid "Loading"
+msgstr "Laden"
+
+msgid "Deleting"
+msgstr "Löschen"
+
+msgid "Moving"
+msgstr "Verschieben"
+
+msgid "Copying"
+msgstr "Kopieren"
+
+msgid "FSTrim"
+msgstr "FSTrimmen"
+
 msgid "Close"
 msgstr "Schliessen"
 
@@ -118,9 +132,6 @@ msgstr "Abgebrochen"
 msgid "Please wait"
 msgstr "Bitte warten"
 
-msgid "min"
-msgstr "Min"
-
 msgid "TMDB Infos ..."
 msgstr "TMDB Infos "
 
@@ -184,8 +195,8 @@ msgstr "männlich"
 msgid "divers"
 msgstr "divers"
 
-msgid "None"
-msgstr "N/A"
+msgid "not specified"
+msgstr "undefiniert"
 
 msgid "OK"
 msgstr "Ok"
@@ -205,6 +216,9 @@ msgstr "Cover Auflösung:"
 msgid "Backdrop resolution:"
 msgstr "Backdrop Auflösung:"
 
+msgid "Player for trailers:"
+msgstr "Player für Trailer:"
+
 msgid "Overview"
 msgstr "Überblick"
 
@@ -343,6 +357,9 @@ msgstr "Serie"
 msgid "Person"
 msgstr "Person"
 
+msgid "min"
+msgstr "Min"
+
 msgid "TMDBCockpit"
 msgstr "TMDBCockpit"
 

diff --git a/src/ConfigInit.py b/src/ConfigInit.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # coding=utf-8
 #
-# Copyright (C) 2018-2023 by dream-alpha
+# Copyright (C) 2018-2024 by dream-alpha
 #
 # In case of reuse of this source code please do not remove this copyright.
 #
@@ -35,4 +35,5 @@ def __init__(self):
 		config.plugins.tmdb.skip_to_movie = ConfigYesNo(default=True)
 		config.plugins.tmdb.key_yellow = ConfigYesNo(default=True)
 
+		config.plugins.tmdb.trailer_player = ConfigSelection(default="MediaPortal", choices=["MediaPortal", "MyTube"])
 		setLogLevel(log_levels[config.plugins.tmdb.debug_log_level.value])
diff --git a/src/Debug.py b/src/Debug.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # coding=utf-8
 #
-# Copyright (C) 2018-2023 by dream-alpha
+# Copyright (C) 2018-2024 by dream-alpha
 #
 # In case of reuse of this source code please do not remove this copyright.
 #

diff --git a/src/DelayTimer.py b/src/DelayTimer.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # coding=utf-8
 #
-# Copyright (C) 2018-2023 by dream-alpha
+# Copyright (C) 2018-2024 by dream-alpha
 #
 # In case of reuse of this source code please do not remove this copyright.
 #

diff --git a/src/EpgSelection.py b/src/EpgSelection.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # coding=utf-8
 #
-# Copyright (C) 2018-2023 by dream-alpha
+# Copyright (C) 2018-2024 by dream-alpha
 #
 # In case of reuse of this source code please do not remove this copyright.
 #