From 133c072eb7f63e807f2a211804537f59d1f8b0ed Mon Sep 17 00:00:00 2001 From: Jeremy Rimpo Date: Thu, 21 Sep 2023 00:08:58 -0500 Subject: Rework download category parsing - Bypasses issue where hidden downloads are not accessible - getCategoryID no longer necessary --- src/modlistviewactions.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/modlistviewactions.cpp') diff --git a/src/modlistviewactions.cpp b/src/modlistviewactions.cpp index fd2f5c68..d82dca87 100644 --- a/src/modlistviewactions.cpp +++ b/src/modlistviewactions.cpp @@ -279,12 +279,13 @@ void ModListViewActions::assignCategories() const } for (auto mod : m_core.modList()->allMods()) { ModInfo::Ptr modInfo = ModInfo::getByName(mod); - QString file = modInfo->installationFile(); int nexusCategory = modInfo->getNexusCategory(); if (!nexusCategory) { - auto download = m_core.downloadManager()->getDownloadIndex(file); - if (download >= 0) { - nexusCategory = m_core.downloadManager()->getCategoryID(download); + QSettings downloadMeta(m_core.downloadsPath() + "/" + + modInfo->installationFile() + ".meta", + QSettings::IniFormat); + if (downloadMeta.contains("category")) { + nexusCategory = downloadMeta.value("category", 0).toInt(); } } int newCategory = CategoryFactory::instance()->resolveNexusID(nexusCategory); @@ -1127,11 +1128,11 @@ void ModListViewActions::remapCategory(const QModelIndexList& indices) const int categoryID = modInfo->getNexusCategory(); if (!categoryID) { - int downloadIndex = - m_core.downloadManager()->getDownloadIndex(modInfo->installationFile()); - if (downloadIndex >= 0) { - auto downloadInfo = m_core.downloadManager()->getFileInfo(downloadIndex); - categoryID = downloadInfo->categoryID; + QSettings downloadMeta(m_core.downloadsPath() + "/" + + modInfo->installationFile() + ".meta", + QSettings::IniFormat); + if (downloadMeta.contains("category")) { + categoryID = downloadMeta.value("category", 0).toInt(); } } unsigned int categoryIndex = -- cgit v1.3.1