From 294f8a6a22c5a38513484e4463eb9070cd183dd1 Mon Sep 17 00:00:00 2001 From: JAJames Date: Tue, 2 Feb 2016 00:07:41 -0500 Subject: [PATCH] output_times is now database-specific. --- Release/Plugins/RenX.Core.lib | Bin 190556 -> 191246 bytes RenX.Core/RenX_LadderDatabase.cpp | 16 ++++++++++++--- RenX.Core/RenX_LadderDatabase.h | 19 ++++++++++++++++-- RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp | 3 ++- RenX.Ladder.Daily/RenX_Ladder_Daily.cpp | 3 ++- RenX.Ladder.Daily/RenX_Ladder_Daily.h | 2 +- RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp | 3 ++- RenX.Ladder.Monthly/RenX_Ladder_Monthly.h | 2 +- RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp | 3 ++- RenX.Ladder.Weekly/RenX_Ladder_Weekly.h | 2 +- RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp | 3 ++- RenX.Ladder.Yearly/RenX_Ladder_Yearly.h | 2 +- RenX.Ladder/RenX_Ladder.cpp | 3 +-- RenX.Ladder/RenX_Ladder.h | 2 +- 14 files changed, 46 insertions(+), 17 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 3c0edd01d727406c66ff178a83f0e0674a7a16ae..f3c236d288596df2c29e59aba60ec1730720e6d9 100644 GIT binary patch delta 20446 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 delta 20282 zcmc(H37C#$+y8l9NfKkMgDgYHI>s8s7`rTEY-4BavW_LMglCe3%Jyh3A%-N$GEs

o|UMb6@9m?&oH=X$Se&R205`P^6F5^$;KPqp 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 diff --git a/RenX.Core/RenX_LadderDatabase.cpp b/RenX.Core/RenX_LadderDatabase.cpp index 9b9624a..29a1b18 100644 --- a/RenX.Core/RenX_LadderDatabase.cpp +++ b/RenX.Core/RenX_LadderDatabase.cpp @@ -391,13 +391,13 @@ void RenX::LadderDatabase::sort_entries() RenX::LadderDatabase::last_sort = std::chrono::steady_clock::now(); } -void RenX::LadderDatabase::updateLadder(RenX::Server *server, const RenX::TeamType &team, bool output_times) +void RenX::LadderDatabase::updateLadder(RenX::Server *server, const RenX::TeamType &team) { if (server->players.size() != server->getBotCount()) { // call the PreUpdateLadder event if (this->OnPreUpdateLadder != nullptr) - this->OnPreUpdateLadder(*this, server, team, output_times); + this->OnPreUpdateLadder(*this, server, team); // update player stats in memory RenX::PlayerInfo *player; @@ -484,7 +484,7 @@ void RenX::LadderDatabase::updateLadder(RenX::Server *server, const RenX::TeamTy RenX::LadderDatabase::write(this->getFilename()); std::chrono::steady_clock::duration write_duration = std::chrono::steady_clock::now() - start_time; - if (output_times) + if (RenX::LadderDatabase::output_times) { Jupiter::StringS str = Jupiter::StringS::Format("Ladder: %u entries sorted in %f seconds; Database written in %f seconds." ENDL, RenX::LadderDatabase::getEntries(), @@ -520,3 +520,13 @@ void RenX::LadderDatabase::setName(const Jupiter::ReadableString &in_name) { RenX::LadderDatabase::name = in_name; } + +bool RenX::LadderDatabase::getOutputTimes() const +{ + return RenX::LadderDatabase::output_times; +} + +void RenX::LadderDatabase::setOutputTimes(bool in_output_times) +{ + RenX::LadderDatabase::output_times = in_output_times; +} diff --git a/RenX.Core/RenX_LadderDatabase.h b/RenX.Core/RenX_LadderDatabase.h index 54a73b9..a712833 100644 --- a/RenX.Core/RenX_LadderDatabase.h +++ b/RenX.Core/RenX_LadderDatabase.h @@ -168,7 +168,7 @@ namespace RenX * @param team Team which just won * @param output_times True if the sort/write times should be output, false otherwise. */ - void updateLadder(RenX::Server *server, const RenX::TeamType &team, bool output_times); + void updateLadder(RenX::Server *server, const RenX::TeamType &team); /** * @brief Erases all entries in the database. @@ -185,6 +185,20 @@ namespace RenX */ void setName(const Jupiter::ReadableString &in_name); + /** + * @brief Checks if this database outputs sort/write times when 'updateLadder' is called. + * + * @return True if output times get printed, false otherwise. + */ + bool getOutputTimes() const; + + /** + * @brief Sets this database to output sort/write times, or to not output sort/write times. + * + * @param in_output_times True to output sort/write times, false otherwise. + */ + void setOutputTimes(bool in_output_times); + /** * @brief Constructor for the LadderDatabase class */ @@ -200,7 +214,7 @@ namespace RenX */ ~LadderDatabase(); - typedef void PreUpdateLadderFunction(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team, bool output_times); + typedef void PreUpdateLadderFunction(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team); PreUpdateLadderFunction *OnPreUpdateLadder = nullptr; private: @@ -208,6 +222,7 @@ namespace RenX const uint8_t write_version = 0; uint8_t read_version = write_version; + bool output_times = false; Jupiter::StringS name; std::chrono::steady_clock::time_point last_sort = std::chrono::steady_clock::now(); size_t entries = 0; diff --git a/RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp b/RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp index 27c3e37..fb51ee1 100644 --- a/RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp +++ b/RenX.Ladder.All-Time/RenX_Ladder_All_Time.cpp @@ -27,9 +27,10 @@ RenX_Ladder_All_TimePlugin::RenX_Ladder_All_TimePlugin() // Load database this->database.process_file(Jupiter::IRC::Client::Config->get(this->getName(), "LadderDatabase"_jrs, "Ladder.db"_jrs)); this->database.setName(Jupiter::IRC::Client::Config->get(this->getName(), "DatabaseName"_jrs, "All-Time"_jrs)); + this->database.setOutputTimes(Jupiter::IRC::Client::Config->getBool(this->getName(), "OutputTimes"_jrs, true)); // Force database to default, if desired - if (Jupiter::IRC::Client::Config->getBool(this->getName(), "ForceDefault"_jrs, false)) + if (Jupiter::IRC::Client::Config->getBool(this->getName(), "ForceDefault"_jrs, true)) RenX::default_ladder_database = &this->database; } diff --git a/RenX.Ladder.Daily/RenX_Ladder_Daily.cpp b/RenX.Ladder.Daily/RenX_Ladder_Daily.cpp index 5b90824..99d3893 100644 --- a/RenX.Ladder.Daily/RenX_Ladder_Daily.cpp +++ b/RenX.Ladder.Daily/RenX_Ladder_Daily.cpp @@ -28,6 +28,7 @@ RenX_Ladder_Daily_TimePlugin::RenX_Ladder_Daily_TimePlugin() // Load database this->database.process_file(Jupiter::IRC::Client::Config->get(this->getName(), "LadderDatabase"_jrs, "Ladder.Daily.db"_jrs)); this->database.setName(Jupiter::IRC::Client::Config->get(this->getName(), "DatabaseName"_jrs, "Daily"_jrs)); + this->database.setOutputTimes(Jupiter::IRC::Client::Config->getBool(this->getName(), "OutputTimes"_jrs, false)); this->last_sorted_day = gmtime(std::addressof(time(0)))->tm_wday; this->database.OnPreUpdateLadder = OnPreUpdateLadder; @@ -40,7 +41,7 @@ RenX_Ladder_Daily_TimePlugin::RenX_Ladder_Daily_TimePlugin() // Plugin instantiation and entry point. RenX_Ladder_Daily_TimePlugin pluginInstance; -void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team, bool output_times) +void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team) { tm *tm_ptr = gmtime(std::addressof(time(0))); if (pluginInstance.last_sorted_day != tm_ptr->tm_wday) diff --git a/RenX.Ladder.Daily/RenX_Ladder_Daily.h b/RenX.Ladder.Daily/RenX_Ladder_Daily.h index be3f87c..646e015 100644 --- a/RenX.Ladder.Daily/RenX_Ladder_Daily.h +++ b/RenX.Ladder.Daily/RenX_Ladder_Daily.h @@ -37,6 +37,6 @@ private: STRING_LITERAL_AS_NAMED_REFERENCE(name, "RenX.Ladder.Daily"); }; -void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team, bool output_times); +void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team); #endif // _RENX_LADDER_ALL_TIME \ No newline at end of file diff --git a/RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp b/RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp index f4a46e1..c4109c1 100644 --- a/RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp +++ b/RenX.Ladder.Monthly/RenX_Ladder_Monthly.cpp @@ -28,6 +28,7 @@ RenX_Ladder_Monthly_TimePlugin::RenX_Ladder_Monthly_TimePlugin() // Load database this->database.process_file(Jupiter::IRC::Client::Config->get(this->getName(), "LadderDatabase"_jrs, "Ladder.Monthly.db"_jrs)); this->database.setName(Jupiter::IRC::Client::Config->get(this->getName(), "DatabaseName"_jrs, "Monthly"_jrs)); + this->database.setOutputTimes(Jupiter::IRC::Client::Config->getBool(this->getName(), "OutputTimes"_jrs, false)); this->last_sorted_month = gmtime(std::addressof(time(0)))->tm_mon; this->database.OnPreUpdateLadder = OnPreUpdateLadder; @@ -40,7 +41,7 @@ RenX_Ladder_Monthly_TimePlugin::RenX_Ladder_Monthly_TimePlugin() // Plugin instantiation and entry point. RenX_Ladder_Monthly_TimePlugin pluginInstance; -void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team, bool output_times) +void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team) { tm *tm_ptr = gmtime(std::addressof(time(0))); if (pluginInstance.last_sorted_month != tm_ptr->tm_mon) diff --git a/RenX.Ladder.Monthly/RenX_Ladder_Monthly.h b/RenX.Ladder.Monthly/RenX_Ladder_Monthly.h index a556d37..20da6fb 100644 --- a/RenX.Ladder.Monthly/RenX_Ladder_Monthly.h +++ b/RenX.Ladder.Monthly/RenX_Ladder_Monthly.h @@ -37,6 +37,6 @@ private: STRING_LITERAL_AS_NAMED_REFERENCE(name, "RenX.Ladder.Monthly"); }; -void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team, bool output_times); +void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team); #endif // _RENX_LADDER_ALL_TIME \ No newline at end of file diff --git a/RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp b/RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp index fe58a1e..5ed0538 100644 --- a/RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp +++ b/RenX.Ladder.Weekly/RenX_Ladder_Weekly.cpp @@ -28,6 +28,7 @@ RenX_Ladder_Weekly_TimePlugin::RenX_Ladder_Weekly_TimePlugin() // Load database this->database.process_file(Jupiter::IRC::Client::Config->get(this->getName(), "LadderDatabase"_jrs, "Ladder.Weekly.db"_jrs)); this->database.setName(Jupiter::IRC::Client::Config->get(this->getName(), "DatabaseName"_jrs, "Weekly"_jrs)); + this->database.setOutputTimes(Jupiter::IRC::Client::Config->getBool(this->getName(), "OutputTimes"_jrs, false)); this->last_sorted_day = gmtime(std::addressof(time(0)))->tm_wday; this->reset_day = Jupiter::IRC::Client::Config->getInt(this->getName(), "ResetDay"_jrs); @@ -41,7 +42,7 @@ RenX_Ladder_Weekly_TimePlugin::RenX_Ladder_Weekly_TimePlugin() // Plugin instantiation and entry point. RenX_Ladder_Weekly_TimePlugin pluginInstance; -void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team, bool output_times) +void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team) { tm *tm_ptr = gmtime(std::addressof(time(0))); if (pluginInstance.last_sorted_day != tm_ptr->tm_wday && tm_ptr->tm_wday == pluginInstance.reset_day) diff --git a/RenX.Ladder.Weekly/RenX_Ladder_Weekly.h b/RenX.Ladder.Weekly/RenX_Ladder_Weekly.h index b3d5542..0a737ff 100644 --- a/RenX.Ladder.Weekly/RenX_Ladder_Weekly.h +++ b/RenX.Ladder.Weekly/RenX_Ladder_Weekly.h @@ -38,6 +38,6 @@ private: STRING_LITERAL_AS_NAMED_REFERENCE(name, "RenX.Ladder.Weekly"); }; -void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team, bool output_times); +void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team); #endif // _RENX_LADDER_ALL_TIME \ No newline at end of file diff --git a/RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp b/RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp index acee35f..3256e1c 100644 --- a/RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp +++ b/RenX.Ladder.Yearly/RenX_Ladder_Yearly.cpp @@ -28,6 +28,7 @@ RenX_Ladder_Yearly_TimePlugin::RenX_Ladder_Yearly_TimePlugin() // Load database this->database.process_file(Jupiter::IRC::Client::Config->get(this->getName(), "LadderDatabase"_jrs, "Ladder.Yearly.db"_jrs)); this->database.setName(Jupiter::IRC::Client::Config->get(this->getName(), "DatabaseName"_jrs, "Yearly"_jrs)); + this->database.setOutputTimes(Jupiter::IRC::Client::Config->getBool(this->getName(), "OutputTimes"_jrs, false)); this->last_sorted_year = gmtime(std::addressof(time(0)))->tm_year; this->database.OnPreUpdateLadder = OnPreUpdateLadder; @@ -40,7 +41,7 @@ RenX_Ladder_Yearly_TimePlugin::RenX_Ladder_Yearly_TimePlugin() // Plugin instantiation and entry point. RenX_Ladder_Yearly_TimePlugin pluginInstance; -void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team, bool output_times) +void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team) { tm *tm_ptr = gmtime(std::addressof(time(0))); if (pluginInstance.last_sorted_year != tm_ptr->tm_year) diff --git a/RenX.Ladder.Yearly/RenX_Ladder_Yearly.h b/RenX.Ladder.Yearly/RenX_Ladder_Yearly.h index 85ae403..d92c42c 100644 --- a/RenX.Ladder.Yearly/RenX_Ladder_Yearly.h +++ b/RenX.Ladder.Yearly/RenX_Ladder_Yearly.h @@ -37,6 +37,6 @@ private: STRING_LITERAL_AS_NAMED_REFERENCE(name, "RenX.Ladder.Yearly"); }; -void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team, bool output_times); +void OnPreUpdateLadder(RenX::LadderDatabase &database, RenX::Server *server, const RenX::TeamType &team); #endif // _RENX_LADDER_ALL_TIME \ No newline at end of file diff --git a/RenX.Ladder/RenX_Ladder.cpp b/RenX.Ladder/RenX_Ladder.cpp index cb722cf..b9ce420 100644 --- a/RenX.Ladder/RenX_Ladder.cpp +++ b/RenX.Ladder/RenX_Ladder.cpp @@ -29,7 +29,6 @@ using namespace Jupiter::literals; RenX_LadderPlugin::RenX_LadderPlugin() { RenX_LadderPlugin::only_pure = Jupiter::IRC::Client::Config->getBool(this->getName(), "OnlyPure"_jrs, false); - RenX_LadderPlugin::output_times = Jupiter::IRC::Client::Config->getBool(this->getName(), "OutputTimes"_jrs, true); int mlcpno = Jupiter::IRC::Client::Config->getInt(this->getName(), "MaxLadderCommandPartNameOutput"_jrs, 5); if (mlcpno < 0) RenX_LadderPlugin::max_ladder_command_part_name_output = 0; @@ -59,7 +58,7 @@ void RenX_LadderPlugin::RenX_OnCommand(RenX::Server *server, const Jupiter::Read server->varData.set(this->name, "w"_jrs, "0"_jrs); RenX::TeamType team = static_cast(server->varData.get(this->name, "t"_jrs, "\0"_jrs).get(0)); for (size_t index = 0; index != RenX::ladder_databases.size(); ++index) - RenX::ladder_databases.get(index)->updateLadder(server, team, RenX_LadderPlugin::output_times); + RenX::ladder_databases.get(index)->updateLadder(server, team); } } } diff --git a/RenX.Ladder/RenX_Ladder.h b/RenX.Ladder/RenX_Ladder.h index f7cc16d..ab254ec 100644 --- a/RenX.Ladder/RenX_Ladder.h +++ b/RenX.Ladder/RenX_Ladder.h @@ -44,7 +44,7 @@ public: private: /** Configuration variables */ - bool only_pure, output_times; + bool only_pure; size_t max_ladder_command_part_name_output; STRING_LITERAL_AS_NAMED_REFERENCE(name, "RenX.Ladder"); };