From 257033301020cf4fb651cbf7bb915a9ec9650d81 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Mon, 16 Nov 2020 08:37:53 +0100
Subject: [PATCH] helpers.h/cpp: add default timeout parameter with value 1

For flexible usage of timeout in related downloadUrl methods if required.
---
 src/system/helpers.cpp | 8 ++++----
 src/system/helpers.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/system/helpers.cpp b/src/system/helpers.cpp
index a0dd5d65f..b7de55c90 100644
--- a/src/system/helpers.cpp
+++ b/src/system/helpers.cpp
@@ -1615,18 +1615,18 @@ std::string randomFile(std::string suffix, std::string directory, unsigned int l
 	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(), "://"))
 	{
 		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 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)
@@ -1642,7 +1642,7 @@ std::string downloadUrlToLogo(std::string url, std::string directory, t_channel_
 		std::string file = directory + "/" + strChnId + url.substr(url.find_last_of("."));
 		if (file_exists(file))
 			return file;
-		if (downloadUrl(url, file, " ", 1))
+		if (downloadUrl(url, file, " ", timeout))
 			return file;
 	}
 	return url;
diff --git a/src/system/helpers.h b/src/system/helpers.h
index 6374f9e7b..c6904efca 100644
--- a/src/system/helpers.h
+++ b/src/system/helpers.h
@@ -169,8 +169,8 @@ bool utf8_check_is_valid(const std::string &str);
 
 std::string randomString(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 downloadUrlToLogo(std::string url, std::string directory = "/tmp", t_channel_id channel_id = 0);
+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, unsigned int timeout = 1);
 
 // curl
 struct MemoryStruct {