From f45ad930a1f328f880def7e4caa5f48e76c3392f Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 25 Mar 2011 16:30:22 +0100
Subject: db: remove recursive loading of lamedb

---
 lib/dvb/db.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'lib/dvb/db.cpp')

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 522035eb..ccaecd4f 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -325,19 +325,11 @@ void eDVBDB::loadServicelist(const char *file)
 {
 	eDebug("---- opening lame channel db");
 	FILE *f=fopen(file, "rt");
-	if (!f && strcmp(file, eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str()) == 0)
-	{
-		struct stat s;
-		if ( !stat("lamedb", &s) )
-		{
-			if ( !stat(eEnv::resolve("${sysconfdir}/enigma2").c_str(), &s) )
-			{
-				rename("lamedb", eEnv::resolve("${sysconfdir}/enigma2/lamedb").c_str());
-				reloadServicelist();
-			}
-		}
+	if (!f) {
+		eDebug("can't open %s: %m", file);
 		return;
 	}
+
 	char line[256];
 	int version=3;
 	if ((!fgets(line, 256, f)) || sscanf(line, "eDVB services /%d/", &version) != 1)
-- 
cgit v1.2.3


From 73c456d053fec157ed8a8b70a5efa7b622b58af4 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 25 Mar 2011 16:34:11 +0100
Subject: db: remove recursive loading of bouquets

---
 lib/dvb/db.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'lib/dvb/db.cpp')

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index ccaecd4f..47b5427e 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -618,14 +618,7 @@ void eDVBDB::loadBouquet(const char *path)
 	int entries=0;
 	if (!fp)
 	{
-		struct stat s;
-		if ( !stat(path, &s) )
-		{
-			rename(path, p.c_str() );
-			loadBouquet(path);
-			return;
-		}
-		eDebug("failed to open.");
+		eDebug("can't open %s: %m", p.c_str());
 		if ( strstr(path, "bouquets.tv") )
 		{
 			eDebug("recreate bouquets.tv");
-- 
cgit v1.2.3


From 26f6e599f59a33b435340251d3eed2ff7786b1e3 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 25 Mar 2011 16:35:07 +0100
Subject: db: move variable

---
 lib/dvb/db.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/dvb/db.cpp')

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 47b5427e..718e0888 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -615,7 +615,6 @@ void eDVBDB::loadBouquet(const char *path)
 	p+=path;
 	eDebug("loading bouquet... %s", p.c_str());
 	FILE *fp=fopen(p.c_str(), "rt");
-	int entries=0;
 	if (!fp)
 	{
 		eDebug("can't open %s: %m", p.c_str());
@@ -633,6 +632,7 @@ void eDVBDB::loadBouquet(const char *path)
 		}
 		return;
 	}
+	int entries=0;
 	char line[256];
 	bool read_descr=false;
 	eServiceReference *e = NULL;
-- 
cgit v1.2.3


From 157a1d18e849c42c6a85ddc97c125ee0287bf7dc Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 25 Mar 2011 16:35:35 +0100
Subject: db: use strcmp when recreating bouquets.{tv,radio}

---
 lib/dvb/db.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/dvb/db.cpp')

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 718e0888..05474071 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -618,13 +618,13 @@ void eDVBDB::loadBouquet(const char *path)
 	if (!fp)
 	{
 		eDebug("can't open %s: %m", p.c_str());
-		if ( strstr(path, "bouquets.tv") )
+		if (!strcmp(path, "bouquets.tv"))
 		{
 			eDebug("recreate bouquets.tv");
 			bouquet.m_bouquet_name="Bouquets (TV)";
 			bouquet.flushChanges();
 		}
-		else if ( strstr(path, "bouquets.radio") )
+		else if (!strcmp(path, "bouquets.radio"))
 		{
 			eDebug("recreate bouquets.radio");
 			bouquet.m_bouquet_name="Bouquets (Radio)";
-- 
cgit v1.2.3