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

Refactored old report reading code.

Browse Source
This commit is contained in:
WrinklyNinja
2014-03-19 22:24:54 +00:00
parent c3628fa69c
commit bd97167459
2 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/generators.h
+31 -2
View File
@@ -43,6 +43,34 @@ namespace loot {
//LOOT Report generation stuff.
inline std::string GetOldReportDetails(boost::filesystem::path& filepath) {
if (boost::filesystem::exists(filepath)) {
BOOST_LOG_TRIVIAL(debug) << "Reading the previous report's details section.";
//Read the whole file in.
std::string contents;
loot::ifstream in(filepath, ios::binary);
in.seekg(0, std::ios::end);
contents.resize(in.tellg());
in.seekg(0, std::ios::beg);
in.read(&contents[0], contents.size());
in.close();
//Slim down to only the details section.
size_t pos1 = contents.find("<div id=\"plugins\"");
if (pos1 != string::npos) {
pos1 = contents.find("<ul>", pos1);
if (pos1 != string::npos) {
size_t pos2 = contents.find("<div id=\"summary\">", pos1);
if (pos2 != string::npos) {
pos2 -= 6; // "</div>"
return contents.substr(pos1, pos2 - pos1);
}
}
}
}
return "";
}
struct xml_string_writer: pugi::xml_writer {
std::string result;
@@ -541,7 +569,6 @@ namespace loot {
inline void GenerateReport(const boost::filesystem::path& file,
std::list<Message>& messages,
const std::list<Plugin>& plugins,
const std::string& oldDetails,
const std::string& masterlistVersion,
const bool masterlistUpdateEnabled) {
@@ -554,7 +581,9 @@ namespace loot {
AppendNav(body);
int messageNo=0;
int messageNo = 0;
//Read the details section of the previous report, if it exists.
string oldDetails = GetOldReportDetails(file);
AppendMain(body, oldDetails, masterlistVersion, masterlistUpdateEnabled, messages, plugins, messageNo);
AppendFilters(body, messageNo, plugins.size());
src/gui/main.cpp
-29
View File
@@ -61,8 +61,6 @@
#include <wx/aboutdlg.h>
#include <wx/progdlg.h>
#define BOOST_THREAD_VERSION 4
wxIMPLEMENT_APP(LOOT);
using namespace loot;
@@ -913,38 +911,11 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) {
// Build & Display Report
///////////////////////////////////////////////////////
//Read the details section of the previous report, if it exists.
string oldDetails;
if (fs::exists(_game.ReportPath().string())) {
BOOST_LOG_TRIVIAL(debug) << "Reading the previous report's details section.";
//Read the whole file in.
loot::ifstream in(_game.ReportPath(), ios::binary);
in.seekg(0, std::ios::end);
oldDetails.resize(in.tellg());
in.seekg(0, std::ios::beg);
in.read(&oldDetails[0], oldDetails.size());
in.close();
//Slim down to only the details section.
size_t pos1 = oldDetails.find("<div id=\"plugins\"");
if (pos1 != string::npos) {
pos1 = oldDetails.find("<ul>", pos1);
if (pos1 != string::npos) {
size_t pos2 = oldDetails.find("<div id=\"summary\">", pos1);
if (pos2 != string::npos) {
pos2 -= 6; // "</div>"
oldDetails = oldDetails.substr(pos1, pos2 - pos1);
}
}
}
}
BOOST_LOG_TRIVIAL(debug) << "Generating report...";
try {
GenerateReport(_game.ReportPath(),
messages,
plugins,
oldDetails,
revision,
doUpdate);
} catch (loot::error& e) {