update check failed mods

kaniol-lck · Jan 21, 2022 · 604d9a0 · 604d9a0
1 parent eb0df91
commit 604d9a0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/src/local/localmod.cpp b/src/local/localmod.cpp
@@ -43,6 +43,8 @@ LocalMod::LocalMod(LocalModPath *parent, LocalModFile *file) :
 {
     connect(this, &LocalMod::tagsEditted, path_, &LocalModPath::writeToFile);
     connect(this, &LocalMod::modCacheUpdated, path_, &LocalModPath::writeToFile);
+    connect(updateChecker_, &CheckSheet::started, this, &LocalMod::checkUpdateStarted);
+    connect(updateChecker_, &CheckSheet::finished, this, &LocalMod::checkUpdateFinished);
     connect(updateChecker_, &CheckSheet::finished, this, &LocalMod::updateReady);
     addSubTagable(path_);
     if(file) setModFile(file);

diff --git a/src/local/localmod.h b/src/local/localmod.h
@@ -145,13 +145,11 @@ public slots:
     void modrinthUpdateReady(bool success = true);
 
     //update
-//    void checkUpdatesStarted();
-//    void checkCancelled();
+    void checkUpdateStarted();
+    void checkUpdateFinished(bool success);
     void updateReady();
 
-    void checkCurseforgeStarted();
     void checkCurseforgeUpdateStarted();
-    void checkModrinthStarted();
     void checkModrinthUpdateStarted();
 
     void updateStarted();

diff --git a/src/local/localmodpath.cpp b/src/local/localmodpath.cpp
@@ -528,7 +528,7 @@ void LocalModPath::checkModUpdates() // force = true by default
     if(modMap_.isEmpty() || updateChecker_.isWaiting()) return;
     updateChecker_.start();
     for(auto &&mod : modList()){
-        updateChecker_.add(mod->updateChecker(), &CheckSheet::started, &CheckSheet::finished);
+        updateChecker_.add(mod, &LocalMod::checkUpdateStarted, &LocalMod::checkUpdateFinished);
         mod->checkUpdates();
     }
     updateChecker_.done();

diff --git a/src/ui/local/localmodbrowser.cpp b/src/ui/local/localmodbrowser.cpp
@@ -400,8 +400,17 @@ void LocalModBrowser::onCheckUpdatesFinished(bool success)
     onUpdatableCountChanged();
     updateStatusText();
     qDebug() << success << modPath_->updateChecker()->failedCount();
-    if(!success)
-        QMessageBox::information(this, tr("Update Checking Incompleted"), tr("%1 mods failed checking update because of network.").arg(modPath_->updateChecker()->failedCount()));
+    if(!success) {
+        auto &&failedObjects = modPath_->updateChecker()->failedObjects();
+        QStringList stringlist;
+        for(auto &&object : failedObjects){
+            if(auto mod = qobject_cast<const LocalMod *>(object))
+                stringlist << "<li>" + mod->displayName() + "</li>";
+        }
+        QMessageBox::information(this, tr("Update Checking Incompleted"), tr("%1 mods failed checking update because of network: <ul>%2</ul>")
+                                 .arg(modPath_->updateChecker()->failedCount())
+                                 .arg(stringlist.join("")));
+    }
 }
 
 void LocalModBrowser::onUpdatableCountChanged()

diff --git a/src/ui/local/localmoditemwidget.cpp b/src/ui/local/localmoditemwidget.cpp
@@ -48,11 +48,9 @@ LocalModItemWidget::LocalModItemWidget(QWidget *parent, LocalMod *mod) :
 
     connect(mod_, &LocalMod::updateReady, this, &LocalModItemWidget::updateReady);
 
-    connect(mod_, &LocalMod::checkCurseforgeStarted, this, &LocalModItemWidget::startCheckCurseforge);
     connect(mod_, &LocalMod::curseforgeReady, this, &LocalModItemWidget::curseforgeReady);
     connect(mod_, &LocalMod::checkCurseforgeUpdateStarted, this, &LocalModItemWidget::startCheckCurseforgeUpdate);
 
-    connect(mod_, &LocalMod::checkModrinthStarted, this, &LocalModItemWidget::startCheckModrinth);
     connect(mod_, &LocalMod::modrinthReady, this, &LocalModItemWidget::modrinthReady);
     connect(mod_, &LocalMod::checkModrinthUpdateStarted, this, &LocalModItemWidget::startCheckModrinthUpdate);
 

diff --git a/src/util/checksheet.h b/src/util/checksheet.h
@@ -3,6 +3,7 @@
 
 #include <QMap>
 #include <QObject>
+#include <QDebug>
 
 class CheckSheet : public QObject
 {
@@ -14,12 +15,12 @@ class CheckSheet : public QObject
     void done();
 
     template <typename Func1, typename Func2>
-    void add(const typename QtPrivate::FunctionPointer<Func1>::Object *sender, Func1 startSignal, Func2 finishSignal)
+    void add(const typename QtPrivate::FunctionPointer<Func1>::Object *object, Func1 startSignal, Func2 finishSignal)
     {
-        startConnections_ << connect(sender, startSignal, this, [=]{
-            objects_.insert(sender, { false, false });
-            finishConnections_ << connect(sender, finishSignal, [=](bool success){
-                objects_[sender] = { true, success };
+        startConnections_ << connect(object, startSignal, this, [=]{
+            objects_.insert(object, { false, false });
+            finishConnections_ << connect(object, finishSignal, [=](bool success){
+                objects_[object] = { true, success };
                 if(isAdding_) return;
                 emit progress(finishedCount(), objects_.count());
                 if(allFinished()){