7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-02-17 00:30:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

use mods-v2 for index

Browse source
This commit is contained in:
altalk23 2023-09-04 23:15:41 +03:00
parent b0d39e79c9
commit 5572f9cd1c
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
loader/src/loader/Index.cpp
View file

@ -209,7 +209,7 @@ class Index::Impl final {
public: public:
// for once, the fact that std::map is ordered is useful (this makes // for once, the fact that std::map is ordered is useful (this makes
// getting the latest version of a mod as easy as items.rbegin()) // getting the latest version of a mod as easy as items.rbegin())
using ItemVersions = std::map<size_t, IndexItemHandle>; using ItemVersions = std::map<VersionInfo, IndexItemHandle>;
private: private:
std::unordered_map< std::unordered_map<
@ -369,9 +369,24 @@ void Index::Impl::updateFromLocalTree() {
// delete old items // delete old items
m_items.clear(); m_items.clear();
// read directory and add new items auto indexRoot = dirs::getIndexDir() / "v0";
try { auto entriesRoot = indexRoot / "mods-v2";
for (auto& dir : ghc::filesystem::directory_iterator(dirs::getIndexDir() / "v0" / "mods")) {
auto configRes = file::readJson(indexRoot / "config.json");
if (!configRes) {
IndexUpdateEvent("Unable to read index config").post();
return;
}
auto config = configRes.unwrap();
JsonChecker checker(config);
auto root = checker.root("[config.json]").obj();
for (auto& [modID, entry] : root.has("entries").items()) {
for (auto& version : entry.obj().has("versions").iterate()) {
log::debug("Adding index item for {} {}", modID, version.get<std::string>());
auto dir = entriesRoot / modID / version.get<std::string>();
auto addRes = IndexItem::Impl::create(dir); auto addRes = IndexItem::Impl::create(dir);
if (!addRes) { if (!addRes) {
log::warn("Unable to add index item from {}: {}", dir, addRes.unwrapErr()); log::warn("Unable to add index item from {}: {}", dir, addRes.unwrapErr());
@ -379,24 +394,11 @@ void Index::Impl::updateFromLocalTree() {
} }
auto add = addRes.unwrap(); auto add = addRes.unwrap();
auto metadata = add->getMetadata(); auto metadata = add->getMetadata();
// check if this major version of this item has already been added
if (m_items[metadata.getID()].count(metadata.getVersion().getMajor())) { m_items[modID].insert({metadata.getVersion(),
log::warn(
"Item {}@{} has already been added, skipping",
metadata.getID(),
metadata.getVersion()
);
continue;
}
// add new major version of this item
m_items[metadata.getID()].insert({metadata.getVersion().getMajor(),
add add
}); });
} }
} catch(std::exception& e) {
log::error("Unable to read local index tree: {}", e.what());
IndexUpdateEvent("Unable to read local index tree").post();
return;
} }
// mark source as finished // mark source as finished