Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 15:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added disabling of manually downloaded themes to GuiThemeDownloader

Browse source
This commit is contained in:
Leon Styhre 2023-03-23 20:44:58 +01:00
parent e1c78f1932
commit 7ca665bdf1
2 changed files with 97 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,9 +21,9 @@ GuiThemeDownloader::GuiThemeDownloader()
: mRenderer {Renderer::getInstance()} : mRenderer {Renderer::getInstance()}
, mBackground {":/graphics/frame.svg"} , mBackground {":/graphics/frame.svg"}
, mGrid {glm::ivec2 {3, 3}} , mGrid {glm::ivec2 {3, 3}}
, mRepositoryError {RepositoryError::NO_ERROR}
, mFetching {false} , mFetching {false}
, mLatestThemesList {false} , mLatestThemesList {false}
, mHasLocalChanges {false}
{ {
addChild(&mBackground); addChild(&mBackground);
addChild(&mGrid); addChild(&mGrid);
@ -78,13 +78,26 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
bool allowReset) bool allowReset)
{ {
int errorCode {0}; int errorCode {0};
std::string repositoryName {repoInfo.first}; mRepositoryName = repoInfo.first;
const std::string url {repoInfo.second}; mUrl = repoInfo.second;
const std::string path {Utils::FileSystem::getHomePath() + "/.emulationstation/themes/" + mPath = Utils::FileSystem::getHomePath() + "/.emulationstation/themes/" + mRepositoryName;
repositoryName}; mRepositoryError = RepositoryError::NO_ERROR;
mErrorMessage = ""; mErrorMessage = "";
mManualPathSuffix = "";
const bool isThemesList {mRepositoryName == "themes-list"};
if (!isThemesList && (Utils::FileSystem::exists(mPath + "-main") ||
Utils::FileSystem::exists(mPath + "-master"))) {
mRepositoryError = RepositoryError::MANUALLY_DOWNLOADED;
if (Utils::FileSystem::exists(mPath + "-main"))
mManualPathSuffix = "-main";
else
mManualPathSuffix = "-master";
mPromise.set_value(true);
return true;
}
const bool isThemesList {repositoryName == "themes-list"};
git_repository* repository {nullptr}; git_repository* repository {nullptr};
#if LIBGIT2_VER_MAJOR >= 1 #if LIBGIT2_VER_MAJOR >= 1
@ -119,20 +132,21 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
return 0; return 0;
}; };
if (Utils::FileSystem::exists(path)) { if (Utils::FileSystem::exists(mPath)) {
errorCode = git_repository_open(&repository, &path[0]); errorCode = git_repository_open(&repository, &mPath[0]);
if (errorCode != 0 && isThemesList) { if (errorCode != 0 && isThemesList) {
if (renameDirectory(path)) { if (renameDirectory(mPath)) {
LOG(LogError) << "Couldn't rename \"" << path << "\", permission problems?"; LOG(LogError) << "Couldn't rename \"" << mPath << "\", permission problems?";
mWindow->pushGui(new GuiMsgBox( mWindow->pushGui(new GuiMsgBox(
getHelpStyle(), "COULDN'T RENAME DIRECTORY\n" + path + "\nPERMISSION PROBLEMS?", getHelpStyle(),
"OK", [] { return; }, "", nullptr, "", nullptr, true)); "COULDN'T RENAME DIRECTORY\n" + mPath + "\nPERMISSION PROBLEMS?", "OK",
[] { return; }, "", nullptr, "", nullptr, true));
return true; return true;
} }
} }
} }
if (!Utils::FileSystem::exists(path)) { if (!Utils::FileSystem::exists(mPath)) {
// Repository does not exist, so clone it. // Repository does not exist, so clone it.
#if LIBGIT2_VER_MAJOR >= 1 #if LIBGIT2_VER_MAJOR >= 1
git_clone_options cloneOptions; git_clone_options cloneOptions;
@ -148,7 +162,7 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
mResolveDeltaProgress = 0.0f; mResolveDeltaProgress = 0.0f;
mFetching = true; mFetching = true;
errorCode = git_clone(&repository, &url[0], &path[0], &cloneOptions); errorCode = git_clone(&repository, &mUrl[0], &mPath[0], &cloneOptions);
git_repository_free(repository); git_repository_free(repository);
if (errorCode != 0) { if (errorCode != 0) {
@ -165,23 +179,26 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
mLatestThemesList = true; mLatestThemesList = true;
} }
else { else {
mHasLocalChanges = false;
git_remote* gitRemote {nullptr}; git_remote* gitRemote {nullptr};
try { try {
mFetching = true; mFetching = true;
errorCode = git_repository_open(&repository, &path[0]); errorCode = git_repository_open(&repository, &mPath[0]);
if (errorCode != 0) if (errorCode != 0) {
mRepositoryError = RepositoryError::NOT_A_REPOSITORY;
throw std::runtime_error("Couldn't open local repository, "); throw std::runtime_error("Couldn't open local repository, ");
}
errorCode = git_remote_lookup(&gitRemote, repository, "origin"); errorCode = git_remote_lookup(&gitRemote, repository, "origin");
if (errorCode != 0) if (errorCode != 0) {
mRepositoryError = RepositoryError::INVALID_ORIGIN;
throw std::runtime_error("Couldn't get information about origin, "); throw std::runtime_error("Couldn't get information about origin, ");
}
// int state {git_repository_state(repository)}; // int state {git_repository_state(repository)};
// if (state != GIT_REPOSITORY_STATE_NONE) { // if (state != GIT_REPOSITORY_STATE_NONE) {
// // // //
// } // }
#if LIBGIT2_VER_MAJOR >= 1 #if LIBGIT2_VER_MAJOR >= 1
git_fetch_options fetchOptions; git_fetch_options fetchOptions;
@ -198,7 +215,7 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
git_object* object {nullptr}; git_object* object {nullptr};
if (git_repository_head_detached(repository)) { if (git_repository_head_detached(repository)) {
LOG(LogWarning) << "Repository \"" << repositoryName LOG(LogWarning) << "Repository \"" << mRepositoryName
<< "\" has HEAD detached, resetting it"; << "\" has HEAD detached, resetting it";
git_buf buffer {}; git_buf buffer {};
errorCode = git_remote_default_branch(&buffer, gitRemote); errorCode = git_remote_default_branch(&buffer, gitRemote);
@ -239,7 +256,7 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
} }
if (mergeAnalysis & GIT_MERGE_ANALYSIS_UP_TO_DATE) { if (mergeAnalysis & GIT_MERGE_ANALYSIS_UP_TO_DATE) {
LOG(LogInfo) << "Repository \"" << repositoryName << "\" already up to date"; LOG(LogInfo) << "Repository \"" << mRepositoryName << "\" already up to date";
git_annotated_commit_free(annotated); git_annotated_commit_free(annotated);
git_object_free(object); git_object_free(object);
mPromise.set_value(true); mPromise.set_value(true);
@ -250,7 +267,7 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
if (!(mergeAnalysis & GIT_MERGE_ANALYSIS_FASTFORWARD)) { if (!(mergeAnalysis & GIT_MERGE_ANALYSIS_FASTFORWARD)) {
if (allowReset) { if (allowReset) {
LOG(LogWarning) << "Repository \"" << repositoryName LOG(LogWarning) << "Repository \"" << mRepositoryName
<< "\" has diverged from origin, performing hard reset"; << "\" has diverged from origin, 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");
@ -258,12 +275,12 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
git_object_free(objectHead); git_object_free(objectHead);
} }
else { else {
LOG(LogWarning) << "Repository \"" << repositoryName LOG(LogWarning) << "Repository \"" << mRepositoryName
<< "\" has diverged from origin, can't fast-forward"; << "\" has diverged from origin, can't fast-forward";
git_annotated_commit_free(annotated); git_annotated_commit_free(annotated);
git_object_free(object); git_object_free(object);
mPromise.set_value(true); mPromise.set_value(true);
mHasLocalChanges = true; mRepositoryError = RepositoryError::HAS_DIVERGED;
return true; return true;
} }
} }
@ -288,7 +305,7 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
if (statusEntryCount != 0) { if (statusEntryCount != 0) {
if (allowReset) { if (allowReset) {
LOG(LogWarning) << "Repository \"" << repositoryName LOG(LogWarning) << "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");
@ -296,20 +313,20 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
git_object_free(objectHead); git_object_free(objectHead);
} }
else { else {
LOG(LogWarning) << "Repository \"" << repositoryName LOG(LogWarning) << "Repository \"" << mRepositoryName
<< "\" contains local changes, can't fast-forward"; << "\" contains local changes, can't fast-forward";
git_status_list_free(status); git_status_list_free(status);
git_annotated_commit_free(annotated); git_annotated_commit_free(annotated);
git_object_free(object); git_object_free(object);
mPromise.set_value(true); mPromise.set_value(true);
mHasLocalChanges = true; mRepositoryError = RepositoryError::HAS_LOCAL_CHANGES;
return true; return true;
} }
} }
git_status_list_free(status); git_status_list_free(status);
LOG(LogInfo) << "Performing Git fast-forward of repository \"" << repositoryName LOG(LogInfo) << "Performing Git fast-forward of repository \"" << mRepositoryName
<< "\""; << "\"";
git_reference* oldTargetRef {nullptr}; git_reference* oldTargetRef {nullptr};
@ -359,6 +376,10 @@ bool GuiThemeDownloader::fetchRepository(std::pair<std::string, std::string> rep
} }
mPromise.set_value(true); mPromise.set_value(true);
mRepositoryName = "";
mUrl = "";
mPath = "";
return false; return false;
} }
@ -509,15 +530,39 @@ void GuiThemeDownloader::update(int deltaTime)
if (mFetchThread.joinable()) { if (mFetchThread.joinable()) {
mFetchThread.join(); mFetchThread.join();
mFetching = false; mFetching = false;
if (mHasLocalChanges) { if (mRepositoryError == RepositoryError::HAS_LOCAL_CHANGES) {
LOG(LogError) << "Repository has local changes"; LOG(LogError) << "Repository has local changes";
mHasLocalChanges = false;
} }
if (mErrorMessage != "") { if (mRepositoryError != RepositoryError::NO_ERROR) {
std::string errorMessage {"ERROR: "}; if (mRepositoryError == RepositoryError::NOT_A_REPOSITORY ||
errorMessage.append(Utils::String::toUpper(mErrorMessage)); mRepositoryError == RepositoryError::MANUALLY_DOWNLOADED) {
mWindow->queueInfoPopup(errorMessage, 6000); mWindow->pushGui(new GuiMsgBox(
LOG(LogError) << "Error: " << mErrorMessage; getHelpStyle(),
"IT SEEMS AS IF THIS THEME HAS BEEN MANUALLY DOWNLOADED INSTEAD OF VIA "
"THIS THEME DOWNLOADER. A FRESH DOWNLOAD IS REQUIRED AND THE OLD THEME "
"DIRECTORY \"" +
mRepositoryName + mManualPathSuffix + "\" WILL BE RENAMED TO \"" +
mRepositoryName + mManualPathSuffix + "_DISABLED\"",
"PROCEED",
[this] {
renameDirectory(mPath + mManualPathSuffix);
std::promise<bool>().swap(mPromise);
mFuture = mPromise.get_future();
mFetchThread =
std::thread(&GuiThemeDownloader::fetchRepository, this,
std::make_pair(mRepositoryName, mUrl), false);
},
"ABORT", [] { return; }, "", nullptr, true, true,
(mRenderer->getIsVerticalOrientation() ?
0.75f :
0.45f * (1.778f / mRenderer->getScreenAspectRatio()))));
}
else {
std::string errorMessage {"ERROR: "};
errorMessage.append(Utils::String::toUpper(mErrorMessage));
mWindow->queueInfoPopup(errorMessage, 6000);
LOG(LogError) << "Error: " << mErrorMessage;
}
} }
if (mThemeSets.empty() && mLatestThemesList) if (mThemeSets.empty() && mLatestThemesList)
parseThemesList(); parseThemesList();

15
es-app/src/guis/GuiThemeDownloader.h
View file

@ -61,13 +61,26 @@ private:
std::shared_ptr<ComponentGrid> mButtons; std::shared_ptr<ComponentGrid> mButtons;
BusyComponent mBusyAnim; BusyComponent mBusyAnim;
enum class RepositoryError {
NO_ERROR,
MANUALLY_DOWNLOADED,
NOT_A_REPOSITORY,
INVALID_ORIGIN,
HAS_DIVERGED,
HAS_LOCAL_CHANGES
};
RepositoryError mRepositoryError;
std::string mRepositoryName;
std::string mUrl;
std::string mPath;
std::string mManualPathSuffix;
std::string mErrorMessage; std::string mErrorMessage;
std::thread mFetchThread; std::thread mFetchThread;
std::promise<bool> mPromise; std::promise<bool> mPromise;
std::future<bool> mFuture; std::future<bool> mFuture;
std::atomic<bool> mFetching; std::atomic<bool> mFetching;
std::atomic<bool> mLatestThemesList; std::atomic<bool> mLatestThemesList;
bool mHasLocalChanges;
static inline std::atomic<float> mReceivedObjectsProgress {0.0f}; static inline std::atomic<float> mReceivedObjectsProgress {0.0f};
static inline std::atomic<float> mResolveDeltaProgress {0.0f}; static inline std::atomic<float> mResolveDeltaProgress {0.0f};