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: Added $...$ escape syntax for using the string value of another Webparser measure as input for the URL option.

Browse Source 
Syntax: Url=http://www.[$SomeOtherWebparserMeasure$].com
This commit is contained in:
Brian Ferguson 2013-07-11 11:40:22 -06:00
parent c3987115ee
commit 2507b4fe2c
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Plugins/PluginWebParser/WebParser.cpp
View File

@ -759,24 +759,36 @@ PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
std::unordered_map<std::wstring, std::wstring> replacedTokens; std::unordered_map<std::wstring, std::wstring> replacedTokens;
for (auto iter : tokens) for (auto iter : tokens)
{ {
if (iter[0] == L'[' && iter[iter.size() - 1] == L']' && iter.size() >= 3) if (iter.size() >= 3 && iter[0] == L'[' && iter[iter.size() - 1] == L']')
{ {
std::wstring section = iter.substr(1, iter.size() - 2); std::wstring section = iter.substr(1, iter.size() - 2);
bool found = false; bool found = false;
for (auto jter : g_Measures) // Check for "escaped" Webparser measures eg. [$WebparserMeasure$]
if (section[0] != L'$' && section[section.size() - 1] != L'$')
{ {
if (jter->section == section) for (auto jter : g_Measures)
{ {
found = true; if (jter->section == section)
break; {
found = true;
break;
}
} }
} }
else
{
section.erase(0,1);
section.erase(section.size() - 1, 1);
}
section.insert(0, L"[");
section.append(L"]");
// A non-WebParser measure was found, read a "dummy" key value // A non-WebParser measure was found, read a "dummy" key value
if (!found) if (!found)
{ {
replacedTokens[iter] = RmReadString(rm, L"DUMMY", iter.c_str(), TRUE); replacedTokens[iter] = RmReadString(rm, L"DUMMY", section.c_str(), TRUE);
} }
} }
} }