listenbrainz: handle authentication error

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8988 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 7 insertions, 3 deletions

diff --git a/src/plugins/General/listenbrainz/listenbrainz.cpp b/src/plugins/General/listenbrainz/listenbrainz.cpp
index f6a73be1a..c1bea4843 100644
--- a/src/plugins/General/listenbrainz/listenbrainz.cpp
+++ b/src/plugins/General/listenbrainz/listenbrainz.cpp
@@ -47,7 +47,7 @@ ListenBrainz::ListenBrainz(QObject *parent)
     : QObject(parent)
 {
     m_time = new QElapsedTimer();
-    m_cache = new PayloadCache(Qmmp::configDir() +"/listenbrainz_.cache");
+    m_cache = new PayloadCache(Qmmp::configDir() +"/listenbrainz.cache");
     m_ua = QString("qmmp-plugins/%1").arg(Qmmp::strVersion().toLower()).toLatin1();
     m_http = new QNetworkAccessManager(this);
     m_core = SoundCore::instance();
@@ -78,7 +78,6 @@ ListenBrainz::~ListenBrainz()
     m_cache->save(m_cachedSongs);
     delete m_time;
     delete m_cache;
-
 }
 
 void ListenBrainz::setState(Qmmp::State state)
@@ -156,6 +155,11 @@ void ListenBrainz::processResponse(QNetworkReply *reply)
     {
         status.clear();
         qWarning("ListenBrainz: server reply: %s", data.constData());
+        if(reply->error() == QNetworkReply::AuthenticationRequiredError)
+        {
+            m_token.clear();
+            qWarning("ListenBrainz: invalid user token, submitting has been disabled");
+        }
     }
 
     if(reply == m_submitReply)
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index d9532f987..c6cdaf438 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -250,7 +250,7 @@ void Scrobbler::processResponse(QNetworkReply *reply)
         else if(error_code == "9") //invalid session key
         {
             m_session.clear();
-            qWarning("Scrobbler[%s]: invalid session key, scrobbling disabled", qPrintable(m_name));
+            qWarning("Scrobbler[%s]: invalid session key, scrobbling has been disabled", qPrintable(m_name));
         }
     }
     reply->deleteLater();