Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-18 07:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added logic for handling local theme repository changes to GuiThemeDownloader

Browse source
This commit is contained in:
Leon Styhre 2023-03-23 21:51:29 +01:00
parent 08ca3d8f4b
commit eede78daf7
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
es-app/src/guis/GuiThemeDownloader.cpp
View file

@ -305,8 +305,8 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
if (statusEntryCount != 0) { if (statusEntryCount != 0) {
if (allowReset) { if (allowReset) {
LOG(LogWarning) << "Repository \"" << mRepositoryName LOG(LogInfo) << "Repository \"" << mRepositoryName
<< "\" contains local changes, performing hard reset"; << "\" contains local changes, performing hard reset";
git_object* objectHead {nullptr}; git_object* objectHead {nullptr};
errorCode = git_revparse_single(&objectHead, repository, "HEAD"); errorCode = git_revparse_single(&objectHead, repository, "HEAD");
errorCode = git_reset(repository, objectHead, GIT_RESET_HARD, nullptr); errorCode = git_reset(repository, objectHead, GIT_RESET_HARD, nullptr);
@ -515,7 +515,7 @@ void GuiThemeDownloader::populateGUI()
std::promise<bool>().swap(mPromise); std::promise<bool>().swap(mPromise);
mFuture = mPromise.get_future(); mFuture = mPromise.get_future();
mFetchThread = std::thread(&GuiThemeDownloader::fetchRepository, this, mFetchThread = std::thread(&GuiThemeDownloader::fetchRepository, this,
std::make_pair(theme.reponame, theme.url), true); std::make_pair(theme.reponame, theme.url), false);
}); });
mList->addRow(row); mList->addRow(row);
} }
@ -557,6 +557,25 @@ void GuiThemeDownloader::update(int deltaTime)
0.75f : 0.75f :
0.45f * (1.778f / mRenderer->getScreenAspectRatio())))); 0.45f * (1.778f / mRenderer->getScreenAspectRatio()))));
} }
else if (mRepositoryError == RepositoryError::HAS_LOCAL_CHANGES) {
mWindow->pushGui(new GuiMsgBox(
getHelpStyle(),
"THEME REPOSITORY \"" + mRepositoryName +
"\" CONTAINS LOCAL CHANGES. PROCEED TO OVERWRITE YOUR CHANGES "
"OR ABORT TO SKIP ALL UPDATES FOR THIS THEME",
"PROCEED",
[this] {
std::promise<bool>().swap(mPromise);
mFuture = mPromise.get_future();
mFetchThread =
std::thread(&GuiThemeDownloader::fetchRepository, this,
std::make_pair(mRepositoryName, mUrl), true);
},
"ABORT", [] { return; }, "", nullptr, true, true,
(mRenderer->getIsVerticalOrientation() ?
0.75f :
0.45f * (1.778f / mRenderer->getScreenAspectRatio()))));
}
else { else {
std::string errorMessage {"ERROR: "}; std::string errorMessage {"ERROR: "};
errorMessage.append(Utils::String::toUpper(mErrorMessage)); errorMessage.append(Utils::String::toUpper(mErrorMessage));