chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

WebParser: Cosmetics

Browse Source
This commit is contained in:
Brian Ferguson 2013-07-10 17:10:11 -06:00
parent f9ab4ee414
commit 19c6c58271
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Plugins/PluginWebParser/WebParser.cpp
View File

@ -733,7 +733,7 @@ std::vector<std::wstring> TokenizeUrl(const std::wstring url)
{ {
tokens.emplace_back(url.substr(start, end - start)); tokens.emplace_back(url.substr(start, end - start));
} }
// Push back [MeasureName] // Push back [MeasureName]
tokens.emplace_back(url.substr(end, ending - end + 1)); tokens.emplace_back(url.substr(end, ending - end + 1));
@ -801,11 +801,10 @@ PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
measure->stringIndex2 = RmReadInt(rm, L"StringIndex2", 0); measure->stringIndex2 = RmReadInt(rm, L"StringIndex2", 0);
measure->decodeCharacterReference = RmReadInt(rm, L"DecodeCharacterReference", 0); measure->decodeCharacterReference = RmReadInt(rm, L"DecodeCharacterReference", 0);
measure->updateRate = RmReadInt(rm, L"UpdateRate", 600); measure->updateRate = RmReadInt(rm, L"UpdateRate", 600);
measure->download = 1 == RmReadInt(rm, L"Download", 0); measure->forceReload = 0!=RmReadInt(rm, L"ForceReload", 0);
measure->forceReload = 1 == RmReadInt(rm, L"ForceReload", 0);
measure->debug = RmReadInt(rm, L"Debug", 0);
measure->codepage = RmReadInt(rm, L"CodePage", 0); measure->codepage = RmReadInt(rm, L"CodePage", 0);
measure->download = 0!=RmReadInt(rm, L"Download", 0);
if (measure->download) if (measure->download)
{ {
measure->downloadFolder = RmPathToAbsolute(rm, L"DownloadFile\\"); measure->downloadFolder = RmPathToAbsolute(rm, L"DownloadFile\\");
@ -816,8 +815,10 @@ PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
measure->downloadFile.clear(); measure->downloadFile.clear();
} }
measure->debug = RmReadInt(rm, L"Debug", 0);
if (measure->debug == 2) if (measure->debug == 2)
{ {
measure->debugFileLocation = RmReadPath(rm, L"Debug2File", L"WebParserDump.txt"); measure->debugFileLocation = RmReadPath(rm, L"Debug2File", L"WebParserDump.txt");
RmLog(LOG_DEBUG, measure->debugFileLocation.c_str()); RmLog(LOG_DEBUG, measure->debugFileLocation.c_str());
} }
@ -969,11 +970,11 @@ void ParseData(MeasureData* measure, LPCSTR parseData, DWORD dwSize)
// Compile the regular expression in the first argument // Compile the regular expression in the first argument
re = pcre_compile( re = pcre_compile(
StringUtil::NarrowUTF8(measure->regExp).c_str(), // the pattern StringUtil::NarrowUTF8(measure->regExp).c_str(), // the pattern
flags, // default options flags, // default options
&error, // for error message &error, // for error message
&erroffset, // for error offset &erroffset, // for error offset
nullptr); // use default character tables nullptr); // use default character tables
if (re != nullptr) if (re != nullptr)
{ {
@ -996,14 +997,14 @@ void ParseData(MeasureData* measure, LPCSTR parseData, DWORD dwSize)
} }
rc = pcre_exec( rc = pcre_exec(
re, // the compiled pattern re, // the compiled pattern
nullptr, // no extra data - we didn't study the pattern nullptr, // no extra data - we didn't study the pattern
parseData, // the subject string parseData, // the subject string
dwSize, // the length of the subject dwSize, // the length of the subject
0, // start at offset 0 in the subject 0, // start at offset 0 in the subject
0, // default options 0, // default options
ovector, // output vector for substring information ovector, // output vector for substring information
OVECCOUNT); // number of elements in the output vector OVECCOUNT); // number of elements in the output vector
if (rc >= 0) if (rc >= 0)