Updated to 3.4.0. Don's sleep wehile HDD is active

diff --git a/elektro/CONTROL/control b/elektro/CONTROL/control
index 2071a64..e627041 100644 (file)
--- a/elektro/CONTROL/control
+++ b/elektro/CONTROL/control
@@ -1,5 +1,5 @@
 Package: enigma2-plugin-extensions-elektro\r
-Version: 3.3.5\r
+Version: 3.4.0\r
 Description: Automatically shut down your box when you don't need it.\r
 Architecture: mipsel\r
 Section: extra\r

diff --git a/elektro/maintainer.info b/elektro/maintainer.info
new file mode 100644 (file)
index 0000000..cd02cff
--- /dev/null
+++ b/elektro/maintainer.info
@@ -0,0 +1,2 @@
+morty@gmx.net
+Elektro

diff --git a/elektro/po/de.po b/elektro/po/de.po
index b68eaaa..5b662c6 100644 (file)
--- a/elektro/po/de.po
+++ b/elektro/po/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elektro Power Save\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-26 11:35+0100\n"
-"PO-Revision-Date: 2009-04-26 11:35+0100\n"
+"POT-Creation-Date: 2010-07-18 14:48+0100\n"
+"PO-Revision-Date: 2010-07-18 14:49+0100\n"
 "Last-Translator: Moritz 'Morty' Strübe <morty@gmx.net>\n"
 "Language-Team: Morty <morty@gmx.net>\n"
 "MIME-Version: 1.0\n"
@@ -15,96 +15,124 @@ msgstr ""
 "X-Poedit-Basepath: ../../..\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: plugin.py:110
+#: plugin.py:113
+#: plugin_neu.py:113
 msgid "Monday"
 msgstr "Montag"
 
-#: plugin.py:111
+#: plugin.py:114
+#: plugin_neu.py:114
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: plugin.py:112
+#: plugin.py:115
+#: plugin_neu.py:115
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: plugin.py:113
+#: plugin.py:116
+#: plugin_neu.py:116
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: plugin.py:114
+#: plugin.py:117
+#: plugin_neu.py:117
 msgid "Friday"
 msgstr "Freitag"
 
-#: plugin.py:115
+#: plugin.py:118
+#: plugin_neu.py:118
 msgid "Saturday"
 msgstr "Samstag"
 
-#: plugin.py:116
+#: plugin.py:119
+#: plugin_neu.py:119
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: plugin.py:195
+#: plugin.py:203
+#: plugin_neu.py:203
 msgid "Enable Elektro Power Save"
 msgstr "Elektro Power Save aktivieren"
 
-#: plugin.py:196
-#: plugin.py:300
+#: plugin.py:204
+#: plugin.py:309
+#: plugin_neu.py:204
+#: plugin_neu.py:308
 msgid "Standby on boot"
 msgstr "Nach dem Booten in den Standby"
 
-#: plugin.py:197
+#: plugin.py:205
+#: plugin_neu.py:205
 msgid "Standby on manual boot"
 msgstr "Nach dem manuellen Booten in den Standby"
 
-#: plugin.py:198
+#: plugin.py:206
+#: plugin_neu.py:206
 msgid "Standby on boot screen timeout"
 msgstr "In-den-Standby-Bildschirm Anzeigezeit"
 
-#: plugin.py:199
+#: plugin.py:207
+#: plugin_neu.py:207
 msgid "Force sleep (even when not in standby)"
 msgstr "Erzwinge Ruhezustand (auch wenn nicht im Standby)"
 
-#: plugin.py:200
+#: plugin.py:208
+msgid "Don't sleep while hdd is active (e.g. ftp)"
+msgstr "Nicht schlafen, wenn die HDD aktiv ist (z.B. ftp)"
+
+#: plugin.py:209
+#: plugin_neu.py:208
 msgid "Dont wake up"
 msgstr "Nicht aufwachen"
 
