diff --git a/.gitignore b/.gitignore index b62b021..e0d23b8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ __pycache__/ # C extensions *.so +.vscode/ + # Distribution / packaging .Python build/ @@ -128,3 +130,5 @@ dmypy.json # Pyre type checker .pyre/ + +script.kodi.geforcenow.zip diff --git a/README.md b/README.md index 460e87e..defd416 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ Kodi addon for launching NVIDIA GeForce NOW app +Supports the latest Kodi v20.1 (and probably even newer ones) + ## Keep in mind - You have to have official NVIDIA GeForce NOW app installed - you can get it [here](https://www.nvidia.com/en-us/geforce-now/download/) - Currently only supports Windows diff --git a/script.kodi.geforcenow/addon.py b/script.kodi.geforcenow/addon.py index 0417565..dbc6ccc 100644 --- a/script.kodi.geforcenow/addon.py +++ b/script.kodi.geforcenow/addon.py @@ -6,17 +6,17 @@ import os.path import subprocess -ADDON = xbmcaddon.Addon('script.kodi.geforcenow') -ADDON_ID = ADDON.getAddonInfo('id') -ADDON_NAME = ADDON.getAddonInfo('name') -ADDON_VERSION = ADDON.getAddonInfo('version') +ADDON = xbmcaddon.Addon("script.kodi.geforcenow") +ADDON_ID = ADDON.getAddonInfo("id") +ADDON_NAME = ADDON.getAddonInfo("name") +ADDON_VERSION = ADDON.getAddonInfo("version") MSG = ADDON.getLocalizedString -useCustomExecutable = ADDON.getSetting('useCustomExecutable') -stopMedia = ADDON.getSetting('stopMedia') +useCustomExecutable = ADDON.getSetting("useCustomExecutable") +stopMedia = ADDON.getSetting("stopMedia") -def log(message, level=xbmc.LOGNOTICE): +def log(message, level=xbmc.LOGINFO): xbmc.log("[{0}:v{1}] {2}".format(ADDON_ID, ADDON_VERSION, message), level) @@ -53,8 +53,8 @@ def stopMediaPlayback(): def execute(executable): - parameters = '' - log('Calling executable: {0} with parameters: {1}'.format(executable,parameters)) + parameters = "" + log("Calling executable: {0} with parameters: {1}".format(executable, parameters)) if stopMedia: stopMediaPlayback() @@ -64,28 +64,33 @@ def execute(executable): log("Starting Addon") -if useCustomExecutable == 'true': - customExecutable = ADDON.getSetting('customExecutable') +if useCustomExecutable == "true": + customExecutable = ADDON.getSetting("customExecutable") if os.path.isfile(customExecutable): execute(customExecutable) else: - log('Executable not found on the custom location provided by user', xbmc.LOGERROR) + log( + "Executable not found on the custom location provided by user", + xbmc.LOGERROR, + ) showCustomExecutableNotFoundDialog() else: - executable = '' - executableTemp = '' + executable = "" + executableTemp = "" - if platform.system() == 'Windows': - executableTemp = os.path.expandvars(r'%LOCALAPPDATA%\NVIDIA Corporation\GeForceNOW\CEF\GeForceNOW.exe') + if platform.system() == "Windows": + executableTemp = os.path.expandvars( + r"%LOCALAPPDATA%\NVIDIA Corporation\GeForceNOW\CEF\GeForceNOW.exe" + ) if os.path.isfile(executableTemp): executable = executableTemp else: - log('Windows executable not found on default paths', xbmc.LOGERROR) + log("Windows executable not found on default paths", xbmc.LOGERROR) showExecutableNotFoundDialog() if executable: execute(executable) else: - log('Platforms other than Windows are not supported now', xbmc.LOGERROR) - showWindowsNotDetected() \ No newline at end of file + log("Platforms other than Windows are not supported now", xbmc.LOGERROR) + showWindowsNotDetected() diff --git a/script.kodi.geforcenow/addon.xml b/script.kodi.geforcenow/addon.xml index 5d7e0fe..1466c31 100644 --- a/script.kodi.geforcenow/addon.xml +++ b/script.kodi.geforcenow/addon.xml @@ -1,7 +1,8 @@ - + - + executable @@ -10,16 +11,20 @@ windx Kodi Addon for launching GeForce NOW Kodi Addon for launching NVIDIA GeForce NOW app. + Wtyczka do odpalania GeForce NOW + Wtyczka do odpalania aplikacji NVIDIA GeForce NOW. GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007 - en - https://github.com/GanzeVA/Kodi-GeForceNOW - https://github.com/GanzeVA/Kodi-GeForceNOW - - szymonosis@o2.pl - + v.2.0 (2023-06-03) + - Assure support with latest Kodi versions (bump xbmc.python libary) + - Add Polish language translation + - Clean-up addon information, update repository url + + https://github.com/ZoltePudeleczko/Kodi-GeForceNOW + https://github.com/ZoltePudeleczko/Kodi-GeForceNOW + szzborowski@gmail.com icon.png fanart.jpg - + \ No newline at end of file diff --git a/script.kodi.geforcenow/changelog.md b/script.kodi.geforcenow/changelog.md index 1d472db..412c999 100644 --- a/script.kodi.geforcenow/changelog.md +++ b/script.kodi.geforcenow/changelog.md @@ -1,3 +1,8 @@ +v.2.0 +- Assure support with latest Kodi versions (bump xbmc.python libary) +- Add Polish language translation :poland: +- Clean-up addon information, update repository url + v.1.2 - Rewrite changelog to markdown file - Update language file @@ -13,4 +18,4 @@ v.1.0 - English language provided - Addon finds NVIDIA GeForce NOW in it's default location if installed - Automatically stops any playback from Kodi -- In settings user can input a custom location \ No newline at end of file +- In settings user can input a custom location diff --git a/script.kodi.geforcenow/resources/language/English/strings.po b/script.kodi.geforcenow/resources/language/resource.language.en_gb/strings.po similarity index 80% rename from script.kodi.geforcenow/resources/language/English/strings.po rename to script.kodi.geforcenow/resources/language/resource.language.en_gb/strings.po index a32f913..a471110 100644 --- a/script.kodi.geforcenow/resources/language/English/strings.po +++ b/script.kodi.geforcenow/resources/language/resource.language.en_gb/strings.po @@ -1,15 +1,15 @@ # Kodi Media Center language file # Addon Name: Kodi GeForceNOW # Addon id: script.kodi.geforcenow -# Addon Provider: Szymon Zborowski +# Addon Provider: Szymon Zborowski msgid "" msgstr "" "Project-Id-Version: script.kodi.geforcenow\n" -"Report-Msgid-Bugs-To: szymonosis@o2.pl\n" +"Report-Msgid-Bugs-To: szzborowski@gmail.com\n" "POT-Creation-Date: 2020-03-02 15:30-0600\n" -"PO-Revision-Date: 2020-03-02 15:30-0600\n" -"Last-Translator: Szymon Zborowski \n" -"Language-Team: English \n" +"PO-Revision-Date: 2023-06-03 15:14-0600\n" +"Last-Translator: Szymon Zborowski \n" +"Language-Team: English \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -29,7 +29,7 @@ msgid "Executable not found" msgstr "" msgctxt "#32004" -msgid "The NVIDIA GeForceNOW executable was not found on your System on the expected locations." +msgid "The NVIDIA GeForceNOW executable was not found on your System in the expected locations." msgstr "" msgctxt "#32005" diff --git a/script.kodi.geforcenow/resources/language/resource.language.pl_pl/strings.po b/script.kodi.geforcenow/resources/language/resource.language.pl_pl/strings.po new file mode 100644 index 0000000..9d07ff8 --- /dev/null +++ b/script.kodi.geforcenow/resources/language/resource.language.pl_pl/strings.po @@ -0,0 +1,61 @@ +# Kodi Media Center language file +# Addon Name: Kodi GeForceNOW +# Addon id: script.kodi.geforcenow +# Addon Provider: Szymon Zborowski +msgid "" +msgstr "" +"Project-Id-Version: script.kodi.geforcenow\n" +"Report-Msgid-Bugs-To: szzborowski@gmail.com\n" +"POT-Creation-Date: 2020-03-02 15:30-0600\n" +"PO-Revision-Date: 2023-06-03 15:14-0600\n" +"Last-Translator: Szymon Zborowski \n" +"Language-Team: Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);f\n" + +msgctxt "#32001" +msgid "Use custom executable:" +msgstr "Użyj innego pliku .exe:" + +msgctxt "#32002" +msgid "Custom Executable:" +msgstr "Ścieżka:" + +msgctxt "#32003" +msgid "Executable not found" +msgstr "Nie znaleziono pliku .exe" + +msgctxt "#32004" +msgid "The NVIDIA GeForceNOW executable was not found on your System in the expected locations." +msgstr "Nie znaleziono zainstalowanego NVIDIA GeForceNOW na komputerze." + +msgctxt "#32005" +msgid "Addon Settings" +msgstr "Ustawienia Wtyczki" + +msgctxt "#32006" +msgid "Would you like to open the Addon Settings and specify the NVIDIA GeForceNOW location?" +msgstr "Czy chcesz otworzyć ustawienia wtyczki i wybrać lokalizację NVIDIA GeForceNOW?" + +msgctxt "#32007" +msgid "Windows Not Detected" +msgstr "Zły system operacyjny" + +msgctxt "#32008" +msgid "This Addon currently works only on Windows platforms." +msgstr "Ta wtyczka działa w tym momencie tylko na platformie Windows." + +msgctxt "#32009" +msgid "Custom executable not found" +msgstr "Nie znaleziono podanego pliku .exe" + +msgctxt "#32010" +msgid "The custom executable was not found. Please select a new location for it on the Addon Settings." +msgstr "Nie znaleziono podanego pliku .exe. Proszę wybrać nową lokalizację w ustawieniach wtyczki." + +msgctxt "#32011" +msgid "Stop all media playback on start" +msgstr "Zatrzymaj wszystkie odtwarzane media przy starcie" \ No newline at end of file diff --git a/script.kodi.geforcenow/resources/settings.xml b/script.kodi.geforcenow/resources/settings.xml index 9c64a82..c92d776 100644 --- a/script.kodi.geforcenow/resources/settings.xml +++ b/script.kodi.geforcenow/resources/settings.xml @@ -1,8 +1,9 @@ - - - - + + + + - + \ No newline at end of file