Remove userinput.exe from the main addon package

Sandmann79 · Nov 11, 2019 · bfbd51b · bfbd51b
1 parent 96fce73
commit bfbd51b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 0 deletions.
diff --git a/plugin.video.amazon-test/resources/language/resource.language.de_de/strings.po b/plugin.video.amazon-test/resources/language/resource.language.de_de/strings.po
@@ -576,3 +576,11 @@ msgstr "Lade Seite {0}…"
 msgctxt "#30253"
 msgid "{0} seasons"
 msgstr "{0} Staffeln"
+
+msgctxt "#30254"
+msgid "userinput.exe not found"
+msgstr ""
+
+msgctxt "#30255"
+msgid "Please download it from GitHub and manually install it in the addon directory"
+msgstr ""
diff --git a/plugin.video.amazon-test/resources/language/resource.language.en_gb/strings.po b/plugin.video.amazon-test/resources/language/resource.language.en_gb/strings.po
@@ -616,3 +616,11 @@ msgstr ""
 msgctxt "#30253"
 msgid "{0} seasons"
 msgstr ""
+
+msgctxt "#30254"
+msgid "userinput.exe not found"
+msgstr ""
+
+msgctxt "#30255"
+msgid "Please download it from GitHub and manually install it in the addon directory"
+msgstr ""
diff --git a/plugin.video.amazon-test/resources/lib/playback.py b/plugin.video.amazon-test/resources/lib/playback.py
@@ -54,6 +54,10 @@ def _Input(mousex=0, mousey=0, click=0, keys=None, delay='200'):
 
     if g.platform & g.OS_WINDOWS:
         app = os.path.join(g.PLUGIN_PATH, 'tools', 'userinput.exe')
+        if not os.path.exists(app):
+            from .l10n import getString
+            g.dialog.notification(getString(30254), getString(30255), xbmcgui.NOTIFICATION_ERROR)
+            return
         mouse = ' mouse %s %s' % (mousex, mousey)
         mclk = ' ' + str(click)
         keybd = ' key %s %s' % (keys, delay)

diff --git a/plugin.video.amazon-test/tools/userinput.exe b/plugin.video.amazon-test/tools/userinput.exe
diff --git a/plugin.video.amazon/resources/language/English/strings.po b/plugin.video.amazon/resources/language/English/strings.po
@@ -814,3 +814,11 @@ msgstr ""
 msgctxt "#30226"
 msgid "Server settings or advancedsettings.xml not found"
 msgstr ""
+
+msgctxt "#30227"
+msgid "userinput.exe not found"
+msgstr ""
+
+msgctxt "#30228"
+msgid "Please download it from GitHub and manually install it in the addon directory"
+msgstr ""
diff --git a/plugin.video.amazon/resources/language/German/strings.po b/plugin.video.amazon/resources/language/German/strings.po
@@ -788,3 +788,11 @@ msgstr "Benutzername oder Passwort falsch"
 msgctxt "#30226"
 msgid "Server settings or advancedsettings.xml not found"
 msgstr "Serverkonfiguration oder advancedsettings.xml nicht gefunden"
+
+msgctxt "#30227"
+msgid "userinput.exe not found"
+msgstr ""
+
+msgctxt "#30228"
+msgid "Please download it from GitHub and manually install it in the addon directory"
+msgstr ""
diff --git a/plugin.video.amazon/resources/lib/play.py b/plugin.video.amazon/resources/lib/play.py
@@ -619,6 +619,9 @@ def Input(mousex=0, mousey=0, click=0, keys=None, delay='200'):
 
     if platform & OS_WINDOWS:
         app = os.path.join(pluginpath, 'tools', 'userinput.exe')
+        if not os.path.exists(app):
+            Dialog.notification(getString(30227), getString(30228), xbmcgui.NOTIFICATION_ERROR)
+            return
         mouse = ' mouse {} {}'.format(mousex, mousey)
         mclk = ' ' + str(click)
         keybd = ' key {} {}'.format(keys, delay)

diff --git a/plugin.video.amazon/tools/userinput.exe b/plugin.video.amazon/tools/userinput.exe