follow eThread changes: mainly thread_running -> sync, hasStarted()
[enigma2.git] / lib / dvb / epgcache.cpp
index 60eee05a2369627b272a6e2d13900f8f264405f1..79012d387e5bcf04fc9de41f800cb849d4da74f0 100644 (file)
@@ -8,6 +8,8 @@
 #include <sys/vfs.h> // for statfs
 // #include <libmd5sum.h>
 #include <lib/base/eerror.h>
+#include <lib/dvb/pmt.h>
+#include <lib/dvb/db.h>
 #include <Python.h>
 
 int eventData::CacheSize=0;
@@ -64,7 +66,6 @@ const eit_event_struct* eventData::get() const
 {
        int pos = 12;
        int tmp = ByteSize-12;
-
        memcpy(data, EITdata, 12);
        __u32 *p = (__u32*)(EITdata+12);
        while(tmp>0)
@@ -176,12 +177,11 @@ eEPGCache::eEPGCache()
 
 void eEPGCache::timeUpdated()
 {
-       if ( !thread_running() )
+       if (!sync())
        {
                eDebug("[EPGC] time updated.. start EPG Mainloop");
                run();
-       }
-       else
+       } else
                messages.send(Message(Message::timeChanged));
 }
 
@@ -193,6 +193,9 @@ void eEPGCache::DVBChannelAdded(eDVBChannel *chan)
                channel_data *data = new channel_data(this);
                data->channel = chan;
                data->prevChannelState = -1;
+#ifdef ENABLE_PRIVATE_EPG
+               data->m_PrivatePid = -1;
+#endif
                singleLock s(channel_map_lock);
                m_knownChannels.insert( std::pair<iDVBChannel*, channel_data* >(chan, data) );
                chan->connectStateChange(slot(*this, &eEPGCache::DVBChannelStateChanged), data->m_stateChangedConn);
@@ -242,7 +245,14 @@ void eEPGCache::DVBChannelRunning(iDVBChannel *chan)
                                        eDebug("[eEPGCache] couldnt initialize schedule other reader!!");
                                        return;
                                }
-
+#ifdef ENABLE_PRIVATE_EPG
+                               res = demux->createSectionReader( this, data.m_PrivateReader );
+                               if ( res )
+                               {
+                                       eDebug("[eEPGCache] couldnt initialize private reader!!");
+                                       return;
+                               }
+#endif
                                messages.send(Message(Message::startChannel, chan));
                                // -> gotMessage -> changedService
                        }
@@ -508,6 +518,15 @@ void eEPGCache::flushEPG(const uniqueEPGKey & s)
                        eventDB.erase(it);
 
                        // TODO .. search corresponding channel for removed service and remove this channel from lastupdated map
+#ifdef ENABLE_PRIVATE_EPG
+                       contentMaps::iterator it =
+                               content_time_tables.find(s);
+                       if ( it != content_time_tables.end() )
+                       {
+                               it->second.clear();
+                               content_time_tables.erase(it);
+                       }
+#endif
                }
        }
        else // clear complete EPG Cache
@@ -523,6 +542,9 @@ void eEPGCache::flushEPG(const uniqueEPGKey & s)
                        tmMap.clear();
                }
                eventDB.clear();
+#ifdef ENABLE_PRIVATE_EPG
+               content_time_tables.clear();
+#endif
                channelLastUpdated.clear();
                singleLock m(channel_map_lock);
                for (channelMapIterator it(m_knownChannels.begin()); it != m_knownChannels.end(); ++it)
@@ -542,6 +564,7 @@ void eEPGCache::cleanLoop()
 
                for (eventCache::iterator DBIt = eventDB.begin(); DBIt != eventDB.end(); DBIt++)
                {
+                       bool updated = false;
                        for (timeMap::iterator It = DBIt->second.second.begin(); It != DBIt->second.second.end() && It->first < now;)
                        {
                                if ( now > (It->first+It->second->getDuration()) )  // outdated normal entry (nvod references to)
@@ -560,10 +583,37 @@ void eEPGCache::cleanLoop()
                                        delete It->second;
                                        DBIt->second.second.erase(It++);
 //                                     eDebug("[EPGC] delete old event (timeMap)");
+                                       updated = true;
                                }
                                else
                                        ++It;
                        }
+#ifdef ENABLE_PRIVATE_EPG
+                       if ( updated )
+                       {
+                               contentMaps::iterator x =
+                                       content_time_tables.find( DBIt->first );
+                               if ( x != content_time_tables.end() )
+                               {
+                                       timeMap &tmMap = eventDB[DBIt->first].second;
+                                       for ( contentMap::iterator i = x->second.begin(); i != x->second.end(); )
+                                       {
+                                               for ( contentTimeMap::iterator it(i->second.begin());
+                                                       it != i->second.end(); )
+                                               {
+                                                       if ( tmMap.find(it->second.first) == tmMap.end() )
+                                                               i->second.erase(it++);
+                                                       else
+                                                               ++it;
+                                               }
+                                               if ( i->second.size() )
+                                                       ++i;
+                                               else
+                                                       x->second.erase(i++);
+                                       }
+                               }
+                       }
+#endif
                }
                eDebug("[EPGC] stop cleanloop");
                eDebug("[EPGC] %i bytes for cache used", eventData::CacheSize);
@@ -609,6 +659,27 @@ void eEPGCache::gotMessage( const Message &msg )
                case Message::quit:
                        quit(0);
                        break;
