New upstream version 3.5.1

[minitube] / src / invidious / ivchannelsource.cpp

diff --git a/src/invidious/ivchannelsource.cpp b/src/invidious/ivchannelsource.cpp
index f4865172fe68266098e82ecbf0c2d313854607f3..ff3096506e1c993e37a5836b9d673f883349a3e7 100644 (file)
--- a/src/invidious/ivchannelsource.cpp
+++ b/src/invidious/ivchannelsource.cpp
@@ -13,13 +13,11 @@ int invidiousFixedMax = 20;
 }
 
 IVChannelSource::IVChannelSource(SearchParams *searchParams, QObject *parent)
-    : VideoSource(parent), searchParams(searchParams) {
+    : IVVideoSource(parent), searchParams(searchParams) {
     searchParams->setParent(this);
 }
 
-void IVChannelSource::loadVideos(int max, int startIndex) {
-    aborted = false;
-
+void IVChannelSource::reallyLoadVideos(int max, int startIndex) {
     QUrl url = Invidious::instance().method("channels/videos/");
     url.setPath(url.path() + searchParams->channelId());
 
@@ -43,6 +41,11 @@ void IVChannelSource::loadVideos(int max, int startIndex) {
     connect(reply, &HttpReply::data, this, [this](auto data) {
         QJsonDocument doc = QJsonDocument::fromJson(data);
         const QJsonArray items = doc.array();
+        if (items.isEmpty()) {
+            handleError("No videos");
+            return;
+        }
+
         IVListParser parser(items);
         const QVector<Video *> &videos = parser.getVideos();
 
@@ -61,14 +64,7 @@ void IVChannelSource::loadVideos(int max, int startIndex) {
         emit gotVideos(videos);
         emit finished(videos.size());
     });
-    connect(reply, &HttpReply::error, this, [this](auto message) {
-        Invidious::instance().initServers();
-        emit error(message);
-    });
-}
-
-void IVChannelSource::abort() {
-    aborted = true;
+    connect(reply, &HttpReply::error, this, &IVChannelSource::handleError);
 }
 
 QString IVChannelSource::getName() {