Update for API changes, Also added keepalive heartbeat and a settings

dotblank · dotblank · commit 28c89811ff99 · 2011-04-29T01:22:43.000-04:00
window.
diff --git a/groove.cpp b/groove.cpp
@@ -116,13 +116,17 @@ groove::groove(QWidget *parent) :
     connect(bBar,SIGNAL(settings()),settingsWin,SLOT(show()));
 
     connect(bBar,SIGNAL(back()),player,SLOT(back()));
-    connect(bBar,SIGNAL(settings()),settingsWin,SLOT(show()));
+    stack->addWidget(settingsWin);
+    connect(bBar,SIGNAL(settings()),this,SLOT(toggleSettings()));
+    connect(settingsWin,SIGNAL(closed()),this,SLOT(toggleSettings()));
     bBar->setPlaybackProgress(100,100);
     pwindow = new pWin();
     stack->addWidget(pwindow);
     stack->setCurrentWidget(resultView);
     connect(bBar,SIGNAL(list()),this,SLOT(togglePlaylist()));
     pwindow->setModel(pl);
+    connect(settingsWin,SIGNAL(settingsChange(QString,QVariant)),pl,SLOT(setSettings(QString,QVariant)));
+    settingsWin->populate();
 
 }
 void groove::showSettings(){
@@ -131,6 +135,14 @@ void groove::showSettings(){
 #endif
 }
 
+void groove::toggleSettings()
+{
+    if(stack->currentWidget()==settingsWin)
+        stack->setCurrentWidget(resultView);
+    else
+        stack->setCurrentWidget(settingsWin);
+}
+
 void groove::togglePlaylist()
 {
     if(stack->currentWidget()==pwindow)
diff --git a/groove.h b/groove.h
@@ -40,6 +40,7 @@ private slots:
     void addSongPlaylist();
     void showOthers();
     void togglePlaylist();
+    void toggleSettings();
     void showSettings();
 private:
     void resizeEvent(QResizeEvent *);
diff --git a/gscom.cpp b/gscom.cpp
@@ -2,13 +2,17 @@
 #include <parser.h>
 #include <serializer.h>
 #include <QCryptographicHash>
+#include <QTimer>
+
 //#include <QApplication>
-#define CVERSION "20100831"
+//#define CVERSION "20100831"
+#define CVERSION "20101222"
 #define CLIENT "htmlshark"
 
 gscom::gscom()
 {
     manager = new QNetworkAccessManager(this);
+    QTimer *timer = new QTimer(this);
     connect(manager, SIGNAL(finished(QNetworkReply*)),
             this, SLOT(replyFinished(QNetworkReply*)));
     cookies = manager->cookieJar();
@@ -21,6 +25,8 @@ gscom::gscom()
     model->setHorizontalHeaderLabels(
         QStringList() << "Online");
     addDebugMsg("You may now search for a song");
+    connect(timer,SIGNAL(timeout()),this,SLOT(refreshsession()));
+    timer->start(60000); //default to one min
     //addProgressbar("test");
     //getSessionKey();
 }
@@ -42,7 +48,7 @@ QStandardItemModel* gscom::getSongModel(QString song)
         QString *token = getToken(getSearchResults);
         qDebug() << token->toAscii();
         QNetworkRequest request;
-        request.setUrl(QUrl("http://listen.grooveshark.com/more.php?getSearchResults"));
+        request.setUrl(QUrl("http://grooveshark.com/more.php?getSearchResults"));
         request.setHeader(request.ContentTypeHeader,QVariant("application/json"));
         QVariantMap jlist;
         QVariantMap header;
@@ -84,7 +90,7 @@ QStandardItemModel* gscom::getArtistModel(QString song)
         QString *token = getToken(getSearchResults);
         qDebug() << token->toAscii();
         QNetworkRequest request;
-        request.setUrl(QUrl("http://listen.grooveshark.com/more.php?getSearchResults"));
+        request.setUrl(QUrl("http://grooveshark.com/more.php?getSearchResults"));
         request.setHeader(request.ContentTypeHeader,QVariant("application/json"));
         QVariantMap jlist;
         QVariantMap header;
@@ -147,6 +153,15 @@ QStandardItemModel* gscom::getAlbumModel(QString song)
 
     return model;
 }
+void gscom::refreshsession()
+{
+    if(this->currentaction==none)
+    {
+        currentaction=refresh;
+        manager->get(QNetworkRequest(QUrl(GS_KEEPALIVE)));
+    }
+}
+
 void gscom::replyFinished(QNetworkReply *reply)
 {
     switch (currentaction)
@@ -237,7 +252,9 @@ void gscom::replyFinished(QNetworkReply *reply)
         {
             QJson::Parser parser;
             bool ok;
-            QVariantMap result = parser.parse (reply->readAll(), &ok).toMap();
+            QByteArray array = reply->readAll();
+            //qDebug(array);
+            QVariantMap result = parser.parse (array, &ok).toMap();
             if (!ok) {
               qFatal("An error occurred during parsing");
               return;
@@ -271,6 +288,33 @@ void gscom::replyFinished(QNetworkReply *reply)
             emit finishedSearch();
         }
         break;
+    case refresh:
+        {
+            qDebug() << "Got refresh reply";
+            reply->readAll();
+            reply->close();
+            currentaction = none;
+            /*
+            QList<QNetworkCookie> cookieList = cookies->cookiesForUrl(QUrl(QString("http://") + GS_LISTEN));
+            foreach(QNetworkCookie cookie, cookieList)
+            {
+                if(cookie.name() == "PHPSESSID")
+                {
+                    if(phpSession!=cookie.value())
+                    {
+                    delete phpSession;
+                    phpSession = new QString(cookie.value());
+                    qDebug() << QDateTime::currentDateTime();
+                    qDebug() << cookie.expirationDate();
+                    currentaction = getCommunicationToken;
+                    getSessionKey();
+                    continue;
+                    }
+                }
+            }
+            */
+        }
+        break;
     default:
         qDebug() << reply->readAll();
         reply->close();
@@ -364,7 +408,7 @@ void gscom::getSong(QString songid)
         QString *token = getToken(getStreamKeyFromSongIDEx);
         qDebug() << token->toAscii();
         QNetworkRequest request;
-        request.setUrl(QUrl("http://listen.grooveshark.com/more.php?getStreamKeyFromSongIDEx"));
+        request.setUrl(QUrl("http://grooveshark.com/more.php?getStreamKeyFromSongIDEx"));
         request.setHeader(request.ContentTypeHeader,QVariant("application/json"));
         QVariantMap jlist;
         QVariantMap header;
@@ -399,7 +443,8 @@ void gscom::getSong(QString songid)
 void gscom::getSessionKey()
 {
     QNetworkRequest request; // = new QNetworkRequest(QUrl("https://listen.grooveshark.com/service.php"));
-    request.setUrl(QUrl("https://listen.grooveshark.com/more.php"));
+    //request.setUrl(QUrl("https://listen.grooveshark.com/more.php"));
+    request.setUrl(QUrl("https://grooveshark.com/more.php?getCommunicationToken"));
     request.setHeader(request.ContentTypeHeader,QVariant("application/json"));
     QVariantMap jlist;
     QVariantMap header;
diff --git a/gscom.h b/gscom.h
@@ -6,7 +6,8 @@
 //#include <parser.h>
 #define GSPASS "**********"
 #define GSIP "grooveshark.com"
-#define GS_LISTEN "listen.grooveshark.com"
+#define GS_LISTEN "grooveshark.com"
+#define GS_KEEPALIVE "http://grooveshark.com/sidebar.php?ThemeID=166&0=1"
 #define GS_GUTS "guts.grroveshark.com"
 class gscom : public QObject
 {
@@ -39,6 +40,7 @@ public slots:
         getStreamKeyFromSongIDEx,
         getPHP,
         getTokenForForSong,
+        refresh,
         none
     };
     gMETHOD currentaction;
@@ -54,6 +56,8 @@ public slots:
     void addProgressbar(QString debug);
     bool firstR;
     QByteArray *postdata;
+private slots:
+    void refreshsession();
 };
 
 #endif // GSCOM_H
diff --git a/playlist.cpp b/playlist.cpp
@@ -11,14 +11,16 @@ playlist::playlist(QObject *parent) :
    this->reply = NULL;
    invalid = new QVariant();
    icon = new QVariant(QIcon(":/groove/icons/general_forward.png"));
+   this->bufferpcnt = 0.05;
+   this->prefetch = 3;
 }
 
 //Implemented model class information
 QVariant playlist::data(const QModelIndex &index, int role) const
 {
 
     playlist* play = (playlist *)index.model();
-    /*QVariant dat = *play->invalid;
+    QVariant dat = *play->invalid;
     if(play->existAt(index.row()))
     {
         if (!index.isValid())
@@ -82,8 +84,8 @@ QVariant playlist::data(const QModelIndex &index, int role) const
     }
     else
         dat = *play->invalid;
-    return dat;*/
-    return *play->invalid;
+    return dat;
+    //return *play->invalid;
 }
 int playlist::rowCount(const QModelIndex &) const
 {
@@ -143,7 +145,20 @@ void playlist::setCurrentPlaying(int position)
     {
         this->currentplayingitem = position;
         if(!pList->at(position)->downloaded && this->currentdownloaditem != this->currentplayingitem)
+        {
             this->beginDownload(position);
+        }
+        else
+        {
+            for(int i = 0; i < prefetch;i++)
+            {
+                if(this->existAt(position+1+i) && !pList->at(position+1+i)->downloaded)
+                {
+                    this->beginDownload(position+1+i);
+                    continue;
+                }
+            }
+        }
         /*if(pList->at(position)->bufferready == false &&)
         {
             if(!pList->at(position)->downloaded)
@@ -168,6 +183,24 @@ QIODevice * playlist::getBuffer(int position)
 {
     return pList->at(position)->buffer;
 }
+void playlist::setSettings(QString key, QVariant Val)
+{
+    if(key=="buffer-pcnt")
+        this->bufferpcnt = Val.toInt()/100.0;
+    if(key=="playlist-precache")
+    {
+        this->prefetch = Val.toInt();
+        //when we change precahce never delete and make sure the setting takes effect
+        if(this->currentdownloaditem!=this->currentplayingitem)
+            for(int i = 0; i < this->prefetch;i++)
+                if(this->existAt(this->currentplayingitem+1+i) && !pList->at(this->currentplayingitem+1+i)->downloaded)
+                {
+                    this->beginDownload(this->currentplayingitem+1+i);
+                    continue;
+                }
+    }
+
+}
 
 void playlist::beginDownload(int position)
 {
@@ -239,10 +272,15 @@ int playlist::addSong(QStandardItem *item, QString name)
 void playlist::downloadDone(int position)
 {
     if(this->existAt(position+1) && this->currentSkeyItem == -1 && !pList->at(position+1)->downloaded && this->currentdownloaditem != position+1)
-        beginDownload(position+1);
+    {
+        if(((position+1) - this->currentplaying())<=this->prefetch)
+            beginDownload(position+1);
+    }
     else
         this->currentdownloaditem = -1;
     pList->at(position)->downloaded = true;
+    QModelIndex changed = this->createIndex(position,this->sName,0);
+    emit this->dataChanged(changed,changed);
 }
 void playlist::networkReplyFinish()
 {
@@ -277,7 +315,7 @@ void playlist::downloadSlot(qint64 b, qint64 t)
         {
             pList->at(this->currentdownloaditem)->buffer->buffer().append(reply->readAll());
             //qDebug() << !pList->at(this->currentdownloaditem)->bufferready << this->currentdownloaditem;
-            if ( b >= t*0.05 && !pList->at(this->currentdownloaditem)->bufferready)
+            if ( b >= t*bufferpcnt && !pList->at(this->currentdownloaditem)->bufferready)
                 //if(!pList->at(currentdownloaditem)->bufferready && b/(startStreamT.msecsTo(QTime::currentTime()) + 1)*100/1024 >= 10)
             {
                 this->setBufferRdy(this->currentdownloaditem);
diff --git a/playlist.h b/playlist.h
@@ -52,6 +52,7 @@ class playlist : public QAbstractTableModel
         bool played;
         bool bufferready;
     };
+    int prefetch;
     QList<songElement *>* getList();
     explicit playlist(QObject *parent = 0);
     int addSong(QStandardItem *item,QString name);
@@ -85,6 +86,7 @@ class playlist : public QAbstractTableModel
     void rowsInserted ( const QModelIndex & parent, int start, int end );
 
 public slots:
+    void setSettings(QString key, QVariant Val);
 private slots:
     void downloadSlot(qint64 d, qint64 t);
     void networkReplyFinish();
@@ -93,11 +95,6 @@ private slots:
     void setBufferRdy(int b);
     void getNError(QNetworkReply::NetworkError);
 private:
-
-
-
-
-
     int currentplayingitem;
     int currentSkeyItem;
     QList<songElement *> *pList;
@@ -109,6 +106,8 @@ private slots:
     QTime startStreamT;
     QVariant *icon;
     QVariant *invalid;
+    double bufferpcnt;
+
 };
 
 #endif // PLAYLIST_H
diff --git a/settings.cpp b/settings.cpp
diff --git a/settings.h b/settings.h
diff --git a/settings.ui b/settings.ui
