X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2d0d9ad2cf4891c5386a3d8ca040c2738b5c2532..fab31898f5892e9841b5c4f24fe505bd216e0ab2:/lib/service/service.cpp

diff --git a/lib/service/service.cpp b/lib/service/service.cpp
index 82957c81..eb2757ab 100644
--- a/lib/service/service.cpp
+++ b/lib/service/service.cpp
@@ -6,6 +6,51 @@
 #include <lib/base/init.h>
 #include <lib/python/python.h>
 
+static std::string encode(const std::string s)
+{
+	int len = s.size();
+	std::string res;
+	int i;
+	for (i=0; i<len; ++i)
+	{
+		unsigned char c = s[i];
+		if ((c == ':') || (c < 32) || (c == '%'))
+		{
+			res += "%";
+			char hex[8];
+			snprintf(hex, 8, "%02x", c);
+			res += hex;
+		} else
+			res += c;
+	}
+	return res;
+}
+
+static std::string decode(const std::string s)
+{
+	int len = s.size();
+	std::string res;
+	int i;
+	for (i=0; i<len; ++i)
+	{
+		unsigned char c = s[i];
+		if (c != '%')
+			res += c;
+		else
+		{
+			i += 2;
+			if (i >= len)
+				break;
+			char t[3] = {s[i - 1], s[i], 0};
+			unsigned char r = strtoul(t, 0, 0x10);
+			if (r)
+				res += r;
+		}
+	}
+	return res;
+}
+
+
 eServiceReference::eServiceReference(const std::string &string)
 {
 	const char *c=string.c_str();
@@ -35,6 +80,9 @@ eServiceReference::eServiceReference(const std::string &string)
 		else
 			path=pathstr;
 	}
+	
+	path = decode(path);
+	name = decode(name);
 }
 
 std::string eServiceReference::toString() const
@@ -45,9 +93,9 @@ std::string eServiceReference::toString() const
 	ret += getNum(flags);
 	for (unsigned int i=0; i<sizeof(data)/sizeof(*data); ++i)
 		ret+=":"+ getNum(data[i], 0x10);
-	ret+=":"+path;
+	ret+=":"+encode(path); /* we absolutely have a problem when the path contains a ':' (for example: http://). we need an encoding here. */
 	if (name.length())
-		ret+=":"+name;
+		ret+=":"+encode(name);
 	return ret;
 }
 
@@ -58,7 +106,7 @@ std::string eServiceReference::toCompareString() const
 	ret += ":0";
 	for (unsigned int i=0; i<sizeof(data)/sizeof(*data); ++i)
 		ret+=":"+getNum(data[i], 0x10);
-	ret+=":"+path;
+	ret+=":"+encode(path);
 	return ret;
 }
 
@@ -139,18 +187,38 @@ RESULT eServiceCenter::offlineOperations(const eServiceReference &ref, ePtr<iSer
 	return i->second->offlineOperations(ref, ptr);
 }
 
-RESULT eServiceCenter::addServiceFactory(int id, iServiceHandler *hnd)
+RESULT eServiceCenter::addServiceFactory(int id, iServiceHandler *hnd, std::list<std::string> &extensions)
 {
 	handler.insert(std::pair<int,ePtr<iServiceHandler> >(id, hnd));
+	this->extensions[id]=extensions;
 	return 0;
 }
 
 RESULT eServiceCenter::removeServiceFactory(int id)
 {
 	handler.erase(id);
+	extensions.erase(id);
 	return 0;
 }
 
+int eServiceCenter::getServiceTypeForExtension(const char *str)
+{
+	for (std::map<int, std::list<std::string> >::iterator sit(extensions.begin()); sit != extensions.end(); ++sit)
+	{
+		for (std::list<std::string>::iterator eit(sit->second.begin()); eit != sit->second.end(); ++eit)
+		{
+			if (*eit == str)
+				return sit->first;
+		}
+	}
+	return -1;
+}
+
+int eServiceCenter::getServiceTypeForExtension(const std::string &str)
+{
+	return getServiceTypeForExtension(str.c_str());
+}
+
 	/* default handlers */
 RESULT iServiceHandler::info(const eServiceReference &, ePtr<iStaticServiceInformation> &ptr)
 {
@@ -171,7 +239,7 @@ int iStaticServiceInformation::getLength(const eServiceReference &ref)
 	return -1;
 }
 
-int iStaticServiceInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+int iStaticServiceInformation::isPlayable(const eServiceReference &ref, const eServiceReference &ignore, bool simulate)
 {
 	return 0;
 }
@@ -192,6 +260,11 @@ std::string iStaticServiceInformation::getInfoString(const eServiceReference &re
 	return "";
 }
 
+PyObject *iStaticServiceInformation::getInfoObject(const eServiceReference &ref, int w)
+{
+	Py_RETURN_NONE;
+}
+
 int iServiceInformation::getInfo(int w)
 {
 	return -1;
@@ -204,8 +277,7 @@ std::string iServiceInformation::getInfoString(int w)
 
 PyObject* iServiceInformation::getInfoObject(int w)
 {
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 int iStaticServiceInformation::setInfo(const eServiceReference &ref, int w, int v)