X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/527b292c4f846302522430695fcbfa1f8dadb8d8..3c63f506284a82e013ab8c02af0b2779e5168d09:/lib/dvb/epgcache.cpp

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 63331061..c412fd59 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -12,6 +12,7 @@
 #include <sys/vfs.h> // for statfs
 // #include <libmd5sum.h>
 #include <lib/base/eerror.h>
+#include <lib/base/estring.h>
 #include <lib/dvb/pmt.h>
 #include <lib/dvb/db.h>
 #include <lib/python/python.h>
@@ -1162,7 +1163,7 @@ void eEPGCache::channel_data::startEPG()
 	m_ScheduleOtherReader->start(mask);
 	isRunning |= SCHEDULE_OTHER;
 
-//	abortTimer.start(7000,true);
+	abortTimer.start(7000,true);
 }
 
 void eEPGCache::channel_data::abortNonAvail()
@@ -1285,7 +1286,6 @@ void eEPGCache::channel_data::abortEPG()
 
 void eEPGCache::channel_data::readData( const __u8 *data)
 {
-#if 0
 	int source;
 	int map;
 	iDVBSectionReader *reader=NULL;
@@ -1368,7 +1368,6 @@ void eEPGCache::channel_data::readData( const __u8 *data)
 			cache->sectionRead(data, source, this);
 		}
 	}
-#endif
 }
 
 RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eventData *&result, int direction)
@@ -1508,8 +1507,9 @@ RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id,
 
 RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin, int minutes)
 {
+	const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)handleGroup(service);
 	Lock();
-	eventCache::iterator It = eventDB.find(handleGroup(service));
+	eventCache::iterator It = eventDB.find(ref);
 	if ( It != eventDB.end() && It->second.second.size() )
 	{
 		m_timemap_end = minutes != -1 ? It->second.second.upper_bound(begin+minutes*60) : It->second.second.end();
@@ -1533,7 +1533,6 @@ RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin,
 		}
 		else
 			m_timemap_cursor = It->second.second.begin();
-		const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)handleGroup(service);
 		currentQueryTsidOnid = (ref.getTransportStreamID().get()<<16) | ref.getOriginalNetworkID().get();
 		Unlock();
 		return 0;
@@ -1621,6 +1620,7 @@ void fillTuple(ePyObject tuple, char *argstring, int argcount, ePyObject service
 				tmp = service;
 				inc_refcount = true;
 				break;
+			case 'n': // short service name
 			case 'N': // service name
 				tmp = service_name;
 				inc_refcount = true;
@@ -1680,6 +1680,7 @@ int handleEvent(ePtr<eServiceEvent> &ptr, ePyObject dest_list, char* argstring,
 //   C = Current Time
 //   R = Service Reference
 //   N = Service Name
+//   n = Short Service Name
 // then for each service follows a tuple
 //   first tuple entry is the servicereference (as string... use the ref.toString() function)
 //   the second is the type of query
@@ -1742,7 +1743,7 @@ PyObject *eEPGCache::lookupEvent(ePyObject list, ePyObject convertFunc)
 		PyLong_FromLong(eDVBLocalTimeHandler::getInstance()->nowTime()) :
 		ePyObject();
 
-	bool must_get_service_name = strchr(argstring, 'N') ? true : false;
+	int must_get_service_name = strchr(argstring, 'N') ? 1 : strchr(argstring, 'n') ? 2 : 0;
 
 	// create dest list
 	ePyObject dest_list=PyList_New(0);
@@ -1830,6 +1831,19 @@ PyObject *eEPGCache::lookupEvent(ePyObject list, ePyObject convertFunc)
 					{
 						std::string name;
 						sptr->getName(ref, name);
+
+						if (must_get_service_name == 1)
+						{
+							unsigned int pos;
+							// filter short name brakets
+							while((pos = name.find("\xc2\x86")) != std::string::npos)
+								name.erase(pos,2);
+							while((pos = name.find("\xc2\x87")) != std::string::npos)
+								name.erase(pos,2);
+						}
+						else
+							name = buildShortName(name);
+
 						if (name.length())
 							service_name = PyString_FromString(name.c_str());
 					}
@@ -1922,6 +1936,7 @@ void fillTuple2(ePyObject tuple, const char *argstring, int argcount, eventData
 				tmp = service_reference;
 				inc_refcount = true;
 				break;
+			case 'n': // short service name
 			case 'N': // service name
 				tmp = service_name;
 				inc_refcount = true;
@@ -1948,6 +1963,7 @@ void fillTuple2(ePyObject tuple, const char *argstring, int argcount, eventData
 //   E = Event Extended Description
 //   R = Service Reference
 //   N = Service Name
+//   n = Short Service Name
 //  the second tuple entry is the MAX matches value
 //  the third tuple entry is the type of query
 //     0 = search for similar broadcastings (SIMILAR_BROADCASTINGS_SEARCH)
@@ -2226,24 +2242,41 @@ PyObject *eEPGCache::search(ePyObject arg)
 								eDebug("event not found !!!!!!!!!!!");
 						}
 					// create service name
-						if (!service_name && strchr(argstring,'N'))
+						if (!service_name)
 						{
-							ePtr<iStaticServiceInformation> sptr;
-							eServiceCenterPtr service_center;
-							eServiceCenter::getPrivInstance(service_center);
-							if (service_center)
+							int must_get_service_name = strchr(argstring, 'N') ? 1 : strchr(argstring, 'n') ? 2 : 0;
+							if (must_get_service_name)
 							{
-								service_center->info(ref, sptr);
-								if (sptr)
+								ePtr<iStaticServiceInformation> sptr;
+								eServiceCenterPtr service_center;
+								eServiceCenter::getPrivInstance(service_center);
+								if (service_center)
 								{
-									std::string name;
-									sptr->getName(ref, name);
-									if (name.length())
-										service_name = PyString_FromString(name.c_str());
+									service_center->info(ref, sptr);
+									if (sptr)
+									{
+										std::string name;
+										sptr->getName(ref, name);
+
+										if (must_get_service_name == 1)
+										{
+											unsigned int pos;
+											// filter short name brakets
+											while((pos = name.find("\xc2\x86")) != std::string::npos)
+												name.erase(pos,2);
+											while((pos = name.find("\xc2\x87")) != std::string::npos)
+												name.erase(pos,2);
+										}
+										else
+											name = buildShortName(name);
+
+										if (name.length())
+											service_name = PyString_FromString(name.c_str());
+									}
 								}
+								if (!service_name)
+									service_name = PyString_FromString("<n/a>");
 							}
-							if (!service_name)
-								service_name = PyString_FromString("<n/a>");
 						}
 					// create servicereference string
 						if (!service_reference && strchr(argstring,'R'))