+#ifdef ENABLE_PRIVATE_EPG
+               case Message::got_private_pid:
+               {
+                       for (channelMapIterator it(m_knownChannels.begin()); it != m_knownChannels.end(); ++it)
+                       {
+                               eDVBChannel *channel = (eDVBChannel*) it->first;
+                               channel_data *data = it->second;
+                               eDVBChannelID chid = channel->getChannelID();
+                               if ( chid.transport_stream_id.get() == msg.service.tsid &&
+                                       chid.original_network_id.get() == msg.service.onid &&
+                                       data->m_PrivatePid == -1 )
+                               {
+                                       data->m_PrivatePid = msg.pid;
+                                       data->m_PrivateService = msg.service;
+                                       data->startPrivateReader(msg.pid, -1);
+                                       break;
+                               }
+                       }
+                       break;
+               }
+#endif
                case Message::timeChanged:
                        cleanLoop();
                        break;
@@ -620,24 +691,27 @@ void eEPGCache::gotMessage( const Message &msg )
 
 void eEPGCache::thread()
 {
+       hasStarted();
        nice(4);
        load();
        cleanLoop();
-       exec();
+       runLoop();
        save();
 }
 
 void eEPGCache::load()
 {
+       singleLock s(cache_lock);
        FILE *f = fopen("/hdd/epg.dat", "r");
        if (f)
        {
-               unsigned char md5_saved[16];
-               unsigned char md5[16];
                int size=0;
                int cnt=0;
-               bool md5ok=false;
 #if 0
+               unsigned char md5_saved[16];
+               unsigned char md5[16];
+               bool md5ok=false;
+
                if (!md5_file("/hdd/epg.dat", 1, md5))
                {
                        FILE *f = fopen("/hdd/epg.dat.md5", "r");
@@ -652,9 +726,17 @@ void eEPGCache::load()
                if ( md5ok )
 #endif
                {
+                       unsigned int magic=0;
+                       fread( &magic, sizeof(int), 1, f);
+                       if (magic != 0x98765432)
+                       {
+                               eDebug("epg file has incorrect byte order.. dont read it");
+                               fclose(f);
+                               return;
+                       }
                        char text1[13];
                        fread( text1, 13, 1, f);
-                       if ( !strncmp( text1, "ENIGMA_EPG_V4", 13) )
+                       if ( !strncmp( text1, "ENIGMA_EPG_V5", 13) )
                        {
                                fread( &size, sizeof(int), 1, f);
                                while(size--)
@@ -684,6 +766,38 @@ void eEPGCache::load()
                                }
                                eventData::load(f);
                                eDebug("%d events read from /hdd/epg.dat", cnt);
+#ifdef ENABLE_PRIVATE_EPG
+                               char text2[11];
+                               fread( text2, 11, 1, f);
+                               if ( !strncmp( text2, "PRIVATE_EPG", 11) )
+                               {
+                                       size=0;
+                                       fread( &size, sizeof(int), 1, f);
+                                       while(size--)
+                                       {
+                                               int size=0;
+                                               uniqueEPGKey key;
+                                               fread( &key, sizeof(uniqueEPGKey), 1, f);
+                                               fread( &size, sizeof(int), 1, f);
+                                               while(size--)
+                                               {
+                                                       int size;
+                                                       int content_id;
+                                                       fread( &content_id, sizeof(int), 1, f);
+                                                       fread( &size, sizeof(int), 1, f);
+                                                       while(size--)
+                                                       {
+                                                               time_t time1, time2;
+                                                               __u16 event_id;
+                                                               fread( &time1, sizeof(time_t), 1, f);
+                                                               fread( &time2, sizeof(time_t), 1, f);
+                                                               fread( &event_id, sizeof(__u16), 1, f);
+                                                               content_time_tables[key][content_id][time1]=std::pair<time_t, __u16>(time2, event_id);
+                                                       }
+                                               }
+                                       }
+                               }
+#endif // ENABLE_PRIVATE_EPG
                        }
                        else
                                eDebug("[EPGC] don't read old epg database");
@@ -718,7 +832,9 @@ void eEPGCache::save()
        int cnt=0;
        if ( f )
        {
-               const char *text = "ENIGMA_EPG_V4";
+               unsigned int magic = 0x98765432;
+               fwrite( &magic, sizeof(int), 1, f);
+               const char *text = "ENIGMA_EPG_V5";
                fwrite( text, 13, 1, f );
                int size = eventDB.size();
                fwrite( &size, sizeof(int), 1, f );
@@ -739,6 +855,32 @@ void eEPGCache::save()
                }
                eDebug("%d events written to /hdd/epg.dat", cnt);
                eventData::save(f);
+#ifdef ENABLE_PRIVATE_EPG
+               const char* text3 = "PRIVATE_EPG";
+               fwrite( text3, 11, 1, f );
+               size = content_time_tables.size();
+               fwrite( &size, sizeof(int), 1, f);
+               for (contentMaps::iterator a = content_time_tables.begin(); a != content_time_tables.end(); ++a)
+               {
+                       contentMap &content_time_table = a->second;
+                       fwrite( &a->first, sizeof(uniqueEPGKey), 1, f);
+                       int size = content_time_table.size();
+                       fwrite( &size, sizeof(int), 1, f);
+                       for (contentMap::iterator i = content_time_table.begin(); i != content_time_table.end(); ++i )
+                       {
+                               int size = i->second.size();
+                               fwrite( &i->first, sizeof(int), 1, f);
+                               fwrite( &size, sizeof(int), 1, f);
+                               for ( contentTimeMap::iterator it(i->second.begin());
+                                       it != i->second.end(); ++it )
+                               {
+                                       fwrite( &it->first, sizeof(time_t), 1, f);
+                                       fwrite( &it->second.first, sizeof(time_t), 1, f);
+                                       fwrite( &it->second.second, sizeof(__u16), 1, f);
+                               }
+                       }
+               }
+#endif
                fclose(f);
 #if 0
                unsigned char md5[16];
@@ -778,6 +920,9 @@ bool eEPGCache::channel_data::finishEPG()
                }
                singleLock l(cache->cache_lock);
                cache->channelLastUpdated[channel->getChannelID()] = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
+#ifdef ENABLE_PRIVATE_EPG
+               if (seenPrivateSections.empty())
+#endif
                can_delete=1;
                return true;
        }
@@ -857,6 +1002,9 @@ void eEPGCache::channel_data::abortNonAvail()
                                seenSections[i].clear();
                                calcedSections[i].clear();
                        }
