Merge commit 'origin/bug_449_fix_wlan_usbstick_recognition'

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

diff --git a/lib/dvb/metaparser.cpp b/lib/dvb/metaparser.cpp
index 175c7cdb055af9a97289cdf71049d56550db6add..5eff4d9dbf277febc6523cacdb5a88e7a5c1800c 100644 (file)
--- a/lib/dvb/metaparser.cpp
+++ b/lib/dvb/metaparser.cpp
@@ -17,7 +17,31 @@ int eDVBMetaParser::parseFile(const std::string &basename)
                return 0;
        
                /* otherwise, use recordings.epl */
                return 0;
        
                /* otherwise, use recordings.epl */

-       return parseRecordings(basename);
+       if (!parseRecordings(basename))
+               return 0;
+       m_filesize = fileSize(basename);
+       return -1;
+
+}
+
+long long eDVBMetaParser::fileSize(const std::string &basename)
+{
+       long long filesize = 0;
+       char buf[255];
+       struct stat64 s;
+               /* get filesize */
+       if (!stat64(basename.c_str(), &s))
+               filesize = (long long) s.st_size;
+               /* handling for old splitted recordings (enigma 1) */
+       int slice=1;
+       while(true)
+       {
+               snprintf(buf, 255, "%s.%03d", basename.c_str(), slice++);
+               if (stat64(buf, &s) < 0)
+                       break;
+               filesize += (long long) s.st_size;
+       }
+       return filesize;

 }
 
 int eDVBMetaParser::parseMeta(const std::string &tsname)
 }
 
 int eDVBMetaParser::parseMeta(const std::string &tsname)


@@ -67,6 +91,9 @@ int eDVBMetaParser::parseMeta(const std::string &tsname)
                case 6:
                        m_filesize = atoll(line);
                        break;
                case 6:
                        m_filesize = atoll(line);
                        break;

+               case 7:
+                       m_service_data = line;
+                       break;

                default:
                        break;
                }
                default:
                        break;
                }


@@ -121,7 +148,7 @@ int eDVBMetaParser::parseRecordings(const std::string &filename)
                        m_description = "";
                        m_time_create = 0;
                        m_length = 0;
                        m_description = "";
                        m_time_create = 0;
                        m_length = 0;

-                       m_filesize = 0;
+                       m_filesize = fileSize(filename);

                                                
                        m_data_ok = 1;
                        fclose(f);
                                                
                        m_data_ok = 1;
                        fclose(f);


@@ -145,7 +172,7 @@ int eDVBMetaParser::updateMeta(const std::string &tsname)
        FILE *f = fopen(filename.c_str(), "w");
        if (!f)
                return -ENOENT;
        FILE *f = fopen(filename.c_str(), "w");
        if (!f)
                return -ENOENT;

-       fprintf(f, "%s\n%s\n%s\n%d\n%s\n%d\n%lld\n", ref.toString().c_str(), m_name.c_str(), m_description.c_str(), m_time_create, m_tags.c_str(), m_length, m_filesize );
+       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;
 }
        fclose(f);
        return 0;
 }