much more flexible method to get a servicelist in python..

5 files changed, 165 insertions, 42 deletions

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 3a0e32cd..5ddf0cf8 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -513,7 +513,7 @@ class iListableService: public iObject
 public:
 		/* legacy interface: get a list */
 	virtual RESULT getContent(std::list<eServiceReference> &list, bool sorted=false)=0;
-	virtual RESULT getContent(PyObject *list, bool sorted=false)=0;
+	virtual PyObject *getContent(const char* format, bool sorted=false)=0;
 
 		/* new, shiny interface: streaming. */
 	virtual SWIG_VOID(RESULT) getNext(eServiceReference &SWIG_OUTPUT)=0;
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index fb84aa18..8efca0d0 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -350,31 +350,6 @@ RESULT eDVBServiceList::startQuery()
 	return 0;
 }
 
-RESULT eDVBServiceList::getContent(PyObject *list, bool sorted)
-{
-	eServiceReferenceDVB ref;
-
-	if (!m_query || !list || !PyList_Check(list))
-		return -1;
-
-	std::list<eServiceReferenceDVB> tmplist;
-
-	while (!m_query->getNextResult(ref))
-		tmplist.push_back(ref);
-
-	if (sorted)
-		tmplist.sort(iListableServiceCompare(this));
-
-	for (std::list<eServiceReferenceDVB>::iterator it(tmplist.begin());
-		it != tmplist.end(); ++it)
-	{
-		PyObject *refobj = New_eServiceReference(*it);
-		PyList_Append(list, refobj);
-		Py_DECREF(refobj);
-	}
-	return 0;
-}
-
 RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list, bool sorted)
 {
 	eServiceReferenceDVB ref;
@@ -391,6 +366,91 @@ RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list, bool sort
 	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 *eDVBServiceList::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 eDVBServiceList::getNext(eServiceReference &ref)
 {
 	if (!m_query)
diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 4b13193e..81a6b743 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -33,8 +33,8 @@ class eDVBServiceList: public iListableService, public iMutableServiceList
 DECLARE_REF(eDVBServiceList);
 public:
 	virtual ~eDVBServiceList();
+	PyObject *getContent(const char* formatstr, bool sorted=false);
 	RESULT getContent(std::list<eServiceReference> &list, bool sorted=false);
-	RESULT getContent(PyObject *list, bool sorted=false);
 	RESULT getNext(eServiceReference &ptr);
 	int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
 	
diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp
index 3e2f97b3..708825f6 100644
--- a/lib/service/servicefs.cpp
+++ b/lib/service/servicefs.cpp
@@ -164,27 +164,89 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list, bool sorted)
 	return 0;
 }
 
-RESULT eServiceFS::getContent(PyObject *list, bool sorted)
+//   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)
 {
-	if (!list || !PyList_Check(list))
-		return -1;
-
+	PyObject *ret=0;
 	std::list<eServiceReference> tmplist;
+	int retcount=1;
 
-	getContent(tmplist, sorted);
-
-	if (sorted)
-		tmplist.sort(iListableServiceCompare(this));
+	if (!format || !(retcount=strlen(format)))
+		format = "R"; // just return service reference swig object ...
 
-	for (std::list<eServiceReference>::iterator it(tmplist.begin());
-		it != tmplist.end(); ++it)
+	if (!getContent(tmplist, sorted))
 	{
-		PyObject *refobj = New_eServiceReference(*it);
-		PyList_Append(list, refobj);
-		Py_DECREF(refobj);
-	}
+		int services=tmplist.size();
+		ePtr<iStaticServiceInformation> sptr;
+		eServiceCenterPtr service_center;
 
-	return 0;
+		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)
diff --git a/lib/service/servicefs.h b/lib/service/servicefs.h
index 4257f2ac..abd10f37 100644
--- a/lib/service/servicefs.h
+++ b/lib/service/servicefs.h
@@ -36,6 +36,7 @@ public:
 	
 	RESULT getContent(std::list<eServiceReference> &list, bool sorted=false);
 	RESULT getContent(PyObject *list, bool sorted=false);
+	PyObject *getContent(const char *format, bool sorted=false);
 	RESULT getNext(eServiceReference &ptr);
 	int compareLessEqual(const eServiceReference &, const eServiceReference &);
 	RESULT startEdit(ePtr<iMutableServiceList> &);