BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-01 23:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

change TimeFromStringWithLiteral to work with floats

Browse Source
This commit is contained in:
SaltySnail 2024-05-25 21:43:54 +02:00
parent 419a951c29
commit e35bf4fe15
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ChronoWrapper.cpp
View File

@ -2,35 +2,26 @@
#include "Common.h" #include "Common.h"
#include <regex> #include <regex>
std::chrono::high_resolution_clock::duration ChronoWrapper::TimeFromStringWithLiteral(const std::string time_str) std::chrono::high_resolution_clock::duration ChronoWrapper::TimeFromStringWithLiteral(const std::string& time_str)
{ {
// const std::regex time_regex(R"((\d+)(min|ms|us|ns|[dhs]))"); //i.e one of: "25ns, 6us, 256ms, 2s, 13min, 69h, 356d" will get matched (only available in newer C++ versions) // const std::regex time_regex(R"((\d+)(min|ms|us|ns|[dhs]))"); //i.e one of: "25ns, 6us, 256ms, 2s, 13min, 69h, 356d" will get matched (only available in newer C++ versions)
const std::regex time_regex(R"((\d+\.*\d*)(min|[dhs]))"); //i.e one of: "2.01s, 13min, 69h, 356.69d" will get matched const std::regex time_regex(R"((\d+\.*\d*)(min|[dhs]))"); //i.e one of: "2.01s, 13min, 69h, 356.69d" will get matched
std::smatch match; std::smatch match;
int64_t time_value; //TODO: make time_value a float and figure out how to return that as the correct amount of nanoseconds in high_precision_clock::duration float time_value;
if (!std::regex_search(time_str, match, time_regex)) return std::chrono::nanoseconds(0); if (!std::regex_search(time_str, match, time_regex)) return std::chrono::nanoseconds(0);
time_value = stoi(match.str(1)); time_value = stof(match.str(1));
beammp_debugf("Parsed time was: {}{}", time_value, match.str(2)); beammp_debugf("Parsed time was: {}{}", time_value, match.str(2));
if (match.str(2) == "d") { if (match.str(2) == "d") {
return std::chrono::days(time_value); return std::chrono::seconds((uint64_t)(time_value * 86400)); //86400 seconds in a day
} }
else if (match.str(2) == "h") { else if (match.str(2) == "h") {
return std::chrono::hours(time_value); return std::chrono::seconds((uint64_t)(time_value * 3600)); //3600 seconds in an hour
} }
else if (match.str(2) == "min") { else if (match.str(2) == "min") {
return std::chrono::minutes(time_value); return std::chrono::seconds((uint64_t)(time_value * 60));
} }
else if (match.str(2) == "s") { else if (match.str(2) == "s") {
return std::chrono::seconds(time_value); return std::chrono::seconds((uint64_t)time_value);
} }
// else if (match.str(2) == "ms") {
// return std::chrono::milliseconds(time_value);
// }
// else if (match.str(2) == "us") {
// return std::chrono::microseconds(time_value);
// }
// else if (match.str(2) == "ns") {
// return std::chrono::nanoseconds(time_value);
// }
return std::chrono::nanoseconds(0); return std::chrono::nanoseconds(0);
} }