smaller fixes, bump required e2 version, add sample for custom destination path

diff --git a/autotimer/CONTROL/control b/autotimer/CONTROL/control
index 8ae232e..f03eb14 100644 (file)
--- a/autotimer/CONTROL/control
+++ b/autotimer/CONTROL/control
@@ -6,5 +6,5 @@ Section: extra
 Priority: optional
 Maintainer: Moritz Venn <moritz.venn@freaque.net>
 Homepage: http://www.ritzmo.de
-Depends: enigma2(>2.3cvs20080214)
+Depends: enigma2(>2.3cvs20080220)
 Source: http://www.ritzmo.de

diff --git a/autotimer/etc/autotimer.xml b/autotimer/etc/autotimer.xml
index c484db6..03baafb 100644 (file)
--- a/autotimer/etc/autotimer.xml
+++ b/autotimer/etc/autotimer.xml
@@ -41,8 +41,9 @@
     - Record all Events with "Malcolm" in its Title
     - When their extended description matches a rather weird regular expression
       (must contain upper case L and end with "al" - any better example?)
+    - Save recordings into /media/net/Malcolm
  -->
- <timer name="Events with Malcolm" match="Malcolm" enabled="no">
+ <timer name="Events with Malcolm" match="Malcolm" destination="/media/net/Malcolm/" enabled="no">
   <!-- Don't limit stations to record on -->
   <!-- If the recording ends between 23:00 and 06:00 shutdown afterwards -->
   <afterevent from="23:00" to="06:00">shutdown</afterevent>

diff --git a/autotimer/src/AutoTimerEditor.py b/autotimer/src/AutoTimerEditor.py
index 807f319..5e181fb 100644 (file)
--- a/autotimer/src/AutoTimerEditor.py
+++ b/autotimer/src/AutoTimerEditor.py
@@ -275,7 +275,7 @@ class AutoTimerEditor(Screen, ConfigListScreen):
                self.avoidDuplicateDescription = ConfigEnableDisable(default = timer.getAvoidDuplicateDescription())
 
                # Custom Location
-               self.destination = ConfigSelection(choices = [timer.destination or "/hdd/movie"])
+               self.destination = ConfigSelection(choices = [timer.destination or "/hdd/movie/"])
 
        def refresh(self):
                # First four entries are always shown
@@ -385,6 +385,8 @@ class AutoTimerEditor(Screen, ConfigListScreen):
                                filename = "",
                                currDir = self.destination.value
                        )
+               else:
+                       ConfigListScreen.keyOK(self)
 
        def pathSelected(self, res):
                if res is not None:
@@ -504,7 +506,11 @@ class AutoTimerEditor(Screen, ConfigListScreen):
                        self.timer.matchFormatString = ''
 
                self.timer.avoidDuplicateDescription = self.avoidDuplicateDescription.value
-               self.timer.destination = self.destination.value
+
+               if self.destination.value == "/hdd/movie/":
+                       self.timer.destination = None
+               else:
+                       self.timer.destination = self.destination.value
 
                # Close
                self.close(self.timer)