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 display of Bash Tags.

Browse Source 
Also implemented display of the user edits icon, and refactored the
priority string generation.
This commit is contained in:
WrinklyNinja
2014-07-16 16:11:25 +01:00
parent bc95f20382
commit 4d81bc94c1
2 changed files with 137 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/report/js/script.js
+87 -27
View File
@@ -734,6 +734,78 @@ function initGlobalVars() {
onFailure: processCefError
});
}
function getPriorityString(plugin) {
if (plugin.userlist) {
var priorityText = 'Priority: ' + plugin.userlist.modPriority + ', Global: ';
if (plugin.userlist.isGlobalPriority) {
priorityText += '✓';
} else {
priorityText += '✗';
}
return priorityText;
} else if (plugin.masterlist) {
var priorityText = 'Priority: ' + plugin.masterlist.modPriority + ', Global: ';
if (plugin.masterlist.isGlobalPriority) {
priorityText += '✓';
} else {
priorityText += '✗';
}
return priorityText;
} else {
return 'Priority: 0, Global: ✗';
}
}
function getTagsStrings(plugin) {
var tagsAdded = [];
var tagsRemoved = [];
if (plugin.masterlist && plugin.masterlist.tag) {
for (var i = 0; i < plugin.masterlist.tag.length; ++i) {
if (plugin.masterlist.tag[i].name[0] == '-') {
tagsRemoved.push(plugin.masterlist.tag[i].name);
} else {
tagsAdded.push(plugin.masterlist.tag[i].name);
}
}
}
/* Now make sure that the same tag doesn't appear in both arrays.
Prefer the removed list. */
for (var i = 0; i < tagsAdded.length; ++i) {
for (var j = 0; j < tagsRemoved.length; ++j) {
if (tagsRemoved[j].name.toLowerCase() == tagsAdded[i].name.toLowerCase()) {
/* Remove tag from the tagsAdded array. */
tagsAdded.splice(i, 1);
--i;
}
}
}
if (plugin.userlist && plugin.userlist.tag) {
for (var i = 0; i < plugin.userlist.tag.length; ++i) {
if (plugin.userlist.tag[i][0] == '-') {
tagsRemoved.push(plugin.userlist.tag[i]);
} else {
tagsAdded.push(plugin.userlist.tag[i]);
}
}
}
/* Now again make sure that the same tag doesn't appear in both arrays.
Prefer the removed list. */
for (var i = 0; i < tagsAdded.length; ++i) {
for (var j = 0; j < tagsRemoved.length; ++j) {
if (tagsRemoved[j].name.toLowerCase() == tagsAdded[i].name.toLowerCase()) {
/* Remove tag from the tagsAdded array. */
tagsAdded.splice(i, 1);
--i;
}
}
}
return {
tagsAdded: tagsAdded.join(', '),
tagsRemoved: tagsRemoved.join(', ')
};
}
function updateInterfaceWithGameInfo(response) {
try {
@@ -781,17 +853,8 @@ function updateInterfaceWithGameInfo(response) {
clone.getElementsByClassName('name')[0].textContent = loot.game.plugins[i].name;
clone.getElementsByTagName('a')[0].href = '#' + loot.game.plugins[i].name.replace(/\s+/g, '');
if (loot.game.plugins[i].masterlist) {
var priorityText = 'Priority: ' + loot.game.plugins[i].masterlist.modPriority + ', Global: ';
if (loot.game.plugins[i].masterlist.isGlobalPriority) {
priorityText += '✓';
} else {
priorityText += '✗';
}
clone.getElementsByClassName('priority')[0].textContent = priorityText;
} else {
clone.getElementsByClassName('priority')[0].textContent = 'Priority: 0, Global: ✗';
}
clone.getElementsByClassName('priority')[0].textContent = getPriorityString(loot.game.plugins[i]);
if (loot.game.plugins[i].isDummy) {
clone.getElementsByClassName('dummyPlugin')[0].className += ' fa fa-eye-slash';
@@ -801,11 +864,9 @@ function updateInterfaceWithGameInfo(response) {
clone.getElementsByClassName('loadsBSA')[0].className += ' fa fa-paperclip';
}
/*// This won't actually be handled anything like this in the real data implementation.
if (data.plugins[i].hasUserEdits) {
if (loot.game.plugins[i].userlist) {
clone.getElementsByClassName('hasUserEdits')[0].className += ' fa fa-user';
}*/
}
/* Now add plugin 'card'. */
content = document.getElementById('pluginSection').content;
@@ -840,10 +901,9 @@ function updateInterfaceWithGameInfo(response) {
showElement(clone.getElementsByClassName('loadsBSA')[0]);
}
/*// This won't actually be handled anything like this in the real data implementation.
if (data.plugins[i].hasUserEdits) {
if (loot.game.plugins[i].userlist) {
showElement(clone.getElementsByClassName('hasUserEdits')[0]);
}*/
}
if (loot.game.plugins[i].version) {
clone.getElementsByClassName('version')[0].textContent = 'Version: ' + loot.game.plugins[i].version;
@@ -851,17 +911,17 @@ function updateInterfaceWithGameInfo(response) {
hideElement(clone.getElementsByClassName('version')[0]);
}
/*if (data.plugins[i].tagsAdd && data.plugins[i].tagsAdd.length != 0) {
clone.getElementsByClassName('tag add')[0].textContent = data.plugins[i].tagsAdd.join(', ');
} else {*/
var tags = getTagsStrings(loot.game.plugins[i]);
if (tags.tagsAdded) {
clone.getElementsByClassName('tag add')[0].textContent = tags.tagsAdded;
} else {
hideElement(clone.getElementsByClassName('tag add')[0]);
//}
/*if (data.plugins[i].tagRemove && data.plugins[i].tagRemove.length != 0) {
clone.getElementsByClassName('tag remove')[0].textContent = data.plugins[i].tagsRemove.join(', ');
} else {*/
}
if (tags.tagsRemoved) {
clone.getElementsByClassName('tag remove')[0].textContent = tags.tagsRemoved;
} else {
hideElement(clone.getElementsByClassName('tag remove')[0]);
//}
}
clone.getElementsByClassName('editMetadata')[0].setAttribute('data-target', clone.id);
clone.getElementsByClassName('copyMetadata')[0].setAttribute('data-target', clone.id);
src/gui/handler.cpp
+50 -17
View File
@@ -234,38 +234,71 @@ namespace loot {
// Find the masterlist metadata for this plugin.
BOOST_LOG_TRIVIAL(trace) << "Getting masterlist metadata for: " << plugin.Name();
Plugin tempPlugin(plugin);
tempPlugin.MergeMetadata(g_app_state.CurrentGame().masterlist.FindPlugin(plugin.Name()));
Plugin mlistPlugin(plugin);
mlistPlugin.MergeMetadata(g_app_state.CurrentGame().masterlist.FindPlugin(plugin.Name()));
if (!tempPlugin.HasNameOnly()) {
BOOST_LOG_TRIVIAL(trace) << "Number of masters for " << tempPlugin.Name() << ": " << tempPlugin.Masters().size();
if (!mlistPlugin.HasNameOnly()) {
//Evaluate any conditions
BOOST_LOG_TRIVIAL(trace) << "Evaluate conditions for merged plugin data.";
try {
tempPlugin.EvalAllConditions(g_app_state.CurrentGame(), language);
mlistPlugin.EvalAllConditions(g_app_state.CurrentGame(), language);
}
catch (std::exception& e) {
BOOST_LOG_TRIVIAL(error) << "\"" << tempPlugin.Name() << "\" contains a condition that could not be evaluated. Details: " << e.what();
g_app_state.CurrentGame().masterlist.messages.push_back(Message(Message::error, (format(loc::translate("\"%1%\" contains a condition that could not be evaluated. Details: %2%")) % tempPlugin.Name() % e.what()).str()));
BOOST_LOG_TRIVIAL(error) << "\"" << mlistPlugin.Name() << "\" contains a condition that could not be evaluated. Details: " << e.what();
g_app_state.CurrentGame().masterlist.messages.push_back(Message(Message::error, (format(loc::translate("\"%1%\" contains a condition that could not be evaluated. Details: %2%")) % mlistPlugin.Name() % e.what()).str()));
}
//Also check install validity.
BOOST_LOG_TRIVIAL(trace) << "Checking that the current install is valid according to this plugin's data.";
tempPlugin.CheckInstallValidity(g_app_state.CurrentGame());
mlistPlugin.CheckInstallValidity(g_app_state.CurrentGame());
// Now add the masterlist metadata to the pluginNode.
pluginNode["masterlist"]["modPriority"] = modulo(tempPlugin.Priority(), max_priority);
pluginNode["masterlist"]["isGlobalPriority"] = (abs(tempPlugin.Priority()) >= max_priority);
pluginNode["masterlist"]["after"] = tempPlugin.LoadAfter();
pluginNode["masterlist"]["req"] = tempPlugin.Reqs();
pluginNode["masterlist"]["inc"] = tempPlugin.Incs();
pluginNode["masterlist"]["msg"] = tempPlugin.Messages();
pluginNode["masterlist"]["tag"] = tempPlugin.Tags();
pluginNode["masterlist"]["dirty"] = tempPlugin.DirtyInfo();
pluginNode["masterlist"]["modPriority"] = modulo(mlistPlugin.Priority(), max_priority);
pluginNode["masterlist"]["isGlobalPriority"] = (abs(mlistPlugin.Priority()) >= max_priority);
pluginNode["masterlist"]["after"] = mlistPlugin.LoadAfter();
pluginNode["masterlist"]["req"] = mlistPlugin.Reqs();
pluginNode["masterlist"]["inc"] = mlistPlugin.Incs();
pluginNode["masterlist"]["msg"] = mlistPlugin.Messages();
pluginNode["masterlist"]["tag"] = mlistPlugin.Tags();
pluginNode["masterlist"]["dirty"] = mlistPlugin.DirtyInfo();
}
// Now do the same again for any userlist data.
BOOST_LOG_TRIVIAL(trace) << "Getting userlist metadata for: " << plugin.Name();
Plugin ulistPlugin(plugin);
// Clear Bash Tags to prevent false positives.
ulistPlugin.Tags(set<Tag>());
ulistPlugin.MergeMetadata(g_app_state.CurrentGame().userlist.FindPlugin(plugin.Name()));
if (!ulistPlugin.HasNameOnly()) {
//Evaluate any conditions
BOOST_LOG_TRIVIAL(trace) << "Evaluate conditions for merged plugin data.";
try {
ulistPlugin.EvalAllConditions(g_app_state.CurrentGame(), language);
}
catch (std::exception& e) {
BOOST_LOG_TRIVIAL(error) << "\"" << ulistPlugin.Name() << "\" contains a condition that could not be evaluated. Details: " << e.what();
g_app_state.CurrentGame().masterlist.messages.push_back(Message(Message::error, (format(loc::translate("\"%1%\" contains a condition that could not be evaluated. Details: %2%")) % ulistPlugin.Name() % e.what()).str()));
}
//Also check install validity.
BOOST_LOG_TRIVIAL(trace) << "Checking that the current install is valid according to this plugin's data.";
ulistPlugin.CheckInstallValidity(g_app_state.CurrentGame());
// Now add the masterlist metadata to the pluginNode.
pluginNode["userlist"]["modPriority"] = modulo(ulistPlugin.Priority(), max_priority);
pluginNode["userlist"]["isGlobalPriority"] = (abs(ulistPlugin.Priority()) >= max_priority);
pluginNode["userlist"]["after"] = ulistPlugin.LoadAfter();
pluginNode["userlist"]["req"] = ulistPlugin.Reqs();
pluginNode["userlist"]["inc"] = ulistPlugin.Incs();
pluginNode["userlist"]["msg"] = ulistPlugin.Messages();
pluginNode["userlist"]["tag"] = ulistPlugin.Tags();
pluginNode["userlist"]["dirty"] = ulistPlugin.DirtyInfo();
}
gameNode["plugins"].push_back(pluginNode);
}