Add OSMC launcher & some small fixes

.gitignore

@@ -29,4 +29,8 @@ crashlytics-build.properties
 fabric.properties
 
 *.pyc
-.vscode/
+.vscode/
+
+# launch script logfiles
+**/logfile
+**/logfile.old

resources/launchscripts/osmc_vero/launch.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/sh
+
+resume() {
+  killall -CONT kodi.bin
+}
+
+trap resume EXIT
+
+killall -STOP kodi.bin
+
+# prevent black screen after playing video
+echo 1 > /sys/class/graphics/fb0/blank
+echo "rm default" > /sys/class/vfm/map
+echo add default decoder ppmgr deinterlace amlvideo amvideo > /sys/class/vfm/map
+
+mv logfile logfile.old
+LD_PRELOAD="/usr/local/lib/libmoonlight-aml.so /usr/osmc/lib/libamavutils.so /usr/osmc/lib/libamadec.so /usr/osmc/lib/libamcodec.so" \
+  moonlight stream \
+  -platform aml \
+  -app "$@" >> logfile 2>&1

resources/launchscripts/osmc_vero/postscript.sh

@@ -0,0 +1 @@
+#!/usr/bin/sh

resources/launchscripts/osmc_vero/prescript.sh

@@ -0,0 +1 @@
+#!/usr/bin/sh

resources/lib/util/moonlighthelper.py

@@ -59,20 +59,21 @@ def list_games(self):
         list_regex = r'\d+\.\s+([^\n]*)'
 
         try:
-            moonlightOut = subprocess.check_output(['moonlight', 'list'], cwd=binary_path, timeout=5, encoding='utf-8', start_new_session=True)
+            host = self.plugin.getSetting('host_addr')
+            moonlightOut = subprocess.check_output(['moonlight', 'list', host], cwd=binary_path, timeout=5, encoding='utf-8', start_new_session=True)
 
             if 'must pair' in moonlightOut:
                 return True
 
             return re.findall(list_regex, moonlightOut)
-        except:
+        except Exception:
             return False
 
     def quit_game(self):
         binary_path = self.config_helper.binary_path
         try:
             subprocess.run(['moonlight', 'quit'], cwd=binary_path, timeout=5, start_new_session=True)
-        except:
+        except Exception:
             return False
 
         return True
@@ -104,14 +105,29 @@ def launch_game(self, game_id):
 
             xbmc.audioSuspend()
             t0 = time.monotonic()
+            host = self.plugin.getSetting('host_addr')
             subprocess.run([scripts_path + 'prescript.sh', binary_path, codec], cwd=scripts_path, start_new_session=True)
-            launch_cmd = subprocess.Popen([scripts_path + 'launch.sh', game_id], cwd=binary_path, start_new_session=True)
+            launch_cmd = subprocess.Popen(
+                [scripts_path + 'launch.sh', game_id, host],
+                cwd=scripts_path,
+                start_new_session=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+            )
+            # pipe launch script output to Kodi logger
+            # moonlight launcher output should be logged to a file to prevent chatty Kodi logs (see any launch.sh)
+            with launch_cmd.stdout:
+                for line in iter(launch_cmd.stdout.readline, b''):
+                    self.logger.info(f'{line}')
+            with launch_cmd.stderr:
+                for line in iter(launch_cmd.stderr.readline, b''):
+                    self.logger.error(f'{line}')
             launch_cmd.wait()
             subprocess.run([scripts_path + 'postscript.sh', binary_path], cwd=scripts_path, start_new_session=True)
 
         except Exception as e:
-            print("Failed to execute moonlight process.")
-            print(e)
+            self.logger.error("Failed to execute moonlight process.")
+            self.logger.error(str(e))
         finally:
             xbmc.audioResume()
             xbmc.executebuiltin("InhibitScreensaver(false)")

resources/settings.xml

@@ -84,8 +84,8 @@
                     <default>20</default>
                     <constraints>
                         <minimum>5</minimum>
-                        <step>1</step>
-                        <maximum>100</maximum>
+                        <step>10</step>
+                        <maximum>250</maximum>
                     </constraints>
                     <control type="slider" format="integer">
                         <popup>false</popup>
@@ -254,4 +254,4 @@
             </group>
         </category>
     </section>
-</settings>
+</settings>