+#ifdef ENABLE_PRIVATE_EPG
+                       if (seenPrivateSections.empty())
+#endif
                        can_delete=1;
                }
        }
@@ -909,8 +1057,14 @@ void eEPGCache::channel_data::abortEPG()
                        m_ScheduleOtherReader->stop();
                        m_ScheduleOtherConn=0;
                }
-               can_delete=1;
        }
+#ifdef ENABLE_PRIVATE_EPG
+       if (m_PrivateReader)
+               m_PrivateReader->stop();
+       if (m_PrivateConn)
+               m_PrivateConn=0;
+#endif
+       can_delete=1;
 }
 
 void eEPGCache::channel_data::readData( const __u8 *data)
@@ -1004,7 +1158,7 @@ void eEPGCache::channel_data::readData( const __u8 *data)
        }
 }
 
-RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eventData *&result )
+RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eventData *&result, int direction)
 // if t == -1 we search the current event...
 {
        singleLock s(cache_lock);
@@ -1016,20 +1170,24 @@ RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, co
        {
                if (t==-1)
                        t = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
-               timeMap::iterator i = It->second.second.lower_bound(t);  // find > or equal
+               timeMap::iterator i = direction <= 0 ? It->second.second.lower_bound(t) :  // find > or equal
+                       It->second.second.upper_bound(t); // just >
                if ( i != It->second.second.end() )
                {
-                       if ( i->second->getStartTime() != t )
+                       if ( direction < 0 || (direction == 0 && i->second->getStartTime() > t) )
                        {
                                timeMap::iterator x = i;
                                --x;
                                if ( x != It->second.second.end() )
                                {
                                        time_t start_time = x->second->getStartTime();
-                                       if (t < start_time)
-                                               return -1;
-                                       if (t > (start_time+x->second->getDuration()))
-                                               return -1;
+                                       if (direction >= 0)
+                                       {
+                                               if (t < start_time)
+                                                       return -1;
+                                               if (t > (start_time+x->second->getDuration()))
+                                                       return -1;
+                                       }
                                        i = x;
                                }
                                else
@@ -1042,31 +1200,31 @@ RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, co
        return -1;
 }
 
-RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eit_event_struct *&result )
+RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, const eit_event_struct *&result, int direction)
 {
        singleLock s(cache_lock);
        const eventData *data=0;
-       RESULT ret = lookupEventTime(service, t, data);
+       RESULT ret = lookupEventTime(service, t, data, direction);
        if ( !ret && data )
                result = data->get();
        return ret;
 }
 
-RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, Event *& result )
+RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, Event *& result, int direction)
 {
        singleLock s(cache_lock);
        const eventData *data=0;
-       RESULT ret = lookupEventTime(service, t, data);
+       RESULT ret = lookupEventTime(service, t, data, direction);
        if ( !ret && data )
                result = new Event((uint8_t*)data->get());
        return ret;
 }
 
-RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, ePtr<eServiceEvent> &result )
+RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, ePtr<eServiceEvent> &result, int direction)
 {
        singleLock s(cache_lock);
        const eventData *data=0;
-       RESULT ret = lookupEventTime(service, t, data);
+       RESULT ret = lookupEventTime(service, t, data, direction);
        if ( !ret && data )
        {
                Event ev((uint8_t*)data->get());
@@ -1218,6 +1376,9 @@ void fillTuple(PyObject *tuple, char *argstring, int argcount, PyObject *service
                bool inc_refcount=false;
                switch(argstring[pos])
                {
+                       case '0': // PyLong 0
+                               tmp = PyLong_FromLong(0);
+                               break;
                        case 'I': // Event Id
                                tmp = ptr ? PyLong_FromLong(ptr->getEventId()) : NULL;
                                break;
@@ -1288,25 +1449,29 @@ PyObject *handleEvent(ePtr<eServiceEvent> &ptr, PyObject *dest_list, char* argst
        return 0;
 }
 
-// here we get a list with tuples
-// first tuple entry is the servicereference
-// the second is the type of query (0 = time, 1 = event_id)
-// the third
-//             when type is eventid it is the event_id
-//             when type is time then it is the start_time ( 0 for now_time )
-// the fourth is the end_time .. ( optional )
-
-/* argv is a python string
-   I = Event Id
-   B = Event Begin Time
-   D = Event Duration
-   T = Event Title
-   S = Event Short Description
-   E = Event Extended Description
-   C = Current Time
-   R = Service Reference
-   N = Service Name
-*/
+// here we get a python list
+// the first entry in the list is a python string to specify the format of the returned tuples (in a list)
+//   0 = PyLong(0)
+//   I = Event Id
+//   B = Event Begin Time
+//   D = Event Duration
+//   T = Event Title
+//   S = Event Short Description
+//   E = Event Extended Description
+//   C = Current Time
+//   R = Service Reference
+//   N = 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
+//     2 = event_id
+//    -1 = event before given start_time
+//     0 = event intersects given start_time
+//    +1 = event after given start_time
+//   the third
+//      when type is eventid it is the event_id
+//      when type is time then it is the start_time ( 0 for now_time )
+//   the fourth is the end_time .. ( optional .. for query all events in time range)
 
 PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
 {
@@ -1384,17 +1549,17 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                                                if (!PyString_Check(entry))
                                                {
                                                        eDebug("tuple entry 0 is no a string");
-                                                       continue;
+                                                       goto skip_entry;
                                                }
                                                service = entry;
                                                break;
                                        }
                                        case 1:
                                                type=PyInt_AsLong(entry);
-                                               if (type < 0 || type > 1)
+                                               if (type < -1 || type > 2)
                                                {
                                                        eDebug("unknown type %d", type);
-                                                       continue;
+                                                       goto skip_entry;
                                                }
                                                break;
                                        case 2:
@@ -1454,10 +1619,10 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                                ePtr<eServiceEvent> ptr;
                                if (stime)
                                {
-                                       if (type == 0)
-                                               lookupEventTime(ref, stime, ptr);
-                                       else // type == 1
+                                       if (type == 2)
                                                lookupEventId(ref, event_id, ptr);
+                                       else
+                                               lookupEventTime(ref, stime, ptr, type);
                                }
                                PyObject *ret = handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs);
                                if (ret)
@@ -1466,6 +1631,8 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                        if (service_name)
                                Py_DECREF(service_name);
                }
+skip_entry:
+               ;
        }
        if (convertFuncArgs)
                Py_DECREF(convertFuncArgs);
@@ -1474,6 +1641,699 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
        return dest_list;
 }
 
+void fillTuple2(PyObject *tuple, const char *argstring, int argcount, eventData *evData, ePtr<eServiceEvent> &ptr, PyObject *service_name, PyObject *service_reference)
+{
+       PyObject *tmp=NULL;
+       int pos=0;
+       while(pos < argcount)
+       {
+               bool inc_refcount=false;
+               switch(argstring[pos])
+               {
+                       case '0': // PyLong 0
+                               tmp = PyLong_FromLong(0);
+                               break;
+                       case 'I': // Event Id
+                               tmp = PyLong_FromLong(evData->getEventID());
+                               break;
+                       case 'B': // Event Begin Time
+                               if (ptr)
+                                       tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : NULL;
+                               else
+                                       tmp = PyLong_FromLong(evData->getStartTime());
+                               break;
+                       case 'D': // Event Duration
+                               if (ptr)
+                                       tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : NULL;
+                               else
+                                       tmp = PyLong_FromLong(evData->getDuration());
+                               break;
+                       case 'T': // Event Title
+                               tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : NULL;
+                               break;
+                       case 'S': // Event Short Description
+                               tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : NULL;
+                               break;
+                       case 'E': // Event Extended Description
+                               tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : NULL;
+                               break;
+                       case 'R': // service reference string
+                               tmp = service_reference;
+                               inc_refcount = true;
+                               break;
+                       case 'N': // service name
+                               tmp = service_name;
+                               inc_refcount = true;
+                               break;
+               }
+               if (!tmp)
+               {
+                       tmp = Py_None;
+                       inc_refcount = true;
+               }
+               if (inc_refcount)
+                       Py_INCREF(tmp);
+               PyTuple_SET_ITEM(tuple, pos++, tmp);
+       }
+}
 
