Changeset 165 for smplayer/trunk/src/youtube

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/youtube/codedownloader.cpp (modified) (1 diff)
• src/youtube/codedownloader.h (modified) (1 diff)
• src/youtube/retrieveyoutubeurl.cpp (modified) (10 diffs)
• src/youtube/retrieveyoutubeurl.h (modified) (6 diffs)
• src/youtube/ytsig.cpp (modified) (6 diffs)
• src/youtube/ytsig.h (modified) (2 diffs)

smplayer/trunk/src/youtube/codedownloader.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify

smplayer/trunk/src/youtube/codedownloader.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify

smplayer/trunk/src/youtube/retrieveyoutubeurl.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
     Copyright (C) 2010 Ori Rejwan
 
@@ -25 +25 @@
 #include "ytsig.h"
 
+#if QT_VERSION >= 0x050000
+#include <QUrlQuery>
+#endif
+
+#define USE_PLAYER_NAME
+
+QString RetrieveYoutubeUrl::user_agent;
+
 RetrieveYoutubeUrl::RetrieveYoutubeUrl( QObject* parent ) : QObject(parent)
 {
         reply = 0;
         manager = new QNetworkAccessManager(this);
-        connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(gotResponse(QNetworkReply*)));
 
         preferred_quality = FLV_360p;
-        user_agent = "Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20100101 Firefox/5.0.1";
 }
 
@@ -39 +45 @@
 
 void RetrieveYoutubeUrl::fetchPage(const QString & url) {
+        QString agent = user_agent;
+        if (agent.isEmpty()) agent = "Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20100101 Firefox/5.0.1";
+        qDebug("RetrieveYoutubeUrl::fetchPage: user agent: %s", agent.toLatin1().constData());
+
+        QNetworkRequest req(url);
+        req.setRawHeader("User-Agent", agent.toLatin1());
+        reply = manager->get(req);
+        connect(reply, SIGNAL(finished()), this, SLOT(gotResponse()));
+        orig_url = url;
+
+        emit connecting(QUrl(url).host());
+
+#ifdef YT_GET_VIDEOINFO
+        video_id = getVideoID(url);
+#endif
+}
+
+#ifdef YT_GET_VIDEOINFO
+void RetrieveYoutubeUrl::fetchVideoInfoPage() {
+        QString url = QString("http://www.youtube.com/get_video_info?el=detailpage&ps=default&eurl=&gl=US&hl=en&video_id=%1").arg(video_id);
+        //qDebug("RetrieveYoutubeUrl::fetchVideoInfoPage: url: %s", url.toUtf8().constData());
+
+        YTSig::check(url);
         QNetworkRequest req(url);
         req.setRawHeader("User-Agent", user_agent.toLatin1());
         reply = manager->get(req);
-        orig_url = url;
-
-        emit connecting(url);
-}
+        connect(reply, SIGNAL(finished()), this, SLOT(gotVideoInfoResponse()));
+
+        emit connecting(QUrl(url).host());
+}
+#endif
 
 void RetrieveYoutubeUrl::close() {
@@ -51 +81 @@
 }
 
