Skip to content

Commit

Permalink
user config now stores only if changed
Browse files Browse the repository at this point in the history
  • Loading branch information
@benapetr
benapetr committed Jun 3, 2014
1 parent 4b02722 commit 2b9f82c
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 12 deletions.
51 changes: 42 additions & 9 deletions huggle/configuration.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,33 @@ QVariant Configuration::SetOption(QString key_, QString config_, QVariant defaul
switch (default_.type())
{
case QVariant::Int:
h = new HuggleOption(key_, value.toInt(), value != d_);
h = new HuggleOption(key_, value.toInt(), value == d_);
break;
case QVariant::Bool:
h = new HuggleOption(key_, SafeBool(value), value != d_);
h = new HuggleOption(key_, SafeBool(value), value == d_);
break;
default:
h = new HuggleOption(key_, value, value != d_);
h = new HuggleOption(key_, value, value == d_);
break;
}
this->UserOptions.insert(key_, h);
return h->GetVariant();
}

QStringList Configuration::SetUserOptionList(QString key_, QString config_, QStringList default_, bool CS)
{
if (this->UserOptions.contains(key_))
{
// we must not add 2 same
throw new Huggle::Exception("This option is already in a list you can't have multiple same keys in it",
"void Configuration::SetOption(QString key, QVariant data)");
}
QStringList value = HuggleParser::ConfigurationParse_QL(key_, config_, default_, CS);
HuggleOption *h = new HuggleOption(key_, value, value == default_);
this->UserOptions.insert(key_, h);
return value;
}

int Configuration::GetSafeUserInt(QString key_, int default_value)
{
HuggleOption *option = this->GetOption(key_);
Expand Down Expand Up @@ -297,7 +311,6 @@ QString Configuration::MakeLocalUserConfig()
configuration_ += "HAN_DisplayBots:" + Bool2String(HuggleConfiguration->UserConfig_HAN_DisplayBots) + "\n";
configuration_ += "HAN_DisplayUser:" + Bool2String(HuggleConfiguration->UserConfig_HAN_DisplayUser) + "\n";
configuration_ += "QueueID:" + HuggleConfiguration->UserConfig_QueueID + "\n";
configuration_ += "// queues\nqueues:\n";
QStringList kl = HuggleConfiguration->UserOptions.keys();
foreach (QString item, kl)
{
Expand All @@ -309,10 +322,30 @@ QString Configuration::MakeLocalUserConfig()
}
if (!option->IsDefault())
{
// in case we modified this item we store it
configuration_ += item + ":" + option->GetVariant().toString() + "\n";
if (option->GetVariant().type() != QVariant::StringList)
{
// in case we modified this item we store it
configuration_ += item + ":" + option->GetVariant().toString() + "\n";
} else
{
QStringList list = option->GetVariant().toStringList();
configuration_ += item + ":\n";
int x = 0;
while (x < list.count())
{
if (x+1 < list.count())
{
configuration_ += " " + list.at(x) + ",\n";
} else
{
configuration_ += " " + list.at(x) + "\n\n";
}
x++;
}
}
}
}
configuration_ += "// queues\nqueues:\n";
int c = 0;
while (c < HuggleQueueFilter::Filters.count())
{
Expand Down Expand Up @@ -764,12 +797,12 @@ bool Configuration::ParseUserConfig(QString config)
this->ProjectConfig_WarnSummary4 = this->SetOption("warn-summary-4", config, this->ProjectConfig_WarnSummary4).toString();
this->UserConfig_AutomaticallyResolveConflicts = SafeBool(ConfigurationParse("automatically-resolve-conflicts", config), false);
this->ProjectConfig_TemplateAge = this->SetOption("template-age", config, this->ProjectConfig_TemplateAge).toInt();
this->ProjectConfig_RevertSummaries = HuggleParser::ConfigurationParse_QL("template-summ", config, this->ProjectConfig_RevertSummaries);
this->ProjectConfig_WarningTypes = HuggleParser::ConfigurationParse_QL("warning-types", config, this->ProjectConfig_WarningTypes);
this->ProjectConfig_RevertSummaries = this->SetUserOptionList("template-summ", config, this->ProjectConfig_RevertSummaries);
this->ProjectConfig_WarningTypes = this->SetUserOptionList("warning-types", config, this->ProjectConfig_WarningTypes);
this->ProjectConfig_ScoreChange = this->SetOption("score-change", config, this->ProjectConfig_ScoreChange).toInt();
this->ProjectConfig_ScoreUser = this->SetOption("score-user", config, this->ProjectConfig_ScoreUser).toInt();
this->ProjectConfig_ScoreTalk = this->SetOption("score-talk", config, this->ProjectConfig_ScoreTalk).toInt();
this->ProjectConfig_WarningDefs = HuggleParser::ConfigurationParse_QL("warning-template-tags", config, this->ProjectConfig_WarningDefs);
this->ProjectConfig_WarningDefs = this->SetUserOptionList("warning-template-tags", config, this->ProjectConfig_WarningDefs);
this->ProjectConfig_BotScore = this->SetOption("score-bot", config, this->ProjectConfig_BotScore).toInt();
HuggleQueueFilter::Filters += HuggleParser::ConfigurationParseQueueList(config, false);
this->UserConfig_TruncateEdits = SafeBool(ConfigurationParse("TruncateEdits", config, "false"));
Expand Down
7 changes: 4 additions & 3 deletions huggle/configuration.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ namespace Huggle
* \param default_ Value that is used in case there is no such a key
*/
QVariant SetOption(QString key_, QString config_, QVariant default_);
QStringList SetUserOptionList(QString key_, QString config_, QStringList default_, bool CS = false);
int GetSafeUserInt(QString key_, int default_value = 0);
bool GetSafeUserBool(QString key_, bool default_value = false);
QString GetSafeUserString(QString key_, QString default_value = "");
Expand All @@ -210,7 +211,7 @@ namespace Huggle
//! Version
QString HuggleVersion;
//! currently selected project
WikiSite *Project = NULL;
WikiSite *Project = nullptr;
//! List of projects
QList<WikiSite *> ProjectList;
//! When this is true most of functions will not work
Expand Down Expand Up @@ -538,9 +539,9 @@ namespace Huggle
QString VandalNw_Ident;
bool VandalNw_Login = true;
//! Pointer to AIV page
WikiPage *AIVP = NULL;
WikiPage *AIVP = nullptr;
//! Pointer to UAA page
WikiPage *UAAP = NULL;
WikiPage *UAAP = nullptr;
//! Operating system that is sent to update server
QString Platform;
private:
Expand Down

0 comments on commit 2b9f82c

Please sign in to comment.