Add service flags and pid cache to recordings meta file. This adds possibility to...

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

diff --git a/lib/dvb/metaparser.cpp b/lib/dvb/metaparser.cpp
index ed4947b419e61d9399df9c71b963d2ad9171e778..24a5ab67b1439e57298460a4c618d6c3c1ff1395 100644 (file)
--- a/lib/dvb/metaparser.cpp
+++ b/lib/dvb/metaparser.cpp
@@ -5,6 +5,9 @@
 eDVBMetaParser::eDVBMetaParser()
 {
        m_time_create = 0;
+       m_data_ok = 0;
+       m_length = 0;
+       m_filesize = 0;
 }
 
 int eDVBMetaParser::parseFile(const std::string &basename)
@@ -58,12 +61,22 @@ int eDVBMetaParser::parseMeta(const std::string &tsname)
                case 4:
                        m_tags = line;
                        break;
+               case 5:
+                       m_length = atoi(line);  //movielength in pts
+                       break;
+               case 6:
+                       m_filesize = atoll(line);
+                       break;
+               case 7:
+                       m_service_data = line;
+                       break;
                default:
                        break;
                }
                ++linecnt;
        }
        fclose(f);
+       m_data_ok = 1;
        return 0;
 }
 
@@ -103,15 +116,19 @@ int eDVBMetaParser::parseRecordings(const std::string &filename)
                        ref = eServiceReferenceDVB(line + 10);
                if (!strncmp(line, "#DESCRIPTION: ", 14))
                        description = line + 14;
-
-               if ((line[0] == '/') && (ref.path == filename))
+               if ((line[0] == '/') && (ref.path.substr(ref.path.find_last_of('/')) == filename.substr(filename.find_last_of('/'))))
                {
 //                     eDebug("hit! ref %s descr %s", m_ref.toString().c_str(), m_name.c_str());
                        m_ref = ref;
                        m_name = description;
                        m_description = "";
                        m_time_create = 0;
+                       m_length = 0;
+                       m_filesize = 0;
+                                               
+                       m_data_ok = 1;
                        fclose(f);
+                       updateMeta(filename.c_str());
                        return 0;
                }
        }
@@ -121,12 +138,17 @@ int eDVBMetaParser::parseRecordings(const std::string &filename)
 
 int eDVBMetaParser::updateMeta(const std::string &tsname)
 {
+       /* write meta file only if we have valid data. Note that we might convert recordings.epl data to .meta, which is fine. */
+       if (!m_data_ok)
+               return -1;
        std::string filename = tsname + ".meta";
+       eServiceReference ref = m_ref;
+       ref.path = "";
 
        FILE *f = fopen(filename.c_str(), "w");
        if (!f)
                return -ENOENT;
-       fprintf(f, "%s\n%s\n%s\n%d\n%s\n", m_ref.toString().c_str(), m_name.c_str(), m_description.c_str(), m_time_create, m_tags.c_str());
+       fprintf(f, "%s\n%s\n%s\n%d\n%s\n%d\n%lld\n%s\n", ref.toString().c_str(), m_name.c_str(), m_description.c_str(), m_time_create, m_tags.c_str(), m_length, m_filesize, m_service_data.c_str() );
        fclose(f);
        return 0;
 }