Fix problems with timers from epg.

diff --git a/webinterface/src/WebComponents/Sources/Timer.py b/webinterface/src/WebComponents/Sources/Timer.py
index 52fe3a9..3e7a51a 100644 (file)
--- a/webinterface/src/WebComponents/Sources/Timer.py
+++ b/webinterface/src/WebComponents/Sources/Timer.py
@@ -264,7 +264,7 @@ class Timer( Source):
             if ( param['afterevent'] == "0") or (param['afterevent'] == "1") or (param['afterevent'] == "2"):
                 afterEvent = int(param['afterevent'])
 
-        dirname = None
+        dirname = config.movielist.last_timer_videodir.value
         if param.has_key('dirname'):
             dirname = param['dirname']
 
@@ -272,55 +272,59 @@ class Timer( Source):
         if param.has_key('tags'):
             tags = unescape(param['tags']).split(' ')
 
+        delold = 0
+        if param.has_key('deleteOldOnSave'):
+            delold = int(param['deleteOldOnSave'])
+
         #Try to edit an existing Timer
-        if param.has_key('channelOld'):
-            print "ChannelOld: %s" %param['channelOld']
-            if param['channelOld'] != '':
+        if delold:
+            if param.has_key('channelOld') and param['channelOld'] != '':
                 channelOld = ServiceReference(param['channelOld'])
-                
-                # We do need all of the following Parameters, too, for being able of finding the Timer.
-                # Therefore so we can neither use default values in this part nor can we 
-                # continue if a parameter is missing            
-                if param.has_key('beginOld'):
-                    beginOld = int(param['beginOld'])
-                else:
-                    return False, "Missing Parameter: beginOld"
-                
-                if param.has_key('endOld'):
-                    endOld = int(param['endOld'])
-                else:
-                    return False, "Missing Parameter: endOld"
-                
-                #let's try to find the timer
-                try:
-                    for timer in self.recordtimer.timer_list + self.recordtimer.processed_timers:
-                        if str(timer.service_ref) == str(channelOld):
-                            if int(timer.begin) == beginOld:
-                                if int(timer.end) == endOld:
-                                    #we've found the timer we've been searching for
-                                    #Let's apply the new values
-                                    timer.service_ref = service_ref
-                                    timer.begin = int(begin)
-                                    timer.end = int(end)
-                                    timer.name = name
-                                    timer.description = description
-                                    timer.disabled = disabled
-                                    timer.justplay = justplay
-                                    timer.afterEvent = afterEvent
-                                    timer.repeated = repeated
-                                    timer.dirname = dirname
-                                    timer.tags = tags
-                                    
-                                    #send the changed timer back to enigma2 and hope it's good
-                                    self.session.nav.RecordTimer.timeChanged(timer)
-                                    print "[WebComponents.Timer] editTimer: Timer changed!"
-                                    return True, "Timer %s has been changed!" %(timer.name)
-                except:
-                    #obviously some value was not good, return an error
-                    return False, "Changing the timer for '%s' failed!" %name
-                
-                return False, "Could not find timer '%s' with given start and end time!" %name
-        
+            else:
+                return False, "Missing Parameter: channelOld"
+            # We do need all of the following Parameters, too, for being able of finding the Timer.
+            # Therefore so we can neither use default values in this part nor can we 
+            # continue if a parameter is missing            
+            if param.has_key('beginOld'):
+                beginOld = int(param['beginOld'])
+            else:
+                return False, "Missing Parameter: beginOld"
+            
+            if param.has_key('endOld'):
+                endOld = int(param['endOld'])
+            else:
+                return False, "Missing Parameter: endOld"
+            
+            #let's try to find the timer
+            try:
+                for timer in self.recordtimer.timer_list + self.recordtimer.processed_timers:
+                    if str(timer.service_ref) == str(channelOld):
+                        if int(timer.begin) == beginOld:
+                            if int(timer.end) == endOld:
+                                #we've found the timer we've been searching for
+                                #Let's apply the new values
+                                timer.service_ref = service_ref
+                                timer.begin = int(begin)
+                                timer.end = int(end)
+                                timer.name = name
+                                timer.description = description
+                                timer.disabled = disabled
+                                timer.justplay = justplay
+                                timer.afterEvent = afterEvent
+                                timer.repeated = repeated
+                                timer.dirname = dirname
+                                timer.tags = tags
+                                
+                                #send the changed timer back to enigma2 and hope it's good
+                                self.session.nav.RecordTimer.timeChanged(timer)
+                                print "[WebComponents.Timer] editTimer: Timer changed!"
+                                return True, "Timer %s has been changed!" %(timer.name)
+            except:
+                #obviously some value was not good, return an error
+                return False, "Changing the timer for '%s' failed!" %name
+            
+            return False, "Could not find timer '%s' with given start and end time!" %name
+
         #Try adding a new Timer
 
         try:
