loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Implemented delete-and-retry for masterlist update.

Browse Source 
Closes #176.
This commit is contained in:
WrinklyNinja
2014-06-23 10:55:02 +01:00
parent c9b69e9ebe
commit e88a0915be
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/network.cpp
+5 -5
View File
@@ -45,6 +45,10 @@ namespace loot {
public:
git_handler() : repo(nullptr), remote(nullptr), cfg(nullptr), obj(nullptr), commit(nullptr), ref(nullptr), sig(nullptr), blob(nullptr) {}
~git_handler() {
free();
}
void free() {
git_commit_free(commit);
git_object_free(obj);
@@ -182,7 +186,7 @@ namespace loot {
git_handler git;
BOOST_LOG_TRIVIAL(debug) << "Checking for a Git repository.";
git.ui_message = "An error occurred while trying to access the local masterlist repository. If this error happens again, try deleting the \".git\" folder in \"%LOCALAPPDATA%\\LOOT\\" + game.FolderName() + "\".";
git.ui_message = "An error occurred while trying to access the local masterlist repository.";
//Checking for a ".git" folder.
if (fs::exists(game.MasterlistPath().parent_path() / ".git")) {
@@ -266,10 +270,6 @@ namespace loot {
7. Perform the checkout of HEAD.
*/
//Apparently I'm using libgit2's head, not v0.20.0, so I don't need this...
//LOG_INFO("Creating a Git signature.");
//git.call(git_signature_default(&git.sig, git.repo));
bool parsingFailed = false;
unsigned int rollbacks = 0;
string revision, date;
src/gui/main.cpp
+18 -3
View File
@@ -111,9 +111,24 @@ struct masterlist_updater_parser {
if (_doUpdate) {
BOOST_LOG_TRIVIAL(debug) << "Updating masterlist";
try {
pair<string, string> ret = UpdateMasterlist(_game, _errors, _plugins, _messages);
_revision = ret.first;
_date = ret.second;
try {
pair<string, string> ret = UpdateMasterlist(_game, _errors, _plugins, _messages);
_revision = ret.first;
_date = ret.second;
}
catch (loot::error &e) {
BOOST_LOG_TRIVIAL(error) << "Masterlist update failed. Details: " << e.what();
if (e.code() == loot::error::git_error) {
BOOST_LOG_TRIVIAL(info) << "Masterlist update failure was due to Git error, deleting repository and retrying...";
//Delete .git folder and try again.
fs::remove_all(_game.MasterlistPath().parent_path() / ".git");
pair<string, string> ret = UpdateMasterlist(_game, _errors, _plugins, _messages);
_revision = ret.first;
_date = ret.second;
}
else
throw e;
}
} catch (std::exception& e) {
_plugins.clear();
_messages.clear();