-void RetrieveYoutubeUrl::gotResponse(QNetworkReply* reply) {
+void RetrieveYoutubeUrl::gotResponse() {
+        QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+
         if (reply->error() == QNetworkReply::NoError) {
                 int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
@@ -71 +103 @@
 }
 
+#ifdef YT_GET_VIDEOINFO
+void RetrieveYoutubeUrl::gotVideoInfoResponse() {
+        qDebug("RetrieveYoutubeUrl::gotVideoInfoResponse");
+
+        QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+
+        if (reply->error() != QNetworkReply::NoError) {
+                emit errorOcurred((int)reply->error(), reply->errorString());
+                return;
+        }
+        parseVideoInfo(reply->readAll());
+}
+#endif
+
 void RetrieveYoutubeUrl::parse(QByteArray text) {
         qDebug("RetrieveYoutubeUrl::parse");
@@ -87 +133 @@
         }
 
+        //qDebug("RetrieveYoutubeUrl::parse: replyString: %s",replyString.toLatin1().constData());
+
+        QString player;
+        QRegExp rxplayer("html5player-([\\d,\\w,-]+)\\.js");
+        if (rxplayer.indexIn(replyString) != -1) {
+                player = rxplayer.cap(1);
+                qDebug("RetrieveYoutubeUrl::parse: html5player: %s", player.toLatin1().constData());
+        }
+
         QRegExp regex("\\\"url_encoded_fmt_stream_map\\\"\\s*:\\s*\\\"([^\\\"]*)");
         regex.indexIn(replyString);
@@ -93 +148 @@
         fmtArray.replace(QRegExp("\\\\(.)"), "\\1");
 
-        bool signature_not_found = false;
+#ifndef YT_GET_VIDEOINFO
+        bool failed_to_decrypt_signature = false;
+#endif
+
+        #if QT_VERSION >= 0x050000
+        QUrlQuery * q = new QUrlQuery();
+        #endif
 
         QList<QByteArray> codeList = fmtArray.toLatin1().split(',');
@@ -101 +162 @@
 
                 QUrl line;
-                line.setEncodedQuery(code);
-
-                if (line.hasQueryItem("url")) {
-                        QUrl url( line.queryItemValue("url") );
+                #if QT_VERSION >= 0x050000
+                q->setQuery(code);
+                #else
+                QUrl * q = &line;
+                q->setEncodedQuery(code);
+                #endif
+
+                if (q->hasQueryItem("url")) {
+                        QUrl url( q->queryItemValue("url") );
                         line.setScheme(url.scheme());
                         line.setHost(url.host());
                         line.setPath(url.path());
-                        line.setEncodedQuery( line.encodedQuery() + "&" + url.encodedQuery() );
-                        line.removeQueryItem("url");
-
-                        if (line.hasQueryItem("sig")) {
-                                line.addQueryItem("signature", line.queryItemValue("sig"));
-                                line.removeQueryItem("sig");
+                        q->removeQueryItem("url");
+                        #if QT_VERSION >= 0x050000
+                        q->setQuery( q->query(QUrl::FullyDecoded) + "&" + url.query(QUrl::FullyDecoded) );
+                        /*
+                        QList < QPair < QString,QString > > l = q->queryItems();
+                        for (int n=0; n < l.count(); n++) {
+                                qDebug("n: %d, %s = %s", n, l[n].first.toLatin1().constData(), l[n].second.toLatin1().constData());
+                        }
+                        */
+                        #else
+                        q->setEncodedQuery( q->encodedQuery() + "&" + url.encodedQuery() );
+                        /*
+                        QList < QPair < QString,QString > > l = q->queryItems();
+                        for (int n=0; n < l.count(); n++) {
+                                qDebug("n: %d, %s = %s", n, l[n].first.toLatin1().constData(), l[n].second.toLatin1().constData());
+                        }
+                        */
+                        #endif
+
+                        if (q->hasQueryItem("sig")) {
+                                q->addQueryItem("signature", q->queryItemValue("sig"));
+                                q->removeQueryItem("sig");
                         }
                         else
-                        if (line.hasQueryItem("s")) {
-                                QString signature = YTSig::aclara(line.queryItemValue("s"));
+                        if (q->hasQueryItem("s")) {
+                                #ifdef USE_PLAYER_NAME
+                                QString signature = YTSig::aclara(q->queryItemValue("s"), player);
+                                #else
+                                QString signature = YTSig::aclara(q->queryItemValue("s"));
+                                #endif
                                 if (!signature.isEmpty()) {
-                                        line.addQueryItem("signature", signature);
+                                        q->addQueryItem("signature", signature);
                                 } else {
-                                        signature_not_found = true;
+                                #ifndef YT_GET_VIDEOINFO
+                                        failed_to_decrypt_signature = true;
+                                #endif
                                 }
-                                line.removeQueryItem("s");
-                        }
-                        line.removeAllQueryItems("fallback_host");
-                        line.removeAllQueryItems("type");
-                        if ((line.hasQueryItem("itag")) && (line.hasQueryItem("signature"))) {
-                                QString itag = line.queryItemValue("itag");
-                                line.removeAllQueryItems("itag"); // Remove duplicated itag
-                                line.addQueryItem("itag", itag);
+                                q->removeQueryItem("s");
+                        }
+                        q->removeAllQueryItems("fallback_host");
+                        q->removeAllQueryItems("type");
+
+                        if ((q->hasQueryItem("itag")) && (q->hasQueryItem("signature"))) {
+                                QString itag = q->queryItemValue("itag");
+                                q->removeAllQueryItems("itag"); // Remove duplicated itag
+                                q->addQueryItem("itag", itag);
+                                #if QT_VERSION >= 0x050000
+                                line.setQuery(q->query(QUrl::FullyDecoded));
+                                #endif
                                 urlMap[itag.toInt()] = line.toString();
                                 //qDebug("line: %s", line.toString().toLatin1().constData());
@@ -137 +229 @@
         }
 
+        #if QT_VERSION >= 0x050000
+        delete q;
+        #endif
+
         qDebug("RetrieveYoutubeUrl::parse: url count: %d", urlMap.count());
 
-        if ((urlMap.count() == 0) && (signature_not_found)) {
+#ifndef YT_GET_VIDEOINFO
+        if ((urlMap.count() == 0) && (failed_to_decrypt_signature)) {
                 qDebug("RetrieveYoutubeUrl::parse: no url found with valid signature");
                 emit signatureNotFound(url_title);
                 return;
         }
+#else
+        if (urlMap.count() == 0) {
+                qDebug("RetrieveYoutubeUrl::parse: no url found with valid signature");
+                fetchVideoInfoPage();
+                return;
+        }
+#endif
 
         QString p_url = findPreferredUrl();
@@ -155 +259 @@
         }
 }
+
+QString RetrieveYoutubeUrl::getVideoID(QString video_url) {
+        if (video_url.contains("youtu.be/")) {
+                video_url.replace("youtu.be/", "youtube.com/watch?v=");
+        }
+        else
+        if (video_url.contains("y2u.be/")) {
+                video_url.replace("y2u.be/", "youtube.com/watch?v=");
+        }
+        else
+        if (video_url.contains("m.youtube.com")) {
+                video_url.replace("m.youtube.com", "www.youtube.com");
+        }
+
+        if ((video_url.startsWith("youtube.com")) || (video_url.startsWith("www.youtube.com"))) video_url = "http://" + video_url;
+
+        //qDebug("RetrieveYoutubeUrl::getVideoID: video_url: %s", video_url.toLatin1().constData());
+
+        QUrl url(video_url);
+
+        QString ID;
+
+#if QT_VERSION >= 0x050000
+        QUrlQuery * q = new QUrlQuery(url);
+#else
+        const QUrl * q = &url;
+#endif
+
+        if ((url.host().contains("youtube")) && (url.path().contains("watch_videos"))) {
+                if (q->hasQueryItem("video_ids")) {
+                        int index = 0;
+                        if (q->hasQueryItem("index")) index = q->queryItemValue("index").toInt();
+                        QStringList list = q->queryItemValue("video_ids").split(",");
+                        if (index < list.count()) ID = list[index];
+                }
+        }
+        else
+        if ((url.host().contains("youtube")) && (url.path().contains("watch"))) {
+                if (q->hasQueryItem("v")) {
+                        ID = q->queryItemValue("v");
+                }
+        }
+
+#if QT_VERSION >= 0x050000
+        delete q;
+#endif
+
+        //qDebug("RetrieveYoutubeUrl::getVideoID: ID: %s", ID.toLatin1().constData());
+
+        return ID;
+}
+
+bool RetrieveYoutubeUrl::isUrlSupported(const QString & url) {
+        return (!getVideoID(url).isEmpty());
+}
+
+QString RetrieveYoutubeUrl::fullUrl(const QString & url) {
+        QString r;
+        QString ID = getVideoID(url);
+        if (!ID.isEmpty()) r = "http://www.youtube.com/watch?v=" + ID;
+        return r;
+}
+
+#ifdef YT_GET_VIDEOINFO
+void RetrieveYoutubeUrl::parseVideoInfo(QByteArray text) {
+        urlMap.clear();
+
+        #if QT_VERSION >= 0x050000
+        QUrlQuery all;
+        all.setQuery(text);
+        QByteArray fmtArray = all.queryItemValue("url_encoded_fmt_stream_map").toLatin1();
+        #else
+        QUrl all;
+        all.setEncodedQuery(text);
+        QByteArray fmtArray = all.queryItemValue("url_encoded_fmt_stream_map").toLatin1();
+        #endif
+
+        /*
+        qDebug("fmtArray: %s", fmtArray.constData());
+        return;
+        */
+
+        bool failed_to_decrypt_signature = false;
+
+        #if QT_VERSION >= 0x050000
+        QUrlQuery * q = new QUrlQuery();
+        #endif
+
+        QList<QByteArray> codeList = fmtArray.split(',');
+        foreach(QByteArray code, codeList) {
+                code = QUrl::fromPercentEncoding(code).toLatin1();
+                //qDebug("code: %s", code.constData());
+
+                QUrl line;
+                #if QT_VERSION >= 0x050000
+                q->setQuery(code);
+                #else
+                QUrl * q = &line;
+                q->setEncodedQuery(code);
+                #endif
+
+                if (q->hasQueryItem("url")) {
+                        QUrl url( q->queryItemValue("url") );
+                        line.setScheme(url.scheme());
+                        line.setHost(url.host());
+                        line.setPath(url.path());
+                        q->removeQueryItem("url");
+                        #if QT_VERSION >= 0x050000
+                        q->setQuery( q->query(QUrl::FullyDecoded) + "&" + url.query(QUrl::FullyDecoded) );
+                        /*
+                        QList < QPair < QString,QString > > l = q->queryItems();
+                        for (int n=0; n < l.count(); n++) {
+                                qDebug("n: %d, %s = %s", n, l[n].first.toLatin1().constData(), l[n].second.toLatin1().constData());
+                        }
+                        */
+                        #else
+                        q->setEncodedQuery( q->encodedQuery() + "&" + url.encodedQuery() );
+                        /*
+                        QList < QPair < QString,QString > > l = q->queryItems();
+                        for (int n=0; n < l.count(); n++) {
+                                qDebug("n: %d, %s = %s", n, l[n].first.toLatin1().constData(), l[n].second.toLatin1().constData());
+                        }
+                        */
+                        #endif
+
+                        if (q->hasQueryItem("sig")) {
+                                q->addQueryItem("signature", q->queryItemValue("sig"));
+                                q->removeQueryItem("sig");
+                        }
+                        else
+                        if (q->hasQueryItem("s")) {
+                                QString signature = YTSig::aclara(q->queryItemValue("s"), "", "aclara_f");
+                                if (!signature.isEmpty()) {
+                                        q->addQueryItem("signature", signature);
+                                } else {
+                                        failed_to_decrypt_signature = true;
+                                }
+                                q->removeQueryItem("s");
+                        }
+                        q->removeAllQueryItems("fallback_host");
+                        q->removeAllQueryItems("type");
+                        if ((q->hasQueryItem("itag")) && (q->hasQueryItem("signature"))) {
+                                QString itag = q->queryItemValue("itag");
+                                q->removeAllQueryItems("itag"); // Remove duplicated itag
+                                q->addQueryItem("itag", itag);
+                                #if QT_VERSION >= 0x050000
+                                line.setQuery(q->query(QUrl::FullyDecoded));
+                                #endif
+                                urlMap[itag.toInt()] = line.toString();
+                                //qDebug("line: %s", line.toString().toLatin1().constData());
+                        }
+                }
+        }
+
+        #if QT_VERSION >= 0x050000
+        delete q;
+        #endif
+
+        qDebug("RetrieveYoutubeUrl::parseVideoInfo: url count: %d", urlMap.count());
+
+        if ((urlMap.count() == 0) && (failed_to_decrypt_signature)) {
+                qDebug("RetrieveYoutubeUrl::parseVideoInfo: no url found with valid signature");
+                emit signatureNotFound(url_title);
+                return;
+        }
+
+        QString p_url = findPreferredUrl();
+        //qDebug("p_url: '%s'", p_url.toLatin1().constData());
+
+        if (!p_url.isNull()) {
+                emit gotUrls(urlMap);
+                emit gotPreferredUrl(p_url);
+        } else {
+                 emit gotEmptyList();
+        }
+}
+#endif
 
 QString RetrieveYoutubeUrl::findPreferredUrl() {

smplayer/trunk/src/youtube/retrieveyoutubeurl.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -24 +24 @@
 #include <QMap>
 
+#define YT_GET_VIDEOINFO
+
 class RetrieveYoutubeUrl : public QObject
 {
@@ -39 +41 @@
         void close();
 
-        void setUserAgent(const QString & s) { user_agent = s; };
-        QString userAgent() { return user_agent; };
+        static void setUserAgent(const QString & s) { user_agent = s; };
+        static QString userAgent() { return user_agent; };
 
         void setPreferredQuality(Quality q) { preferred_quality = q; }
@@ -51 +53 @@
         QString latestPreferredUrl() { return latest_preferred_url; }
         QString origUrl() { return orig_url; }
+
+        bool isUrlSupported(const QString & url);
+        QString fullUrl(const QString & url);
 
 signals:
@@ -63 +68 @@
 
 protected slots:
-        void gotResponse(QNetworkReply* reply);
+        void gotResponse();
         void parse(QByteArray text);
+#ifdef YT_GET_VIDEOINFO
+        void gotVideoInfoResponse();
+        void parseVideoInfo(QByteArray text);
+        void fetchVideoInfoPage();
+#endif
 
 protected:
         static QString sanitizeForUnicodePoint(QString string);
         static void htmlDecode(QString& string);
+        QString getVideoID(QString video_url);
 
         QMap<int, QString> urlMap;
@@ -76 +87 @@
 
         Quality preferred_quality;
-        QString user_agent;
+        static QString user_agent;
+
+#ifdef YT_GET_VIDEOINFO
+        QString video_id;
+#endif
 
 private:

smplayer/trunk/src/youtube/ytsig.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -21 +21 @@
 #ifdef YT_USE_SCRIPT
 #include <QtScript>
-#endif
 
-#ifdef YT_USE_SCRIPT
-QString YTSig::aclara(const QString & text) {
+QString YTSig::aclara(const QString & text, const QString & player, const QString & function_name) {
         int dot = text.indexOf('.');
-        qDebug("YTSig::aclara: length: %d (%d.%d)", text.size(), dot, text.size()-dot-1);
+        qDebug("YTSig::aclara: length: %d (%d.%d) p: %d", text.size(), dot, text.size()-dot-1, !player.isEmpty());
 
         if (script.isEmpty()) script = default_script;
@@ -36 +34 @@
 
         engine.evaluate(script);
-        QScriptValue aclarar = engine.globalObject().property("aclara");
-        QString res = aclarar.call(QScriptValue(), QScriptValueList() << text).toString();
+
+        QScriptValueList args;
+        QString fname;
+
+        if (!function_name.isEmpty()) {
+                fname = function_name;
+                args << text;
+        }
+        else
+        if (player.isEmpty()) {
+                fname = "aclara";
+                args << text;
+        }
+        else {
+                fname = "aclara_p";
+                args << text << player;
+        }
+
+        //qDebug("YTSig::aclara: function_name: %s", function_name.toLatin1().constData());
+
+        QScriptValue aclarar = engine.globalObject().property(fname);
+        QString res = aclarar.call(QScriptValue(), args).toString();
 
         //qDebug() << res;
@@ -61 +79 @@
         f.close();
 
+        parsed_ts = "";
+
         if (!bytes.isEmpty()) {
                 script = bytes;
+
+                QRegExp rx("D: ([\\d,a-z,A-Z-]+)");
+                if (rx.indexIn(bytes)) {
+                        QByteArray d = rx.cap(1).toLatin1();
+                        qDebug("YTSig::reloadScriptFile: d: %s", d.constData());
+                        parsed_ts = QByteArray::fromBase64(d);
+                }
+
         }
 }
@@ -69 +97 @@
 QString YTSig::script_file;
 
-// Algorithms from youtube-dl (http://rg3.github.io/youtube-dl/)
-
 QString YTSig::default_script;
 
+#else // YT_USE_SCRIPT
+
+#ifdef YTSIG_STATIC
+#include "ytsig_priv.cpp"
 #else
-
-QString YTSig::rev(const QString & orig) {
-        QString r;
-        for (int n = orig.size()-1; n >= 0; n--) {
-                r.append(orig.at(n));
-        }
-        return r;
-}
-
-QString YTSig::aclara(const QString & text) {
+QString YTSig::aclara(const QString & text, const QString & player, const QString & function_name) {
         QString res;
 
         int dot = text.indexOf('.');
         qDebug("YTSig::aclara (2): length: %d (%d.%d)", text.size(), dot, text.size()-dot-1);
-
-#if 0
-        if (text.size() == xx) {
-                res = <your code>;
-        }
-        else {
-                qDebug("YTSig::aclara: signature length not supported: %d: %s", text.size(), text.toLatin1().constData());
-                return res;
-        }
-#endif
 
         /*
@@ -106 +117 @@
         return res;
 }
+#endif
 
-#endif
+#endif // YT_USE_SCRIPT
+
+void YTSig::check(QString & u) {
+        if (!parsed_ts.isEmpty()) {
+                u.append(QString("&%1").arg(parsed_ts));
+        }
+}
+
+QString YTSig::parsed_ts;

smplayer/trunk/src/youtube/ytsig.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -25 +25 @@
 {
 public:
-        static QString aclara(const QString &);
+        static QString aclara(const QString & text, const QString & player = "", const QString & function_name = QString::null);
+
+        static void check(QString & u);
 
 #ifdef YT_USE_SCRIPT
         static void setScriptFile(const QString & f) { script_file = f; reloadScriptFile(); };
 
-protected:
+private:
         static QString script;
         static QString default_script;
         static QString script_file;
         static void reloadScriptFile();
-#else
-protected:
-        static QString rev(const QString & orig);
 #endif
+
+private:
+        static QString parsed_ts;
 };