@@ -355,8 +359,9 @@ class Timer( Source):
             return False, "EventId not found"
         
         (begin, end, name, description, eit) = parseEvent(event)
-        
-        timer = RecordTimerEntry(ServiceReference(param['sRef']), begin , end, name, description, eit, False, justplay, AFTEREVENT.NONE)                                
+        location = config.movielist.last_timer_videodir.value
+
+        timer = RecordTimerEntry(ServiceReference(param['sRef']), begin , end, name, description, eit, False, justplay, AFTEREVENT.NONE, dirname=location)
         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 5d365c6..062ac7f 100644 (file)
--- a/webinterface/src/web-data/timer.js
+++ b/webinterface/src/web-data/timer.js
@@ -259,7 +259,7 @@ function loadTimerFormNow() {
        addTimerEditFormArray.channelSort = "tv";
        addTimerEditFormArray.name = "";
        addTimerEditFormArray.description = "";
-       addTimerEditFormArray.dirname = "/hdd/movie";
+       addTimerEditFormArray.dirname = "";
        addTimerEditFormArray.tags = "";
        addTimerEditFormArray.repeated = 0;
        addTimerEditFormArray.afterEvent = "3";

diff --git a/webinterface/src/web-data/tpl/default/tplEpgList.htm b/webinterface/src/web-data/tpl/default/tplEpgList.htm
index 1333212..6f68a7f 100644 (file)
--- a/webinterface/src/web-data/tpl/default/tplEpgList.htm
+++ b/webinterface/src/web-data/tpl/default/tplEpgList.htm
@@ -34,7 +34,7 @@
                                                        <td>
                                                                <a href="#" onclick="return false;"><img src="/web-data/img/timer.png" title="Add Timer" border="0" onclick=" if( opener.parentPin( '${e.servicereference}' ) ) { opener.addTimerByID('${e.servicereference}','${e.eventid}','0');}"></a>&nbsp;&nbsp;
                                                                <a href="#" onclick="return false;"><img src="/web-data/img/zap.png" title="Add zap Timer" border="0" onclick="if ( opener.parentPin( '${e.servicereference}' ) ) { opener.addTimerByID('${e.servicereference}','${e.eventid}','1');}"></a>&nbsp;&nbsp;
-                                                               <a href="#" onclick="return false;"><img src="/web-data/img/edit.png" title="Edit and add timer" border="0" onclick="opener.loadTimerEditForm(0,'${e.start}','${e.end}',0,'${e.servicereference}','${e.servicename}','${e.title}','${e.description}','0',0,'${e.eventid}');"></a><br/>
+                                                               <a href="#" onclick="return false;"><img src="/web-data/img/edit.png" title="Edit and add timer" border="0" onclick="opener.loadTimerEditForm(0,'${e.start}','${e.end}',0,'${e.servicereference}','${e.servicename}','${e.title}','${e.description}',0,'','3',0,'${e.eventid}');"></a><br/>
                                                                <a target="_blank" href="/web/epgsearch.rss?search=${e.title}" ><img src="/web-data/img/feed.png" title="RSS-Feed for this Title" border="0"></a><br/>
                                                                <a target="_blank" href="http://www.imdb.com/find?s=all&amp;q=${e.titleESC}" ><img src="/web-data/img/world.png" title="Search IMDb" border="0"></a><br/>
                                                        </td>