use recordings.epl as backup if existing. only first part will be played, though.

[enigma2.git] / lib / dvb / epgcache.cpp

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 6c950279837f0c1840a0fb33de9cc02d85e25f0b..0af14c6b9c7e2c8586592ff3942f06b84a08f007 100644 (file)
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -701,15 +701,17 @@ void eEPGCache::thread()
 
 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");
@@ -724,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--)
@@ -822,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 );
@@ -1530,7 +1542,7 @@ 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;
@@ -1540,7 +1552,7 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                                                if (type < -1 || type > 2)
                                                {
                                                        eDebug("unknown type %d", type);
-                                                       continue;
+                                                       goto skip_entry;
                                                }
                                                break;
                                        case 2:
@@ -1612,6 +1624,8 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                        if (service_name)
                                Py_DECREF(service_name);
                }
+skip_entry:
+               ;
        }
        if (convertFuncArgs)
                Py_DECREF(convertFuncArgs);
@@ -1882,9 +1896,9 @@ void eEPGCache::channel_data::readPrivateData( const __u8 *data)
                eDebug("get Null pointer from section reader !!");
        else
        {
-#ifdef NEED_DEMUX_WORKAROUND
                if ( seenPrivateSections.find( data[6] ) == seenPrivateSections.end() )
                {
+#ifdef NEED_DEMUX_WORKAROUND
                        int version = data[5];
                        version = ((version & 0x3E) >> 1);
                        can_delete = 0;