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

Improved C++ <-> JS queries' error handling.

Browse Source 
Also refactored query handling code a bit. Closes #134.
This commit is contained in:
WrinklyNinja
2014-08-19 21:11:23 +01:00
parent d9f6ce7ec8
commit 5c5e9b7ef2
6 changed files with 437 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/report/js/custom.js
+2 -6
View File
@@ -55,10 +55,8 @@ var pluginMenuProto = Object.create(HTMLElement.prototype, {
]
});
loot.query(request).then(function(result){
loot.query(request).then(JSON.parse).then(function(result){
if (result) {
result = JSON.parse(result);
/* Need to empty the UI-side user metadata. */
for (var i = 0; i < loot.game.plugins.length; ++i) {
if (loot.game.plugins[i].id == pluginID) {
@@ -243,10 +241,8 @@ var pluginCardProto = Object.create(HTMLElement.prototype, {
card.readFromEditor()
]
});
loot.query(request).then(function(result){
loot.query(request).then(JSON.parse).then(function(result){
if (result) {
result = JSON.parse(result);
for (var i = 0; i < loot.game.plugins.length; ++i) {
if (loot.game.plugins[i].id == card.id) {
resources/report/js/script.js
+44 -55
View File
@@ -45,13 +45,10 @@ function processCefError(err) {
var marked;
function saveFilterState(evt) {
var attr;
var type;
if (evt.currentTarget.type == 'checkbox') {
attr = 'checked';
type = 'boolean';
} else {
attr = 'value';
type = 'string';
}
if (evt.currentTarget[attr]) {
loot.settings.filters[evt.currentTarget.id] = true;
@@ -63,7 +60,6 @@ function saveFilterState(evt) {
name: 'saveFilterState',
args: [
evt.currentTarget.id,
type,
evt.currentTarget[attr]
]
});
@@ -124,9 +120,8 @@ function getConflictingPluginsFromFilter() {
]
});
return loot.query(request).then(function(result){
return loot.query(request).then(JSON.parse).then(function(result){
if (result) {
result = JSON.parse(result);
for (var key in result.crcs) {
for (var i = 0; i < loot.game.plugins.length; ++i) {
if (loot.game.plugins[i].name == key) {
@@ -422,37 +417,39 @@ function sortPlugins(evt) {
updateMasterlist(evt);
}
loot.query('sortPlugins').then(JSON.parse).then(function(result){
for (var key in result.crcs) {
for (var i = 0; i < loot.game.plugins.length; ++i) {
if (loot.game.plugins[i].name == key) {
loot.game.plugins[i].crc = result.crcs[key];
break;
if (result) {
for (var key in result.crcs) {
for (var i = 0; i < loot.game.plugins.length; ++i) {
if (loot.game.plugins[i].name == key) {
loot.game.plugins[i].crc = result.crcs[key];
break;
}
}
}
}
if (loot.neverTellMeTheOdds) {
/* Array shuffler from <https://stackoverflow.com/questions/6274339/how-can-i-shuffle-an-array-in-javascript> */
for(var j, x, i = result.loadOrder.length; i; j = Math.floor(Math.random() * i), x = result.loadOrder[--i], result.loadOrder[i] = result.loadOrder[j], result.loadOrder[j] = x);
}
if (loot.neverTellMeTheOdds) {
/* Array shuffler from <https://stackoverflow.com/questions/6274339/how-can-i-shuffle-an-array-in-javascript> */
for(var j, x, i = result.loadOrder.length; i; j = Math.floor(Math.random() * i), x = result.loadOrder[--i], result.loadOrder[i] = result.loadOrder[j], result.loadOrder[j] = x);
}
/* Record the previous order in case the user cancels sorting. */
/* Start at 2 to skip summary and general messages. */
var cards = document.getElementById('main').children;
loot.newLoadOrder = result.loadOrder;
loot.lastLoadOrder = [];
for (var i = 2; i < cards.length; ++i) {
loot.lastLoadOrder.push(cards[i].getElementsByTagName('h1')[0].textContent);
}
/* Now update the UI for the new order. */
sortUIElements(result.loadOrder);
/* Record the previous order in case the user cancels sorting. */
/* Start at 2 to skip summary and general messages. */
var cards = document.getElementById('main').children;
loot.newLoadOrder = result.loadOrder;
loot.lastLoadOrder = [];
for (var i = 2; i < cards.length; ++i) {
loot.lastLoadOrder.push(cards[i].getElementsByTagName('h1')[0].textContent);
}
/* Now update the UI for the new order. */
sortUIElements(result.loadOrder);
/* Now hide the masterlist update buttons, and display the accept and
cancel sort buttons. */
hideElement(document.getElementById('updateMasterlistButton'));
hideElement(document.getElementById('sortButton'));
showElement(document.getElementById('applySortButton'));
showElement(document.getElementById('cancelSortButton'));
/* Now hide the masterlist update buttons, and display the accept and
cancel sort buttons. */
hideElement(document.getElementById('updateMasterlistButton'));
hideElement(document.getElementById('sortButton'));
showElement(document.getElementById('applySortButton'));
showElement(document.getElementById('cancelSortButton'));
}
}).catch(processCefError);
}
function applySort(evt) {
@@ -506,27 +503,23 @@ function redatePlugins(evt) {
function clearAllMetadata(evt) {
showMessageDialog('Clear All Metadata', 'Are you sure you want to clear all existing user-added metadata from all plugins?', function(result){
if (result) {
loot.query('clearAllMetadata').then(function(result){
if (result) {
result = JSON.parse(result);
loot.query('clearAllMetadata').then(JSON.parse).then(function(result){
/* Need to empty the UI-side user metadata. */
result.forEach(function(plugin){
for (var i = 0; i < loot.game.plugins.length; ++i) {
if (loot.game.plugins[i].name == plugin.name) {
loot.game.plugins[i].userlist = undefined;
/* Need to empty the UI-side user metadata. */
result.forEach(function(plugin){
for (var i = 0; i < loot.game.plugins.length; ++i) {
if (loot.game.plugins[i].name == plugin.name) {
loot.game.plugins[i].userlist = undefined;
loot.game.plugins[i].modPriority = plugin.modPriority;
loot.game.plugins[i].isGlobalPriority = plugin.isGlobalPriority;
loot.game.plugins[i].messages = plugin.messages;
loot.game.plugins[i].tags = plugin.tags;
loot.game.plugins[i].isDirty = plugin.isDirty;
loot.game.plugins[i].modPriority = plugin.modPriority;
loot.game.plugins[i].isGlobalPriority = plugin.isGlobalPriority;
loot.game.plugins[i].messages = plugin.messages;
loot.game.plugins[i].tags = plugin.tags;
loot.game.plugins[i].isDirty = plugin.isDirty;
break;
}
break;
}
});
}
}
});
}).catch(processCefError);
}
});
@@ -896,11 +889,7 @@ function initVars() {
}
try {
if (results[1]) {
loot.installedGames = JSON.parse(results[1]);
} else {
loot.installedGames = [];
}
loot.installedGames = JSON.parse(results[1]);
} catch (e) {
console.log(e);
console.log('getInstalledGames response: ' + results[1]);
src/gui/app.cpp
+8 -3
View File
@@ -234,7 +234,7 @@ namespace loot {
}
void LootState::ChangeGame(const std::string& newGameFolder) {
BOOST_LOG_TRIVIAL(debug) << "Changing current game...";
BOOST_LOG_TRIVIAL(debug) << "Changing current game to that with folder: " << newGameFolder;
auto it = std::find_if(_games.begin(), _games.end(), [&newGameFolder](const Game& game){
return game.FolderName() == newGameFolder;
});
@@ -248,8 +248,13 @@ namespace loot {
return _games[_currentGame];
}
const std::vector<Game>& LootState::InstalledGames() const {
return _games;
std::vector<std::string> LootState::InstalledGames() const {
vector<string> installedGames;
for (const auto &game : _games) {
if (game.IsInstalled())
installedGames.push_back(game.FolderName());
}
return installedGames;
}
const YAML::Node& LootState::GetSettings() const {
src/gui/app.h
+2 -1
View File
@@ -72,7 +72,8 @@ namespace loot {
Game& CurrentGame();
void ChangeGame(const std::string& newGameFolder);
const std::vector<Game>& InstalledGames() const;
// Get the folder names of the installed games.
std::vector<std::string> InstalledGames() const;
const YAML::Node& GetSettings() const;
void UpdateSettings(const YAML::Node& settings);
src/gui/handler.cpp
+368 -284
View File
File diff suppressed because it is too large Load Diff
src/gui/handler.h
+13
View File
@@ -58,6 +58,19 @@ namespace loot {
std::string GetInstalledGames();
std::string GetGameData();
std::string UpdateMasterlist();
std::string ClearAllMetadata();
std::string SortPlugins();
// Handle queries with input arguments.
bool HandleComplexQuery(CefRefPtr<CefBrowser> browser, YAML::Node& request,
CefRefPtr<Callback> callback);
void Find(CefRefPtr<CefBrowser> browser, const std::string& search);
std::string GetConflictingPlugins(const std::string& pluginName);
void CopyMetadata(const std::string& pluginName);
std::string ClearPluginMetadata(const std::string& pluginName);
void SaveFilterState(const std::string& filterId, const std::string& value);
std::string ApplyUserEdits(const YAML::Node& pluginMetadata);
YAML::Node Handler::GenerateDerivedMetadata(const std::string& pluginName);
YAML::Node Handler::GenerateDerivedMetadata(const Plugin& file, const Plugin& masterlist, const Plugin& userlist);