X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c1b6a960332c78e7aa441dffd513c03a32893682..1f14a8b7aa70bdc6f155b2ff69e2de7c2bcdccbb:/lib/dvb/db.cpp

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 70d512c1..de2de1e4 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -10,6 +10,47 @@
 
 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;
+}
+
 eDVBService::eDVBService()
 {
 }
@@ -347,6 +388,49 @@ void eDVBDB::save()
 	fclose(f);
 }
 
+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;
+}
+
 void eDVBDB::loadBouquet(const char *path)
 {
 	std::string bouquet_name = path;
@@ -507,7 +591,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())
@@ -609,7 +693,8 @@ RESULT eDVBDBQuery::getNextResult(eServiceReferenceDVB &ref)
 			return 0;
 	}
 
-	ref = eServiceReferenceDVB();
+	ref.type = eServiceReference::idInvalid;
+
 	return 1;
 }
 
@@ -637,7 +722,7 @@ RESULT eDVBDBBouquetQuery::getNextResult(eServiceReferenceDVB &ref)
 			return 0;
 	}
 
-	ref = eServiceReferenceDVB();
+	ref.type = eServiceReference::idInvalid;
 
 	return 1;
 }