Merge pull request #1 from pellcorp/linux-no-chrome-launcher

added linux support including lirc and remove need for chrome launcher

Author: andrewleech

.gitignore

@@ -0,0 +1,4 @@
+.project
+.pydevproject
+.settings
+

browser.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Managed to resolve the issues with, but will leave this here anyway, as its a good fallback
+CHROME_STARTED=`ps -ef | grep google-chrome | grep -v "grep" | wc -l`
+if [ $CHROME_STARTED -gt 0 ]; then
+	exit 1;
+fi
+
+# lets find out if irxevent and xdotool actually exist before we try to call them.
+command -v irxevent >/dev/null 2>&1
+IRXEVENT=$?
+command -v xdotool >/dev/null 2>&1
+XDOTOOL=$?
+
+if [ $IRXEVENT -eq 0 ]; then
+	killall irxevent >/dev/null 2>&1
+fi
+
+# http://stackoverflow.com/questions/59895/can-a-bash-script-tell-what-directory-its-stored-in
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+if [ $# -eq 2 ]; then
+	url="https://www.netflix.com/SwitchProfile?tkn=$2&nextpage=https%3A%2F%2Fwww.netflix.com%2FWiPlayer%3Fmovieid%3D$1"
+else
+	url="http://www.netflix.com/WiPlayer?movieid=$1"
+fi
+
+# notice the ampersand to send google chrome into back ground so that the script continues and we execute the xdotool below
+/usr/bin/google-chrome --start-maximized --disable-translate --disable-new-tab-first-run --no-default-browser-check --no-first-run --kiosk "$url" &
+CHROME_PID=$!
+
+if [ $IRXEVENT -eq 0 ]; then
+	# run irxevent as a daemon so that we can call xdotool
+	irxevent -d $DIR/netflix.lirc &
+else
+	echo "irxevent is not installed, can't do remote control"	
+fi
+
+if [ $XDOTOOL -eq 0 ]; then
+	# no point sleeping if xdotool is not installed.
+	sleep 5
+	xdotool mousemove 9999 9999 click 1
+else
+	echo "xdotool is not installed, can't remove cursor"
+fi
+
+# wait for google-chrome to be killed before killing irxevent below.  This only works if we execute irxevent as a daemon, otherwise
+# the script would never finish.
+wait $CHROME_PID
+
+if [ $IRXEVENT -eq 0 ]; then
+	killall irxevent >/dev/null 2>&1
+fi

default.py

@@ -38,6 +38,7 @@
 sendKeysPath = xbmc.translatePath('special://home/addons/'+addonID+'/resources/NetfliXBMC_SendKeys.exe')
 fakeVidPath = xbmc.translatePath('special://home/addons/'+addonID+'/resources/fakeVid.mp4')
 downloadScript = xbmc.translatePath('special://home/addons/'+addonID+'/download.py')
+browserScript = xbmc.translatePath('special://home/addons/'+addonID+'/browser.sh')
 searchHistoryFolder = os.path.join(addonUserDataFolder, "history")
 cacheFolder = os.path.join(addonUserDataFolder, "cache")
 cacheFolderCoversTMDB = os.path.join(cacheFolder, "covers")
@@ -564,10 +565,10 @@ def playVideo(id):
 
 def playVideoMain(id):
     xbmc.Player().stop()
+    token = ""
     if singleProfile:
         url = urlMain+"/WiPlayer?movieid="+id
     else:
-        token = ""
         if addon.getSetting("profile"):
             token = addon.getSetting("profile")
         url = "https://www.netflix.com/SwitchProfile?tkn="+token+"&nextpage="+urllib.quote_plus(urlMain+"/WiPlayer?movieid="+id)
@@ -589,16 +590,16 @@ def playVideoMain(id):
         except:
             pass
     elif osLinux:
-        xbmc.executebuiltin("RunPlugin(plugin://plugin.program.chrome.launcher/?url="+urllib.quote_plus(url)+"&mode=showSite&kiosk="+kiosk+")")
-        try:
-            xbmc.sleep(5000)
-            subprocess.Popen('xdotool mousemove 9999 9999', shell=True)
-            xbmc.sleep(5000)
-            subprocess.Popen('xdotool mousemove 9999 9999', shell=True)
-            xbmc.sleep(5000)
-            subprocess.Popen('xdotool mousemove 9999 9999', shell=True)
-        except:
-            pass
+        xbmc.executebuiltin('LIRC.Stop')
+        
+        if token != "":
+            call = '"'+browserScript+'" "'+id+'" "'+token+'"';
+        else:
+            call = '"'+browserScript+'" "'+id+'"';
+        
+        subprocess.call(call, shell=True)
+         
+        xbmc.executebuiltin('LIRC.Start')
     elif osWin:
         if winBrowser == 1:
             path = 'C:\\Program Files\\Internet Explorer\\iexplore.exe'

netflix.lirc

@@ -0,0 +1,53 @@
+#### BEGIN CurrentWindow - NETFLIX CONTROLS
+begin
+    prog = irxevent
+    button = KEY_PAUSE
+    repeat = 0
+    config = Key space Focus CurrentWindow
+end
+begin
+    prog = irxevent
+    button = KEY_PLAY
+    repeat = 0
+    config = Key space Focus CurrentWindow
+end
+begin
+    prog = irxevent
+    button = KEY_UP
+    config = Key Up Focus CurrentWindow
+end
+begin
+    prog = irxevent
+    button = KEY_DOWN
+    config = Key Down Focus CurrentWindow
+end
+begin
+    prog = irxevent
+    button = KEY_LEFT
+    config = Key Left Focus CurrentWindow
+end
+begin
+    prog = irxevent
+    button = KEY_RIGHT
+    config = Key Right Focus CurrentWindow
+end
+begin
+    prog = irxevent
+    button = KEY_STOP
+    repeat = 0
+    config = Key ctrl-w Focus CurrentWindow
+end
+begin
+    prog = irxevent
+    button = KEY_REWIND
+    repeat = 0
+    config = Key shift-left Focus CurrentWindow
+end
+begin
+    prog = irxevent
+    button = KEY_FORWARD
+    repeat = 0
+    config = Key shift-right Focus CurrentWindow
+end
+
+#### END CurrentWindow - NETFLIX CONTROLS