Removed unused code, added js ageGate

diff --git a/src/jsfunctions.cpp b/src/jsfunctions.cpp
index 2c95a1deff498819f67c2f3d430dfb21273031d4..ff7859133976462c1febed05c38a16e4d9e57413 100644 (file)
--- a/src/jsfunctions.cpp
+++ b/src/jsfunctions.cpp
@@ -94,13 +94,13 @@ void JsFunctions::errorJs(QNetworkReply *reply) {
                   << reply->url().toString() << reply->errorString();
 }
 
-QString JsFunctions::evaluate(const QString &function) {
+QString JsFunctions::evaluate(const QString &js) {
     if (!engine) return QString();
-    QScriptValue value = engine->evaluate(function);
+    QScriptValue value = engine->evaluate(js);
     if (value.isUndefined())
-        qWarning() << "Undefined result for" << function;
+        qWarning() << "Undefined result for" << js;
     if (value.isError())
-        qWarning() << "Error in" << function << value.toString();
+        qWarning() << "Error in" << js << value.toString();
 
     return value.toString();
 }
@@ -129,6 +129,10 @@ QString JsFunctions::webPageFmtMapRE() {
     return evaluate("webPageFmtMapRE()");
 }
 
+QString JsFunctions::ageGateRE() {
+    return evaluate("ageGateRE()");
+}
+
 QString JsFunctions::jsPlayerRE() {
     return evaluate("jsPlayerRE()");
 }

diff --git a/src/jsfunctions.h b/src/jsfunctions.h
index ab0f1d19194271948f11938021fbad4423d3c8df..e623a4b5c7dcc04d5e2793cade85da3b7ca9313b 100644 (file)
--- a/src/jsfunctions.h
+++ b/src/jsfunctions.h
@@ -40,11 +40,12 @@ public:
     QString videoTokenRE();
     QString videoInfoFmtMapRE();
     QString webPageFmtMapRE();
+    QString ageGateRE();
     QString jsPlayerRE();
     QString signatureFunctionNameRE();
 
 protected:
-    QString evaluate(const QString &function);
+    QString evaluate(const QString &js);
 
 private slots:
     void gotJs(QByteArray bytes);

diff --git a/src/video.cpp b/src/video.cpp
index f9018a83700f12399222b17f8c7fd3e836782ef6..e7c90da4464d06b3bbaf85be11e6f8b20d1ad952 100644 (file)
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -162,7 +162,7 @@ void  Video::gotVideoInfo(QByteArray data) {
     // get video token
     QRegExp videoTokeRE(JsFunctions::instance()->videoTokenRE());
     if (videoTokeRE.indexIn(videoInfo) == -1) {
-        qWarning() << "Cannot get token. Trying next el param" << videoInfo << videoTokeRE.pattern();
+        // qWarning() << "Cannot get token. Trying next el param" << videoInfo << videoTokeRE.pattern();
         // Don't panic! We're gonna try another magic "el" param
         elIndex++;
         getVideoInfo();
@@ -179,7 +179,7 @@ void  Video::gotVideoInfo(QByteArray data) {
     // get fmt_url_map
     QRegExp fmtMapRE(JsFunctions::instance()->videoInfoFmtMapRE());
     if (fmtMapRE.indexIn(videoInfo) == -1) {
-        qWarning() << "Cannot get urlMap. Trying next el param";
+        // qWarning() << "Cannot get urlMap. Trying next el param";
         // Don't panic! We're gonna try another magic "el" param
         elIndex++;
         getVideoInfo();
@@ -305,18 +305,6 @@ void Video::parseFmtUrlMap(const QString &fmtUrlMap, bool fromWebPage) {
     emit errorStreamUrl(tr("Cannot get video stream for %1").arg(m_webpage.toString()));
 }
 
-void Video::foundVideoUrl(QString videoToken, int definitionCode) {
-    // qDebug() << "foundVideoUrl" << videoToken << definitionCode;
-
-    QUrl videoUrl = QUrl(QString(
-                             "http://www.youtube.com/get_video?video_id=%1&t=%2&eurl=&el=&ps=&asv=&fmt=%3"
-                             ).arg(videoId, videoToken, QString::number(definitionCode)));
-
-    m_streamUrl = videoUrl;
-    loadingStreamUrl = false;
-    emit gotStreamUrl(videoUrl);
-}
-
 void Video::errorVideoInfo(QNetworkReply *reply) {
     loadingStreamUrl = false;
     emit errorStreamUrl(tr("Network error: %1 for %2").arg(reply->errorString(), reply->url().toString()));
@@ -326,7 +314,8 @@ void Video::scrapeWebPage(QByteArray data) {
     QString html = QString::fromUtf8(data);
     // qWarning() << html;
 
-    if (html.contains("player-age-gate-content\"")) {
+    QRegExp ageGateRE(JsFunctions::instance()->ageGateRE());
+    if (ageGateRE.indexIn(html) != -1) {
         // qDebug() << "Found ageGate";
         ageGate = true;
         elIndex = 4;

diff --git a/src/video.h b/src/video.h
index 897fd526244a422661ecbd68ed7f85208ca36453..3a85233bb82ad5bb111094d8846afd89dbfbcbf9 100644 (file)
--- a/src/video.h
+++ b/src/video.h
@@ -102,7 +102,6 @@ private slots:
 
 private:
     void getVideoInfo();
-    void foundVideoUrl(QString videoToken, int definitionCode);
     void parseFmtUrlMap(const QString &fmtUrlMap, bool fromWebPage = false);
     void captureFunction(const QString &name, const QString &js);
     void captureObject(const QString &name, const QString &js);