X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/393d6e8e0a108dbca6a0ef2dde96f23be2ce2987..69172e0e3684d849825b90b01e53026852e01a97:/stglibs/common.lib/include/stg/common.h diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h index eb0d14a6..90bd639d 100644 --- a/stglibs/common.lib/include/stg/common.h +++ b/stglibs/common.lib/include/stg/common.h @@ -33,6 +33,7 @@ #include #endif #include +#include #include "stg/os_int.h" #include "stg/const.h" @@ -56,15 +57,16 @@ const char * IntToKMG(int64_t a, int statType = ST_F); const char * LogDate(time_t t); int ParesTimeStat(const char * str); int IsTimeStat(struct tm * t, int statTime); -/*bool IsDigit(char c); -bool IsAlpha(char c);*/ -int strtodouble2(const char * s, double &a); +int strtodouble2(const char * str, double & value); +inline int strtodouble2(const std::string & str, double & value) { return strtodouble2(str.c_str(), value); } int printfd(const char * __file__, const char * fmt, ...); void Encode12(char * dst, const char * src, size_t srcLen); void Decode21(char * dst, const char * src); void Encode12str(std::string & dst, const std::string & src); void Decode21str(std::string & dst, const std::string & src); +std::string Encode12str(const std::string & src); +std::string Decode21str(const std::string & src); int ParseIPString(const char * str, uint32_t * ips, int maxIP); void KOIToWin(const char * s1, char * s2, int l); @@ -74,9 +76,9 @@ void WinToKOI(const std::string & s1, std::string * s2); int DaysInMonth(unsigned year, unsigned mon); int DaysInCurrentMonth(); int Min8(int a); -//char * inet_ntostr(unsigned long); std::string inet_ntostring(uint32_t); uint32_t inet_strington(const std::string & value); +std::string TimeToString(time_t time); int strprintf(std::string * str, const char * fmt, ...); int ParseTariffTimeStr(const char * str, int &h1, int &m1, int &h2, int &m2); uint32_t CalcMask(uint32_t msk); @@ -95,8 +97,53 @@ void SwapBytes(int64_t & value); std::string & TrimL(std::string & val); std::string & TrimR(std::string & val); std::string & Trim(std::string & val); +std::string Trim(const std::string & val); -std::string IconvString(const std::string & source, const std::string & from, const std::string & to); +std::string ToLower(std::string value); +std::string ToUpper(std::string value); + +template +inline +C Split(const std::string & value, char delim, F conv) +{ +C res; +size_t startPos = 0; +size_t pos = value.find_first_of(delim); +while (pos != std::string::npos) + { + res.push_back(conv(value.substr(startPos, pos - startPos))); + startPos = pos + 1; + pos = value.find_first_of(delim, pos + 1); + } +res.push_back(conv(value.substr(startPos, pos - startPos))); +return res; +} + +template +inline +T FromString(const std::string & value) +{ +T res; +std::istringstream stream(value); +stream >> res; +return res; +} + +template <> +inline +std::string FromString(const std::string & value) +{ +return value; +} + +template +inline +C Split(const std::string & value, char delim) +{ + return Split(value, delim, FromString); +} + +std::string IconvString(const std::string & source, const std::string & from, const std::string & to); int ParseInt(const std::string & str, int * val); int ParseUnsigned(const std::string & str, unsigned * val); @@ -107,16 +154,37 @@ int ParseYesNo(const std::string & str, bool * val); bool WaitPackets(int sd); +bool ReadAll(int sd, void * dest, size_t size); +bool WriteAll(int sd, const void * source, size_t size); + +std::string ToPrintable(const std::string & src); + +//----------------------------------------------------------------------------- +int str2x(const std::string & str, int32_t & x); +int str2x(const std::string & str, uint32_t & x); +inline +int str2x(const std::string & str, double & x) { return strtodouble2(str.c_str(), x); } +#ifndef WIN32 +int str2x(const std::string & str, int64_t & x); +int str2x(const std::string & str, uint64_t & x); +#endif +//----------------------------------------------------------------------------- +const std::string & x2str(uint32_t x, std::string & s); +const std::string & x2str(uint64_t x, std::string & s); +//----------------------------------------------------------------------------- +const std::string & x2str(double x, std::string & s); +//----------------------------------------------------------------------------- + template int str2x(const std::string & str, varT & x); template const std::string & x2str(varT x, std::string & s); template -const std::string & x2str(varT x) { std::string s; return x2str(x, s); } +std::string x2str(varT x) { std::string s; return x2str(x, s); } template const std::string & unsigned2str(varT x, std::string & s); template -const std::string & unsigned2str(varT x) { std::string s; return unsigned2str(x, s); } +std::string unsigned2str(varT x) { std::string s; return unsigned2str(x, s); } //----------------------------------------------------------------------------- template @@ -152,7 +220,7 @@ int str2x(const std::string & str, varT & x) x += str[i] - '0'; } - x*= minus; + x *= minus; return 0; } @@ -240,16 +308,6 @@ const std::string & unsigned2str(varT x, std::string & s) return s; } //----------------------------------------------------------------------------- -int str2x(const std::string & str, int32_t & x); -int str2x(const std::string & str, uint32_t & x); -#ifndef WIN32 -int str2x(const std::string & str, int64_t & x); -int str2x(const std::string & str, uint64_t & x); -#endif -//----------------------------------------------------------------------------- -const std::string & x2str(uint32_t x, std::string & s); -const std::string & x2str(uint64_t x, std::string & s); -//----------------------------------------------------------------------------- char * stg_strptime(const char *, const char *, struct tm *); time_t stg_timegm(struct tm *);