The branch, frodo has been updated
via 995fb0853f541dc07682ce6281d5ea303e15e761 (commit)
from 0ce1a8089367077b2beca0ccc6463951d8e664b7 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=995fb0853f541dc07682ce6281d5ea303e15e761
commit 995fb0853f541dc07682ce6281d5ea303e15e761
Author: Martijn Kaijser <[email protected]>
Date: Tue May 13 09:45:31 2014 +0200
[plugin.audio.groove] 2.0.10
diff --git a/plugin.audio.groove/addon.xml b/plugin.audio.groove/addon.xml
index 8a0c758..40502e8 100644
--- a/plugin.audio.groove/addon.xml
+++ b/plugin.audio.groove/addon.xml
@@ -1,6 +1,6 @@
<?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"/>
diff --git a/plugin.audio.groove/changelog.txt
b/plugin.audio.groove/changelog.txt
index e521ff5..5dcfffe 100644
--- a/plugin.audio.groove/changelog.txt
+++ b/plugin.audio.groove/changelog.txt
@@ -1,3 +1,7 @@
+2.10.0
+
+Fix sessions bug.
+
2.0.9
Fix for Android temp directory.
diff --git a/plugin.audio.groove/default.py b/plugin.audio.groove/default.py
index 3ae1e04..75cc6b0 100644
--- a/plugin.audio.groove/default.py
+++ b/plugin.audio.groove/default.py
@@ -714,8 +714,7 @@ class Grooveshark:
dialog.ok(__language__(30008), __language__(30069),
__language__(30070), __language__(30082))
return 0
else:
- if self.userid == 0:
- uid = groovesharkApi.login(self.username, self.password)
+ uid = groovesharkApi.login(self.username, self.password)
if (uid != 0):
return uid
else:
diff --git a/plugin.audio.groove/resources/lib/GroovesharkAPI.py
b/plugin.audio.groove/resources/lib/GroovesharkAPI.py
index c34d3ea..a911570 100644
--- a/plugin.audio.groove/resources/lib/GroovesharkAPI.py
+++ b/plugin.audio.groove/resources/lib/GroovesharkAPI.py
@@ -15,7 +15,7 @@
# 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
SESSION_EXPIRY = 1209600 # 2 weeks
@@ -66,6 +66,7 @@ class GrooveAPI:
self._ip = self._getIP()
self._country = self._getCountry()
self._setSavedSession()
+ self.logout()
# Call to API
def _callRemote(self, method, params):
@@ -228,7 +229,7 @@ class GrooveAPI:
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 }
diff --git a/plugin.audio.groove/resources/settings.xml
b/plugin.audio.groove/resources/settings.xml
index 521e914..799c239 100644
--- a/plugin.audio.groove/resources/settings.xml
+++ b/plugin.audio.groove/resources/settings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<settings>
<category label="User credentials">
<setting id="username" type="text" label="30000" default=""/>
-----------------------------------------------------------------------
Summary of changes:
plugin.audio.groove/addon.xml | 2 +-
plugin.audio.groove/changelog.txt | 4 ++++
plugin.audio.groove/default.py | 3 +--
.../resources/lib/GroovesharkAPI.py | 5 +++--
plugin.audio.groove/resources/settings.xml | 1 +
5 files changed, 10 insertions(+), 5 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
