Moved formatDuration to DataUtils

[minitube] / src / video.cpp

diff --git a/src/video.cpp b/src/video.cpp
index 29b74b8125731e125886a0de2e4dc9a3beb99c90..03edbdad3240b89f882038100c3ec0b3ee232b7c 100644 (file)
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -24,6 +24,8 @@ $END_LICENSE */
 #include "videodefinition.h"
 #include "jsfunctions.h"
 #include "temporary.h"
+#include "compatibility/qurlqueryhelper.h"
+#include "datautils.h"
 
 namespace The {
 NetworkAccess* http();
@@ -123,28 +125,18 @@ void  Video::getVideoInfo() {
     static const QStringList elTypes = QStringList() << "&el=embedded" << "&el=detailpage" << "&el=vevo" << "";
 
     QUrl url;
-
     if (elIndex == elTypes.size()) {
         // qDebug() << "Trying special embedded el param";
         url = QUrl("https://www.youtube.com/get_video_info");
 
-#if QT_VERSION >= 0x050000
-        {
-            QUrl &u = url;
-            QUrlQuery url;
-#endif
-            url.addQueryItem("video_id", videoId);
-            url.addQueryItem("el", "embedded");
-            url.addQueryItem("gl", "US");
-            url.addQueryItem("hl", "en");
-            url.addQueryItem("eurl", "https://youtube.googleapis.com/v/" + videoId);
-            url.addQueryItem("asv", "3");
-            url.addQueryItem("sts", "1588");
-#if QT_VERSION >= 0x050000
-            u.setQuery(url);
-        }
-#endif
-
+        QUrlQueryHelper urlHelper(url);
+        urlHelper.addQueryItem("video_id", videoId);
+        urlHelper.addQueryItem("el", "embedded");
+        urlHelper.addQueryItem("gl", "US");
+        urlHelper.addQueryItem("hl", "en");
+        urlHelper.addQueryItem("eurl", "https://youtube.googleapis.com/v/" + videoId);
+        urlHelper.addQueryItem("asv", "3");
+        urlHelper.addQueryItem("sts", "1588");
     } else if (elIndex > elTypes.size() - 1) {
         qWarning() << "Cannot get video info";
         loadingStreamUrl = false;
@@ -204,22 +196,21 @@ void  Video::gotVideoInfo(QByteArray data) {
 }
 
 void Video::parseFmtUrlMap(const QString &fmtUrlMap, bool fromWebPage) {
-    QSettings settings;
-    QString definitionName = settings.value("definition", "360p").toString();
-    int definitionCode = VideoDefinition::getDefinitionCode(definitionName);
+    const QString definitionName = QSettings().value("definition", "360p").toString();
+    const VideoDefinition& definition = VideoDefinition::getDefinitionFor(definitionName);
 
     // qDebug() << "fmtUrlMap" << fmtUrlMap;
-    QStringList formatUrls = fmtUrlMap.split(',', QString::SkipEmptyParts);
+    const QStringList formatUrls = fmtUrlMap.split(',', QString::SkipEmptyParts);
     QHash<int, QString> urlMap;
-    foreach(QString formatUrl, formatUrls) {
+    foreach(const QString &formatUrl, formatUrls) {
         // qDebug() << "formatUrl" << formatUrl;
-        QStringList urlParams = formatUrl.split('&', QString::SkipEmptyParts);
+        const QStringList urlParams = formatUrl.split('&', QString::SkipEmptyParts);
         // qDebug() << "urlParams" << urlParams;
 
         int format = -1;
         QString url;
         QString sig;
-        foreach(QString urlParam, urlParams) {
+        foreach(const QString &urlParam, urlParams) {
             // qWarning() << urlParam;
             if (urlParam.startsWith("itag=")) {
                 int separator = urlParam.indexOf("=");
@@ -247,20 +238,13 @@ void Video::parseFmtUrlMap(const QString &fmtUrlMap, bool fromWebPage) {
                 } else {
 
                     QUrl url("http://www.youtube.com/watch");
-
-#if QT_VERSION >= 0x050000
                     {
-                        QUrl &u = url;
-                        QUrlQuery url;
-#endif
-                        url.addQueryItem("v", videoId);
-                        url.addQueryItem("gl", "US");
-                        url.addQueryItem("hl", "en");
-                        url.addQueryItem("has_verified", "1");
-#if QT_VERSION >= 0x050000
-                        u.setQuery(url);
+                        QUrlQueryHelper urlHelper(url);
+                        urlHelper.addQueryItem("v", videoId);
+                        urlHelper.addQueryItem("gl", "US");
+                        urlHelper.addQueryItem("hl", "en");
+                        urlHelper.addQueryItem("has_verified", "1");
                     }
-#endif
                     // qDebug() << "Loading webpage" << url;
                     QObject *reply = The::http()->get(url);
                     connect(reply, SIGNAL(data(QByteArray)), SLOT(scrapeWebPage(QByteArray)));
@@ -279,37 +263,25 @@ void Video::parseFmtUrlMap(const QString &fmtUrlMap, bool fromWebPage) {
 
         // qWarning() << url;
 
-        if (format == definitionCode) {
+        if (format == definition.getCode()) {
             // qDebug() << "Found format" << definitionCode;
-            QUrl videoUrl = QUrl::fromEncoded(url.toUtf8(), QUrl::StrictMode);
-            m_streamUrl = videoUrl;
-            this->definitionCode = definitionCode;
-            emit gotStreamUrl(videoUrl);
-            loadingStreamUrl = false;
+            saveDefinitionForUrl(url, definition);
             return;
         }
 
         urlMap.insert(format, url);
     }
 
-    QList<int> definitionCodes = VideoDefinition::getDefinitionCodes();
-    int currentIndex = definitionCodes.indexOf(definitionCode);
-    int previousIndex = 0;
-    while (currentIndex >= 0) {
-        previousIndex = currentIndex - 1;
-        if (previousIndex < 0) previousIndex = 0;
-        int definitionCode = definitionCodes.at(previousIndex);
-        if (urlMap.contains(definitionCode)) {
+    const QList<VideoDefinition>& definitions = VideoDefinition::getDefinitions();
+    int previousIndex = std::max(definitions.indexOf(definition) - 1, 0);
+    for (; previousIndex >= 0; previousIndex--) {
+        const VideoDefinition& previousDefinition = definitions.at(previousIndex);
+        if (urlMap.contains(previousDefinition.getCode())) {
             // 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;
+            saveDefinitionForUrl(urlMap.value(previousDefinition.getCode()),
+                                 previousDefinition);
             return;
         }
-        currentIndex--;
     }
 
     emit errorStreamUrl(tr("Cannot get video stream for %1").arg(m_webpage));
@@ -478,12 +450,12 @@ void Video::captureObject(const QString &name, const QString &js) {
 QString Video::decryptSignature(const QString &s) {
     if (sigFuncName.isEmpty()) return QString();
     QScriptEngine engine;
-    foreach (QString f, sigObjects.values()) {
+    foreach (const QString &f, sigObjects.values()) {
         QScriptValue value = engine.evaluate(f);
         if (value.isError())
             qWarning() << "Error in" << f << value.toString();
     }
-    foreach (QString f, sigFunctions.values()) {
+    foreach (const QString &f, sigFunctions.values()) {
         QScriptValue value = engine.evaluate(f);
         if (value.isError())
             qWarning() << "Error in" << f << value.toString();
@@ -502,6 +474,14 @@ QString Video::decryptSignature(const QString &s) {
 }
 
 QString Video::formattedDuration() const {
-    QString format = m_duration > 3600 ? "h:mm:ss" : "m:ss";
-    return QTime().addSecs(m_duration).toString(format);
+    return DataUtils::formatDuration(m_duration);
 }
+
+void Video::saveDefinitionForUrl(const QString& url, const VideoDefinition& definition) {
+    const QUrl videoUrl = QUrl::fromEncoded(url.toUtf8(), QUrl::StrictMode);
+    m_streamUrl = videoUrl;
+    definitionCode = definition.getCode();
+    emit gotStreamUrl(videoUrl);
+    loadingStreamUrl = false;
+}
+