From 97909d42012ca026c51d2e7b882ce55eb0acffab Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Thu, 15 Jan 2009 00:49:09 +0100 Subject: [PATCH] cache movie filelengths in .meta file, by luke_s --- lib/dvb/metaparser.cpp | 23 ++++++++++++++++++----- lib/dvb/metaparser.h | 3 ++- lib/service/servicedvb.cpp | 13 ++++++++++++- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/lib/dvb/metaparser.cpp b/lib/dvb/metaparser.cpp index 3e3f9a79..175c7cdb 100644 --- a/lib/dvb/metaparser.cpp +++ b/lib/dvb/metaparser.cpp @@ -6,6 +6,8 @@ eDVBMetaParser::eDVBMetaParser() { m_time_create = 0; m_data_ok = 0; + m_length = 0; + m_filesize = 0; } int eDVBMetaParser::parseFile(const std::string &basename) @@ -59,6 +61,12 @@ 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; default: break; } @@ -105,17 +113,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; } } @@ -125,14 +135,17 @@ int eDVBMetaParser::parseRecordings(const std::string &filename) int eDVBMetaParser::updateMeta(const std::string &tsname) { - if (!m_data_ok) + /* 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", ref.toString().c_str(), m_name.c_str(), m_description.c_str(), m_time_create, m_tags.c_str(), m_length, m_filesize ); fclose(f); return 0; } diff --git a/lib/dvb/metaparser.h b/lib/dvb/metaparser.h index 01fabde8..2ca94d6d 100644 --- a/lib/dvb/metaparser.h +++ b/lib/dvb/metaparser.h @@ -18,7 +18,8 @@ public: eServiceReferenceDVB m_ref; std::string m_name, m_description; - int m_time_create; + int m_time_create, m_length; + long long m_filesize; std::string m_tags; }; diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 90195d9b..dcd7017c 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -536,14 +536,25 @@ int eStaticServiceDVBPVRInformation::getLength(const eServiceReference &ref) eDVBTSTools tstools; + struct stat s; + stat(ref.path.c_str(), &s); + if (tstools.openFile(ref.path.c_str())) return 0; + /* check if cached data is still valid */ + if (m_parser.m_data_ok && (s.st_size == m_parser.m_filesize) && (m_parser.m_length)) + return m_parser.m_length / 90000; + + /* otherwise, re-calc length and update meta file */ pts_t len; if (tstools.calcLen(len)) return 0; - return len / 90000; + m_parser.m_length = len; + m_parser.m_filesize = s.st_size; + m_parser.updateMeta(ref.path); + return m_parser.m_length / 90000; } int eStaticServiceDVBPVRInformation::getInfo(const eServiceReference &ref, int w) -- 2.30.2