From: Jakob Haufe <sur5r@sur5r.net>
Date: Sun, 13 Mar 2016 21:53:39 +0000 (+0100)
Subject: Imported Upstream version 2.5.2
X-Git-Tag: upstream/2.5.2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=097986aba4ccdb7c991f67af12487b79e4582858;p=minitube

Imported Upstream version 2.5.2
---

diff --git a/CHANGES b/CHANGES
index 1b5a982..52d3333 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+2.5.2
+- Fixed VEVO videos
+
+2.5.1
+- Fixed VEVO videos
+
 2.5
 - Upgraded to Qt 5
 - HiDPI (aka Retina Display) support
diff --git a/locale/pt.ts b/locale/pt.ts
index ed538f8..b3e8dd1 100644
--- a/locale/pt.ts
+++ b/locale/pt.ts
@@ -241,7 +241,7 @@
     <message>
         <location filename="src/datautils.cpp" line="88"/>
         <source>Just now</source>
-        <translation type="unfinished"/>
+        <translation>Agora mesmo</translation>
     </message>
     <message numerus="yes">
         <location filename="src/datautils.cpp" line="90"/>
@@ -405,22 +405,22 @@
     <message>
         <location filename="local/src/extra.cpp" line="251"/>
         <source>The executable file has been tempered with, maybe by a virus.</source>
-        <translation type="unfinished"/>
+        <translation>O arquivo executável foi temperada com, talvez por um vírus.</translation>
     </message>
     <message>
         <location filename="local/src/extra.cpp" line="252"/>
         <source>%1 will not run. Try installing again.</source>
-        <translation type="unfinished"/>
+        <translation>%1 não será executado. Tente instalar novamente.</translation>
     </message>
     <message>
         <location filename="local/src/extra.cpp" line="253"/>
         <source>Quit</source>
-        <translation type="unfinished"/>
+        <translation>Sair</translation>
     </message>
     <message>
         <location filename="local/src/extra.cpp" line="254"/>
         <source>Reinstall</source>
-        <translation type="unfinished"/>
+        <translation>Reinstalar</translation>
     </message>
 </context>
 <context>
@@ -738,7 +738,7 @@
     <message>
         <location filename="src/mainwindow.cpp" line="566"/>
         <source>&amp;Adjust Window Size</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ajuste o tamanho da janela</translation>
     </message>
     <message>
         <location filename="src/mainwindow.cpp" line="571"/>
@@ -854,7 +854,7 @@
     <message>
         <location filename="src/mainwindow.cpp" line="1158"/>
         <source>&amp;Loading...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Carregando...</translation>
     </message>
     <message>
         <location filename="src/mainwindow.cpp" line="1264"/>
@@ -1059,12 +1059,12 @@
     <message>
         <location filename="src/mediaview.cpp" line="1166"/>
         <source>Unsubscribed from %1</source>
-        <translation type="unfinished"/>
+        <translation>Não subscrito de %1</translation>
     </message>
     <message>
         <location filename="src/mediaview.cpp" line="1169"/>
         <source>Subscribed to %1</source>
-        <translation type="unfinished"/>
+        <translation>Subscrito %1</translation>
     </message>
     <message>
         <location filename="src/mediaview.cpp" line="808"/>
diff --git a/locale/uk_UA.ts b/locale/uk_UA.ts
index 56433ec..85f04d7 100644
--- a/locale/uk_UA.ts
+++ b/locale/uk_UA.ts
@@ -242,7 +242,7 @@
     <message>
         <location filename="src/datautils.cpp" line="88"/>
         <source>Just now</source>
-        <translation type="unfinished"/>
+        <translation>Тільки зараз</translation>
     </message>
     <message numerus="yes">
         <location filename="src/datautils.cpp" line="90"/>
@@ -411,17 +411,17 @@
     <message>
         <location filename="local/src/extra.cpp" line="252"/>
         <source>%1 will not run. Try installing again.</source>
-        <translation type="unfinished"/>
+        <translation>%1 не буде працювати. Спробуйте встановити заново</translation>
     </message>
     <message>
         <location filename="local/src/extra.cpp" line="253"/>
         <source>Quit</source>
-        <translation type="unfinished"/>
+        <translation>Вийти</translation>
     </message>
     <message>
         <location filename="local/src/extra.cpp" line="254"/>
         <source>Reinstall</source>
-        <translation type="unfinished"/>
+        <translation>Перевстановити</translation>
     </message>
 </context>
 <context>
@@ -739,12 +739,12 @@
     <message>
         <location filename="src/mainwindow.cpp" line="566"/>
         <source>&amp;Adjust Window Size</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Змінити розмір вікна</translation>
     </message>
     <message>
         <location filename="src/mainwindow.cpp" line="571"/>
         <source>&amp;Stop After This Video</source>
-        <translation>Зу&amp;пинити після цього видиво</translation>
+        <translation>&amp;Зупинити після цього відео</translation>
     </message>
     <message>
         <location filename="src/mainwindow.cpp" line="578"/>
@@ -764,12 +764,12 @@
     <message>
         <location filename="src/mainwindow.cpp" line="597"/>
         <source>&amp;Related Videos</source>
