[eDVBDB]

* improve getAllServicesRaw
openatv · Sep 19, 2024 · 095c395 · 095c395
1 parent 9f94476
commit 095c395
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 14 deletions.
diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
@@ -2606,24 +2606,48 @@ void eDVBDB::searchAllReferences(std::vector<eServiceReference> &result, int tsi
 	}
 }
 
-PyObject *eDVBDB::getAllServicesRaw()
+PyObject *eDVBDB::getAllServicesRaw(int type)
 {
 
 	ePyObject serviceList = PyDict_New();
 	if (serviceList)
 	{
-		for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator sit(m_services.begin());
-			sit != m_services.end(); ++sit)
-		{
-			ePyObject tuple = PyTuple_New(5);
-			ePtr<eDVBService> service = sit->second;
-			PyTuple_SET_ITEM(tuple, 0, PyUnicode_FromString(service->m_service_name.c_str()));
-			PyTuple_SET_ITEM(tuple, 1, PyUnicode_FromString(!service->m_service_display_name.empty() ? service->m_service_display_name.c_str() : service->m_service_name.c_str()));
-			PyTuple_SET_ITEM(tuple, 2, PyUnicode_FromString(service->m_provider_name.c_str()));
-			PyTuple_SET_ITEM(tuple, 3, PyUnicode_FromString(service->m_provider_display_name.c_str()));
-			PyTuple_SET_ITEM(tuple, 4, PyLong_FromLongLong(service->m_flags));
-			PyDict_SetItemString(serviceList, sit->first.toReferenceString().c_str(), tuple);
-			Py_DECREF(tuple);
+
+		switch (type)
+		{
+		case 1:
+			for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator sit(m_services.begin()); sit != m_services.end(); ++sit)
+			{
+				ePyObject tuple = PyTuple_New(6);
+				ePtr<eDVBService> service = sit->second;
+
+				PyTuple_SET_ITEM(tuple, 0, PyUnicode_FromString(sit->first.toReferenceString().c_str()));
+				PyTuple_SET_ITEM(tuple, 1, PyUnicode_FromString(service->m_provider_name.c_str()));
+				PyTuple_SET_ITEM(tuple, 2, PyUnicode_FromString(service->m_provider_display_name.c_str()));
+				PyTuple_SET_ITEM(tuple, 3, PyUnicode_FromString(service->m_service_name.c_str()));
+				PyTuple_SET_ITEM(tuple, 4, PyUnicode_FromString(!service->m_service_display_name.empty() ? service->m_service_display_name.c_str() : service->m_service_name.c_str()));
+				int flags = (service->m_flags & (eDVBService::dxIntNewServiceName | eDVBService::dxIntNewProvider)) >> 14;
+				PyTuple_SET_ITEM(tuple, 5, PyLong_FromLongLong(flags));
+				PyDict_SetItemString(serviceList, sit->first.toLCNReferenceString().c_str(), tuple);
+				Py_DECREF(tuple);
+			}
+			break;
+
+		default:
+			for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator sit(m_services.begin()); sit != m_services.end(); ++sit)
+			{
+				ePyObject tuple = PyTuple_New(5);
+				ePtr<eDVBService> service = sit->second;
+				PyTuple_SET_ITEM(tuple, 0, PyUnicode_FromString(service->m_service_name.c_str()));
+				PyTuple_SET_ITEM(tuple, 1, PyUnicode_FromString(!service->m_service_display_name.empty() ? service->m_service_display_name.c_str() : service->m_service_name.c_str()));
+				PyTuple_SET_ITEM(tuple, 2, PyUnicode_FromString(service->m_provider_name.c_str()));
+				PyTuple_SET_ITEM(tuple, 3, PyUnicode_FromString(service->m_provider_display_name.c_str()));
+				int flags = (service->m_flags & (eDVBService::dxIntNewServiceName | eDVBService::dxIntNewProvider)) >> 14;
+				PyTuple_SET_ITEM(tuple, 4, PyLong_FromLongLong(flags));
+				PyDict_SetItemString(serviceList, sit->first.toReferenceString().c_str(), tuple);
+				Py_DECREF(tuple);
+			}
+			break;
 		}
 
 	} 

diff --git a/lib/dvb/db.h b/lib/dvb/db.h
@@ -219,7 +219,7 @@ class eDVBDB: public iDVBChannelList
 	bool isValidService(int tsid, int onid, int sid);
 	void parseServiceData(ePtr<eDVBService> s, std::string str);
 	int getMaxNumber() const { return m_max_number; }
-	PyObject *getAllServicesRaw();
+	PyObject *getAllServicesRaw(int type=0);
 };
 
 #ifndef SWIG

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
@@ -177,6 +177,7 @@ class eServiceReference
 	std::string toString() const;
 	std::string toCompareString() const;
 	std::string toReferenceString() const;
+	std::string toLCNReferenceString() const;
 #ifndef SWIG
 	operator bool() const
 	{

diff --git a/lib/service/service.cpp b/lib/service/service.cpp
@@ -138,6 +138,18 @@ std::string eServiceReference::toReferenceString() const
 	return ret;
 }
 
+std::string eServiceReference::toLCNReferenceString() const
+{
+	std::string ret;
+	ret.reserve((4 * sizeof(data)/sizeof(*data)) + 8); /* Estimate required space */
+
+	for (unsigned int i=1; i<5; ++i)
+	{
+		ret += getNum(data[i], 0x10);
+		ret += ':';
+	}
+	return ret;
+}
 
 eServiceCenter *eServiceCenter::instance;