X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7a0e4749e8bf580370bd23d9b450763d9e917909..33ceea2a8e9afa4d3002724d2fe3f2fbe3909ea9:/lib/service/servicefs.cpp

diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp
index a22b88d3..3e2f97b3 100644
--- a/lib/service/servicefs.cpp
+++ b/lib/service/servicefs.cpp
@@ -96,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)
@@ -129,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;
@@ -141,6 +157,33 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list)
 		}
 	}
 	closedir(d);
+
+	if (sorted)
+		list.sort(iListableServiceCompare(this));
+
+	return 0;
+}
+
+RESULT eServiceFS::getContent(PyObject *list, bool sorted)
+{
+	if (!list || !PyList_Check(list))
+		return -1;
+
+	std::list<eServiceReference> tmplist;
+
+	getContent(tmplist, sorted);
+
+	if (sorted)
+		tmplist.sort(iListableServiceCompare(this));
+
+	for (std::list<eServiceReference>::iterator it(tmplist.begin());
+		it != tmplist.end(); ++it)
+	{
+		PyObject *refobj = New_eServiceReference(*it);
+		PyList_Append(list, refobj);
+		Py_DECREF(refobj);
+	}
+
 	return 0;
 }