Revert "Revert "disable m2ts support for release 2.6""

[enigma2.git] / lib / python / Components / Converter / MovieInfo.py

diff --git a/lib/python/Components/Converter/MovieInfo.py b/lib/python/Components/Converter/MovieInfo.py
index 068d24d3a73f84f2d47a6e8475f544cc5e913f80..a973b41f5601c8bb062e31ca52983aeda9e70dc9 100644 (file)
--- a/lib/python/Components/Converter/MovieInfo.py
+++ b/lib/python/Components/Converter/MovieInfo.py
@@ -1,5 +1,5 @@
 from Components.Converter.Converter import Converter
-from Components.Element import cached
+from Components.Element import cached, ElementError
 from enigma import iServiceInformation
 from ServiceReference import ServiceReference
 
@@ -7,6 +7,7 @@ class MovieInfo(Converter, object):
        MOVIE_SHORT_DESCRIPTION = 0 # meta description when available.. when not .eit short description
        MOVIE_META_DESCRIPTION = 1 # just meta description when available
        MOVIE_REC_SERVICE_NAME = 2 # name of recording service
+       MOVIE_REC_FILESIZE = 3 # filesize of recording
 
        def __init__(self, type):
                if type == "ShortDescription":
@@ -15,8 +16,10 @@ class MovieInfo(Converter, object):
                        self.type = self.MOVIE_META_DESCRIPTION
                elif type == "RecordServiceName":
                        self.type = self.MOVIE_REC_SERVICE_NAME
+               elif type == "FileSize":
+                       self.type = self.MOVIE_REC_FILESIZE
                else:
-                       raise str("'%s' is not <ShortDescription|MetaDescription|RecordServiceName> for MovieInfo converter" % type)
+                       raise ElementError("'%s' is not <ShortDescription|MetaDescription|RecordServiceName|FileSize> for MovieInfo converter" % type)
                Converter.__init__(self, type)
 
        @cached
@@ -37,6 +40,10 @@ class MovieInfo(Converter, object):
                        elif self.type == self.MOVIE_REC_SERVICE_NAME:
                                rec_ref_str = info.getInfoString(service, iServiceInformation.sServiceref)
                                return ServiceReference(rec_ref_str).getServiceName()
+                       elif self.type == self.MOVIE_REC_FILESIZE:
+                               filesize = info.getInfoObject(service, iServiceInformation.sFileSize)
+                               if filesize is not None:
+                                       return "%d MB" % (filesize / (1024*1024))
                return ""
 
        text = property(getText)