add extended description of timers

diff --git a/webinterface/src/WebComponents/Sources/Timer.py b/webinterface/src/WebComponents/Sources/Timer.py
index bc27907..16a7e6e 100644 (file)
--- a/webinterface/src/WebComponents/Sources/Timer.py
+++ b/webinterface/src/WebComponents/Sources/Timer.py
@@ -1,5 +1,6 @@
 from enigma import *
 from enigma import eServiceReference 
+from enigma import eServiceCenter
 
 from Components.Sources.Source import Source
 from ServiceReference import ServiceReference
@@ -18,7 +19,8 @@ class Timer( Source):
         Source.__init__(self)        
         self.session = session
         self.recordtimer = session.nav.RecordTimer
-        
+        self.epgcache = eEPGCache.getInstance()
+
     def handleCommand(self,cmd):
         if self.func is self.ADDBYID:
             self.result = self.addTimerByEventID(cmd)
@@ -185,6 +187,13 @@ class Timer( Source):
             timer.append(item.repeated)
             timer.append(item.dontSave)
             timer.append(item.cancelled)
+            
+            event = self.epgcache.lookupEvent(['E',("%s"%item.service_ref,2,item.eit)])
+            if event[0][0] is not None:
+                timer.append(event[0][0])
+            else:
+                timer.append("N/A")
+                
             timerlist.append(timer) 
             
         return timerlist
@@ -211,5 +220,6 @@ class Timer( Source):
            ,"Repeated":18
            ,"dontSave":19
            ,"Cancled":20
+           ,"DescriptionExtended":21
            }
 

diff --git a/webinterface/src/web-data/objects.js b/webinterface/src/web-data/objects.js
index aa3f97d..eb34e97 100644 (file)
--- a/webinterface/src/web-data/objects.js
+++ b/webinterface/src/web-data/objects.js
@@ -294,6 +294,11 @@ function Timer(xml){
                this.description = "N/A";
        }
        try{
+               this.descriptionextended = xml.getElementsByTagName('e2descriptionextended').item(0).firstChild.data;
+       } catch (e) {
+               this.descriptionextended = "N/A";
+       }
+       try{
                this.disabled = xml.getElementsByTagName('e2disabled').item(0).firstChild.data;
        } catch (e) {
                this.disabled = "N/A";
@@ -389,6 +394,9 @@ function Timer(xml){
        this.getDescription = function(){
                return this.description;
        }       
+       this.getDescriptionExtended = function(){
+               return this.descriptionextended;
+       }       
        this.getDisabled = function(){
                return this.tdisabled;
        }

diff --git a/webinterface/src/web-data/templates.js b/webinterface/src/web-data/templates.js
index 0c91f54..a698d6d 100644 (file)
--- a/webinterface/src/web-data/templates.js
+++ b/webinterface/src/web-data/templates.js
@@ -99,7 +99,7 @@ var tplTimerListHeader  = '<table border="0" cellpadding="0" cellspacing="0" cla
        tplTimerListHeader += '<tbody class="scrollContent">\n';
 
 var tplTimerListItem  = '<tr>\n';
-       tplTimerListItem += '<td><div class="sListSName" id="TimerColor%(state)" title="%(description)">%(title) (%(servicename))</div>';
+       tplTimerListItem += '<td><div class="sListSName" id="TimerColor%(state)" title="%(description), %(descriptionextended)">%(title) (%(servicename))</div>';
        tplTimerListItem += '<div class="sListExt" id="TimerColor%(state)">\n';
        tplTimerListItem += '%(duration)&nbsp;Min\n';
        tplTimerListItem += '<a target="_blank" ><img src="/webdata/gfx/trash.gif" title="delete timer entry" border="0" width="20" height="20" onclick="delTimer(\'%(servicereference)\',\'%(begin)\',\'%(end)\');"></a><br/>';

diff --git a/webinterface/src/web-data/tools.js b/webinterface/src/web-data/tools.js
index 60ff053..4a30538 100644 (file)
--- a/webinterface/src/web-data/tools.js
+++ b/webinterface/src/web-data/tools.js
@@ -551,6 +551,7 @@ function incomingTimerList(request){
                                'servicename': timer.getServiceName() ,
                                'title': timer.getName(), 
                                'description': timer.getDescription(), 
+                               'descriptionextended': timer.getDescriptionExtended(), 
                                'begin': timer.getTimeBegin(), 
                                'end': timer.getTimeEnd(), 
                                'state': timer.getState(),

diff --git a/webinterface/src/web/timerlist.xml b/webinterface/src/web/timerlist.xml
index c069442..9ea8ef8 100644 (file)
--- a/webinterface/src/web/timerlist.xml
+++ b/webinterface/src/web/timerlist.xml
@@ -6,6 +6,7 @@
                &lt;e2eit><e2:item name="EIT" />&lt;/e2eit>
                &lt;e2name><e2:item name="Name" filter="xml"/>&lt;/e2name>
                &lt;e2description><e2:item name="Description" filter="xml"/>&lt;/e2description>
+               &lt;e2descriptionextended><e2:item name="DescriptionExtended" filter="xml"/>&lt;/e2descriptionextended>
                &lt;e2disabled><e2:item name="Disabled" />&lt;/e2disabled>
                &lt;e2timebegin><e2:item name="TimeBegin" />&lt;/e2timebegin>
                &lt;e2timeend><e2:item name="TimeEnd" />&lt;/e2timeend>