-#: plugin.py:201
+#: plugin.py:210
+#: plugin_neu.py:209
 msgid "Holiday mode (experimental)"
 msgstr "Urlaubsmodus (Experimentell)"
 
-#: plugin.py:203
+#: plugin.py:212
+#: plugin_neu.py:211
 msgid "Next day starts at"
 msgstr "Die nächste Tag beginnt um"
 
-#: plugin.py:206
+#: plugin.py:215
+#: plugin_neu.py:214
 msgid "Wakeup"
 msgstr "Aufwachen"
 
-#: plugin.py:207
+#: plugin.py:216
+#: plugin_neu.py:215
 msgid "Sleep"
 msgstr "Ruhezustand"
 
-#: plugin.py:211
+#: plugin.py:220
+#: plugin_neu.py:219
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: plugin.py:212
+#: plugin.py:221
+#: plugin_neu.py:220
 msgid "Ok"
 msgstr "OK"
 
-#: plugin.py:213
+#: plugin.py:222
+#: plugin_neu.py:221
 msgid "Help"
 msgstr "Hilfe"
 
-#: plugin.py:237
+#: plugin.py:246
+#: plugin_neu.py:245
 msgid "Showing Elektro readme.txt"
 msgstr "Zeige Electro Readme.txt"
 
-#: plugin.py:323
+#: plugin.py:332
+#: plugin_neu.py:331
 msgid "Go to Standby now?"
 msgstr "Jetzt in den Standby gehen?"
 
-#: plugin.py:465
+#: plugin.py:480
+#: plugin_neu.py:479
 msgid "Go to sleep now?"
 msgstr "Jetzt in den Ruhezustand gehen?"
 

diff --git a/elektro/src/plugin.py b/elektro/src/plugin.py
index 0385840..11e194b 100644 (file)
--- a/elektro/src/plugin.py
+++ b/elektro/src/plugin.py
@@ -1,6 +1,7 @@
 #
 # Power Save Plugin by gutemine
 # Rewritten by Morty (morty@gmx.net)
+# HDD Mod by joergm6
 #
 # Deep standby will be called sleep. Normal standby will be named standby!
 # All calculations are in the local timezone, or in the relative Timezone.
@@ -36,6 +37,8 @@ from Screens import Standby
 from Components.ActionMap import ActionMap
 from Components.Button import Button
 
+from Components.Harddisk import harddiskmanager
+
 # Configuration
 from Components.config import getConfigListEntry, ConfigEnableDisable, \
        ConfigYesNo, ConfigText, ConfigClock, ConfigNumber, ConfigSelection, \
@@ -76,7 +79,7 @@ except IOError:
 # Globals
 session = None
 ElektroWakeUpTime = -1
-elektro_pluginversion = "3.3.4"
+elektro_pluginversion = "3.4.0"
 elektro_readme = "/usr/lib/enigma2/python/Plugins/Extensions/Elektro/readme.txt"
 elektrostarttime = 60 
 elektrosleeptime = 5
@@ -103,6 +106,7 @@ config.plugins.elektro.nextwakeup = ConfigNumber(default = 0)
 config.plugins.elektro.force = ConfigEnableDisable(default = False)
 config.plugins.elektro.dontwakeup = ConfigEnableDisable(default = False)
 config.plugins.elektro.holiday =  ConfigEnableDisable(default = False)
+config.plugins.elektro.hddsleep =  ConfigEnableDisable(default = False)
 
 
 