-        <translation>Схо&amp;жі видива</translation>
+        <translation>&amp;Схожі відео</translation>
     </message>
     <message>
         <location filename="src/mainwindow.cpp" line="599"/>
         <source>Watch videos related to the current one</source>
-        <translation>Дивитися видива, пов’язані з поточним</translation>
+        <translation>Дивитися відео, пов’язані з поточним</translation>
     </message>
     <message>
         <location filename="src/mainwindow.cpp" line="605"/>
@@ -804,7 +804,7 @@
     <message>
         <location filename="src/mainwindow.cpp" line="670"/>
         <source>&amp;Video</source>
-        <translation>&amp;Видиво</translation>
+        <translation>&amp;Відео</translation>
     </message>
     <message>
         <location filename="src/mainwindow.cpp" line="686"/>
@@ -855,7 +855,7 @@
     <message>
         <location filename="src/mainwindow.cpp" line="1158"/>
         <source>&amp;Loading...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Завантаження...</translation>
     </message>
     <message>
         <location filename="src/mainwindow.cpp" line="1264"/>
@@ -910,7 +910,7 @@
     <message>
         <location filename="src/mainwindow.cpp" line="362"/>
         <source>Copy the Video Stream &amp;URL</source>
-        <translation>Копіювати посилання на ви&amp;диво потік</translation>
+        <translation>Копіювати посилання на ві&amp;део-потік</translation>
     </message>
     <message>
         <location filename="src/mainwindow.cpp" line="369"/>
@@ -1060,12 +1060,12 @@
     <message>
         <location filename="src/mediaview.cpp" line="1166"/>
         <source>Unsubscribed from %1</source>
-        <translation type="unfinished"/>
+        <translation>Підписка на %1 анульована</translation>
     </message>
     <message>
         <location filename="src/mediaview.cpp" line="1169"/>
         <source>Subscribed to %1</source>
-        <translation type="unfinished"/>
+        <translation>Підписка на %1 оформлена</translation>
     </message>
     <message>
         <location filename="src/mediaview.cpp" line="808"/>
diff --git a/minitube.pro b/minitube.pro
index e218ab8..42d8808 100644
--- a/minitube.pro
+++ b/minitube.pro
@@ -1,6 +1,6 @@
 CONFIG += release
 TEMPLATE = app
-VERSION = 2.5.1
+VERSION = 2.5.2
 DEFINES += APP_VERSION="$$VERSION"
 
 APP_NAME = Minitube
diff --git a/src/video.cpp b/src/video.cpp
index 5a1dbd0..a5cade0 100644
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -356,7 +356,7 @@ void Video::parseJsPlayer(const QByteArray &bytes) {
     } else {
         sigFuncName = funcNameRe.cap(1);
         captureFunction(sigFuncName, js);
-        // qWarning() << sigFunctions;
+        // qWarning() << sigFunctions << sigObjects;
     }
 
 #ifdef APP_DASH
@@ -404,16 +404,27 @@ void Video::parseDashManifest(const QByteArray &bytes) {
 }
 
 void Video::captureFunction(const QString &name, const QString &js) {
-    QRegExp funcRe("function\\s+" + QRegExp::escape(name) + "\\s*\\([" + jsNameChars + ",\\s]*\\)\\s*\\{[^\\}]+\\}");
-    if (funcRe.indexIn(js) == -1) {
+    const QString argsAndBody = "\\s*\\([" + jsNameChars + ",\\s]*\\)\\s*\\{[^\\}]+\\}";
+    QString func;
+    QRegExp funcRe("function\\s+" + QRegExp::escape(name) + argsAndBody);
+    if (funcRe.indexIn(js) != -1) {
+        func = funcRe.cap(0);
+    } else {
         // try var foo = function(bar) { };
-        funcRe = QRegExp("var\\s+" + QRegExp::escape(name) + "\\s*=\\s*function\\s*\\([" + jsNameChars + ",\\s]*\\)\\s*\\{[^\\}]+\\}");
-        if (funcRe.indexIn(js) == -1) {
-            qWarning() << "Cannot capture function" << name;
-            return;
+        funcRe = QRegExp("var\\s+" + QRegExp::escape(name) + "\\s*=\\s*function" + argsAndBody);
+        if (funcRe.indexIn(js) != -1) {
+            func = funcRe.cap(0);
+        } else {
+            // try ,gr= function(bar) { };
+            funcRe = QRegExp("[,\\s;}\\.\\)](" + QRegExp::escape(name) + "\\s*=\\s*function" + argsAndBody + ")");
+            if (funcRe.indexIn(js) != -1) {
+                func = funcRe.cap(1);
+            } else {
+                qWarning() << "Cannot capture function" << name;
+                return;
+            }
         }
     }
-    QString func = funcRe.cap(0);
     sigFunctions.insert(name, func);
 
     // capture inner functions
@@ -438,7 +449,7 @@ void Video::captureFunction(const QString &name, const QString &js) {
 }
 
 void Video::captureObject(const QString &name, const QString &js) {
-    QRegExp re("var\\s+" + QRegExp::escape(name) + "\\s*=\\s*\\{.+\\}\\s*;");
+    QRegExp re("var\\s+" + QRegExp::escape(name) + "\\s*=\\s*\\{.*\\}\\s*;");
     re.setMinimal(true);
     if (re.indexIn(js) == -1) {
         qWarning() << "Cannot capture object" << name;