X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fservicefs.cpp;h=22d8cf65e3b7b214cca53d70645ff4fcb773f9fd;hp=057498d751de0191cb6a79426cbdaece4b55d451;hb=08fca93e7f2a37a452399d08c5c84b969b7e52af;hpb=fc233e3a96e68514165781859afc94a2bb33e9e9

diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp
index 057498d..22d8cf6 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,17 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list)
 			list.push_back(service);
 		} else
 		{
-				/* FIIIIIX ME */
-			if (filename.substr(filename.size()-3) == ".ts")
+			std::string extension = filename.substr(filename.rfind('.'));
+			int type = -1;
+			
+			if (extension == ".ts")
+				type = eServiceFactoryDVB::id;
+			else if (extension == ".mp3" || extension == ".ogg" || extension == ".avi")
+				type = 4097;
+			
+			if (type != -1)
 			{
-				eServiceReference service(eServiceFactoryDVB::id,
+				eServiceReference service(type,
 					0,
 					filename);
 				service.data[0] = 0;
@@ -139,6 +147,34 @@ 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;
 }
 
@@ -163,4 +199,22 @@ RESULT eServiceFS::getNext(eServiceReference &ptr)
 	return 0;
 }
 
+int eServiceFS::compareLessEqual(const eServiceReference &a, const eServiceReference &b)
+{
+		/* directories first */
+	if ((a.flags & ~b.flags) & eServiceReference::isDirectory)
+		return 1;
+	else if ((~a.flags & b.flags) & eServiceReference::isDirectory)
+		return 0;
+		/* sort by filename */
+	else
+		return a.path < b.path;
+}
+
+RESULT eServiceFS::startEdit(ePtr<iMutableServiceList> &res)
+{
+	res = 0;
+	return -1;
+}
+
 eAutoInitPtr<eServiceFactoryFS> init_eServiceFactoryFS(eAutoInitNumbers::service+1, "eServiceFactoryFS");