Upload 3.9.3-2 to unstable

[minitube] / src / ytsinglevideosource.cpp

diff --git a/src/ytsinglevideosource.cpp b/src/ytsinglevideosource.cpp
index 6d9276cb3d9b0c26ed47c3e7b0b6616cefd0dc71..09936cad8f1a541deb831f31331c4e45f351219c 100644 (file)
--- a/src/ytsinglevideosource.cpp
+++ b/src/ytsinglevideosource.cpp
@@ -19,26 +19,15 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include "ytsinglevideosource.h"
-#include "networkaccess.h"
+#include "http.h"
+#include "httputils.h"
 #include "video.h"
 
-#ifdef APP_YT3
 #include "yt3.h"
 #include "yt3listparser.h"
-#else
-#include "ytfeedreader.h"
-#endif
 
-namespace The {
-NetworkAccess* http();
-}
-
-YTSingleVideoSource::YTSingleVideoSource(QObject *parent) : PaginatedVideoSource(parent),
-    video(0),
-    startIndex(0),
-    max(0) { }
-
-#ifdef APP_YT3
+YTSingleVideoSource::YTSingleVideoSource(QObject *parent)
+    : PaginatedVideoSource(parent), video(nullptr), startIndex(0), max(0) {}
 
 void YTSingleVideoSource::loadVideos(int max, int startIndex) {
     aborted = false;
@@ -48,12 +37,11 @@ void YTSingleVideoSource::loadVideos(int max, int startIndex) {
     QUrl url;
 
     if (startIndex == 1) {
-
         if (video) {
-            QList<Video*> videos;
+            QVector<Video *> videos;
             videos << video->clone();
             if (name.isEmpty()) {
-                name = videos.first()->title();
+                name = videos.at(0)->getTitle();
                 qDebug() << "Emitting name changed" << name;
                 emit nameChanged(name);
             }
@@ -63,132 +51,64 @@ void YTSingleVideoSource::loadVideos(int max, int startIndex) {
         }
 
         url = YT3::instance().method("videos");
-#if QT_VERSION >= 0x050000
-        {
-            QUrl &u = url;
-            QUrlQuery url;
-#endif
-            url.addQueryItem("part", "snippet");
-            url.addQueryItem("id", videoId);
-#if QT_VERSION >= 0x050000
-            u.setQuery(url);
-        }
-#endif
+        QUrlQuery q(url);
+        q.addQueryItem("part", "snippet");
+        q.addQueryItem("id", videoId);
+        url.setQuery(q);
+
     } else {
         url = YT3::instance().method("search");
-#if QT_VERSION >= 0x050000
-        {
-            QUrl &u = url;
-            QUrlQuery url;
-#endif
-            url.addQueryItem("part", "snippet");
-            url.addQueryItem("type", "video");
-            url.addQueryItem("relatedToVideoId", videoId);
-            url.addQueryItem("maxResults", QString::number(max));
-            if (startIndex > 2) {
-                if (maybeReloadToken(max, startIndex)) return;
-                url.addQueryItem("pageToken", nextPageToken);
-            }
-#if QT_VERSION >= 0x050000
-            u.setQuery(url);
+        QUrlQuery q(url);
+        q.addQueryItem("part", "snippet");
+        q.addQueryItem("type", "video");
+        q.addQueryItem("relatedToVideoId", videoId);
+        q.addQueryItem("maxResults", QString::number(max));
+        if (startIndex > 2) {
+            if (maybeReloadToken(max, startIndex)) return;
+            q.addQueryItem("pageToken", nextPageToken);
         }
-#endif
+        url.setQuery(q);
     }
 
     lastUrl = url;
 
-    QObject *reply = The::http()->get(url);
+    QObject *reply = HttpUtils::yt().get(url);
     connect(reply, SIGNAL(data(QByteArray)), SLOT(parseResults(QByteArray)));
-    connect(reply, SIGNAL(error(QNetworkReply*)), SLOT(requestError(QNetworkReply*)));
+    connect(reply, SIGNAL(error(QString)), SLOT(requestError(QString)));
 }
 
 void YTSingleVideoSource::parseResults(QByteArray data) {
     if (aborted) return;
 
     YT3ListParser parser(data);
-    QList<Video*> videos = parser.getVideos();
+    const QVector<Video *> &videos = parser.getVideos();
 
     bool tryingWithNewToken = setPageToken(parser.getNextPageToken());
     if (tryingWithNewToken) return;
 
     if (asyncDetails) {
         emit gotVideos(videos);
-        if (startIndex == 2) emit finished(videos.size() + 1);
-        else emit finished(videos.size());
+        if (startIndex == 2)
+            emit finished(videos.size() + 1);
+        else
+            emit finished(videos.size());
     }
     loadVideoDetails(videos);
 }
 
-#else
-
-void YTSingleVideoSource::loadVideos(int max, int startIndex) {
-    aborted = false;
-    this->startIndex = startIndex;
-    this->max = max;
-
-    QString s;
-    if (startIndex == 1) s = "http://gdata.youtube.com/feeds/api/videos/" + videoId;
-    else s = QString("http://gdata.youtube.com/feeds/api/videos/%1/related").arg(videoId);
-    QUrl url(s);
-#if QT_VERSION >= 0x050000
-    {
-        QUrl &u = url;
-        QUrlQuery url;
-#endif
-        url.addQueryItem("v", "2");
-
-        if (startIndex != 1) {
-            url.addQueryItem("max-results", QString::number(max));
-            url.addQueryItem("start-index", QString::number(startIndex-1));
-        }
-
-#if QT_VERSION >= 0x050000
-        u.setQuery(url);
-    }
-#endif
-    QObject *reply = The::http()->get(url);
-    connect(reply, SIGNAL(data(QByteArray)), SLOT(parse(QByteArray)));
-    connect(reply, SIGNAL(error(QNetworkReply*)), SLOT(requestError(QNetworkReply*)));
-}
-
-void YTSingleVideoSource::parse(QByteArray data) {
-    if (aborted) return;
-
-    YTFeedReader reader(data);
-    QList<Video*> videos = reader.getVideos();
-
-    if (name.isEmpty() && !videos.isEmpty() && startIndex == 1) {
-        name = videos.first()->title();
-        emit nameChanged(name);
-    }
-
-    emit gotVideos(videos);
-
-    if (startIndex == 1) loadVideos(max - 1, 2);
-    else if (startIndex == 2) emit finished(videos.size() + 1);
-    else emit finished(videos.size());
-}
-
-#endif
-
 void YTSingleVideoSource::abort() {
     aborted = true;
 }
 
-const QStringList & YTSingleVideoSource::getSuggestions() {
-    static const QStringList *l = new QStringList();
-    return *l;
-}
-
 QString YTSingleVideoSource::getName() {
     return name;
 }
 
 void YTSingleVideoSource::setVideo(Video *video) {
     this->video = video;
-    videoId = video->id();
+    videoId = video->getId();
 }
 
-void YTSingleVideoSource::requestError(QNetworkReply *reply) {
-    emit error(reply->errorString());
+void YTSingleVideoSource::requestError(const QString &message) {
+    emit error(message);
 }