mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

helpers.h/cpp: add default timeout parameter with value 1

Browse Source 
For flexible usage of timeout in related downloadUrl methods if required.


Origin commit data
------------------
Commit: 7cabce4b80
Author: Thilo Graf <dbt@novatux.de>
Date: 2020-11-16 (Mon, 16 Nov 2020)
This commit is contained in:
Thilo Graf
2020-11-16 08:37:53 +01:00
committed by vanhofen
parent 5da0c3f3fb
commit b0549601a5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/helpers.cpp
View File

@@ -1802,18 +1802,18 @@ std::string randomFile(std::string suffix, std::string directory, unsigned int l
return directory + "/" + randomString(length) + "." + suffix; return directory + "/" + randomString(length) + "." + suffix;
} }
std::string downloadUrlToRandomFile(std::string url, std::string directory, unsigned int length) std::string downloadUrlToRandomFile(std::string url, std::string directory, unsigned int length, unsigned int timeout)
{ {
if (strstr(url.c_str(), "://")) if (strstr(url.c_str(), "://"))
{ {
std::string file = randomFile(url.substr(url.find_last_of(".") + 1), directory, length); std::string file = randomFile(url.substr(url.find_last_of(".") + 1), directory, length);
if (downloadUrl(url, file, " ", 1)) if (downloadUrl(url, file, " ", timeout))
return file; return file;
} }
return url; return url;
} }
std::string downloadUrlToLogo(std::string url, std::string directory, t_channel_id channel_id) std::string downloadUrlToLogo(std::string url, std::string directory, t_channel_id channel_id, unsigned int timeout)
{ {
if (channel_id == 0) if (channel_id == 0)
@@ -1829,7 +1829,7 @@ std::string downloadUrlToLogo(std::string url, std::string directory, t_channel_
std::string file = directory + "/" + strChnId + url.substr(url.find_last_of(".")); std::string file = directory + "/" + strChnId + url.substr(url.find_last_of("."));
if (file_exists(file)) if (file_exists(file))
return file; return file;
if (downloadUrl(url, file, " ", 1)) if (downloadUrl(url, file, " ", timeout))
return file; return file;
} }
return url; return url;

4
src/system/helpers.h
View File

@@ -173,8 +173,8 @@ bool utf8_check_is_valid(const std::string &str);
std::string randomString(unsigned int length = 10); std::string randomString(unsigned int length = 10);
std::string randomFile(std::string suffix = "tmp", std::string directory = "/tmp", unsigned int length = 10); std::string randomFile(std::string suffix = "tmp", std::string directory = "/tmp", unsigned int length = 10);
std::string downloadUrlToRandomFile(std::string url, std::string directory = "/tmp", unsigned int length = 10); std::string downloadUrlToRandomFile(std::string url, std::string directory = "/tmp", unsigned int length = 10, unsigned int timeout = 1);
std::string downloadUrlToLogo(std::string url, std::string directory = "/tmp", t_channel_id channel_id = 0); std::string downloadUrlToLogo(std::string url, std::string directory = "/tmp", t_channel_id channel_id = 0, unsigned int timeout = 1);
// curl // curl
struct MemoryStruct { struct MemoryStruct {