+// here we get a python tuple
+// the first entry in the tuple is a python string to specify the format of the returned tuples (in a list)
+//   I = Event Id
+//   B = Event Begin Time
+//   D = Event Duration
+//   T = Event Title
+//   S = Event Short Description
+//   E = Event Extended Description
+//   R = Service Reference
+//   N = 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)
+//     1 = search events with exactly title name (EXAKT_TITLE_SEARCH)
+//     2 = search events with text in title name (PARTIAL_TITLE_SEARCH)
+//  when type is 0 (SIMILAR_BROADCASTINGS_SEARCH)
+//   the fourth is the servicereference string
+//   the fifth is the eventid
+//  when type is 1 or 2 (EXAKT_TITLE_SEARCH or PARTIAL_TITLE_SEARCH)
+//   the fourth is the search text
+//   the fifth is
+//     0 = case sensitive (CASE_CHECK)
+//     1 = case insensitive (NO_CASECHECK)
+
+PyObject *eEPGCache::search(PyObject *arg)
+{
+       PyObject *ret = 0;
+       int descridx = -1;
+       __u32 descr[512];
+       int eventid = -1;
+       const char *argstring=0;
+       char *refstr=0;
+       int argcount=0;
+       int querytype=-1;
+       bool needServiceEvent=false;
+       int maxmatches=0;
 
+       if (PyTuple_Check(arg))
+       {
+               int tuplesize=PyTuple_Size(arg);
+               if (tuplesize > 0)
+               {
+                       PyObject *obj = PyTuple_GET_ITEM(arg,0);
+                       if (PyString_Check(obj))
+                       {
+                               argcount = PyString_GET_SIZE(obj);
+                               argstring = PyString_AS_STRING(obj);
+                               for (int i=0; i < argcount; ++i)
+                                       switch(argstring[i])
+                                       {
+                                       case 'S':
+                                       case 'E':
+                                       case 'T':
+                                               needServiceEvent=true;
+                                       default:
+                                               break;
+                                       }
+                       }
+                       else
+                       {
+                               PyErr_SetString(PyExc_StandardError,
+                                       "type error");
+                               eDebug("tuple arg 0 is not a string");
+                               return NULL;
+                       }
+               }
+               if (tuplesize > 1)
+                       maxmatches = PyLong_AsLong(PyTuple_GET_ITEM(arg, 1));
+               if (tuplesize > 2)
+               {
+                       querytype = PyLong_AsLong(PyTuple_GET_ITEM(arg, 2));
+                       if (tuplesize > 4 && querytype == 0)
+                       {
+                               PyObject *obj = PyTuple_GET_ITEM(arg, 3);
+                               if (PyString_Check(obj))
+                               {
+                                       refstr = PyString_AS_STRING(obj);
+                                       eServiceReferenceDVB ref(refstr);
+                                       if (ref.valid())
+                                       {
+                                               eventid = PyLong_AsLong(PyTuple_GET_ITEM(arg, 4));
+                                               singleLock s(cache_lock);
+                                               const eventData *evData = 0;
+                                               lookupEventId(ref, eventid, evData);
+                                               if (evData)
+                                               {
+                                                       __u8 *data = evData->EITdata;
+                                                       int tmp = evData->ByteSize-12;
+                                                       __u32 *p = (__u32*)(data+12);
+                                                               // search short and extended event descriptors
+                                                       while(tmp>0)
+                                                       {
+                                                               __u32 crc = *p++;
+                                                               descriptorMap::iterator it =
+                                                                       eventData::descriptors.find(crc);
+                                                               if (it != eventData::descriptors.end())
+                                                               {
+                                                                       __u8 *descr_data = it->second.second;
+                                                                       switch(descr_data[0])
+                                                                       {
+                                                                       case 0x4D ... 0x4E:
+                                                                               descr[++descridx]=crc;
+                                                                       default:
+                                                                               break;
+                                                                       }
+                                                               }
+                                                               tmp-=4;
+                                                       }
+                                               }
+                                               if (descridx<0)
+                                                       eDebug("event not found");
+                                       }
+                                       else
+                                       {
+                                               PyErr_SetString(PyExc_StandardError,
+                                                       "type error");
+                                               eDebug("tuple arg 4 is not a valid service reference string");
+                                               return NULL;
+                                       }
+                               }
+                               else
+                               {
+                                       PyErr_SetString(PyExc_StandardError,
+                                       "type error");
+                                       eDebug("tuple arg 4 is not a string");
+                                       return NULL;
+                               }
+                       }
+                       else if (tuplesize > 4 && (querytype == 1 || querytype == 2) )
+                       {
+                               PyObject *obj = PyTuple_GET_ITEM(arg, 3);
+                               if (PyString_Check(obj))
+                               {
+                                       int casetype = PyLong_AsLong(PyTuple_GET_ITEM(arg, 4));
+                                       const char *str = PyString_AS_STRING(obj);
+                                       int textlen = PyString_GET_SIZE(obj);
+                                       if (querytype == 1)
+                                               eDebug("lookup for events with '%s' as title(%s)", str, casetype?"ignore case":"case sensitive");
+                                       else
+                                               eDebug("lookup for events with '%s' in title(%s)", str, casetype?"ignore case":"case sensitive");
+                                       singleLock s(cache_lock);
+                                       for (descriptorMap::iterator it(eventData::descriptors.begin());
+                                               it != eventData::descriptors.end() && descridx < 511; ++it)
+                                       {
+                                               __u8 *data = it->second.second;
+                                               if ( data[0] == 0x4D ) // short event descriptor
+                                               {
+                                                       int title_len = data[5];
+                                                       if ( querytype == 1 )
+                                                       {
+                                                               if (title_len > textlen)
+                                                                       continue;
+                                                               else if (title_len < textlen)
+                                                                       continue;
+                                                               if ( casetype )
+                                                               {
+                                                                       if ( !strncasecmp((const char*)data+6, str, title_len) )
+                                                                       {
+//                                                                             std::string s((const char*)data+6, title_len);
+//                                                                             eDebug("match1 %s %s", str, s.c_str() );
+                                                                               descr[++descridx] = it->first;
+                                                                       }
+                                                               }
+                                                               else if ( !strncmp((const char*)data+6, str, title_len) )
+                                                               {
+//                                                                     std::string s((const char*)data+6, title_len);
+//                                                                     eDebug("match2 %s %s", str, s.c_str() );
+                                                                       descr[++descridx] = it->first;
+                                                               }
+                                                       }
+                                                       else
+                                                       {
+                                                               int idx=0;
+                                                               while((title_len-idx) >= textlen)
+                                                               {
+                                                                       if (casetype)
+                                                                       {
+                                                                               if (!strncasecmp((const char*)data+6+idx, str, textlen) )
+                                                                               {
+                                                                                       descr[++descridx] = it->first;
+//                                                                                     std::string s((const char*)data+6, title_len);
+//                                                                                     eDebug("match 3 %s %s", str, s.c_str() );
+                                                                                       break;
+                                                                               }
+                                                                               else if (!strncmp((const char*)data+6+idx, str, textlen) )
+                                                                               {
+                                                                                       descr[++descridx] = it->first;
+//                                                                                     std::string s((const char*)data+6, title_len);
+//                                                                                     eDebug("match 4 %s %s", str, s.c_str() );
+                                                                                       break;
+                                                                               }
+                                                                       }
+                                                                       ++idx;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                               else
+                               {
+                                       PyErr_SetString(PyExc_StandardError,
+                                               "type error");
+                                       eDebug("tuple arg 4 is not a string");
+                                       return NULL;
+                               }
+                       }
+                       else
+                       {
+                               PyErr_SetString(PyExc_StandardError,
+                                       "type error");
+                               eDebug("tuple arg 3(%d) is not a known querytype(0, 1, 2)", querytype);
+                               return NULL;
+                       }
+               }
+               else
+               {
+                       PyErr_SetString(PyExc_StandardError,
+                               "type error");
+                       eDebug("not enough args in tuple");
+                       return NULL;
+               }
+       }
+       else
+       {
+               PyErr_SetString(PyExc_StandardError,
+                       "type error");
+               eDebug("arg 0 is not a tuple");
+               return NULL;
+       }
+
+       if (descridx > -1)
+       {
+               int maxcount=maxmatches;
+               eServiceReferenceDVB ref(refstr?refstr:"");
+               // ref is only valid in SIMILAR_BROADCASTING_SEARCH
+               // in this case we start searching with the base service
+               bool first = ref.valid() ? true : false;
+               singleLock s(cache_lock);
+               eventCache::iterator cit(ref.valid() ? eventDB.find(ref) : eventDB.begin());
+               while(cit != eventDB.end() && maxcount)
+               {
+                       if ( ref.valid() && !first && cit->first == ref )
+                       {
+                               // do not scan base service twice ( only in SIMILAR BROADCASTING SEARCH )
+                               ++cit;
+                               continue;
+                       }
+                       PyObject *service_name=0;
+                       PyObject *service_reference=0;
+                       timeMap &evmap = cit->second.second;
+                       // check all events
+                       for (timeMap::iterator evit(evmap.begin()); evit != evmap.end() && maxcount; ++evit)
+                       {
+                               if (evit->second->getEventID() == eventid)
+                                       continue;
+                               __u8 *data = evit->second->EITdata;
+                               int tmp = evit->second->ByteSize-12;
+                               __u32 *p = (__u32*)(data+12);
+                               // check if any of our descriptor used by this event
+                               int cnt=-1;
+                               while(tmp>0)
+                               {
+                                       __u32 crc32 = *p++;
+                                       for ( int i=0; i <= descridx; ++i)
+                                       {
+                                               if (descr[i] == crc32)  // found...
+                                                       ++cnt;
+                                       }
+                                       tmp-=4;
+                               }
+                               if ( (querytype == 0 && cnt == descridx) ||
+                                        ((querytype == 1 || querytype == 2) && cnt != -1) )
+                               {
+                                       const uniqueEPGKey &service = cit->first;
+                                       eServiceReference ref =
+                                               eDVBDB::getInstance()->searchReference(service.tsid, service.onid, service.sid);
+                                       if (ref.valid())
+                                       {
+                                       // create servive event
+                                               ePtr<eServiceEvent> ptr;
+                                               if (needServiceEvent)
+                                               {
+                                                       lookupEventId(ref, evit->first, ptr);
+                                                       if (!ptr)
+                                                               eDebug("event not found !!!!!!!!!!!");
+                                               }
+                                       // create service name
+                                               if (!service_name && strchr(argstring,'N'))
+                                               {
+                                                       ePtr<iStaticServiceInformation> sptr;
+                                                       eServiceCenterPtr service_center;
+                                                       eServiceCenter::getPrivInstance(service_center);
+                                                       if (service_center)
+                                                       {
+                                                               service_center->info(ref, sptr);
+                                                               if (sptr)
+                                                               {
+                                                                       std::string name;
+                                                                       sptr->getName(ref, name);
+                                                                       if (name.length())
+                                                                               service_name = PyString_FromString(name.c_str());
+                                                               }
+                                                       }
+                                                       if (!service_name)
+                                                               service_name = PyString_FromString("<n/a>");
+                                               }
+                                       // create servicereference string
+                                               if (!service_reference && strchr(argstring,'R'))
+                                                       service_reference = PyString_FromString(ref.toString().c_str());
+                                       // create list
+                                               if (!ret)
+                                                       ret = PyList_New(0);
+                                       // create tuple
+                                               PyObject *tuple = PyTuple_New(argcount);
+                                       // fill tuple
+                                               fillTuple2(tuple, argstring, argcount, evit->second, ptr, service_name, service_reference);
+                                               PyList_Append(ret, tuple);
+                                               Py_DECREF(tuple);
+                                               --maxcount;
+                                       }
+                               }
+                       }
+                       if (service_name)
+                               Py_DECREF(service_name);
+                       if (service_reference)
+                               Py_DECREF(service_reference);
+                       if (first)
+                       {
+                               // now start at first service in epgcache database ( only in SIMILAR BROADCASTING SEARCH )
+                               first=false;
+                               cit=eventDB.begin();
+                       }
+                       else
+                               ++cit;
+               }
+       }
+
+       if (!ret)
+       {
+               Py_INCREF(Py_None);
+               ret=Py_None;
+       }
+
+       return ret;
+}
+
+#ifdef ENABLE_PRIVATE_EPG
+#include <dvbsi++/descriptor_tag.h>
+#include <dvbsi++/unknown_descriptor.h>
+#include <dvbsi++/private_data_specifier_descriptor.h>
+
+void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler)
+{
+       ePtr<eTable<ProgramMapSection> > ptr;
+       if (!pmthandler->getPMT(ptr) && ptr)
+       {
+               std::vector<ProgramMapSection*>::const_iterator i;
+               for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i)
+               {
+                       const ProgramMapSection &pmt = **i;
+
+                       ElementaryStreamInfoConstIterator es;
+                       for (es = pmt.getEsInfo()->begin(); es != pmt.getEsInfo()->end(); ++es)
+                       {
+                               int tmp=0;
+                               switch ((*es)->getType())
+                               {
+                               case 0x05: // private
+                                       for (DescriptorConstIterator desc = (*es)->getDescriptors()->begin();
+                                               desc != (*es)->getDescriptors()->end(); ++desc)
+                                       {
+                                               switch ((*desc)->getTag())
+                                               {
+                                                       case PRIVATE_DATA_SPECIFIER_DESCRIPTOR:
+                                                               if (((PrivateDataSpecifierDescriptor*)(*desc))->getPrivateDataSpecifier() == 190)
+                                                                       tmp |= 1;
+                                                               break;
+                                                       case 0x90:
+                                                       {
+                                                               UnknownDescriptor *descr = (UnknownDescriptor*)*desc;
+                                                               int descr_len = descr->getLength();
+                                                               if (descr_len == 4)
+                                                               {
+                                                                       uint8_t data[descr_len+2];
+                                                                       descr->writeToBuffer(data);
+                                                                       if ( !data[2] && !data[3] && data[4] == 0xFF && data[5] == 0xFF )
+                                                                               tmp |= 2;
+                                                               }
+                                                               break;
+                                                       }
+                                                       default:
+                                                               break;
+                                               }
+                                       }
+                               default:
+                                       break;
+                               }
+                               if (tmp==3)
+                               {
+                                       eServiceReferenceDVB ref;
+                                       if (!pmthandler->getService(ref))
+                                       {
+                                               int pid = (*es)->getPid();
+                                               messages.send(Message(Message::got_private_pid, ref, pid));
+                                               return;
+                                       }
+                               }
+                       }
+               }
+       }
+       else
+               eDebug("PMTready but no pmt!!");
+}
+
+struct date_time
+{
+       __u8 data[5];
+       time_t tm;
+       date_time( const date_time &a )
+       {
+               memcpy(data, a.data, 5);
+               tm = a.tm;
+       }
+       date_time( const __u8 data[5])
+       {
+               memcpy(this->data, data, 5);
+               tm = parseDVBtime(data[0], data[1], data[2], data[3], data[4]);
+       }
+       date_time()
+       {
+       }
+       const __u8& operator[](int pos) const
+       {
+               return data[pos];
+       }
+};
+
+struct less_datetime
+{
+       bool operator()( const date_time &a, const date_time &b ) const
+       {
+               return abs(a.tm-b.tm) < 360 ? false : a.tm < b.tm;
+       }
+};
+
+void eEPGCache::privateSectionRead(const uniqueEPGKey &current_service, const __u8 *data)
+{
+       contentMap &content_time_table = content_time_tables[current_service];
+       singleLock s(cache_lock);
+       std::map< date_time, std::list<uniqueEPGKey>, less_datetime > start_times;
+       eventMap &evMap = eventDB[current_service].first;
+       timeMap &tmMap = eventDB[current_service].second;
+       int ptr=8;
+       int content_id = data[ptr++] << 24;
+       content_id |= data[ptr++] << 16;
+       content_id |= data[ptr++] << 8;
+       content_id |= data[ptr++];
+
+       contentTimeMap &time_event_map =
+               content_time_table[content_id];
+       for ( contentTimeMap::iterator it( time_event_map.begin() );
+               it != time_event_map.end(); ++it )
+       {
+               eventMap::iterator evIt( evMap.find(it->second.second) );
+               if ( evIt != evMap.end() )
+               {
+                       delete evIt->second;
+                       evMap.erase(evIt);
+               }
+               tmMap.erase(it->second.first);
+       }
+       time_event_map.clear();
+
+       __u8 duration[3];
+       memcpy(duration, data+ptr, 3);
+       ptr+=3;
+       int duration_sec =
+               fromBCD(duration[0])*3600+fromBCD(duration[1])*60+fromBCD(duration[2]);
+
+       const __u8 *descriptors[65];
+       const __u8 **pdescr = descriptors;
+
+       int descriptors_length = (data[ptr++]&0x0F) << 8;
+       descriptors_length |= data[ptr++];
+       while ( descriptors_length > 0 )
+       {
+               int descr_type = data[ptr];
+               int descr_len = data[ptr+1];
+               descriptors_length -= (descr_len+2);
+               if ( descr_type == 0xf2 )
+               {
+                       ptr+=2;
+                       int tsid = data[ptr++] << 8;
+                       tsid |= data[ptr++];
+                       int onid = data[ptr++] << 8;
+                       onid |= data[ptr++];
+                       int sid = data[ptr++] << 8;
+                       sid |= data[ptr++];
+                       uniqueEPGKey service( sid, onid, tsid );
+                       descr_len -= 6;
+                       while( descr_len > 0 )
+                       {
+                               __u8 datetime[5];
+                               datetime[0] = data[ptr++];
+                               datetime[1] = data[ptr++];
+                               int tmp_len = data[ptr++];
+                               descr_len -= 3;
+                               while( tmp_len > 0 )
+                               {
+                                       memcpy(datetime+2, data+ptr, 3);
+                                       ptr+=3;
+                                       descr_len -= 3;
+                                       tmp_len -= 3;
+                                       start_times[datetime].push_back(service);
+                               }
+                       }
+               }
+               else
+               {
+                       *pdescr++=data+ptr;
+                       ptr += 2;
+                       ptr += descr_len;
+               }
+       }
+       __u8 event[4098];
+       eit_event_struct *ev_struct = (eit_event_struct*) event;
+       ev_struct->running_status = 0;
+       ev_struct->free_CA_mode = 1;
+       memcpy(event+7, duration, 3);
+       ptr = 12;
+       const __u8 **d=descriptors;
+       while ( d < pdescr )
+       {
+               memcpy(event+ptr, *d, ((*d)[1])+2);
+               ptr+=(*d++)[1];
+               ptr+=2;
+       }
+       for ( std::map< date_time, std::list<uniqueEPGKey> >::iterator it(start_times.begin()); it != start_times.end(); ++it )
+       {
+               time_t now = eDVBLocalTimeHandler::getInstance()->nowTime();
+               if ( (it->first.tm + duration_sec) < now )
+                       continue;
+               memcpy(event+2, it->first.data, 5);
+               int bptr = ptr;
+               int cnt=0;
+               for (std::list<uniqueEPGKey>::iterator i(it->second.begin()); i != it->second.end(); ++i)
+               {
+                       event[bptr++] = 0x4A;
+                       __u8 *len = event+(bptr++);
+                       event[bptr++] = (i->tsid & 0xFF00) >> 8;
+                       event[bptr++] = (i->tsid & 0xFF);
+                       event[bptr++] = (i->onid & 0xFF00) >> 8;
+                       event[bptr++] = (i->onid & 0xFF);
+                       event[bptr++] = (i->sid & 0xFF00) >> 8;
+                       event[bptr++] = (i->sid & 0xFF);
+                       event[bptr++] = 0xB0;
+                       bptr += sprintf((char*)(event+bptr), "Option %d", ++cnt);
+                       *len = ((event+bptr) - len)-1;
+               }
+               int llen = bptr - 12;
+               ev_struct->descriptors_loop_length_hi = (llen & 0xF00) >> 8;
+               ev_struct->descriptors_loop_length_lo = (llen & 0xFF);
+
+               time_t stime = it->first.tm;
+               while( tmMap.find(stime) != tmMap.end() )
+                       ++stime;
+               event[6] += (stime - it->first.tm);
+               __u16 event_id = 0;
+               while( evMap.find(event_id) != evMap.end() )
+                       ++event_id;
+               event[0] = (event_id & 0xFF00) >> 8;
+               event[1] = (event_id & 0xFF);
+               time_event_map[it->first.tm]=std::pair<time_t, __u16>(stime, event_id);
+               eventData *d = new eventData( ev_struct, bptr, eEPGCache::SCHEDULE );
+               evMap[event_id] = d;
+               tmMap[stime] = d;
+       }
+}
+
+void eEPGCache::channel_data::startPrivateReader(int pid, int version)
+{
+       eDVBSectionFilterMask mask;
+       memset(&mask, 0, sizeof(mask));
+       mask.pid = pid;
+       mask.flags = eDVBSectionFilterMask::rfCRC;
+       mask.data[0] = 0xA0;
+       mask.mask[0] = 0xFF;
+       eDebug("start privatefilter for pid %04x and version %d", pid, version);
+       if (version != -1)
+       {
+               mask.data[3] = version << 1;
+               mask.mask[3] = 0x3E;
+               mask.mode[3] = 0x3E;
+       }
+       seenPrivateSections.clear();
+       m_PrivateReader->connectRead(slot(*this, &eEPGCache::channel_data::readPrivateData), m_PrivateConn);
+       m_PrivateReader->start(mask);
+#ifdef NEED_DEMUX_WORKAROUND
+       m_PrevVersion=version;
+#endif
+}
+
+void eEPGCache::channel_data::readPrivateData( const __u8 *data)
+{
+       if (!data)
+               eDebug("get Null pointer from section reader !!");
+       else
+       {
+               if ( seenPrivateSections.find( data[6] ) == seenPrivateSections.end() )
+               {
+#ifdef NEED_DEMUX_WORKAROUND
+                       int version = data[5];
+                       version = ((version & 0x3E) >> 1);
+                       can_delete = 0;
+                       if ( m_PrevVersion != version )
+                       {
+                               cache->privateSectionRead(m_PrivateService, data);
+                               seenPrivateSections.insert(data[6]);
+                       }
+                       else
+                               eDebug("ignore");
+#else
+                       can_delete = 0;
+                       cache->privateSectionRead(m_PrivateService, data);
+                       seenPrivateSections.insert(data[6]);
+#endif
+               }
+               if ( seenPrivateSections.size() == (unsigned int)(data[7] + 1) )
+               {
+                       eDebug("[EPGC] private finished");
+                       if (!isRunning)
+                               can_delete = 1;
+                       int version = data[5];
+                       version = ((version & 0x3E) >> 1);
+                       startPrivateReader(m_PrivatePid, version);
+               }
+       }
+}
 
+#endif // ENABLE_PRIVATE_EPG