@@ -177,7 +181,7 @@ def main(session,**kwargs):
 
 class Elektro(ConfigListScreen,Screen):
        skin = """
-                       <screen position="100,100" size="550,400" title="Elektro Power Save Ver. """ + elektro_pluginversion + """" >
+                       <screen position="center,center" size="550,400" title="Elektro Power Save Ver. """ + elektro_pluginversion + """" >
                        <widget name="config" position="0,0" size="550,360" scrollbarMode="showOnDemand" />
                        
                        <widget name="key_red" position="0,360" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;18" transparent="1"/> 
@@ -202,6 +206,7 @@ class Elektro(ConfigListScreen,Screen):
                self.list.append(getConfigListEntry(_("Standby on manual boot"), config.plugins.elektro.standbyOnManualBoot ))
                self.list.append(getConfigListEntry(_("Standby on boot screen timeout"), config.plugins.elektro.standbyOnBootTimeout))
                self.list.append(getConfigListEntry(_("Force sleep (even when not in standby)"), config.plugins.elektro.force ))
+               self.list.append(getConfigListEntry(_("Don't sleep while hdd is active (e.g. ftp)"), config.plugins.elektro.hddsleep ))
                self.list.append(getConfigListEntry(_("Dont wake up"), config.plugins.elektro.dontwakeup ))
                self.list.append(getConfigListEntry(_("Holiday mode (experimental)"), config.plugins.elektro.holiday ))
                
@@ -243,7 +248,7 @@ class Elektro(ConfigListScreen,Screen):
 
 
 class DoElektro(Screen):
-       skin = """ <screen position="100,100" size="300,300" title="Elektro Plugin Menu" > </screen>"""
+       skin = """ <screen position="center,center" size="300,300" title="Elektro Plugin Menu" > </screen>"""
        
        def __init__(self,session):
                Screen.__init__(self,session)
@@ -458,6 +463,12 @@ class DoElektro(Screen):
                if self.session.nav.RecordTimer.isRecording():
                        trysleep = False
                
+               # No Sleep on HDD running - joergm6
+               if (config.plugins.elektro.hddsleep.value == True) and (harddiskmanager.HDDCount() > 0):
+                       hddlist = harddiskmanager.HDDList()
+                       if not hddlist[0][1].isSleeping():
+                               trysleep = False
+               
                # Will there be a recording in a short while?
                nextRecTime = self.session.nav.RecordTimer.getNextRecordingTime()
                if  (nextRecTime > 0) and (nextRecTime - (int)(time()) <  elektroShutdownThreshold):

diff --git a/elektro/src/readme.txt b/elektro/src/readme.txt
index b0bd36b..715f891 100644 (file)
--- a/elektro/src/readme.txt
+++ b/elektro/src/readme.txt
@@ -41,8 +41,8 @@ Release infos
 3.3.3 Added patch to installer to fix enigma2. It 
          should now be possible to run Elektro and 
          EPG refresh in parallel.
-3.3.4 Added Turkish locale by MytHoLoG
-3.3.5 Italian translation updated        
+3.3.4 Added Turkish locale by MytHoLoG   
+3.4.0 no shutdown if HDD not Idle (joergm6)  
 ====================================================
 The English Documentation follows the German one 
 ====================================================
@@ -118,6 +118,11 @@ Hauptmen
    im Standby ist. Auf Aufnahmen hat dies keinen Ein-
    fluss.
    
+ - Nicht schlafen, wenn die HDD aktiv ist
+   Warte bis die Festplatte in den Ruhemodus geht. Je
+   nach Konfiguration kann dies den Ruhezustand
+   vollständig unterbinden.
+   
  - Nicht aufwachen
    Die Box wacht nach dem eine der Ruhe-Zeit nicht von
    alleine auf.
@@ -210,6 +215,11 @@ Main menu -> Extensions -> Elektro Power Save
  - Force sleep 
    Forces sleep, even when not in standby. This
    has influence on sheduled recordings.
+ 
+ - Don't sleep while hdd is active
+   Wait for the HDD to got to sleep mode. Depending on
+   the configuration this can keep the box from going
+   to sleep mode.
    
  - Dont wake up
    Do not wake up at the end of the sleep time.
@@ -228,4 +238,4 @@ Main menu -> Extensions -> Elektro Power Save
 ======================================================
 Have Fun to let Elektro Save Power and the 
 Environment with your Dreambox 7025 !!!!
-======================================================
+======================================================
\ No newline at end of file