movielist can now be filtered by a movietag (or a part of a movietag)

http://dm7025/web/movielist?tag=s finds movies with Tag  "Simpsons" and "Serie"

diff --git a/webinterface/src/WebComponents/Sources/Movie.py b/webinterface/src/WebComponents/Sources/Movie.py
index 0d14d95..f897c1b 100644 (file)
--- a/webinterface/src/WebComponents/Sources/Movie.py
+++ b/webinterface/src/WebComponents/Sources/Movie.py
@@ -22,6 +22,7 @@ class Movie( Source):
         self.movielist.load(self.root,None)
     
     def handleCommand(self,cmd):
+        self.cmd = cmd
         if self.func is self.DEL:
             self.result = self.delMovieFiles(cmd)
         else:
@@ -81,7 +82,9 @@ class Movie( Source):
                 movie.append("")
             filename = "/"+"/".join(serviceref.toString().split("/")[1:])
             movie.append(filename)
-            list.append(movie)
+            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)
         return list
 
     def getText(self):

diff --git a/webinterface/src/web-data/config.js b/webinterface/src/web-data/config.js
index 850fab9..524b8bd 100644 (file)
--- a/webinterface/src/web-data/config.js
+++ b/webinterface/src/web-data/config.js
@@ -18,7 +18,7 @@ var url_subservices = "/web/subservices"; // subservices for current service
 
 var url_updates= "/web/updates.html";
 
-var url_movielist= "/web/movielist";
+var url_movielist= "/web/movielist?tag="; // plus tag as string
 
 var url_about= "/web/about";
 
@@ -47,4 +47,4 @@ var bouqet_radio = '1:7:2:0:0:0:0:0:0:0:(type == 2)FROM BOUQUET "bouquets.radio"
 var bouqet_provider_tv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 195) || (type == 25) FROM PROVIDERS ORDER BY name';
 var bouqet_provider_radio ='1:7:2:0:0:0:0:0:0:0:(type == 2) FROM PROVIDERS ORDER BY name';
 
-var windowStyle = 'alphacube';
\ No newline at end of file
+var windowStyle = 'alphacube';

diff --git a/webinterface/src/web-data/index.html b/webinterface/src/web-data/index.html
index 06c2d4b..a22df72 100644 (file)
--- a/webinterface/src/web-data/index.html
+++ b/webinterface/src/web-data/index.html
@@ -65,7 +65,7 @@
                                        <div class="navMenuPanel" id="accordionMenueBouquetPanelMovieTimer">
                                                <div class="navMenuHeader" id="accordionMenueBouquetHeaderMovieTimer">Movie/Timer</div>
                                                <div class="navMenuContent" id="accordionMenueBouquetContentMovieTimer">
-                                                       <div onclick="loadMovieList()">Movies</div>
+                                                       <div onclick="loadMovieList('')">Movies</div>
                                                        <div onclick="loadTimerList()">Timers</div>
                                                        <div onclick="loadTimerFormNow()">Add Timer</div>
                                                </div>

diff --git a/webinterface/src/web-data/templates.js b/webinterface/src/web-data/templates.js
index de98d14..543e753 100644 (file)
--- a/webinterface/src/web-data/templates.js
+++ b/webinterface/src/web-data/templates.js
@@ -72,8 +72,8 @@ var tplMovieListHeader  = '<table border="0" cellpadding="0" cellspacing="0" cla
        tplMovieListHeader += '<tr>\n';
        tplMovieListHeader += '<th><div class="sListHeader" style="color: #000000;">MovieList</div>\n';
        tplMovieListHeader += '<div class="sListSearch">';
-       tplMovieListHeader += '<form onSubmit="loadEPGBySearchString(document.getElementById(\'searchText\').value); return false;">';
-       tplMovieListHeader += '<input type="text" id="searchText" onfocus="this.value=\'\'" value="Search EPG"/>';
+       tplMovieListHeader += '<form onSubmit="loadMovieList(document.getElementById(\'filterMovietag\').value); return false;">';
+       tplMovieListHeader += '<input type="text" id="filterMovietag" onfocus="this.value=\'\'" value="filter by Tag"/>';
        tplMovieListHeader += '<input style="vertical-align:middle" type="image" src="/webdata/gfx/search.png" alt="search...">';
        tplMovieListHeader += '</form></div></th>';
        tplMovieListHeader += '</tr>\n';

diff --git a/webinterface/src/web-data/tools.js b/webinterface/src/web-data/tools.js
index f1ad15d..59481c5 100644 (file)
--- a/webinterface/src/web-data/tools.js
+++ b/webinterface/src/web-data/tools.js
@@ -565,9 +565,9 @@ function incomingChannellist(request){
        }
 }
 // Movies
-function loadMovieList(){
-       debug("loading movies");
-       doRequest(url_movielist, incomingMovieList);    
+function loadMovieList(tag){
+       debug("loading movies by tag '"+tag+"'");
+       doRequest(url_movielist+tag, incomingMovieList);        
 }
 
 function incomingMovieList(request){
@@ -617,7 +617,7 @@ function incomingDelMovieFileResult(request) {
        if(request.readyState == 4){
                var delresult = new SimpleXMLResult(getXML(request));
                if(delresult.getState()){
-                       loadMovieList();
+                       loadMovieList('');
                }else{
                        messageBox("Deletion Error","Reason: "+delresult.getStateText());
                }
@@ -1038,4 +1038,4 @@ function startDebugWindow() {
 }
 function restartTwisted() {
        new Ajax.Request( "/web/restarttwisted", { asynchronous: true, method: "get" })
-}
\ No newline at end of file
+}

diff --git a/webinterface/src/web/movielist.xml b/webinterface/src/web/movielist.xml
index 870b5a9..5aa2149 100644 (file)
--- a/webinterface/src/web/movielist.xml
+++ b/webinterface/src/web/movielist.xml
@@ -1,5 +1,5 @@
 <e2:screen name="TestScreen">&lt;?xml version="1.0" encoding="UTF-8"?>
-&lt;e2movielist><e2:element source="MovieList" ><e2:convert type="web:ListFiller" >
+&lt;e2movielist><e2:element source="MovieList" id="tag"><e2:convert type="web:ListFiller" >
        &lt;e2movie>
                &lt;e2servicereference><e2:item name="ServiceReference"  filter="xml"/>&lt;/e2servicereference>
                &lt;e2title><e2:item name="Title"  filter="xml"/>&lt;/e2title>