fix curseforge file update

kaniol-lck · Jul 3, 2024 · e0f8700 · e0f8700
1 parent 0120bda
commit e0f8700
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/modmanager.pro b/modmanager.pro
@@ -71,7 +71,7 @@ unix {
 INSTALLS += target
 
 CONFIG(debug, debug|release) {
-#    QMAKE_CXXFLAGS_DEBUG += -g3 -O0
+# QMAKE_CXXFLAGS_DEBUG += -g3 -O0
     message("Currently in DEBUG mode.")
 } else {
     DEFINES += QT_NO_DEBUG QT_NO_DEBUG_OUTPUT

diff --git a/src/curseforge/curseforgemod.cpp b/src/curseforge/curseforgemod.cpp
@@ -106,9 +106,9 @@ std::shared_ptr<Reply<QList<CurseforgeFileInfo> > > CurseforgeMod::acquireLatest
 
 std::shared_ptr<Reply<QList<CurseforgeFileInfo>, int>> CurseforgeMod::acquireMoreFileList(GameVersion version, ModLoaderType::Type loaderType, bool clear)
 {
-    if(allFileListGetter_ && allFileListGetter_->isRunning()) return allFileListGetter_;
-    allFileListGetter_ = api_->getModFiles(modInfo_.id(), clear? 0: modInfo().allFileList().size(), version, loaderType).asShared();
-    allFileListGetter_->setOnFinished(this, [=](const QList<CurseforgeFileInfo> &fileList, int count){
+    if(moreFileListGetter_ && moreFileListGetter_->isRunning()) return moreFileListGetter_;
+    moreFileListGetter_ = api_->getModFiles(modInfo_.id(), clear? 0: modInfo().allFileList().size(), version, loaderType).asShared();
+    moreFileListGetter_->setOnFinished(this, [=](const QList<CurseforgeFileInfo> &fileList, int count){
         if(clear)
             modInfo_.allFileList_ = fileList;
         else
@@ -118,7 +118,7 @@ std::shared_ptr<Reply<QList<CurseforgeFileInfo>, int>> CurseforgeMod::acquireMor
     }, [=](auto){
         emit moreFileListReady({});
     });
-    return allFileListGetter_;
+    return moreFileListGetter_;
 }
 
 const CurseforgeModInfo &CurseforgeMod::modInfo() const

diff --git a/src/curseforge/curseforgemod.h b/src/curseforge/curseforgemod.h
@@ -53,7 +53,7 @@ class CurseforgeMod : public QObject, public Tagable
     bool gettingIcon_ = false;
     std::unique_ptr<Reply<QString>> descriptionGetter_;
     std::shared_ptr<Reply<QList<CurseforgeFileInfo>>> latestIndexedFileListGetter_;
-    std::shared_ptr<Reply<QList<CurseforgeFileInfo>, int>> allFileListGetter_;
+    std::shared_ptr<Reply<QList<CurseforgeFileInfo>, int>> moreFileListGetter_;
 };
 
 #endif // CURSEFORGEMOD_H
diff --git a/src/local/localmod.cpp b/src/local/localmod.cpp
@@ -161,13 +161,19 @@ void LocalMod::checkCurseforgeUpdate(bool force)
     emit checkCurseforgeUpdateStarted();
     //update file list
     if(force || curseforgeMod_->modInfo().allFileList().isEmpty()){
-        //TODO
-        curseforgeFileListGetter_ = curseforgeMod_->acquireMoreFileList();
+        curseforgeFileListGetter_ = curseforgeMod_->acquireMoreFileList(path()->info().gameVersion(), path()->info().loaderType());
         curseforgeFileListGetter_->setOnFinished(this, [=](const QList<CurseforgeFileInfo> &, int count){
             curseforgeUpdater_.findUpdate(modFile_->linker()->curseforgeFileInfo());
             emit curseforgeUpdateReady(true);
         }, [=](auto){
-            emit curseforgeUpdateReady(false);
+            // major version instead
+            curseforgeFileListGetter_ = curseforgeMod_->acquireMoreFileList(path()->info().gameVersion().majorVersion(), path()->info().loaderType());
+            curseforgeFileListGetter_->setOnFinished(this, [=](const QList<CurseforgeFileInfo> &, int count){
+                curseforgeUpdater_.findUpdate(modFile_->linker()->curseforgeFileInfo());
+                    emit curseforgeUpdateReady(true);
+            }, [=](auto){
+                emit curseforgeUpdateReady(false);
+            });
         });
     }else {
         curseforgeUpdater_.findUpdate(modFile_->linker()->curseforgeFileInfo());

diff --git a/src/ui/framelesswrapper.cpp b/src/ui/framelesswrapper.cpp
@@ -135,7 +135,7 @@ bool FramelessWrapper::nativeEvent(const QByteArray &eventType, void *message, l
             titleBar_->setNormal();
         }
         *result = ::DefWindowProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
-         break;
+        break;
     }
     }
     return false;
-Original file line number
+Diff line change
@@ Expand Up @@
                 titleBar_->setNormal();
             }
             *result = ::DefWindowProc(msg->hwnd, msg->message, msg->wParam, msg->lParam);
-             break;
+            break;
         }
         }
         return false;
@@ Expand Down @@