Updated Command Update code to report after each process handling rather than at the end

This commit is contained in:
Uleat
2019-09-07 21:21:46 -04:00
parent a428eb61a1
commit fec567c2f3
6 changed files with 68 additions and 44 deletions
+9 -6
View File
@@ -1470,10 +1470,8 @@ bool SharedDatabase::GetCommandSettings(std::map<std::string, std::pair<uint8, s
return true;
}
bool SharedDatabase::UpdateCommandSettings(const std::vector<std::pair<std::string, uint8>> &injected, const std::vector<std::string> &orphaned)
bool SharedDatabase::UpdateInjectedCommandSettings(const std::vector<std::pair<std::string, uint8>> &injected)
{
bool return_value = true;
if (injected.size()) {
std::string query = fmt::format(
@@ -1486,7 +1484,7 @@ bool SharedDatabase::UpdateCommandSettings(const std::vector<std::pair<std::stri
);
if (!QueryDatabase(query).Success()) {
return_value = false;
return false;
}
Log(Logs::General,
@@ -1497,6 +1495,11 @@ bool SharedDatabase::UpdateCommandSettings(const std::vector<std::pair<std::stri
);
}
return true;
}
bool SharedDatabase::UpdateOrphanedCommandSettings(const std::vector<std::string> &orphaned)
{
if (orphaned.size()) {
std::string query = fmt::format(
@@ -1505,7 +1508,7 @@ bool SharedDatabase::UpdateCommandSettings(const std::vector<std::pair<std::stri
);
if (!QueryDatabase(query).Success()) {
return_value = false;
return false;
}
Log(Logs::General,
@@ -1516,7 +1519,7 @@ bool SharedDatabase::UpdateCommandSettings(const std::vector<std::pair<std::stri
);
}
return return_value;
return true;
}
bool SharedDatabase::LoadSkillCaps(const std::string &prefix) {
+2 -1
View File
@@ -71,7 +71,8 @@ class SharedDatabase : public Database
void LoadCharacterInspectMessage(uint32 character_id, InspectMessage_Struct* message);
void SaveCharacterInspectMessage(uint32 character_id, const InspectMessage_Struct* message);
bool GetCommandSettings(std::map<std::string, std::pair<uint8, std::vector<std::string>>> &command_settings);
bool UpdateCommandSettings(const std::vector<std::pair<std::string, uint8>> &injected, const std::vector<std::string> &orphaned);
bool UpdateInjectedCommandSettings(const std::vector<std::pair<std::string, uint8>> &injected);
bool UpdateOrphanedCommandSettings(const std::vector<std::string> &orphaned);
uint32 GetTotalTimeEntitledOnAccount(uint32 AccountID);
void SetMailKey(int CharID, int IPAddress, int MailKey);
std::string GetMailKey(int CharID, bool key_only = false);