[backup/restore] add distro function to backup folder

lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py

@@ -44,16 +44,16 @@ def eEnv_resolve_multi(path):
 def getBackupPath():
 	backuppath = config.plugins.configurationbackup.backuplocation.value
 	if backuppath.endswith('/'):
-		return backuppath + 'backup_' + boxtype
+		return backuppath + 'backup_' + distro + '_'+ boxtype
 	else:
-		return backuppath + '/backup_' + boxtype
+		return backuppath + '/backup_' + distro + '_'+ boxtype
 
 def getOldBackupPath():
 	backuppath = config.plugins.configurationbackup.backuplocation.value
 	if backuppath.endswith('/'):
-		return backuppath + 'backup'
+		return backuppath + 'backup_' + boxtype
 	else:
-		return backuppath + '/backup'
+		return backuppath + '/backup_' + boxtype
 
 def getBackupFilename():
 	return "enigma2settingsbackup.tar.gz"
@@ -292,7 +292,6 @@ def layoutFinished(self):
 	def setWindowTitle(self):
 		self.setTitle(_("Restore backups"))
 
-
 	def fill_list(self):
 		self.flist = []
 		self.path = getBackupPath()
@@ -365,6 +364,8 @@ def __init__(self, session, runRestore = False):
 			"cancel": self.close,
 		}, -1)
 		self.backuppath = getBackupPath()
+#		if path.exists(self.backuppath) == False:
+#			self.backuppath = getOldBackupPath()
 		if not path.isdir(self.backuppath):
 			self.backuppath = getOldBackupPath()
 		self.backupfile = getBackupFilename()

lib/python/Plugins/SystemPlugins/SoftwareManager/ImageWizard.py

@@ -11,12 +11,13 @@
 from Components.Pixmap import Pixmap, MovingPixmap, MultiPixmap
 from os import popen, path, makedirs, listdir, access, stat, rename, remove, W_OK, R_OK
 from enigma import eEnv
-from boxbranding import getBoxType
+from boxbranding import getBoxType, getImageDistro
 
 from Components.config import config, getConfigListEntry, ConfigSubsection, ConfigText, ConfigLocations, ConfigBoolean
 from Components.Harddisk import harddiskmanager
 
 boxtype = getBoxType()
+distro = getImageDistro()
 
 config.misc.firstrun = ConfigBoolean(default = True)
 config.plugins.configurationbackup = ConfigSubsection()
@@ -31,14 +32,20 @@
 
 def checkConfigBackup():
 	parts = [ (r.description, r.mountpoint) for r in harddiskmanager.getMountedPartitions(onlyhotplug = False)]
-	if boxtype in ('maram9', 'classm', 'axodin', 'axodinc', 'starsatlx', 'genius', 'evo'):
+	if boxtype in ('maram9', 'classm', 'axodin', 'axodinc', 'starsatlx', 'genius', 'evo', 'galaxym6'):
 		parts.append(('mtd backup','/media/backup'))
 	for x in parts:
 		if x[1] == '/':
 			parts.remove(x)
 	if len(parts):
 		for x in parts:
 			if x[1].endswith('/'):
+				fullbackupfile =  x[1] + 'backup_' + distro + '_' +  boxtype + '/' + backupfile
+				if fileExists(fullbackupfile):
+					config.plugins.configurationbackup.backuplocation.setValue(str(x[1]))
+					config.plugins.configurationbackup.backuplocation.save()
+					config.plugins.configurationbackup.save()
+					return x
 				fullbackupfile =  x[1] + 'backup_' + boxtype + '/' + backupfile
 				if fileExists(fullbackupfile):
 					config.plugins.configurationbackup.backuplocation.setValue(str(x[1]))
@@ -52,6 +59,12 @@ def checkConfigBackup():
 					config.plugins.configurationbackup.save()
 					return x
 			else:
+				fullbackupfile =  x[1] + '/backup_' + distro + '_' +   boxtype + '/' + backupfile
+				if fileExists(fullbackupfile):
+					config.plugins.configurationbackup.backuplocation.setValue(str(x[1]))
+					config.plugins.configurationbackup.backuplocation.save()
+					config.plugins.configurationbackup.save()
+					return x
 				fullbackupfile =  x[1] + '/backup_' + boxtype + '/' + backupfile
 				if fileExists(fullbackupfile):
 					config.plugins.configurationbackup.backuplocation.setValue(str(x[1]))
@@ -69,7 +82,7 @@ def checkConfigBackup():
 def checkBackupFile():
 	backuplocation = config.plugins.configurationbackup.backuplocation.value
 	if backuplocation.endswith('/'):
-		fullbackupfile =  backuplocation + 'backup_' + boxtype + '/' + backupfile
+		fullbackupfile =  backuplocation + 'backup_' + distro + '_' + boxtype + '/' + backupfile
 		if fileExists(fullbackupfile):
 			return True
 		else:
@@ -79,7 +92,7 @@ def checkBackupFile():
 			else:
 				return False
 	else:
-		fullbackupfile =  backuplocation + '/backup_' + boxtype + '/' + backupfile
+		fullbackupfile =  backuplocation + '/backup_' + distro + '_' + boxtype + '/' + backupfile
 		if fileExists(fullbackupfile):
 			return True
 		else: