X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Fparam.h;h=91d9fa4d873c75c4610c3387938f1a41e601992c;hb=1e05e43547402c4948d508d1e5fdfdc32bad5a47;hp=ae38d35b164bedc9c01f2b8ec9cb858cd49e3db5;hpb=31786415d2a88d8a0a929ac1ddf06b8283e6e163;p=casparcg

diff --git a/common/param.h b/common/param.h
index ae38d35b1..91d9fa4d8 100644
--- a/common/param.h
+++ b/common/param.h
@@ -10,12 +10,13 @@
 
 namespace caspar {
 
-class param_comparer {
-		const std::wstring& lhs;
-	public:
-		explicit param_comparer(const std::wstring& p) : lhs(p) {}
-		bool operator()(const std::wstring& rhs) { return boost::iequals(lhs, rhs); }
-	};
+class param_comparer
+{
+	const std::wstring& lhs;
+public:
+	explicit param_comparer(const std::wstring& p) : lhs(p) {}
+	bool operator()(const std::wstring& rhs) { return boost::iequals(lhs, rhs); }
+};
 
 template<typename C>
 bool contains_param(const std::wstring& name, C&& params)
@@ -23,44 +24,85 @@ bool contains_param(const std::wstring& name, C&& params)
 	return std::find_if(params.begin(), params.end(), param_comparer(name)) != params.end();
 }
 
+template<typename C>
+bool get_and_consume_flag(const std::wstring& flag_param, C& params)
+{
+	auto flag_it = std::find_if(params.begin(), params.end(), param_comparer(flag_param));
+	bool flag = false;
+
+	if (flag_it != params.end())
+	{
+		flag = true;
+		params.erase(flag_it);
+	}
+
+	return flag;
+}
+
+template<typename C>
+void replace_placeholders(const std::wstring& placeholder, const std::wstring& replacement, C&& params)
+{
+	for (auto& param : params)
+		boost::ireplace_all(param, placeholder, replacement);
+}
+
+static std::vector<std::wstring> protocol_split(const std::wstring& s)
+{
+	std::vector<std::wstring> result;
+	size_t pos;
+
+	if ((pos = s.find(L"://")) != std::wstring::npos)
+	{
+		result.push_back(s.substr(0, pos));
+		result.push_back(s.substr(pos + 3));
+	}
+	else
+	{
+		result.push_back(L"");
+		result.push_back(s);
+	}
+
+	return result;
+}
+
 template<typename T, typename C>
 typename std::enable_if<!std::is_convertible<T, std::wstring>::value, typename std::decay<T>::type>::type get_param(const std::wstring& name, C&& params, T fail_value = T())
-{	
+{
 	auto it = std::find_if(std::begin(params), std::end(params), param_comparer(name));
-	if(it == params.end())	
+	if(it == params.end())
 		return fail_value;
-	
+
 	try
 	{
 		if(++it == params.end())
 			throw std::out_of_range("");
 
-		return boost::lexical_cast<std::decay<T>::type>(*it);
+		return boost::lexical_cast<typename std::decay<T>::type>(*it);
 	}
 	catch(...)
-	{		
-		CASPAR_THROW_EXCEPTION(invalid_argument() << msg_info("Failed to parse param.") << arg_name_info(name) << nested_exception(std::current_exception()));
+	{
+		CASPAR_THROW_EXCEPTION(user_error() << msg_info(L"Failed to parse param " + name) << nested_exception(std::current_exception()));
 	}
 }
 
 template<typename C>
 std::wstring get_param(const std::wstring& name, C&& params, const std::wstring& fail_value = L"")
-{	
+{
 	auto it = std::find_if(std::begin(params), std::end(params), param_comparer(name));
-	if(it == params.end())	
+	if(it == params.end())
 		return fail_value;
-	
+
 	try
 	{
 		if(++it == params.end())
 			throw std::out_of_range("");
 
-		return *it;	
+		return *it;
 	}
 	catch(...)
-	{		
-		CASPAR_THROW_EXCEPTION(invalid_argument() << msg_info("Failed to parse param.") << arg_name_info(name) << nested_exception(std::current_exception()));
+	{
+		CASPAR_THROW_EXCEPTION(user_error() << msg_info(L"Failed to parse param " + name) << nested_exception(std::current_exception()));
 	}
 }
 
-}
\ No newline at end of file
+}