X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fmetaparser.cpp;h=19007fc41c078bcc862cb7076d9d9faac3121e59;hp=ed4947b419e61d9399df9c71b963d2ad9171e778;hb=46c144d3f294b74996cc9276528a9862e4d70efe;hpb=3cb449e91190b3bb3527e5ef3fe487f0d4f4a440

diff --git a/lib/dvb/metaparser.cpp b/lib/dvb/metaparser.cpp
index ed4947b..19007fc 100644
--- a/lib/dvb/metaparser.cpp
+++ b/lib/dvb/metaparser.cpp
@@ -5,6 +5,10 @@
 eDVBMetaParser::eDVBMetaParser()
 {
 	m_time_create = 0;
+	m_data_ok = 0;
+	m_length = 0;
+	m_filesize = 0;
+	m_scrambled = 0;
 }
 
 int eDVBMetaParser::parseFile(const std::string &basename)
@@ -14,7 +18,31 @@ int eDVBMetaParser::parseFile(const std::string &basename)
 		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)
@@ -58,12 +86,25 @@ 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;
+		case 8:
+			m_scrambled = atoi(line);
+			break;
 		default:
 			break;
 		}
 		++linecnt;
 	}
 	fclose(f);
+	m_data_ok = 1;
 	return 0;
 }
 
@@ -103,15 +144,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 = fileSize(filename);
+			m_data_ok = 1;
+			m_scrambled = 0;
 			fclose(f);
+			updateMeta(filename.c_str());
 			return 0;
 		}
 	}
@@ -121,12 +166,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%d\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(), m_scrambled);
 	fclose(f);
 	return 0;
 }