Fix sessions bug.

git-svn-id: svn://svn.code.sf.net/p/xbmc-groove/code@98 2dec19e3-eb1d-4749-8193-008c8bba0994

diff --git a/addon.xml b/addon.xml
index 8a0c758..40502e8 100644 (file)
--- a/addon.xml
+++ b/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.audio.groove" name="Grooveshark XBMC"
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.audio.groove" name="Grooveshark XBMC"

-       version="2.0.9" provider-name="Stephen Denham">
+       version="2.0.10" provider-name="Stephen Denham">

        <requires>
                <import addon="xbmc.python" version="2.1.0" />
                <import addon="script.module.simplejson"/>
        <requires>
                <import addon="xbmc.python" version="2.1.0" />
                <import addon="script.module.simplejson"/>

diff --git a/changelog.txt b/changelog.txt
index e521ff5..5dcfffe 100644 (file)
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+2.10.0
+
+Fix sessions bug.
+

 2.0.9
 
 Fix for Android temp directory.
 2.0.9
 
 Fix for Android temp directory.

diff --git a/resources/lib/GroovesharkAPI.py b/resources/lib/GroovesharkAPI.py
index c34d3ea..91add08 100644 (file)
--- a/resources/lib/GroovesharkAPI.py
+++ b/resources/lib/GroovesharkAPI.py
@@ -15,10 +15,10 @@
 #    You should have received a copy of the GNU General Public License
 #    along with xbmc-groove.  If not, see <http://www.gnu.org/licenses/>.
 
 #    You should have received a copy of the GNU General Public License
 #    along with xbmc-groove.  If not, see <http://www.gnu.org/licenses/>.
 

-import urllib2, pprint, os, pickle, tempfile, time, re, simplejson, base64, sys, socket, hashlib, getpass
+import urllib2, pprint, os, pickle, time, re, simplejson, base64, sys, socket, hashlib

 from blowfish import Blowfish
 
 from blowfish import Blowfish
 

-SESSION_EXPIRY = 1209600 # 2 weeks
+SESSION_EXPIRY = 120 #1209600 # 2 weeks

 
 # Web app
 WEB_APP_URL = "http://xbmc-groove.appspot.com/"
 
 # Web app
 WEB_APP_URL = "http://xbmc-groove.appspot.com/"


@@ -66,6 +66,7 @@ class GrooveAPI:
                                self._ip = self._getIP()
                                self._country = self._getCountry()
                                self._setSavedSession()
                                self._ip = self._getIP()
                                self._country = self._getCountry()
                                self._setSavedSession()

+                               self.logout()

 
        # Call to API
        def _callRemote(self, method, params):
 
        # Call to API
        def _callRemote(self, method, params):


@@ -228,7 +229,7 @@ class GrooveAPI:
                        self._setSavedSession()
                        return True
                return False
                        self._setSavedSession()
                        return True
                return False

-
+       

        # Gets a stream key and host to get song content
        def getSubscriberStreamKey(self, songID):
                params = { "songID": songID, "country": self._country }
        # Gets a stream key and host to get song content
        def getSubscriberStreamKey(self, songID):
                params = { "songID": songID, "country": self._country }