Fix for "majors" trying to protect "intellectual property". If

"intellectual property" also includes Christina Aguilera, that is...

diff --git a/src/video.cpp b/src/video.cpp
index e8014e1a7f172cfaedc2e729ee899564e3537df1..bb863749318ecd4eda41e0c959d5bdad52a21a62 100644 (file)
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -8,7 +8,8 @@ namespace The {
 
 Video::Video() : m_duration(0),
 m_viewCount(-1),
-m_hd(false) { }
+m_hd(false),
+elIndex(0) { }
 
 void Video::preloadThumbnail() {
     if (m_thumbnailUrls.isEmpty()) return;
@@ -31,6 +32,8 @@ void Video::loadStreamUrl() {
     // else emit gotStreamUrl(m_streamUrl);
 }
 
+static const QStringList elTypes = QStringList() << "embedded" << "vevo" << "detailpage";
+
 void Video::scrapeStreamUrl() {
 
     // https://develop.participatoryculture.org/trac/democracy/browser/trunk/tv/portable/flashscraper.py
@@ -51,15 +54,33 @@ void Video::scrapeStreamUrl() {
     // if (!videoId) return false;
     // qDebug() << videoId;
 
+    getVideoInfo();
+
+}
+
+void  Video::getVideoInfo() {
+
+    if (elIndex > elTypes.size() - 1) {
+        // Don't panic! We have a plan B.
+        // get the youtube video webpage
+        QObject *reply = The::http()->get(webpage().toString());
+        connect(reply, SIGNAL(data(QByteArray)), SLOT(scrapWebPage(QByteArray)));
+        connect(reply, SIGNAL(error(QNetworkReply*)), SLOT(errorVideoInfo(QNetworkReply*)));
+        // see you in scrapWebPage(QByteArray)
+        return;
+    }
+
     // Get Video Token
-    QUrl normalizedUrl = QUrl(QString("http://www.youtube.com/get_video_info?video_id=")
-                              .append(videoId).append("&el=embedded&ps=default&eurl="));
+    QUrl videoInfoUrl = QUrl(QString(
+            "http://www.youtube.com/get_video_info?video_id=%1&el=%2&ps=default&eurl="
+            ).arg(videoId, elTypes.at(elIndex)));
 
-    QObject *reply = The::http()->get(normalizedUrl);
+    QObject *reply = The::http()->get(videoInfoUrl);
     connect(reply, SIGNAL(data(QByteArray)), SLOT(gotVideoInfo(QByteArray)));
     connect(reply, SIGNAL(error(QNetworkReply*)), SLOT(errorVideoInfo(QNetworkReply*)));
 
     // see you in gotVideoInfo...
+
 }
 
 void  Video::gotVideoInfo(QByteArray data) {
@@ -68,37 +89,11 @@ void  Video::gotVideoInfo(QByteArray data) {
     QRegExp re = QRegExp("^.*&token=([^&]+).*$");
     bool match = re.exactMatch(videoInfo);
 
-    // on regexp failure, stop and report error
+    // handle regexp failure
     if (!match || re.numCaptures() < 1) {
-
-        // Don't panic! We have a plan B.
-
-        // get the youtube video webpage
-        QObject *reply = The::http()->get(webpage().toString());
-        connect(reply, SIGNAL(data(QByteArray)), SLOT(scrapWebPage(QByteArray)));
-        connect(reply, SIGNAL(error(QNetworkReply*)), SLOT(errorVideoInfo(QNetworkReply*)));
-
-        // see you in scrapWebPage(QByteArray)
-
-        /*
-        qDebug() << videoInfo;
-        re = QRegExp("^.*&reason=([^&]+).*$");
-        match = re.exactMatch(videoInfo);
-        if (match) {
-            // report the error in the status bar
-            QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(qApp->topLevelWidgets().first());
-            QString errorMessage = QUrl::fromEncoded(re.cap(1).toUtf8()).toString().replace("+", " ");
-            int indexOfTag = errorMessage.indexOf("<");
-            if (indexOfTag != -1) {
-                errorMessage = errorMessage.left(indexOfTag);
-            }
-            if (mainWindow) mainWindow->statusBar()->showMessage(errorMessage);
-            emit errorStreamUrl(errorMessage);
-
-        } else
-            emit errorStreamUrl("Error parsing video info");
-        */
-
+        // Don't panic! We're gonna try another magic "el" param
+        elIndex++;
+        getVideoInfo();
         return;
     }
 

diff --git a/src/video.h b/src/video.h
index 0ae15faf772786b606451a1183648be14f402f85..4637308661b45f07712d236b4ffed905bfc11d91 100644 (file)
--- a/src/video.h
+++ b/src/video.h
@@ -60,6 +60,7 @@ private slots:
 
 private:
     void scrapeStreamUrl();
+    void getVideoInfo();
     void findHdVideo(QString videoToken);
     void standardVideoUrl(QString videoToken);
     void hdVideoUrl(QString videoToken);
@@ -83,6 +84,10 @@ private:
 
     QString videoToken;
     int m_hd;
+
+    // current index for the elTypes list
+    // needed to iterate on elTypes
+    int elIndex;
 };
 
 // This is required in order to use QPointer<Video> as a QVariant