Update upstream source from tag 'upstream/3.8'

[minitube] / src / video.cpp

diff --git a/src/video.cpp b/src/video.cpp
index 6df9fd88b14f318fbbba6d6d8962923d6549e490..fdf7a22f11ce09e681f99b36666c5dc3547ae93a 100644 (file)
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -84,8 +84,12 @@ void Video::setWebpage(const QString &value) {
 void Video::loadThumbnail() {
     if (thumbnailUrl.isEmpty() || loadingThumbnail) return;
     loadingThumbnail = true;
-    QObject *reply = HttpUtils::yt().get(thumbnailUrl);
+    auto reply = HttpUtils::yt().get(thumbnailUrl);
     connect(reply, SIGNAL(data(QByteArray)), SLOT(setThumbnail(QByteArray)));
+    connect(reply, &HttpReply::error, this, [this](auto &msg) {
+        qWarning() << msg;
+        loadingThumbnail = false;
+    });
 }
 
 void Video::setDuration(int value) {
@@ -138,16 +142,15 @@ void Video::loadStreamUrlJS() {
     ytjsVideo = new YTJSVideo(id, this);
     connect(ytjsVideo, &YTJSVideo::gotStreamUrl, this, &Video::streamUrlLoaded);
     connect(ytjsVideo, &YTJSVideo::errorStreamUrl, this, [this](const QString &msg) {
-        emit errorStreamUrl(msg);
+        qDebug() << msg;
         ytjsVideo->deleteLater();
         ytjsVideo = nullptr;
+        loadStreamUrlYT();
     });
     ytjsVideo->loadStreamUrl();
 }
 
-void Video::loadStreamUrl() {
-    loadStreamUrlJS();
-    return;
+void Video::loadStreamUrlYT() {
     if (ytVideo) {
         qDebug() << "Already loading" << id;
         return;
@@ -155,6 +158,7 @@ void Video::loadStreamUrl() {
     ytVideo = new YTVideo(id, this);
     connect(ytVideo, &YTVideo::gotStreamUrl, this, &Video::streamUrlLoaded);
     connect(ytVideo, &YTVideo::errorStreamUrl, this, [this](const QString &msg) {
+        qDebug() << msg;
         emit errorStreamUrl(msg);
         ytVideo->deleteLater();
         ytVideo = nullptr;
@@ -162,6 +166,10 @@ void Video::loadStreamUrl() {
     ytVideo->loadStreamUrl();
 }
 
+void Video::loadStreamUrl() {
+    loadStreamUrlJS();
+}
+
 void Video::abortLoadStreamUrl() {
     if (ytVideo) {
         ytVideo->disconnect(this);