Merge branch 'master' of https://github.com/krebscode/painload

2 files changed, 3 insertions, 3 deletions

diff --git a/god/streams/bin/relaxxapi.py b/god/streams/bin/relaxxapi.py
index f367caef..55e628b0 100755
--- a/god/streams/bin/relaxxapi.py
+++ b/god/streams/bin/relaxxapi.py
@@ -78,7 +78,7 @@ class relaxx:
     def get_first(self):
         return json.loads(self._playlist("getPlaylistInfo","0",""))[0]
 
-    def get_first(self):
+    def get_last(self):
         return json.loads(self._playlist("getPlaylistInfo","0",""))[-1]
 
     def clear(self):
@@ -124,7 +124,7 @@ class relaxx:
         if state["status"]["state"] == "play" :
             ident = state["status"]["song"]
             current = state["playlist"]["file"][int(ident)]
-            return current.get("Name",current.get("Artist")) + " - " + current["Title"]
+            return current.get("Name",current.get("Artist","unkown artist")) + " - " + current.get("Title","unknown title")
         else:
             return ""
 
diff --git a/god/streams/bin/streams b/god/streams/bin/streams
index ea6e9a90..8e00a733 100755
--- a/god/streams/bin/streams
+++ b/god/streams/bin/streams
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 import os
 import sys
 from subprocess import Popen, PIPE