From 52741fb1e42a0ffdfd312bfd8b7b9dd18ee2952f Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sat, 4 Jan 2014 20:48:13 +0100 Subject: [PATCH] move toEpoch to helpers.cpp, use strptime --- src/gui/moviebrowser.cpp | 11 ----------- src/system/helpers.cpp | 12 ++++++++++++ src/system/helpers.h | 1 + 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 3690e6d52..891daca53 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -3574,17 +3574,6 @@ void CMovieBrowser::autoFindSerie(void) } } } -static time_t toEpoch(std::string &date) -{ - struct tm t; - memset(&t, 0, sizeof(t)); - if (3 == sscanf(date.c_str(), "%d-%d-%d", &t.tm_year, &t.tm_mon, &t.tm_mday)) { - t.tm_year -= 1900; - t.tm_mon += 1; - return mktime(&t); - } - return 0; -} void CMovieBrowser::loadYTitles(int mode, std::string search, std::string id) { diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp index 2aa1be84b..5dea11f92 100644 --- a/src/system/helpers.cpp +++ b/src/system/helpers.cpp @@ -344,6 +344,18 @@ std::string trim(std::string &str, const std::string &trimChars /*= " \n\r\t"*/) return result.erase(0, result.find_first_not_of(trimChars)); } +time_t toEpoch(std::string &date) +{ + struct tm t; + memset(&t, 0, sizeof(t)); + char *p = strptime(date.c_str(), "%Y-%m-%d", &t); + if(p) + return mktime(&t); + + return 0; + +} + CFileHelpers::CFileHelpers() { FileBufSize = 0xFFFF; diff --git a/src/system/helpers.h b/src/system/helpers.h index 2fbac55cd..e1f870772 100644 --- a/src/system/helpers.h +++ b/src/system/helpers.h @@ -47,6 +47,7 @@ std::string getFileName(std::string &file); std::string getFileExt(std::string &file); std::string getNowTimeStr(const char* format); std::string trim(std::string &str, const std::string &trimChars = " \n\r\t"); +time_t toEpoch(std::string &date); class CFileHelpers {