X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ff00cc62b92da0226e4147cca49bbbb39d248e92..302e22f6795f6d749e813d723408adb32f67ccba:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 25b0fb94..c6871c1a 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -10,6 +10,90 @@
 
 DEFINE_REF(eDVBService);
 
+RESULT eBouquet::addService(const eServiceReference &ref)
+{
+	list::iterator it =
+		std::find(m_services.begin(), m_services.end(), ref);
+	if ( it != m_services.end() )
+		return -1;
+	m_services.push_back(ref);
+	return 0;
+}
+
+RESULT eBouquet::removeService(const eServiceReference &ref)
+{
+	list::iterator it =
+		std::find(m_services.begin(), m_services.end(), ref);
+	if ( it == m_services.end() )
+		return -1;
+	m_services.erase(it);
+	return 0;
+}
+
+RESULT eBouquet::moveService(const eServiceReference &ref, unsigned int pos)
+{
+	if ( pos < 0 || pos >= m_services.size() )
+		return -1;
+	list::iterator source=m_services.end();
+	list::iterator dest=m_services.end();
+	for (list::iterator it(m_services.begin()); it != m_services.end(); ++it)
+	{
+		if (dest == m_services.end() && !pos--)
+			dest = it;
+		if (*it == ref)
+			source = it;
+		if (dest != m_services.end() && source != m_services.end())
+			break;
+	}
+	if (dest == m_services.end() || source == m_services.end() || source == dest)
+		return -1;
+	std::iter_swap(source,dest);
+	return 0;
+}
+
+RESULT eBouquet::flushChanges()
+{
+	FILE *f=fopen(m_path.c_str(), "wt");
+	if (!f)
+		return -1;
+	if ( fprintf(f, "#NAME %s\r\n", m_bouquet_name.c_str()) < 0 )
+		goto err;
+	for (list::iterator i(m_services.begin()); i != m_services.end(); ++i)
+	{
+		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() )
+			if ( fprintf(f, "#DESCRIPTION %s\r\n", i->name.c_str()) < 0 )
+				goto err;
+	}
+	fclose(f);
+	return 0;
+err:
+	fclose(f);
+	eDebug("couldn't write file %s", m_path.c_str());
+	return -1;
+}
+
 eDVBService::eDVBService()
 {
 }
@@ -31,10 +115,12 @@ eDVBService &eDVBService::operator=(const eDVBService &s)
 
 RESULT eDVBService::getName(const eServiceReference &ref, std::string &name)
 {
-	if ( ref.name.length() )
+	if (!ref.name.empty())
 		name = ref.name;
-	else
+	else if (!m_service_name.empty())
 		name = m_service_name;
+	else
+		name = "(...)";
 	return 0;
 }
 
@@ -155,8 +241,6 @@ void eDVBDB::load()
 				sat.fec = fec;
 				sat.orbital_position = orbital_position;
 				sat.inversion = inversion;
-				// ...
-//				t.setSatellite(frequency, symbol_rate, polarisation, fec, sat, inversion);
 				feparm->setDVBS(sat);
 			} else if (line[1]=='t')
 			{
@@ -221,7 +305,13 @@ void eDVBDB::load()
 		s->m_service_name = line;
 		s->m_service_name_sort = removeDVBChars(line);
 		makeUpper(s->m_service_name_sort);
-
+		while ((!s->m_service_name_sort.empty()) && s->m_service_name_sort[0] == ' ')
+			s->m_service_name_sort.erase(0, 1);
+		
+			/* put unnamed services at the end, not at the beginning. */
+		if (s->m_service_name_sort.empty())
+			s->m_service_name_sort = "\xFF";
+		
 		fgets(line, 256, f);
 		if (strlen(line))
 			line[strlen(line)-1]=0;
@@ -368,6 +458,18 @@ void eDVBDB::loadBouquet(const char *path)
 	if (!fp)
 	{
 		eDebug("failed to open.");
+		if ( strstr(path, "bouquets.tv") )
+		{
+			eDebug("recreate bouquets.tv");
+			bouquet.m_bouquet_name="Bouquets (TV)";
+			bouquet.flushChanges();
+		}
+		else if ( strstr(path, "bouquets.radio") )
+		{
+			eDebug("recreate bouquets.radio");
+			bouquet.m_bouquet_name="Bouquets (Radio)";
+			bouquet.flushChanges();
+		}
 		return;
 	}
 	char line[256];
@@ -437,6 +539,39 @@ void eDVBDB::loadBouquets()
 {
 	loadBouquet("bouquets.tv");
 	loadBouquet("bouquets.radio");
+// create default bouquets when missing
+	if ( m_bouquets.find("userbouquet.favourites.tv") == m_bouquets.end() )
+	{
+		eBouquet &b = m_bouquets["userbouquet.favourites.tv"];
+		b.m_path = "userbouquet.favourites.tv";
+		b.m_bouquet_name = "Favourites (TV)";
+		b.flushChanges();
+		eServiceReference ref;
+		memset(ref.data, 0, sizeof(ref.data));
+		ref.type=1;
+		ref.flags=7;
+		ref.data[0]=1;
+		ref.path="(type == 1) FROM BOUQUET \"userbouquet.favourites.tv\" ORDER BY bouquet";
+		eBouquet &parent = m_bouquets["bouquets.tv"];
+		parent.m_services.push_back(ref);
+		parent.flushChanges();
+	}
+	if ( m_bouquets.find("userbouquets.favourites.radio") == m_bouquets.end() )
+	{
+		eBouquet &b = m_bouquets["userbouquet.favourites.radio"];
+		b.m_path = "userbouquet.favourites.radio";
+		b.m_bouquet_name = "Favourites (Radio)";
+		b.flushChanges();
+		eServiceReference ref;
+		memset(ref.data, 0, sizeof(ref.data));
+		ref.type=1;
+		ref.flags=7;
+		ref.data[0]=1;
+		ref.path="(type == 2) FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
+		eBouquet &parent = m_bouquets["bouquets.radio"];
+		parent.m_services.push_back(ref);
+		parent.flushChanges();
+	}
 }
 
 void eDVBDB::saveBouquets()
@@ -501,7 +636,7 @@ RESULT eDVBDB::getService(const eServiceReferenceDVB &reference, ePtr<eDVBServic
 	return 0;
 }
 
-RESULT eDVBDB::getBouquet(const eServiceReference &ref, const eBouquet* &bouquet)
+RESULT eDVBDB::getBouquet(const eServiceReference &ref, eBouquet* &bouquet)
 {
 	std::string str = ref.path;
 	if (str.empty())
@@ -603,7 +738,8 @@ RESULT eDVBDBQuery::getNextResult(eServiceReferenceDVB &ref)
 			return 0;
 	}
 
-	ref = eServiceReferenceDVB();
+	ref.type = eServiceReference::idInvalid;
+
 	return 1;
 }
 
@@ -631,7 +767,7 @@ RESULT eDVBDBBouquetQuery::getNextResult(eServiceReferenceDVB &ref)
 			return 0;
 	}
 
-	ref = eServiceReferenceDVB();
+	ref.type = eServiceReference::idInvalid;
 
 	return 1;
 }