set voltage before send diseqc command (like DiSEqC spec)

[enigma2.git] / lib / python / Plugins / SystemPlugins / ConfigurationBackup / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py
index d0550c3ec46fbe68c6e3347ce58cfb020f2ee8ae..d225cd000d1d43cbc4991d8d4a17a25e0e691bf1 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py
@@ -1,9 +1,7 @@
-from enigma import *

 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.Console import Console
 from Components.ActionMap import ActionMap, NumberActionMap
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.Console import Console
 from Components.ActionMap import ActionMap, NumberActionMap

-from Components.Pixmap import *

 from Components.Pixmap import Pixmap
 from Components.Label import Label
 from Components.MenuList import MenuList
 from Components.Pixmap import Pixmap
 from Components.Label import Label
 from Components.MenuList import MenuList


@@ -13,13 +11,13 @@ from Plugins.Plugin import PluginDescriptor
 
 from Tools.NumericalTextInput import *
 from Tools.Directories import *
 
 from Tools.NumericalTextInput import *
 from Tools.Directories import *

-import os
-import string
-import time
-import datetime
+from os import path, makedirs, listdir
+from time import localtime
+from datetime import date

 
 plugin_path = ""
 
 
 plugin_path = ""
 

+# FIXME: harddiskmanager has a better overview about available mointpoints!

 BackupPath = {
                "hdd" : "/media/hdd/backup",
                "usb" : "/media/usb/backup",
 BackupPath = {
                "hdd" : "/media/hdd/backup",
                "usb" : "/media/usb/backup",


@@ -107,7 +105,7 @@ class BackupSetup(Screen):
                self.list = [ ]
                self["config"] = ConfigList(self.list)
                self.backup = ConfigSubsection()
                self.list = [ ]
                self["config"] = ConfigList(self.list)
                self.backup = ConfigSubsection()

-               self.backup.type = ConfigSelection(choices = [("full", _("full /etc directory")), ("settings", _("only /etc/enigma2 directory")), ("var", _("/var directory")), ("skin", _("/usr/share/enigma2 directory"))])
+               self.backup.type = ConfigSelection(choices = [("full", _("full /etc directory")), ("settings", _("only /etc/enigma2 directory")), ("var", _("/var directory")), ("skin", _("/usr/share/enigma2 directory"))], default="settings")

                self.backup.location = ConfigSelection(choices = [("usb", _("USB Stick")), ("cf", _("CF Drive")), ("hdd", _("Harddisk"))])
                self.list.append(getConfigListEntry(_("Backup Mode"), self.backup.type))
                self.list.append(getConfigListEntry(_("Backup Location"), self.backup.location))
                self.backup.location = ConfigSelection(choices = [("usb", _("USB Stick")), ("cf", _("CF Drive")), ("hdd", _("Harddisk"))])
                self.list.append(getConfigListEntry(_("Backup Mode"), self.backup.type))
                self.list.append(getConfigListEntry(_("Backup Location"), self.backup.location))


@@ -115,8 +113,8 @@ class BackupSetup(Screen):
        def createBackupfolders(self):
                self.path = BackupPath[self.backup.location.value]
                print "Creating Backup Folder if not already there..."
        def createBackupfolders(self):
                self.path = BackupPath[self.backup.location.value]
                print "Creating Backup Folder if not already there..."

-               if (os.path.exists(self.path) == False):
-                       os.makedirs(self.path)
+               if (path.exists(self.path) == False):
+                       makedirs(self.path)

 
        def Backup(self):
                print "this will start the backup now!"
 
        def Backup(self):
                print "this will start the backup now!"


@@ -128,10 +126,10 @@ class BackupSetup(Screen):
 
        def runBackup(self, result):
                if result:
 
        def runBackup(self, result):
                if result:

-                       if os.path.ismount(MountPoints[self.backup.location.value]):
+                       if path.ismount(MountPoints[self.backup.location.value]):

                                self.createBackupfolders()
                                self.createBackupfolders()

-                               d = time.localtime()
-                               dt = datetime.date(d.tm_year, d.tm_mon, d.tm_mday)
+                               d = localtime()
+                               dt = date(d.tm_year, d.tm_mon, d.tm_mday)

                                self.path = BackupPath[self.backup.location.value]
                                if self.backup.type.value == "full":
                                        print "Backup Mode: Full"
                                self.path = BackupPath[self.backup.location.value]
                                if self.backup.type.value == "full":
                                        print "Backup Mode: Full"


@@ -193,9 +191,9 @@ class RestoreMenu(Screen):
        def fill_list(self):
                self.flist = []
                self.path = BackupPath[self.backup.location.value]
        def fill_list(self):
                self.flist = []
                self.path = BackupPath[self.backup.location.value]

-               if (os.path.exists(self.path) == False):
-                       os.makedirs(self.path)
-               for file in os.listdir(self.path):
+               if (path.exists(self.path) == False):
+                       makedirs(self.path)
+               for file in listdir(self.path):

                        if (file.endswith(".tar.gz")):
                                self.flist.append((file))
                                self.entry = True
                        if (file.endswith(".tar.gz")):
                                self.flist.append((file))
                                self.entry = True


@@ -213,7 +211,7 @@ class RestoreMenu(Screen):
        def startRestore(self, ret = False):
                if (ret == True):
                        self.exe = True
        def startRestore(self, ret = False):
                if (ret == True):
                        self.exe = True

-                       self.session.open(Console, title = "Restore running", cmdlist = ["tar -xzvf " + self.path + "/" + self.sel + " -C /", "killall enigma2"])
+                       self.session.open(Console, title = "Restore running", cmdlist = ["tar -xzvf " + self.path + "/" + self.sel + " -C /", "killall -9 enigma2"])

 
        def Exit(self):
                self.close()
 
        def Exit(self):
                self.close()