X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/556d6244747ea2b4b3590e682948e9f708b0a069..344ffd10a4f5b54546fe5e382dbf40a8cf7ecdbb:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index ae30e360..38be6359 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -172,14 +172,32 @@ int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQ
 	switch (query.m_type)
 	{
 	case eDVBChannelQuery::tName:
-		res = m_service_name_sort.find(query.m_string) != std::string::npos;
+		res = m_service_name_sort == query.m_string;
 		break;
 	case eDVBChannelQuery::tProvider:
-		res = m_provider_name.find(query.m_string) != std::string::npos;
+		if (query.m_string == "Unknown" && m_provider_name.empty())
+			res = 1;
+		else
+			res = m_provider_name == query.m_string;
 		break;
 	case eDVBChannelQuery::tType:
-		res = ref.getServiceType() == query.m_int;
+	{
+		int service_type = ref.getServiceType();
+		if (query.m_int == 1) // TV Service
+		{
+			// Hack for dish network
+			int onid = ref.getOriginalNetworkID().get();
+			if (onid >= 0x1001 && onid <= 0x100b)
+			{
+				static int dish_tv_types[] = { 128, 133, 137, 140, 144, 145, 150, 154, 160, 163, 164, 165, 166, 167, 168, 173, 174 };
+				static size_t dish_tv_num_types = sizeof(dish_tv_types) / sizeof(int);
+				if (std::binary_search(dish_tv_types, dish_tv_types + dish_tv_num_types, service_type))
+					return true;
+			}
+		}
+		res = service_type == query.m_int;
 		break;
+	}
 	case eDVBChannelQuery::tBouquet:
 		res = 0;
 		break;
@@ -872,6 +890,7 @@ PyObject *eDVBDB::readSatellites(ePyObject sat_list, ePyObject sat_dict, ePyObje
 					else if (name == "pilot") dest = &pilot;
 					else if (name == "tsid") dest = &tsid;
 					else if (name == "onid") dest = &onid;
+					else continue;
 					if (dest)
 					{
 						//eDebug("\t\t\tvalue: %s", at->value().c_str());
@@ -998,6 +1017,7 @@ PyObject *eDVBDB::readCables(ePyObject cab_list, ePyObject tp_dict)
 					else if (name == "frequency") dest = &freq;
 					else if (name == "symbol_rate") dest = &sr;
 					else if (name == "fec_inner") dest = &fec;
+					else continue;
 					if (dest)
 					{
 						tmp = strtol(at->value().c_str(), &end_ptr, 10);
@@ -1121,6 +1141,7 @@ PyObject *eDVBDB::readTerrestrials(ePyObject ter_list, ePyObject tp_dict)
 					else if (name == "transmission_mode") dest = &transm;
 					else if (name == "hierarchy_information") dest = &hierarchy;
 					else if (name == "inversion") dest = &inv;
+					else continue;
 					if (dest)
 					{
 						tmp = strtol(at->value().c_str(), &end_ptr, 10);