add Filesize of Movies and display that in MegaBytes

diff --git a/webinterface/src/WebComponents/Sources/Movie.py b/webinterface/src/WebComponents/Sources/Movie.py
index 99d7d68..cf991d3 100644 (file)
--- a/webinterface/src/WebComponents/Sources/Movie.py
+++ b/webinterface/src/WebComponents/Sources/Movie.py
@@ -7,7 +7,6 @@ from ServiceReference import ServiceReference,eServiceCenter
 from Tools.Directories import resolveFilename,SCOPE_HDD
 
 import os
-#import sys, traceback
 
 class Movie( Source):
     LIST = 0
@@ -94,6 +93,7 @@ class Movie( Source):
                 movie.append("")
             filename = "/"+"/".join(serviceref.toString().split("/")[1:])
             movie.append(filename)
+            movie.append(os.stat(filename)[6])
             if info.getInfoString(serviceref, iServiceInformation.sTags).lower().find(self.cmd.lower())>=0:
                 """ add movie only to list, if a givven tag is applied to the movie """
                 list.append(movie)
@@ -129,5 +129,6 @@ class Movie( Source):
            ,"Tags": 6
            ,"DescriptionExtended": 7
            ,"Filename": 8
+           ,"Filesize": 9
            }
 

diff --git a/webinterface/src/web-data/objects.js b/webinterface/src/web-data/objects.js
index 38b6c47..b65dd13 100644 (file)
--- a/webinterface/src/web-data/objects.js
+++ b/webinterface/src/web-data/objects.js
@@ -252,6 +252,11 @@ function Movie(xml){
                this.filename = "n/a";
        }
        try{
+               this.filesize = xml.getElementsByTagName('e2filesize').item(0).firstChild.data;
+       } catch (e) {
+               this.filesize = 0;
+       }
+       try{
                this.startTime = xml.getElementsByTagName('e2time').item(0).firstChild.data;
        } catch (e) {
                this.startTime = "0";
@@ -316,6 +321,10 @@ function Movie(xml){
                return encodeURIComponent(this.filename);
                
        }       
+       this.getFilesizeMB = function(){                
+               return Math.floor(parseInt(this.filesize)/100000)+"MB";
+               
+       }       
 }      
 //END class Movie
 

diff --git a/webinterface/src/web-data/templates.js b/webinterface/src/web-data/templates.js
index 87a24a3..74d30d6 100644 (file)
--- a/webinterface/src/web-data/templates.js
+++ b/webinterface/src/web-data/templates.js
@@ -110,6 +110,10 @@ var tplMovieListItem  = '<tr>\n';
                tplMovieListItem += '<td class="movieElementLeft">Tags:</td>\n';
                tplMovieListItem += '<td class="movieElementRight">%(tags)&nbsp;</td>\n';
                tplMovieListItem += '</tr>\n';
+               tplMovieListItem += '<tr>\n';
+               tplMovieListItem += '<td class="movieElementLeft">Size:</td>\n';
+               tplMovieListItem += '<td class="movieElementRight">%(filesize)&nbsp;</td>\n';
+               tplMovieListItem += '</tr>\n';
                tplMovieListItem += '</table>\n';
        tplMovieListItem += '</div>\n';
        tplMovieListItem += '</tr>\n';

diff --git a/webinterface/src/web-data/tools.js b/webinterface/src/web-data/tools.js
index 5bd42c8..4ef1686 100644 (file)
--- a/webinterface/src/web-data/tools.js
+++ b/webinterface/src/web-data/tools.js
@@ -600,6 +600,7 @@ function incomingMovieList(request){
                                'descriptionextended': movie.getDescriptionExtended(),
                                'filelink': String(movie.getFilename()).substr(17,movie.getFilename().length),
                                'filename': String(movie.getFilename()),
+                               'filesize': movie.getFilesizeMB(),
                                'tags': movie.getTags().join(', ') ,
                                'length': movie.getLength() ,
                                'time': movie.getTimeDay()+" "+ movie.getTimeStartString()

diff --git a/webinterface/src/web/movielist.xml b/webinterface/src/web/movielist.xml
index a34620a..b3fdf37 100644 (file)
--- a/webinterface/src/web/movielist.xml
+++ b/webinterface/src/web/movielist.xml
@@ -10,6 +10,7 @@
                &lt;e2length><e2:item name="Length"  filter="xml"/>&lt;/e2length>
                &lt;e2tags><e2:item name="Tags"  filter="xml"/>&lt;/e2tags>
                &lt;e2filename><e2:item name="Filename"  filter="xml"/>&lt;/e2filename>
+               &lt;e2filesize><e2:item name="Filesize"  filter="xml"/>&lt;/e2filesize>
        &lt;/e2movie>
        </e2:convert>
        <e2:convert type="web:TextToHTML" /></e2:element>