Set AFTEREVENT.AUTO for timers added by eventid.

More robust handling of "config.movielist.last_videodir". It may not exist, if it doesn't use '/hdd/movie/' if that doesn't exist, too, return "__ERROR__" so it's becoming obvious something is wrong/missing.

Untested changes - please report!

diff --git a/webinterface/src/WebComponents/Sources/LocationsAndTags.py b/webinterface/src/WebComponents/Sources/LocationsAndTags.py
index 3d486ec..ed7890b 100644 (file)
--- a/webinterface/src/WebComponents/Sources/LocationsAndTags.py
+++ b/webinterface/src/WebComponents/Sources/LocationsAndTags.py
@@ -30,7 +30,11 @@ class LocationsAndTags(Source):
                        self.result = False
 
        def getCurrentLocation(self):
-               return config.movielist.last_videodir.value
+               path = config.movielist.last_videodir.value or "/hdd/movie"
+               if not os.path.exists(path):
+                       path = "__ERROR__"
+               
+               return path
 
        def getLocations(self):
                return config.movielist.videodirs.value

diff --git a/webinterface/src/WebComponents/Sources/Timer.py b/webinterface/src/WebComponents/Sources/Timer.py
index 64bcc07..f2161a1 100644 (file)
--- a/webinterface/src/WebComponents/Sources/Timer.py
+++ b/webinterface/src/WebComponents/Sources/Timer.py
@@ -382,7 +382,7 @@ class Timer(Source):
 
                (begin, end, name, description, eit) = parseEvent(event)
 
-               timer = RecordTimerEntry(ServiceReference(param['sRef']), begin , end, name, description, eit, False, justplay, AFTEREVENT.NONE, dirname=location, tags=tags)
+               timer = RecordTimerEntry(ServiceReference(param['sRef']), begin , end, name, description, eit, False, justplay, AFTEREVENT.AUTO, dirname=location, tags=tags)
                
                conflicts = self.recordtimer.record(timer)
                if conflicts is None: