7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

handle the ui for major and minor versions

Browse source
This commit is contained in:
altalk23 2023-05-01 18:41:18 +03:00
parent b236a1daac
commit 0f6b173a11
10 changed files with 98 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View file

@ -96,6 +96,7 @@ jobs:
- name: Delete resource cache file
run: |
rm ./bin/nightly/resources/.geode_cache
rm ./bin/nightly/resources/dont-update.txt
- name: Upload resources
uses: actions/upload-artifact@v2
with:

1
.gitignore vendored
View file

@ -50,6 +50,7 @@ docs
loader/src/internal/about.hpp
loader/src/internal/resources.hpp
loader/resources/mod.json
loader/resources/version
loader/resources/blanks/rename.js
loader/resources/changelog.md
fods-catgirl-hideout.txt

2
VERSION
View file

@ -1 +1 @@
1.0.0-beta.16
1.0.0-beta.17

1
loader/CMakeLists.txt
View file

@ -29,6 +29,7 @@ execute_process(
# Package info file for internal representation
configure_file(resources/mod.json.in ${CMAKE_CURRENT_SOURCE_DIR}/resources/mod.json)
file(READ resources/mod.json LOADER_MOD_JSON)
configure_file(${GEODE_ROOT_PATH}/VERSION ${CMAKE_CURRENT_SOURCE_DIR}/resources/version COPYONLY)
configure_file(${GEODE_ROOT_PATH}/CHANGELOG.md ${CMAKE_CURRENT_SOURCE_DIR}/resources/changelog.md COPYONLY)
configure_file(src/internal/about.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/src/internal/about.hpp)

3
loader/resources/mod.json.in
View file

@ -37,7 +37,8 @@
"about.md",
"changelog.md",
"support.md",
"mod.json"
"mod.json",
"version"
],
"spritesheets": {
"LogoSheet": [

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

@ -463,8 +463,8 @@ void Index::update(bool force) {
std::vector<IndexItemHandle> Index::getItems() const {
std::vector<IndexItemHandle> res;
for (auto& items : map::values(m_items)) {
if (items.size()) {
res.push_back(items.rbegin()->second);
for (auto& item : items) {
res.push_back(item.second);
}
}
return res;
@ -473,9 +473,9 @@ std::vector<IndexItemHandle> Index::getItems() const {
std::vector<IndexItemHandle> Index::getFeaturedItems() const {
std::vector<IndexItemHandle> res;
for (auto& items : map::values(m_items)) {
if (items.size()) {
if (items.rbegin()->second->isFeatured) {
res.push_back(items.rbegin()->second);
for (auto& item : items) {
if (item.second->isFeatured) {
res.push_back(item.second);
}
}
}
@ -487,9 +487,9 @@ std::vector<IndexItemHandle> Index::getItemsByDeveloper(
) const {
std::vector<IndexItemHandle> res;
for (auto& items : map::values(m_items)) {
if (items.size()) {
if (items.rbegin()->second->info.developer() == name) {
res.push_back(items.rbegin()->second);
for (auto& item : items) {
if (item.second->info.developer() == name) {
res.push_back(item.second);
}
}
}
@ -503,6 +503,15 @@ bool Index::isKnownItem(
return this->getItem(id, version).get();
}
IndexItemHandle Index::getMajorItem(
std::string const& id
) const {
if (m_items.count(id)) {
return m_items.at(id).rbegin()->second;
}
return nullptr;
}
IndexItemHandle Index::getItem(
std::string const& id,
std::optional<VersionInfo> version
@ -558,7 +567,7 @@ bool Index::isUpdateAvailable(IndexItemHandle item) const {
bool Index::areUpdatesAvailable() const {
for (auto& mod : Loader::get()->getAllMods()) {
auto item = this->getItem(mod);
auto item = this->getMajorItem(mod->getID());
if (item && item->info.version() > mod->getVersion()) {
return true;
}

9
loader/src/loader/LoaderImpl.cpp
View file

@ -624,6 +624,15 @@ bool Loader::Impl::verifyLoaderResources() {
return false;
}
// TODO: actually have a proper way to disable checking resources
// for development builds
if (ghc::filesystem::exists(resourcesDir / "dont-update.txt")) {
// this is kind of a hack, but it's the easiest way to prevent
// auto update while developing
log::debug("Not updating resources since dont-update.txt exists");
return true;
}
// make sure every file was covered
size_t coverage = 0;

59
loader/src/ui/internal/info/ModInfoPopup.cpp
View file

@ -347,13 +347,12 @@ bool LocalModInfoPopup::init(Mod* mod, ModListLayer* list) {
uninstallBtn->setPosition(-85.f, 75.f);
m_buttonMenu->addChild(uninstallBtn);
auto indexItem = Index::get()->getItem(
mod->getModInfo().id(),
ComparableVersionInfo(mod->getModInfo().version(), VersionCompare::More)
auto latestIndexItem = Index::get()->getMajorItem(
mod->getModInfo().id()
);
// todo: show update button on loader that invokes the installer
if (indexItem && Index::get()->isUpdateAvailable(indexItem)) {
if (latestIndexItem && Index::get()->isUpdateAvailable(latestIndexItem)) {
m_installBtnSpr = IconButtonSprite::create(
"GE_button_01.png"_spr,
CCSprite::createWithSpriteFrameName("install.png"_spr),
@ -371,15 +370,49 @@ bool LocalModInfoPopup::init(Mod* mod, ModListLayer* list) {
m_installStatus->setVisible(false);
m_mainLayer->addChild(m_installStatus);
m_updateVersionLabel = CCLabelBMFont::create(
("Available: " + indexItem->info.version().toString()).c_str(),
auto minorIndexItem = Index::get()->getItem(
mod->getModInfo().id(),
ComparableVersionInfo(mod->getModInfo().version(), VersionCompare::MoreEq)
);
// TODO: use column layout here?
if (latestIndexItem->info.version().getMajor() > minorIndexItem->info.version().getMajor()) {
// has major update
m_latestVersionLabel = CCLabelBMFont::create(
("Available: " + latestIndexItem->info.version().toString()).c_str(),
"bigFont.fnt"
);
m_updateVersionLabel->setScale(.35f);
m_updateVersionLabel->setAnchorPoint({.0f, .5f});
m_updateVersionLabel->setColor({94, 219, 255});
m_updateVersionLabel->setPosition(winSize.width / 2 + 35.f, winSize.height / 2 + 75.f);
m_mainLayer->addChild(m_updateVersionLabel);
m_latestVersionLabel->setScale(.35f);
m_latestVersionLabel->setAnchorPoint({.0f, .5f});
m_latestVersionLabel->setColor({94, 219, 255});
m_latestVersionLabel->setPosition(winSize.width / 2 + 35.f, winSize.height / 2 + 75.f);
m_mainLayer->addChild(m_latestVersionLabel);
}
if (minorIndexItem->info.version() > mod->getModInfo().version()) {
// has minor update
m_minorVersionLabel = CCLabelBMFont::create(
("Available: " + minorIndexItem->info.version().toString()).c_str(),
"bigFont.fnt"
);
m_minorVersionLabel->setScale(.35f);
m_minorVersionLabel->setAnchorPoint({.0f, .5f});
m_minorVersionLabel->setColor({94, 219, 255});
if (m_latestVersionLabel) {
m_latestVersionLabel->setPosition(
winSize.width / 2 + 35.f, winSize.height / 2 + 81.f
);
m_minorVersionLabel->setPosition(
winSize.width / 2 + 35.f, winSize.height / 2 + 69.f
);
} else {
m_minorVersionLabel->setPosition(
winSize.width / 2 + 35.f, winSize.height / 2 + 75.f
);
}
m_mainLayer->addChild(m_minorVersionLabel);
}
}
} else {
auto* label = CCLabelBMFont::create(LOADER_COMMIT_HASH, "chatFont.fnt");
@ -647,8 +680,8 @@ void IndexItemInfoPopup::onCancel(CCObject*) {
}
void IndexItemInfoPopup::doInstall() {
if (m_updateVersionLabel) {
m_updateVersionLabel->setVisible(false);
if (m_latestVersionLabel) {
m_latestVersionLabel->setVisible(false);
}
this->setInstallStatus(UpdateProgress(0, "Starting install"));

3
loader/src/ui/internal/info/ModInfoPopup.hpp
View file

@ -33,7 +33,8 @@ protected:
IconButtonSprite* m_installBtnSpr;
CCMenuItemSpriteExtra* m_installBtn;
CCMenuItemSpriteExtra* m_infoBtn;
CCLabelBMFont* m_updateVersionLabel = nullptr;
CCLabelBMFont* m_latestVersionLabel = nullptr;
CCLabelBMFont* m_minorVersionLabel = nullptr;
MDTextArea* m_detailsArea;
MDTextArea* m_changelogArea = nullptr;
Scrollbar* m_scrollbar;

15
loader/src/ui/internal/list/ModListCell.cpp
View file

@ -260,14 +260,20 @@ bool ModCell::init(
m_menu->addChild(m_unresolvedExMark);
if (m_mod->wasSuccesfullyLoaded()) {
auto indexItem = Index::get()->getItem(
mod->getModInfo().id(),
ComparableVersionInfo(mod->getModInfo().version(), VersionCompare::More)
auto latestIndexItem = Index::get()->getMajorItem(
mod->getModInfo().id()
);
if (indexItem) {
if (latestIndexItem && Index::get()->isUpdateAvailable(latestIndexItem)) {
viewSpr->updateBGImage("GE_button_01.png"_spr);
auto minorIndexItem = Index::get()->getItem(
mod->getModInfo().id(),
ComparableVersionInfo(mod->getModInfo().version(), VersionCompare::MoreEq)
);
if (latestIndexItem->info.version().getMajor() > minorIndexItem->info.version().getMajor()) {
auto updateIcon = CCSprite::createWithSpriteFrameName("updates-available.png"_spr);
updateIcon->setPosition(viewSpr->getContentSize() - CCSize { 2.f, 2.f });
updateIcon->setZOrder(99);
@ -275,6 +281,7 @@ bool ModCell::init(
viewSpr->addChild(updateIcon);
}
}
}
this->updateState();