Small timer-location/tags fixes

diff --git a/webinterface/src/WebComponents/Sources/Timer.py b/webinterface/src/WebComponents/Sources/Timer.py
index 3e7a51a..f1900fc 100644 (file)
--- a/webinterface/src/WebComponents/Sources/Timer.py
+++ b/webinterface/src/WebComponents/Sources/Timer.py
@@ -195,11 +195,10 @@ class Timer( Source):
 
 
 #===============================================================================
-# This Function can add a new or edit an exisiting Timer
-# When the Parameter "channelOld" is not set, a new Timer will be added to the
-# Timerlist.
-# IF the parameters channelOld, beginOld and endOld are set
-# it's an existing timer will be changed (if possible with the given values)
+# This Function can add a new or edit an exisiting Timer.
+# When the Parameter "deleteOldOnSave" is not set, a new Timer will be added.
+# Otherwise, and if the parameters channelOld, beginOld and endOld are set,
+# an existing timer with corresponding values will be changed.
 #===============================================================================
     def editTimer(self, param):
         print "[WebComponents.Timer] editTimer"
@@ -230,7 +229,6 @@ class Timer( Source):
         else:
             return False, "Missing Parameter: begin"
         
-        
         if param.has_key('end'): 
             end = int(param['end'])
         else:
@@ -353,15 +351,21 @@ class Timer( Source):
             if param['justplay'] == "1":
                 justplay = True
 
+        location = config.movielist.last_timer_videodir.value
+        if param['dirname'] is not None and param['dirname'] != "":
+            location = param['dirname']
+        tags = None
+        if param['tags'] is not None and param['tags'] != "":
+            tags = param['tags']
+
         epgcache = eEPGCache.getInstance()
         event = epgcache.lookupEventId(eServiceReference(param['sRef']),int(param['eventid']))
         if event is None:
             return False, "EventId not found"
         
         (begin, end, name, description, eit) = parseEvent(event)
-        location = config.movielist.last_timer_videodir.value
 
-        timer = RecordTimerEntry(ServiceReference(param['sRef']), begin , end, name, description, eit, False, justplay, AFTEREVENT.NONE, dirname=location)
+        timer = RecordTimerEntry(ServiceReference(param['sRef']), begin , end, name, description, eit, False, justplay, AFTEREVENT.NONE, dirname=location, tags=tags)
         self.recordtimer.record(timer)
         return True, "Timer '%s' added" %(timer.name)  
             

diff --git a/webinterface/src/web-data/timer.js b/webinterface/src/web-data/timer.js
index 062ac7f..78ee1f0 100644 (file)
--- a/webinterface/src/web-data/timer.js
+++ b/webinterface/src/web-data/timer.js
@@ -317,7 +317,7 @@ function incomingTimerFormTags(request){
        debug("[incomingTimerFormTags] called");
        if(request.readyState == 4){
                var result = new SimpleXMLResult(getXML(request));
-               addTimerEditFormArray.tagsList = result.getStateText().split(" ");
+               addTimerEditFormArray.tagsList = (typeof(result.getStateText()) != 'undefined' ? result.getStateText().split(" ") : []);
                loadTimerFormLocations();
        }               
 }
@@ -330,7 +330,7 @@ function incomingTimerFormLocations(request){
        debug("[incomingTimerFormLocations] called");
        if(request.readyState == 4){
                var result = new SimpleXMLResult(getXML(request));
-               addTimerEditFormArray.locationsList = result.getStateText().split(" ");
+               addTimerEditFormArray.locationsList = (typeof(result.getStateText()) != 'undefined' ? result.getStateText().split(" ") : ["/hdd/movie"]);
                loadTimerFormChannels();
        }               
 }

diff --git a/webinterface/src/web/timeraddbyeventid.xml b/webinterface/src/web/timeraddbyeventid.xml
index 35ed20f..503d5af 100644 (file)
--- a/webinterface/src/web/timeraddbyeventid.xml
+++ b/webinterface/src/web/timeraddbyeventid.xml
@@ -1,5 +1,5 @@
 <e2:screen name="TimerWebScreen">&lt;?xml version="1.0" encoding="UTF-8"?>
-       <e2:element source="TimerAddEventID" id="sRef,eventid,justplay">
+       <e2:element source="TimerAddEventID" id="sRef,eventid,justplay,dirname,tags">
                <e2:convert type="web:TextToHTML" />
        </e2:element>
 </e2:screen>
\ No newline at end of file