Imported Debian patch 1.5-1

[minitube] / src / video.cpp

diff --git a/src/video.cpp b/src/video.cpp
index 7b7a803de33d28ca07a891e0690cf9a9192d9a6b..d414990ddf2538be47dac24eb4d6bc678ad6cecc 100644 (file)
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -76,6 +76,9 @@ void  Video::getVideoInfo() {
     static const QStringList elTypes = QStringList() << "&el=embedded" << "&el=vevo" << "&el=detailpage" << "";
 
     if (elIndex > elTypes.size() - 1) {
+        loadingStreamUrl = false;
+        emit errorStreamUrl("Cannot get video info");
+        /*
         // Don't panic! We have a plan B.
         // get the youtube video webpage
         qDebug() << "Scraping" << webpage().toString();
@@ -83,6 +86,7 @@ void  Video::getVideoInfo() {
         connect(reply, SIGNAL(data(QByteArray)), SLOT(scrapeWebPage(QByteArray)));
         connect(reply, SIGNAL(error(QNetworkReply*)), SLOT(errorVideoInfo(QNetworkReply*)));
         // see you in scrapWebPage(QByteArray)
+        */
         return;
     }
 
@@ -121,7 +125,7 @@ void  Video::gotVideoInfo(QByteArray data) {
     this->videoToken = videoToken;
 
     // get fmt_url_map
-    re = QRegExp("^.*&fmt_url_map=([^&]+).*$");
+    re = QRegExp("^.*&url_encoded_fmt_stream_map=([^&]+).*$");
     match = re.exactMatch(videoInfo);
     // handle regexp failure
     if (!match || re.numCaptures() < 1) {
@@ -142,14 +146,29 @@ void  Video::gotVideoInfo(QByteArray data) {
     QStringList formatUrls = fmtUrlMap.split(",", QString::SkipEmptyParts);
     QHash<int, QString> urlMap;
     foreach(QString formatUrl, formatUrls) {
-        int separator = formatUrl.indexOf("|");
-        if (separator == -1) continue;
-        int format = formatUrl.left(separator).toInt();
-        QString url = formatUrl.mid(separator + 1);
+        // qDebug() << "formatUrl" << formatUrl;
+        QStringList urlParams = formatUrl.split("&", QString::SkipEmptyParts);
+        // qDebug() << "urlParams" << urlParams;
+
+        int format = -1;
+        QString url;
+        foreach(QString urlParam, urlParams) {
+            if (urlParam.startsWith("itag=")) {
+                int separator = urlParam.indexOf("=");
+                format = urlParam.mid(separator + 1).toInt();
+            } else if (urlParam.startsWith("url=")) {
+                int separator = urlParam.indexOf("=");
+                url = urlParam.mid(separator + 1);
+                url = QByteArray::fromPercentEncoding(url.toUtf8());
+            }
+        }
+        if (format == -1 || url.isNull()) continue;
 
         if (format == definitionCode) {
+            qDebug() << "Found format" << definitionCode;
             QUrl videoUrl = QUrl::fromEncoded(url.toUtf8(), QUrl::StrictMode);
             m_streamUrl = videoUrl;
+            this->definitionCode = definitionCode;
             emit gotStreamUrl(videoUrl);
             loadingStreamUrl = false;
             return;
@@ -163,12 +182,14 @@ void  Video::gotVideoInfo(QByteArray data) {
     int previousIndex = 0;
     while (currentIndex >= 0) {
         previousIndex = currentIndex - 1;
+        if (previousIndex < 0) previousIndex = 0;
         int definitionCode = definitionCodes.at(previousIndex);
         if (urlMap.contains(definitionCode)) {
             qDebug() << "Found format" << definitionCode;
             QString url = urlMap.value(definitionCode);
             QUrl videoUrl = QUrl::fromEncoded(url.toUtf8(), QUrl::StrictMode);
             m_streamUrl = videoUrl;
+            this->definitionCode = definitionCode;
             emit gotStreamUrl(videoUrl);
             loadingStreamUrl = false;
             return;
@@ -188,13 +209,13 @@ void Video::foundVideoUrl(QString videoToken, int definitionCode) {
             ).arg(videoId, videoToken, QString::number(definitionCode)));
 
     m_streamUrl = videoUrl;
-    emit gotStreamUrl(videoUrl);
     loadingStreamUrl = false;
+    emit gotStreamUrl(videoUrl);
 }
 
 void Video::errorVideoInfo(QNetworkReply *reply) {
-    emit errorStreamUrl(tr("Network error: %1 for %2").arg(reply->errorString(), reply->url().toString()));
     loadingStreamUrl = false;
+    emit errorStreamUrl(tr("Network error: %1 for %2").arg(reply->errorString(), reply->url().toString()));
 }
 
 void Video::scrapeWebPage(QByteArray data) {