X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5824a5dd33390117c70ff1cdfdf76afaaaac71ac..d4fc3e1b8c34dea520fbce11b8dc30ca1245a482:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index eb0221a3..f3d44821 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -81,24 +81,6 @@ RESULT eBouquet::flushChanges()
 	{
 		eServiceReference tmp = *i;
 		std::string str = tmp.path;
-		if ( (i->flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
-		{
-			unsigned int p1 = str.find("FROM BOUQUET \"");
-			if (p1 == std::string::npos)
-			{
-				eDebug("doof... kaputt");
-				continue;
-			}
-			str.erase(0, p1+14);
-			p1 = str.find("\"");
-			if (p1 == std::string::npos)
-			{
-				eDebug("doof2... kaputt");
-				continue;
-			}
-			str.erase(p1);
-			tmp.path=str;
-		}
 		if ( fprintf(f, "#SERVICE %s\r\n", tmp.toString().c_str()) < 0 )
 			goto err;
 		if ( i->name.length() )
@@ -168,7 +150,7 @@ RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &
 	return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
 }
 
-bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+int eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
 {
 	ePtr<eDVBResourceManager> res_mgr;
 	if ( eDVBResourceManager::getInstance( res_mgr ) )
@@ -180,7 +162,7 @@ bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReferen
 		((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
 		return res_mgr->canAllocateChannel(chid, chid_ignore);
 	}
-	return false;
+	return 0;
 }
 
 int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
@@ -633,7 +615,7 @@ void eDVBDB::loadBouquet(const char *path)
 			break;
 		if (line[0]=='#')
 		{
-			if (!strncmp(line, "#SERVICE ", 9) || !strncmp(line, "#SERVICE: ", 10))
+			if (!strncmp(line, "#SERVICE", 8))
 			{
 				int offs = line[8] == ':' ? 10 : 9;
 				eServiceReference tmp(line+offs);
@@ -642,29 +624,48 @@ void eDVBDB::loadBouquet(const char *path)
 					eDebug("only DVB Bouquets supported");
 					continue;
 				}
-				if ( (tmp.flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+				if ( tmp.flags&eServiceReference::canDescent )
 				{
 					unsigned int pos = tmp.path.rfind('/');
+					char buf[256];
+					std::string path = tmp.path;
 					if ( pos != std::string::npos )
-						tmp.path.erase(0, pos+1);
-					if (tmp.path.empty())
+						path.erase(0, pos+1);
+					if (path.empty())
 					{
 						eDebug("Bouquet load failed.. no filename given..");
 						continue;
 					}
-					loadBouquet(tmp.path.c_str());
-					char buf[256];
-					snprintf(buf, 256, "(type == %d) FROM BOUQUET \"%s\" ORDER BY bouquet", tmp.data[0], tmp.path.c_str());
-					tmp.path = buf;
+					pos = path.find("FROM BOUQUET ");
+					if (pos != std::string::npos)
+					{
+						char endchr = path[pos+13];
+						if (endchr != '"')
+						{
+							eDebug("ignore invalid bouquet '%s' (only \" are allowed)",
+								tmp.toString().c_str());
+							continue;
+						}
+						char *beg = &path[pos+14];
+						char *end = strchr(beg, endchr);
+						path.assign(beg, end - beg);
+					}
+					else
+					{
+						snprintf(buf, 256, "FROM BOUQUET \"%s\" ORDER BY bouquet", path.c_str());
+						tmp.path = buf;
+					}
+					loadBouquet(path.c_str());
 				}
 				list.push_back(tmp);
 				e = &list.back();
 				read_descr=true;
 				++entries;
 			}
-			else if (read_descr && !strncmp(line, "#DESCRIPTION ", 13))
+			else if (read_descr && !strncmp(line, "#DESCRIPTION", 12))
 			{
-				e->name = line+13;
+				int offs = line[12] == ':' ? 14 : 13;
+				e->name = line+offs;
 				read_descr=false;
 			}
 			else if (!strncmp(line, "#NAME ", 6))
@@ -693,7 +694,7 @@ void eDVBDB::reloadBouquets()
 		ref.type=1;
 		ref.flags=7;
 		ref.data[0]=1;
-		ref.path="(type == 1) FROM BOUQUET \"userbouquet.favourites.tv\" ORDER BY bouquet";
+		ref.path="FROM BOUQUET \"userbouquet.favourites.tv\" ORDER BY bouquet";
 		eBouquet &parent = m_bouquets["bouquets.tv"];
 		parent.m_services.push_back(ref);
 		parent.flushChanges();
@@ -709,7 +710,7 @@ void eDVBDB::reloadBouquets()
 		ref.type=1;
 		ref.flags=7;
 		ref.data[0]=2;
-		ref.path="(type == 2) FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
+		ref.path="FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
 		eBouquet &parent = m_bouquets["bouquets.radio"];
 		parent.m_services.push_back(ref);
 		parent.flushChanges();
@@ -763,13 +764,15 @@ RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos)
 		bool remove=true;
 		int system;
 		it->second.m_frontendParameters->getSystem(system);
-		if ( orbpos != 0xFFFFFFFF && system == iDVBFrontend::feSatellite )
+		if ( system == iDVBFrontend::feSatellite )
 		{
 			eDVBFrontendParametersSatellite sat;
 			it->second.m_frontendParameters->getDVBS(sat);
 			if ((unsigned int)sat.orbital_position != orbpos)
 				remove=false;
 		}
+		else if (orbpos != 0xFFFFFFFF) // do not remove -C or -T transponders when a orbital position is given..
+			remove=false;
 		if ( remove && chid.dvbnamespace != eNs && chid.dvbnamespace != ch.dvbnamespace )
 			remove=false;
 		if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id )
@@ -1262,10 +1265,7 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
 	std::list<std::string>::const_iterator end_of_exp;
 	
 	if (begin == end)
-	{
-		eDebug("empty expression!");
 		return 0;
-	}
 	
 	if (*begin == "(")
 	{
@@ -1377,9 +1377,18 @@ RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::cons
 	}
 	
 	res->m_string = val;
-	res->m_int = atoi(val.c_str());
-//	res->m_channelid = eDVBChannelID(val);
-	
+
+	if (res->m_type == eDVBChannelQuery::tChannelID)
+	{
+		int ns, tsid, onid;
+		if (sscanf(val.c_str(), "%08x%04x%04x", &ns, &tsid, &onid) == 3)
+			res->m_channelid = eDVBChannelID(eDVBNamespace(ns), eTransportStreamID(tsid), eOriginalNetworkID(onid));
+		else
+			eDebug("couldn't parse channelid !! format should be hex NNNNNNNNTTTTOOOO (namespace, tsid, onid)");
+	}
+	else
+		res->m_int = atoi(val.c_str());
+
 	return 0;
 }