X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2e2cf81de863a180f7d27dca89e5122e1eb0acaa..d43e4676bd757d1de73b8dd669154ffd42192b10:/lib/service/servicefs.cpp

diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp
index 1afdd169..708825f6 100644
--- a/lib/service/servicefs.cpp
+++ b/lib/service/servicefs.cpp
@@ -25,6 +25,7 @@ DEFINE_REF(eStaticServiceFSInformation);
 RESULT eStaticServiceFSInformation::getName(const eServiceReference &ref, std::string &name)
 {
 	name = ref.path;
+	return 0;
 }
 
 // eServiceFactoryFS
@@ -95,7 +96,7 @@ eServiceFS::~eServiceFS()
 {
 }
 
-RESULT eServiceFS::getContent(std::list<eServiceReference> &list)
+RESULT eServiceFS::getContent(std::list<eServiceReference> &list, bool sorted)
 {
 	DIR *d=opendir(path.c_str());
 	if (!d)
@@ -128,10 +129,26 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list)
 			list.push_back(service);
 		} else
 		{
-				/* FIIIIIX ME */
-			if (filename.substr(filename.size()-3) == ".ts")
+			size_t e = filename.rfind('.');
+			std::string extension = (e != std::string::npos) ? filename.substr(e) : "";
+			int type = -1;
+			
+			if (extension == ".ts")
+				type = eServiceFactoryDVB::id;
+			else if (extension == ".mp3")
+				type = 4097;
+			else if (extension == ".ogg")
+				type = 4097;
+			else if (extension == ".mpg")
+				type = 4097;
+			else if (extension == ".vob")
+				type = 4097;
+			else if (extension == ".wav" || extension == ".wave")
+				type = 4097;
+			
+			if (type != -1)
 			{
-				eServiceReference service(eServiceFactoryDVB::id,
+				eServiceReference service(type,
 					0,
 					filename);
 				service.data[0] = 0;
@@ -140,9 +157,98 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list)
 		}
 	}
 	closedir(d);
+
+	if (sorted)
+		list.sort(iListableServiceCompare(this));
+
 	return 0;
 }
 
+//   The first argument of this function is a format string to specify the order and
+//   the content of the returned list
+//   useable format options are
+//   R = Service Reference (as swig object .. this is very slow)
+//   S = Service Reference (as python string object .. same as ref.toString())
+//   N = Service Name (as python string object)
+//   when exactly one return value per service is selected in the format string,
+//   then each value is directly a list entry
+//   when more than one value is returned per service, then the list is a list of
+//   python tuples
+//   unknown format string chars are returned as python None values !
+PyObject *eServiceFS::getContent(const char* format, bool sorted)
+{
+	PyObject *ret=0;
+	std::list<eServiceReference> tmplist;
+	int retcount=1;
+
+	if (!format || !(retcount=strlen(format)))
+		format = "R"; // just return service reference swig object ...
+
+	if (!getContent(tmplist, sorted))
+	{
+		int services=tmplist.size();
+		ePtr<iStaticServiceInformation> sptr;
+		eServiceCenterPtr service_center;
+
+		if (strchr(format, 'N'))
+			eServiceCenter::getPrivInstance(service_center);
+
+		ret = PyList_New(services);
+		std::list<eServiceReference>::iterator it(tmplist.begin());
+
+		for (int cnt=0; cnt < services; ++cnt)
+		{
+			eServiceReference &ref=*it++;
+			PyObject *tuple = retcount > 1 ? PyTuple_New(retcount) : 0;
+			for (int i=0; i < retcount; ++i)
+			{
+				PyObject *tmp=0;
+				switch(format[i])
+				{
+				case 'R':  // service reference (swig)object
+					tmp = New_eServiceReference(ref);
+					break;
+				case 'S':  // service reference string
+					tmp = PyString_FromString(ref.toString().c_str());
+					break;
+				case 'N':  // service name
+					if (service_center)
+					{
+						service_center->info(ref, sptr);
+						if (sptr)
+						{
+							std::string name;
+							sptr->getName(ref, name);
+							if (name.length())
+								tmp = PyString_FromString(name.c_str());
+						}
+					}
+					if (!tmp)
+						tmp = PyString_FromString("<n/a>");
+					break;
+				default:
+					if (tuple)
+					{
+						tmp = Py_None;
+						Py_INCREF(Py_None);
+					}
+					break;
+				}
+				if (tmp)
+				{
+					if (tuple)
+						PyTuple_SET_ITEM(tuple, i, tmp);
+					else
+						PyList_SET_ITEM(ret, cnt, tmp);
+				}
+			}
+			if (tuple)
+				PyList_SET_ITEM(ret, cnt, tuple);
+		}
+	}
+	return ret ? ret : PyList_New(0);
+}
+
 RESULT eServiceFS::getNext(eServiceReference &ptr)
 {
 	if (!m_list_valid)