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: Apply temporary [&MeasureName] syntax for referencing non-WebParser measures

Browse Source
This commit is contained in:
Brian Ferguson 2013-08-02 15:43:45 -06:00
parent 1e82a1659f
commit a47e6ee29e
1 changed files with 16 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
Plugins/PluginWebParser/WebParser.cpp
View File

@ -708,40 +708,6 @@ PLUGIN_EXPORT void Initialize(void** data, void* rm)
++g_InstanceCount; ++g_InstanceCount;
} }
std::vector<std::wstring> TokenizeUrl(const std::wstring& url)
{
std::vector<std::wstring> tokens;
std::wstring::size_type start = 0;
std::wstring::size_type end = url.find_first_of(L'[', 0);
while (std::wstring::npos != start || std::wstring::npos != end)
{
const std::wstring::size_type ending = url.find_first_of(L']', end);
if (ending == std::wstring::npos)
{
// Push back rest of string
if (url.size() != start)
{
tokens.emplace_back(url, start, url.size() - start);
}
break;
}
// Push non-Measure name chars (if any)
if (start != end)
{
tokens.emplace_back(url, start, end - start);
}
// Push back [MeasureName]
tokens.emplace_back(url, end, ending - end + 1);
start = ending + 1;
end = url.find_first_of(L'[', start);
}
return tokens;
}
PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue) PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
{ {
MeasureData* measure = (MeasureData*)data; MeasureData* measure = (MeasureData*)data;
@ -751,57 +717,26 @@ PLUGIN_EXPORT void Reload(void* data, void* rm, double* maxValue)
/* Read our own settings from the ini-file */ /* Read our own settings from the ini-file */
std::wstring url = RmReadString(rm, L"Url", L"", FALSE); std::wstring url = RmReadString(rm, L"Url", L"", FALSE);
/*if (url.find_first_of(L'[', 0) != std::wstring::npos)
std::wstring::size_type start = 0;
while ((start = url.find(L"[&", start)) != std::wstring::npos)
{ {
std::vector<std::wstring> tokens = TokenizeUrl(url); std::wstring::size_type si = start + 1;
std::unordered_map<std::wstring, std::wstring> replacedTokens; std::wstring::size_type end = url.find(L']', si);
for (const auto& token : tokens) if (end == std::wstring::npos) break;
std::wstring var = L"[";
var += url.substr(si + 1, end - si);
std::wstring result = RmReplaceVariables(rm, var.c_str());
if (result != var)
{ {
if (token.size() >= 3 && token[0] == L'[' && token[token.size() - 1] == L']') url.replace(start, end - start + 1, result);
{
std::wstring section = token.substr(1, token.size() - 2);
bool found = false;
// Check for "escaped" Webparser measures eg. [$WebparserMeasure$]
if (section[0] != L'$' && section[section.size() - 1] != L'$')
{
const WCHAR* sectionSz = section.c_str();
for (const auto& measure : g_Measures)
{
if (_wcsicmp(measure->section, sectionSz) == 0)
{
found = true;
break;
}
}
}
else
{
section.erase(0, 1);
section.erase(section.size() - 1, 1);
}
section.insert(0, L"[");
section += L']';
// A non-WebParser measure was found.
if (!found)
{
replacedTokens[token] = RmReplaceVariables(rm, section.c_str());
}
}
} }
for (const auto& ip : replacedTokens) start = end;
{ }
std::wstring::size_type start = url.find(ip.first);
while (start != std::wstring::npos)
{
url.replace(start, ip.first.size(), ip.second, 0, ip.second.size());
start = url.find(ip.first);
}
}
}*/
measure->url = url; measure->url = url;
measure->regExp = RmReadString(rm, L"RegExp", L""); measure->regExp = RmReadString(rm, L"RegExp", L"");