Merge lp:~germar/backintime/ssh into lp:backintime/1.0

[Germar]

* Add generic mount-framework which will make it easy to add new mount services to BIT
* Add mode 'SSH' for backups on remote host using ssh protocol
* Fix bug: wrong path if restore system root
* Add option to choose multiple custom hours for backup

=== modified file 'AUTHORS'
--- AUTHORS	2009-11-06 13:00:42 +0000
+++ AUTHORS	2012-10-23 19:40:24 +0000
@@ -1,3 +1,4 @@
 Oprea Dan (<[e-mail]>)
 Bart de Koning (<[e-mail]>)
 Richard Bailey (<[e-mail]>)
+Germar Reitze (<[e-mail]>)
 
=== modified file 'CHANGES'
--- CHANGES	2012-02-22 09:55:08 +0000
+++ CHANGES	2012-10-23 19:40:24 +0000
@@ -1,5 +1,10 @@
 Back In Time
 
+Version 1.1.0
+* Add generic mount-framework
+* Add mode 'SSH' for backups on remote host using ssh protocol.
+* Fix bug: wrong path if restore system root
+
 Version 1.0.10
 * Add "Restore to ..." in replacement of copy (with or without drag & drop) because copy don't restore user/group/rights 
 
 
=== modified file 'common/backintime.py'
--- common/backintime.py	2010-11-08 21:11:52 +0000
+++ common/backintime.py	2012-10-23 19:40:24 +0000
@@ -26,6 +26,8 @@
 import logger
 import snapshots
 import tools
+import sshtools
+import mount
 
 _=gettext.gettext
 
@@ -44,9 +46,26 @@
 
 def take_snapshot( cfg, force = True ):
 	logger.openlog()
+	_mount(cfg)
 	snapshots.Snapshots( cfg ).take_snapshot( force )
+	_umount(cfg)
 	logger.closelog()
 
+def _mount(cfg):
+	try:
+		hash_id = mount.Mount(cfg = cfg).mount()
+	except mount.MountException as ex:
+		logger.error(str(ex))
+		sys.exit(1)
+	else:
+		cfg.set_current_hash_id(hash_id)
+
+def _umount(cfg):
+	try:
+		mount.Mount(cfg = cfg).umount(cfg.current_hash_id)
+	except mount.MountException as ex:
+		logger.error(str(ex))
+
 
 def print_version( cfg, app_name ):
 	print ''
@@ -79,6 +98,13 @@
 	print '\tShow the ID of the last snapshot (and exit)'
 	print '--last-snapshot-path'
 	print '\tShow the path to the last snapshot (and exit)'
+	print '--keep-mount'
+	print '\tDon\'t unmount on exit. Only valid with'
+	print '\t--snapshots-list-path and --last-snapshot-path.'
+	print '--unmount'
+	print '\tUnmount the profile.'
+	print '--benchmark-cipher [file-size]'
+	print '\tShow a benchmark of all ciphers for ssh transfer (and exit)'
 	print '-v | --version'
 	print '\tShow version (and exit)'
 	print '--license'
@@ -94,6 +120,7 @@
 
 	skip = False
 	index = 0
+	keep_mount = False
 	
 	for arg in sys.argv[ 1 : ]:
 		index = index + 1
@@ -146,18 +173,21 @@
 			if not cfg.is_configured():
 				print "The application is not configured !"
 			else:
+				_mount(cfg)
 				list = snapshots.Snapshots( cfg ).get_snapshots_list()
 				if len( list ) <= 0:
 					print "There are no snapshots"
 				else:
 					for snapshot_id in list:
 						print "SnapshotID: %s" % snapshot_id
+				_umount(cfg)
 			sys.exit(0)
 
 		if arg == '--snapshots-list-path':
 			if not cfg.is_configured():
 				print "The application is not configured !"
 			else:
+				_mount(cfg)
 				s = snapshots.Snapshots( cfg )
 				list = s.get_snapshots_list()
 				if len( list ) <= 0:
@@ -165,29 +195,60 @@
 				else:
 					for snapshot_id in list:
 						print "SnapshotPath: %s" % s.get_snapshot_path( snapshot_id )
+				if not keep_mount:
+					_umount(cfg)
 			sys.exit(0)
 
 		if arg == '--last-snapshot':
 			if not cfg.is_configured():
 				print "The application is not configured !"
 			else:
+				_mount(cfg)
 				list = snapshots.Snapshots( cfg ).get_snapshots_list()
 				if len( list ) <= 0:
 					print "There are no snapshots"
 				else:
 					print "SnapshotID: %s" % list[0]
+				_umount(cfg)
 			sys.exit(0)
 
 		if arg == '--last-snapshot-path':
 			if not cfg.is_configured():
 				print "The application is not configured !"
 			else:
+				_mount(cfg)
 				s = snapshots.Snapshots( cfg )
 				list = s.get_snapshots_list()
 				if len( list ) <= 0:
 					print "There are no snapshots"
 				else:
 					print "SnapshotPath: %s" % s.get_snapshot_path( list[0] )
+				if not keep_mount:
+					_umount(cfg)
+			sys.exit(0)
+			
+		if arg == '--keep-mount':
+			keep_mount = True
+			continue
+			
+		if arg == '--unmount':
+			_mount(cfg)
+			_umount(cfg)
+			sys.exit(0)
+
+		if arg == '--benchmark-cipher':
+			if not cfg.is_configured():
+				print "The application is not configured !"
+			else:
+				try:
+					size = sys.argv[index + 1]
+				except IndexError:
+					size = '40'
+				if cfg.get_snapshots_mode() == 'ssh':
+					ssh = sshtools.SSH(cfg=cfg)
+					ssh.benchmark_cipher(size)
+				else:
+					print('ssh is not configured !')
 			sys.exit(0)
 
 		if arg == '--snapshots' or arg == '-s':
 
=== modified file 'common/config.py'
--- common/config.py	2012-03-06 21:23:31 +0000
+++ common/config.py	2012-10-23 19:40:24 +0000
@@ -26,6 +26,9 @@
 import configfile
 import tools
 import logger
+import mount
+import sshtools
+##import dummytools
 
 _=gettext.gettext
 
@@ -44,6 +47,7 @@
 	_5_MIN = 2
 	_10_MIN = 4
 	HOUR = 10
+	CUSTOM_HOUR = 15
 	DAY = 20
 	WEEK = 30
 	MONTH = 40
@@ -58,6 +62,7 @@
 				_5_MIN: _('Every 5 minutes'), 
 				_10_MIN: _('Every 10 minutes'), 
 				HOUR : _('Every Hour'), 
+				CUSTOM_HOUR : _('Custom Hours'), 
 				DAY : _('Every Day'), 
 				WEEK : _('Every Week'), 
 				MONTH : _('Every Month')
@@ -71,7 +76,30 @@
 
 	MIN_FREE_SPACE_UNITS = { DISK_UNIT_MB : 'Mb', DISK_UNIT_GB : 'Gb' }
 
-	DEFAULT_EXCLUDE = [ '.gvfs', '.cache*', '[Cc]ache*', '.thumbnails*', '[Tt]rash*', '*.backup*', '*~', os.path.expanduser( '~/Ubuntu One' ), '.dropbox*', '/proc', '/sys', '/dev' ]
+	DEFAULT_EXCLUDE = [ '.gvfs', '.cache*', '[Cc]ache*', '.thumbnails*', '[Tt]rash*', '*.backup*', '*~', os.path.expanduser( '~/Ubuntu One' ), '.dropbox*', '/proc', '/sys', '/dev' , '/tmp/backintime']
+	
+	SNAPSHOT_MODES = {
+				#mode : (<mounttools>, _('ComboBox Text') ),
+				'local' : (None, _('Local') ),
+				'ssh' : (sshtools.SSH, _('SSH (without password)') )
+##				'dummy' : (dummytools.Dummy, _('Dummy') )
+				}
+		
+	MOUNT_ROOT = '/tmp/backintime'
+	
+	SSH_CIPHERS =  {'default':    _('Default'),
+					'aes128-ctr': _('AES128-CTR'), 
+					'aes192-ctr': _('AES192-CTR'), 
+					'aes256-ctr': _('AES256-CTR'), 
+					'arcfour256': _('ARCFOUR256'), 
+					'arcfour128': _('ARCFOUR128'), 
+					'aes128-cbc': _('AES128-CBC'), 
+					'3des-cbc':   _('3DES-CBC'), 
+					'blowfish-cbc': _('Blowfish-CBC'), 
+					'cast128-cbc': _('Cast128-CBC'), 
+					'aes192-cbc': _('AES192-CBC'), 
+					'aes256-cbc': _('AES256-CBC'), 
+					'arcfour':    _('ARCFOUR') }
 
 	def __init__( self ):
 		configfile.ConfigFileWithProfiles.__init__( self, _('Main profile') )
@@ -179,6 +207,8 @@
 
 			self.set_int_value( 'config.version', self.CONFIG_VERSION )
 			self.save()
+		
+		self.current_hash_id = 'local'
 
 	def save( self ):
 		configfile.ConfigFile.save( self, self._LOCAL_CONFIG_PATH )
@@ -254,8 +284,22 @@
 
 		return user
 
-	def get_snapshots_path( self, profile_id = None ):
-		return self.get_profile_str_value( 'snapshots.path', '', profile_id )
+	def get_pid(self):
+		return str(os.getpid())
+
+	def get_host(self):
+		return socket.gethostname()
+
+	def get_snapshots_path( self, profile_id = None, mode = None, tmp_mount = False ):
+		if mode is None:
+			mode = self.get_snapshots_mode(profile_id)
+		if self.SNAPSHOT_MODES[mode][0] == None:
+			#no mount needed
+			return self.get_profile_str_value( 'snapshots.path', '', profile_id )
+		else:
+			#mode need to be mounted; return mountpoint
+			symlink = self.get_snapshots_symlink(profile_id = profile_id, tmp_mount = tmp_mount)
+			return os.path.join(self.MOUNT_ROOT, self.get_user(), symlink)
 
 	def get_snapshots_full_path( self, profile_id = None, version = None ):
 		'''Returns the full path for the snapshots: .../backintime/machine/user/profile_id/'''
@@ -268,7 +312,7 @@
 			host, user, profile = self.get_host_user_profile( profile_id )
 			return os.path.join( self.get_snapshots_path( profile_id ), 'backintime', host, user, profile ) 
 
-	def set_snapshots_path( self, value, profile_id = None ):
+	def set_snapshots_path( self, value, profile_id = None, mode = None ):
 		"""Sets the snapshot path to value, initializes, and checks it"""
 		if len( value ) <= 0:
 			return False
@@ -278,6 +322,9 @@
 		#	tjoep
 		#	return False
 			profile_id = self.get_current_profile()
+			
+		if mode is None:
+			mode = self.get_snapshots_mode( profile_id )
 
 		if not os.path.isdir( value ):
 			self.notify_error( _( '%s is not a folder !' ) % value )
@@ -312,8 +359,100 @@
 			return False
 		
 		os.rmdir( check_path )
-		self.set_profile_str_value( 'snapshots.path', value, profile_id )
-		return True
+		if self.SNAPSHOT_MODES[mode][0] is None:
+			self.set_profile_str_value( 'snapshots.path', value, profile_id )
+		return True
+		
+	def get_snapshots_mode( self, profile_id = None ):
+		return self.get_profile_str_value( 'snapshots.mode', 'local', profile_id )
+		
+	def set_snapshots_mode( self, value, profile_id = None ):
+		self.set_profile_str_value( 'snapshots.mode', value, profile_id )
+		
+	def get_snapshots_symlink(self, profile_id = None, tmp_mount = False):
+		if profile_id is None:
+			profile_id = self.current_profile_id
+		symlink = '%s_%s' % (profile_id, self.get_pid())
+		if tmp_mount:
+			symlink = 'tmp_%s' % symlink
+		return symlink
+		
+	def set_current_hash_id(self, hash_id):
+		self.current_hash_id = hash_id
+		
+	def get_hash_collision(self):
+		return self.get_int_value( 'global.hash_collision', 0 )
+		
+	def increment_hash_collision(self):
+		value = self.get_hash_collision() + 1
+		self.set_int_value( 'global.hash_collision', value )
+		
+	def get_snapshots_path_ssh( self, profile_id = None ):
+		return self.get_profile_str_value( 'snapshots.ssh.path', './', profile_id )
+		
+	def get_snapshots_full_path_ssh( self, profile_id = None, version = None ):
+		'''Returns the full path for the snapshots: .../backintime/machine/user/profile_id/'''
+		if version is None:
+			version = self.get_int_value( 'config.version', self.CONFIG_VERSION )
+
+		if version < 4:
+			return os.path.join( self.get_snapshots_path_ssh( profile_id ), 'backintime' )
+		else:
+			host, user, profile = self.get_host_user_profile( profile_id )
+			return os.path.join( self.get_snapshots_path_ssh( profile_id ), 'backintime', host, user, profile ) 
+
+	def set_snapshots_path_ssh( self, value, profile_id = None ):
+		self.set_profile_str_value( 'snapshots.ssh.path', value, profile_id )
+		return True
+
+	def get_ssh_host( self, profile_id = None ):
+		return self.get_profile_str_value( 'snapshots.ssh.host', '', profile_id )
+
+	def set_ssh_host( self, value, profile_id = None ):
+		self.set_profile_str_value( 'snapshots.ssh.host', value, profile_id )
+
+	def get_ssh_port( self, profile_id = None ):
+		return self.get_profile_int_value( 'snapshots.ssh.port', '22', profile_id )
+
+	def set_ssh_port( self, value, profile_id = None ):
+		self.set_profile_int_value( 'snapshots.ssh.port', value, profile_id )
+
+	def get_ssh_cipher( self, profile_id = None ):
+		return self.get_profile_str_value( 'snapshots.ssh.cipher', 'default', profile_id )
+
+	def set_ssh_cipher( self, value, profile_id = None ):
+		self.set_profile_str_value( 'snapshots.ssh.cipher', value, profile_id )
+
+	def get_ssh_user( self, profile_id = None ):
+		return self.get_profile_str_value( 'snapshots.ssh.user', self.get_user(), profile_id )
+
+	def set_ssh_user( self, value, profile_id = None ):
+		self.set_profile_str_value( 'snapshots.ssh.user', value, profile_id )
+		
+	def get_ssh_host_port_user_path(self, profile_id = None ):
+		host = self.get_ssh_host(profile_id)
+		port = self.get_ssh_port(profile_id)
+		user = self.get_ssh_user(profile_id)
+		path = self.get_snapshots_path_ssh(profile_id)
+		return (host, port, user, path)
+
+##	def get_dummy_host( self, profile_id = None ):
+##		return self.get_profile_str_value( 'snapshots.dummy.host', '', profile_id )
+##
+##	def set_dummy_host( self, value, profile_id = None ):
+##		self.set_profile_str_value( 'snapshots.dummy.host', value, profile_id )
+##
+##	def get_dummy_port( self, profile_id = None ):
+##		return self.get_profile_int_value( 'snapshots.dummy.port', '22', profile_id )
+##
+##	def set_dummy_port( self, value, profile_id = None ):
+##		self.set_profile_int_value( 'snapshots.dummy.port', value, profile_id )
+##
+##	def get_dummy_user( self, profile_id = None ):
+##		return self.get_profile_str_value( 'snapshots.dummy.user', self.get_user(), profile_id )
+##
+##	def set_dummy_user( self, value, profile_id = None ):
+##		self.set_profile_str_value( 'snapshots.dummy.user', value, profile_id )
 
 	def get_auto_host_user_profile( self, profile_id = None ):
 		return self.get_profile_bool_value( 'snapshots.path.auto', True, profile_id )
@@ -494,6 +633,12 @@
 	def set_automatic_backup_weekday( self, value, profile_id = None ):
 		self.set_profile_int_value( 'snapshots.automatic_backup_weekday', value, profile_id )
 
+	def get_custom_backup_time( self, profile_id = None ):
+		return self.get_profile_str_value( 'snapshots.custom_backup_time', '8,12,18,23', profile_id )
+
+	def set_custom_backup_time( self, value, profile_id = None ):
+		self.set_profile_str_value( 'snapshots.custom_backup_time', value, profile_id )
+
 	#def get_per_directory_schedule( self, profile_id = None ):
 	#	return self.get_profile_bool_value( 'snapshots.expert.per_directory_schedule', False, profile_id )
 
@@ -816,6 +961,8 @@
 				cron_line = 'echo "{msg}\n*/10 * * * * {cmd}"'
 			if self.HOUR == backup_mode:
 				cron_line = 'echo "{msg}\n0 * * * * {cmd}"'
+			if self.CUSTOM_HOUR == backup_mode:
+				cron_line = 'echo "{msg}\n0 ' + self.get_custom_backup_time( profile_id ) + ' * * * {cmd}"'
 			elif self.DAY == backup_mode:
 				cron_line = "echo \"{msg}\n%s %s * * * {cmd}\"" % (minute, hour)
 			elif self.WEEK == backup_mode:
 
=== modified file 'common/configfile.py'
--- common/configfile.py	2010-03-05 20:23:32 +0000
+++ common/configfile.py	2012-10-23 19:40:24 +0000
@@ -347,4 +347,3 @@
 
 	def set_profile_bool_value( self, key, value, profile_id = None ):
 		self.set_bool_value( self._get_profile_key_( key, profile_id ), value )
-
 
=== modified file 'common/debian_specific/control'
--- common/debian_specific/control	2012-03-06 21:23:31 +0000
+++ common/debian_specific/control	2012-10-23 19:40:24 +0000
@@ -6,7 +6,7 @@
 Maintainer: BIT Team <[e-mail]>
 Homepage: http://backintime.le-web.org
 Architecture: all
-Depends: python, rsync, cron
+Depends: python, rsync, cron, openssh-client, sshfs
 Recommends: powermgmt-base
 Conflicts: backintime
 Replaces: backintime
 
=== added file 'common/dummytools.py'
--- common/dummytools.py	1970-01-01 00:00:00 +0000
+++ common/dummytools.py	2012-10-23 19:40:24 +0000
@@ -0,0 +1,105 @@
+#    Copyright (c) 2012 Germar Reitze
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import gettext
+
+import config
+import mount
+
+_=gettext.gettext
+
+class Dummy(mount.MountControl):
+    """
+    This is a template for mounting services. For simple mount services
+    all you need to do is:
+    - add your settings in gnome|kde/settingsdialog.py (search for the dummy examples)
+    - add settings in gnome/settingsdialog.glade (copy GtkFrame 'mode_dummy')
+    - add settings in common/config.py (search for the dummy examples)
+    - modify a copy of this file
+    
+    Please use self.mountpoint as your local mountpoint.
+    This class inherit from mount.MountControl. All methodes from MountControl can
+    be used exactly like they were in this class.
+    Methodes from MountControl also can be overriden in here if you need
+    something different."""
+    def __init__(self, cfg = None, profile_id = None, hash_id = None, tmp_mount = False, **kwargs):
+        self.config = cfg
+        if self.config is None:
+            self.config = config.Config()
+            
+        self.profile_id = profile_id
+        if not self.profile_id:
+            self.profile_id = self.config.get_current_profile()
+            
+        self.tmp_mount = tmp_mount
+        self.hash_id = hash_id
+            
+        #init MountControl
+        mount.MountControl.__init__(self)
+            
+        self.all_kwargs = {}
+            
+        #First we need to map the settings. 
+        #If <arg> is in kwargs (e.g. if this class is called with dummytools.Dummy(<arg> = <value>)
+        #this will map self.<arg> to kwargs[<arg>]; else self.<arg> = <default> from config
+        #e.g. self.setattr_kwargs(<arg>, <default>, **kwargs)
+        self.setattr_kwargs('mode', self.config.get_snapshots_mode(self.profile_id), **kwargs)
+        self.setattr_kwargs('hash_collision', self.config.get_hash_collision(), **kwargs)
+        #start editing from here---------------------------------------------------------
+        self.setattr_kwargs('user', self.config.get_dummy_user(self.profile_id), **kwargs)
+        self.setattr_kwargs('host', self.config.get_dummy_host(self.profile_id), **kwargs)
+        self.setattr_kwargs('port', self.config.get_dummy_port(self.profile_id), **kwargs)
+            
+        self.set_default_args()
+        
+        #if self.mountpoint is not the remote snapshot path you can specify
+        #a subfolder of self.mountpoint for the symlink
+        self.symlink_subfolder = None
+            
+        self.log_command = '%s: %s@%s' % (self.mode, self.user, self.host)
+        
+    def _mount(self):
+        """mount the service"""
+        #implement your mountprocess here
+        pass
+        
+    def _umount(self):
+        """umount the service"""
+        #implement your unmountprocess here
+        pass
+        
+    def pre_mount_check(self, first_run = False):
+        """check what ever conditions must be given for the mount to be done successful
+           raise MountException( _('Error discription') ) if service can not mount
+           return True if everything is okay
+           all pre|post_[u]mount_check can also be used to prepare things or clean up"""
+        return True
+        
+    def post_mount_check(self):
+        """check if mount was successful
+           raise MountException( _('Error discription') ) if not"""
+        return True
+        
+    def pre_umount_check(self):
+        """check if service is safe to umount
+           raise MountException( _('Error discription') ) if not"""
+        return True
+        
+    def post_umount_check(self):
+        """check if umount successful
+           raise MountException( _('Error discription') ) if not"""
+        return True
+        
 \ No newline at end of file
 
=== modified file 'common/man/C/backintime.1.gz'
 Binary files common/man/C/backintime.1.gz	2012-03-06 21:23:31 +0000 and common/man/C/backintime.1.gz	2012-10-23 19:40:24 +0000 differ
=== added file 'common/mount.py'
--- common/mount.py	1970-01-01 00:00:00 +0000
+++ common/mount.py	2012-10-23 19:40:24 +0000
@@ -0,0 +1,421 @@
+#    Copyright (c) 2012 Germar Reitze
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import os
+import subprocess
+import socket
+import json
+import gettext
+from zlib import crc32
+from time import sleep
+
+import config
+import logger
+
+_=gettext.gettext
+
+class MountException(Exception):
+    pass
+    
+class HashCollision(Exception):
+    pass
+
+class Mount(object):
+    def __init__(self, cfg = None, profile_id = None, tmp_mount = False):
+        self.config = cfg
+        if self.config is None:
+            self.config = config.Config()
+            
+        self.profile_id = profile_id
+        if self.profile_id is None:
+            self.profile_id = self.config.get_current_profile()
+            
+        self.tmp_mount = tmp_mount
+            
+    def mount(self, mode = None, check = True, **kwargs):
+        if mode is None:
+            mode = self.config.get_snapshots_mode(self.profile_id)
+            
+        if self.config.SNAPSHOT_MODES[mode][0] is None:
+            #mode doesn't need to mount
+            return 'local'
+        else:
+            while True:
+                try:
+                    mounttools = self.config.SNAPSHOT_MODES[mode][0]
+                    tools = mounttools(cfg = self.config, profile_id = self.profile_id, tmp_mount = self.tmp_mount, mode = mode, **kwargs)
+                    return tools.mount(check = check)
+                except HashCollision as ex:
+                    logger.warning(str(ex))
+                    del tools
+                    check = False
+                    continue
+                break
+        
+    def umount(self, hash_id = None):
+        if hash_id is None:
+            hash_id = self.config.current_hash_id
+        if hash_id == 'local':
+            #mode doesn't need to umount
+            return
+        else:
+            umount_info = os.path.join(self.config.MOUNT_ROOT, self.config.get_user(), 'mnt', hash_id, 'umount')
+            with open(umount_info, 'r') as f:
+                data_string = f.read()
+                f.close()
+            kwargs = json.loads(data_string)
+            mode = kwargs.pop('mode')
+            mounttools = self.config.SNAPSHOT_MODES[mode][0]
+            tools = mounttools(cfg = self.config, profile_id = self.profile_id, tmp_mount = self.tmp_mount, mode = mode, hash_id = hash_id, **kwargs)
+            tools.umount()
+        
+    def pre_mount_check(self, mode = None, first_run = False, **kwargs):
+        """called by SettingsDialog.save_profile() to check
+           if settings are correct before saving"""
+        if mode is None:
+            mode = self.config.get_snapshots_mode(self.profile_id)
+            
+        if self.config.SNAPSHOT_MODES[mode][0] is None:
+            #mode doesn't need to mount
+            return True
+        else:
+            mounttools = self.config.SNAPSHOT_MODES[mode][0]
+            tools = mounttools(cfg = self.config, profile_id = self.profile_id, tmp_mount = self.tmp_mount, mode = mode, **kwargs)
+            return tools.pre_mount_check(first_run)
+        
+    def remount(self, new_profile_id, mode = None, hash_id = None, **kwargs):
+        """mode            <= new profile
+           kwargs          <= new profile
+           hash_id         <= old profile
+           self.profile_id <= old profile"""
+        if mode is None:
+            mode = self.config.get_snapshots_mode(new_profile_id)
+        if hash_id is None:
+            hash_id = self.config.current_hash_id
+            
+        if self.config.SNAPSHOT_MODES[mode][0] is None:
+            #new profile don't need to mount.
+            self.umount(hash_id = hash_id)
+            return 'local'
+            
+        if hash_id == 'local':
+            #old profile don't need to umount.
+            self.profile_id = new_profile_id
+            return self.mount(mode = mode, **kwargs)
+            
+        mounttools = self.config.SNAPSHOT_MODES[mode][0]
+        tools = mounttools(cfg = self.config, profile_id = new_profile_id, tmp_mount = self.tmp_mount, mode = mode, **kwargs)
+        if tools.compare_remount(hash_id):
+            #profiles uses the same settings. just swap the symlinks
+            tools.remove_symlink(profile_id = self.profile_id) 
+            tools.set_symlink(profile_id = new_profile_id, hash_id = hash_id)
+            return hash_id
+        else:
+            #profiles are different. we need to umount and mount again
+            self.umount(hash_id = hash_id)
+            self.profile_id = new_profile_id
+            return self.mount(mode = mode, **kwargs)
+
+class MountControl(object):
+    def __init__(self):
+        self.local_host = self.config.get_host()
+        self.local_user = self.config.get_user()
+        self.pid = self.config.get_pid()
+            
+    def set_default_args(self):
+        #self.destination should contain all arguments that are nessesary for mount.
+        args = self.all_kwargs.keys()
+        self.destination = '%s:' % self.all_kwargs['mode']
+        args.remove('mode')
+        args.sort()
+        for arg in args:
+            self.destination += ' %s' % self.all_kwargs[arg]
+            
+        #unique id for every different mount settings. Similar settings even in
+        #different profiles will generate the same hash_id and so share the same
+        #mountpoint
+        if self.hash_id is None:
+            self.hash_id = self.hash(self.destination)
+            
+        self.mount_root = self.config.MOUNT_ROOT
+        self.mount_user_path = os.path.join(self.mount_root, self.local_user)
+        self.snapshots_path = self.config.get_snapshots_path(profile_id = self.profile_id, mode = self.mode, tmp_mount = self.tmp_mount)
+        
+        self.hash_id_path = self.get_hash_id_path()
+        self.mountpoint = self.get_mountpoint()
+        self.lock_path = self.get_lock_path()
+        self.umount_info = self.get_umount_info()
+        
+    def mount(self, check = True):
+        self.create_mountstructure()
+        self.mountprocess_lock_acquire()
+        try:
+            if self.is_mounted():
+                if not self.compare_umount_info():
+                    #We probably have a hash collision
+                    self.config.increment_hash_collision()
+                    raise HashCollision( _('Hash collision occurred in hash_id %s. Incrementing global value hash_collision and try again.') % self.hash_id)
+                logger.info('Mountpoint %s is already mounted' % self.mountpoint)
+            else:
+                if check:
+                    self.pre_mount_check()
+                self._mount()
+                self.post_mount_check()
+                logger.info('mount %s on %s' % (self.log_command, self.mountpoint))
+                self.write_umount_info()
+        except Exception:
+            raise
+        else:
+            self.set_mount_lock()
+            self.set_symlink()
+        finally:
+            self.mountprocess_lock_release()
+        return self.hash_id
+        
+    def umount(self):
+        self.mountprocess_lock_acquire()
+        try:
+            if not os.path.isdir(self.hash_id_path):
+                logger.info('Mountpoint %s does not exist.' % self.hash_id_path)
+            else:
+                if not self.is_mounted():
+                    logger.info('Mountpoint %s is not mounted' % self.hash_id_path)
+                else:
+                    if self.check_mount_lock():
+                        logger.info('Mountpoint %s still in use. Keep mounted' % self.mountpoint)
+                    else:
+                        self.pre_umount_check()
+                        self._umount()
+                        self.post_umount_check()
+                        if len(os.listdir(self.mountpoint)) > 0:
+                            logger.warning('Mountpoint %s not empty after unmount' % self.mountpoint)
+                        else:
+                            logger.info('unmount %s from %s' % (self.log_command, self.mountpoint))
+        except Exception:
+            raise
+        else:
+            self.del_mount_lock()
+            self.remove_symlink()
+        finally:
+            self.mountprocess_lock_release()
+        
+    def is_mounted(self):
+        """return True if path is is already mounted"""
+        try:
+            subprocess.check_call(['mountpoint', self.mountpoint], stdout=open(os.devnull, 'w'))
+        except subprocess.CalledProcessError:
+            if len(os.listdir(self.mountpoint)) > 0:
+                raise MountException( _('mountpoint %s not empty.') % self.mountpoint)
+            return False
+        else:
+            return True
+        
+    def create_mountstructure(self):
+        """ folder structure in /tmp/backintime/<user>/:
+        mnt/                      <= used for mount points
+            <pid>.lock            <= mountprocess lock that will prevent different
+                                     processes modifying mountpoints at one time
+            <hash_id>/            <= will be shared by all profiles with the same mount settings
+                      mountpoint/ <= real mountpoint
+                      umount      <= json file with all nessesary args for unmount
+                      locks/      <= for each process you have a <pid>.lock file
+        <profile id>_<pid>/       <= sym-link to the right path. return by config.get_snapshots_path
+                                     (can be ../mnt/<hash_id>/mount_point for ssh or
+                                     ../mnt/<hash_id>/<HOST>/<SHARE> for fusesmb ...)
+        tmp_<profile id>_<pid>/   <= sym-link for testing mountpoints in settingsdialog
+        """
+        self.mkdir(self.mount_root, 0777, force_chmod = True)
+        self.mkdir(self.mount_user_path, 0700)
+        self.mkdir(os.path.join(self.mount_user_path, 'mnt'), 0700)
+        self.mkdir(self.hash_id_path, 0700)
+        self.mkdir(self.mountpoint, 0700)
+        self.mkdir(self.lock_path, 0700)
+                
+    def mkdir(self, path, mode = 0777, force_chmod = False):
+        if not os.path.isdir(path):
+            os.mkdir(path, mode)
+            if force_chmod:
+                #hack: debian and ubuntu won't set go+w on mkdir in tmp
+                os.chmod(path, mode)
+        
+    def mountprocess_lock_acquire(self, timeout = 60):
+        """block while an other process is mounting or unmounting"""
+        lock_path = os.path.join(self.mount_user_path, 'mnt')
+        lock_suffix = '.lock'
+        lock = self.pid + lock_suffix
+        count = 0
+        while self.check_locks(lock_path, lock_suffix):
+            count += 1
+            if count == timeout:
+                raise MountException( _('Mountprocess lock timeout') )
+            sleep(1)
+            
+        with open(os.path.join(lock_path, lock), 'w') as f:
+            f.write(self.pid)
+            f.close()
+        
+    def mountprocess_lock_release(self):
+        lock_path = os.path.join(self.mount_user_path, 'mnt')
+        lock_suffix = '.lock'
+        lock = os.path.join(lock_path, self.pid + lock_suffix)
+        if os.path.exists(lock):
+            os.remove(lock)
+        
+    def set_mount_lock(self):
+        """lock mount for this process"""
+        if self.tmp_mount:
+            lock_suffix = '.tmp.lock'
+        else:
+            lock_suffix = '.lock'
+        lock = self.pid + lock_suffix
+        with open(os.path.join(self.lock_path, lock), 'w') as f:
+            f.write(self.pid)
+            f.close()
+        
+    def check_mount_lock(self):
+        """return True if mount is locked by other processes"""
+        lock_suffix = '.lock' 
+        return self.check_locks(self.lock_path, lock_suffix)
+        
+    def del_mount_lock(self):
+        """remove mount lock for this process"""
+        if self.tmp_mount:
+            lock_suffix = '.tmp.lock'
+        else:
+            lock_suffix = '.lock' 
+        lock = os.path.join(self.lock_path, self.pid + lock_suffix)
+        if os.path.exists(lock):
+            os.remove(lock)
+        
+    def check_process_alive(self, pid):
+        """check if process is still alive"""
+        if os.path.exists(os.path.join('/proc', pid)):
+            return True
+        return False
+        
+    def check_locks(self, path, lock_suffix):
+        """return True if there are active locks"""
+        for file in os.listdir(path):
+            if not file[-len(lock_suffix):] == lock_suffix:
+                continue
+            is_tmp = False
+            if os.path.basename(file)[-len(lock_suffix)-len('.tmp'):-len(lock_suffix)] == '.tmp':
+                is_tmp = True
+            if is_tmp:
+                lock_pid = os.path.basename(file)[:-len('.tmp')-len(lock_suffix)]
+            else:
+                lock_pid = os.path.basename(file)[:-len(lock_suffix)]
+            if lock_pid == self.pid:
+                if is_tmp == self.tmp_mount:
+                    continue
+            if self.check_process_alive(lock_pid):
+                return True
+            else:
+                #clean up
+                os.remove(os.path.join(path, file))
+                for symlink in os.listdir(self.mount_user_path):
+                    if symlink.endswith('_%s' % lock_pid):
+                        os.remove(os.path.join(self.mount_user_path, symlink))
+        return False
+            
+    def setattr_kwargs(self, arg, default, **kwargs):
+        """if kwargs[arg] exist set self.<arg> to kwargs[arg]
+           else set self.<arg> to default which should be the value from config"""
+        if arg in kwargs:
+            value = kwargs[arg]
+        else:
+            value = default
+        setattr(self, arg, value)
+        #make dictionary with all used args for umount
+        self.all_kwargs[arg] = value
+            
+    def write_umount_info(self):
+        """dump dictionary self.all_kwargs to umount_info file"""
+        data_string = json.dumps(self.all_kwargs)
+        with open(self.umount_info, 'w') as f:
+            f.write(data_string) 
+            f.close
+        
+    def read_umount_info(self, umount_info = None):
+        """load dictionary kwargs from umount_info file"""
+        if umount_info is None:
+            umount_info = self.umount_info
+        with open(umount_info, 'r') as f:
+            data_string = f.read()
+            f.close()
+        return json.loads(data_string)
+        
+    def compare_umount_info(self, umount_info = None):
+        """just in case of hash collisions in <hash_id> we compare self.all_kwargs
+           with the old saved in umount_info file.
+           return True if both are identical"""
+        #run self.all_kwargs through json first
+        current_kwargs = json.loads(json.dumps(self.all_kwargs))
+        saved_kwargs = self.read_umount_info(umount_info)
+        if not len(current_kwargs) == len(saved_kwargs):
+            return False
+        for arg in current_kwargs.keys():
+            if not arg in saved_kwargs.keys():
+                return False
+            if not current_kwargs[arg] == saved_kwargs[arg]:
+                return False
+        return True
+        
+    def compare_remount(self, old_hash_id):
+        """return True if profiles are identiacal and we don't need to remount"""
+        if old_hash_id == self.hash_id:
+            return self.compare_umount_info(self.get_umount_info(old_hash_id))
+        return False
+        
+    def set_symlink(self, profile_id = None, hash_id = None, tmp_mount = None):
+        if profile_id is None:
+            profile_id = self.profile_id
+        if hash_id is None:
+            hash_id = self.hash_id
+        if tmp_mount is None:
+            tmp_mount = self.tmp_mount
+        dst = self.config.get_snapshots_path(profile_id = profile_id, mode = self.mode, tmp_mount = tmp_mount)
+        mountpoint = self.get_mountpoint(hash_id)
+        if self.symlink_subfolder is None:
+            src = mountpoint
+        else:
+            src = os.path.join(mountpoint, self.symlink_subfolder)
+        os.symlink(src, dst)
+        
+    def remove_symlink(self, profile_id = None, tmp_mount = None):
+        if profile_id is None:
+            profile_id = self.profile_id
+        if tmp_mount is None:
+            tmp_mount = self.tmp_mount
+        os.remove(self.config.get_snapshots_path(profile_id = profile_id, mode = self.mode, tmp_mount = tmp_mount))
+        
+    def hash(self, str):
+        """return a hex crc32 hash of str"""
+        return('%X' % (crc32(str) & 0xFFFFFFFF))
+        
+    def get_hash_id_path(self, hash_id = None):
+        if hash_id is None:
+            hash_id = self.hash_id
+        return os.path.join(self.mount_user_path, 'mnt', self.hash_id)
+        
+    def get_mountpoint(self, hash_id = None):
+        return os.path.join(self.get_hash_id_path(hash_id), 'mountpoint')
+        
+    def get_lock_path(self, hash_id = None):
+        return os.path.join(self.get_hash_id_path(hash_id), 'locks')
+        
+    def get_umount_info(self, hash_id = None):
+        return os.path.join(self.get_hash_id_path(hash_id), 'umount')
 
=== modified file 'common/snapshots.py'
--- common/snapshots.py	2012-03-05 10:06:01 +0000
+++ common/snapshots.py	2012-10-23 19:40:24 +0000
@@ -27,6 +27,7 @@
 import pwd
 import grp
 import socket
+import subprocess
 
 import config
 import configfile
@@ -112,6 +113,11 @@
 		#print path
 		return path
 
+	def get_snapshot_path_ssh( self, date ):
+		profile_id = self.config.get_current_profile()
+		path = os.path.join( self.config.get_snapshots_full_path_ssh( profile_id ), self.get_snapshot_id( date ) )
+		return path
+
 	def get_snapshot_info_path( self, date ):
 		return os.path.join( self.get_snapshot_path( date ), 'info' )
 
@@ -132,6 +138,14 @@
 	def get_snapshot_path_to( self, snapshot_id, toPath = '/' ):
 		return os.path.join( self._get_snapshot_data_path( snapshot_id ), toPath[ 1 : ] )
 
+	def _get_snapshot_data_path_ssh( self, snapshot_id ):
+		if len( snapshot_id ) <= 1:
+			return '/';
+		return os.path.join( self.get_snapshot_path_ssh( snapshot_id ), 'backup' )
+	
+	def get_snapshot_path_to_ssh( self, snapshot_id, toPath = '/' ):
+		return os.path.join( self._get_snapshot_data_path_ssh( snapshot_id ), toPath[ 1 : ] )
+
 	def can_open_path( self, snapshot_id, full_path ):
 		#full_path = self.get_snapshot_path_to( snapshot_id, path )
 		if not os.path.exists( full_path ):
@@ -452,6 +466,18 @@
 	def restore( self, snapshot_id, path, callback = None, restore_to = '' ):
 		if restore_to.endswith('/'):
 			restore_to = restore_to[ : -1 ]
+			
+		#ssh
+		ssh = False
+		if self.config.get_snapshots_mode() == 'ssh':
+			ssh = True
+		(ssh_host, ssh_port, ssh_user, ssh_path) = self.config.get_ssh_host_port_user_path()
+		ssh_cipher = self.config.get_ssh_cipher()
+		if ssh_cipher == 'default':
+			ssh_cipher_suffix = ''
+		else:
+			ssh_cipher_suffix = '-c %s' % ssh_cipher
+		rsync_ssh_suffix = '--rsh="ssh -p %s %s" "%s@%s:' % ( str(ssh_port), ssh_cipher_suffix, ssh_user, ssh_host )
 
 		logger.info( "Restore: %s to: %s" % (path, restore_to) )
 
@@ -466,6 +492,8 @@
 			cmd = cmd + "--backup --suffix=%s " % backup_suffix
 		#cmd = cmd + '--chmod=+w '
 		src_base = self.get_snapshot_path_to( snapshot_id )
+		if ssh:
+			src_base = self.get_snapshot_path_to_ssh( snapshot_id )
 		src_path = path
 		src_delta = 0
 		if len(restore_to) > 0:
@@ -475,17 +503,24 @@
 			items = os.path.split(src_path)
 			aux = items[0]
 			if aux.startswith('/'):
-				aux = aux[1:]		
-			src_base = os.path.join(src_base, aux) + '/'
+				aux = aux[1:]
+			if len(aux) > 0: #bugfix: restore system root ended in <src_base>//.<src_path>
+				src_base = os.path.join(src_base, aux) + '/'
 			src_path = '/' + items[1]
-			src_delta = len(items[0])
+			if items[0] == '/':
+				src_delta = 0
+			else:
+				src_delta = len(items[0])
 	
 		#print "src_base: %s" % src_base
 		#print "src_path: %s" % src_path
 		#print "src_delta: %s" % src_delta
 		#print "snapshot_id: %s" % snapshot_id 
 	
-		cmd = cmd + "\"%s.%s\" %s" % ( src_base, src_path, restore_to + '/' )
+		if ssh:
+			cmd = cmd + rsync_ssh_suffix + "%s.%s\" %s" % ( src_base, src_path, restore_to + '/' )
+		else:
+			cmd = cmd + "\"%s.%s\" %s" % ( src_base, src_path, restore_to + '/' )
 		self.restore_callback( callback, True, cmd )
 		self._execute( cmd, callback )
 
@@ -600,13 +635,33 @@
 	def remove_snapshot( self, snapshot_id ):
 		if len( snapshot_id ) <= 1:
 			return
-
-		path = self.get_snapshot_path( snapshot_id )
-		#cmd = "chmod -R u+rwx \"%s\"" %  path
-		cmd = "find \"%s\" -type d -exec chmod u+wx {} \\;" % path #Debian patch
-		self._execute( cmd )
-		cmd = "rm -rfv \"%s\"" % path
-		self._execute( cmd )
+		#ssh
+		profile_id = self.config.get_current_profile()
+		ssh = False
+		if self.config.get_snapshots_mode() == 'ssh':
+			ssh = True
+		(ssh_host, ssh_port, ssh_user, ssh_path) = self.config.get_ssh_host_port_user_path(profile_id)
+		ssh_cipher = self.config.get_ssh_cipher(profile_id)
+		if ssh_cipher == 'default':
+			ssh_cipher_suffix = ''
+		else:
+			ssh_cipher_suffix = '-c %s' % ssh_cipher
+		cmd_ssh = 'ssh -p %s %s %s@%s ' % ( ssh_port, ssh_cipher_suffix, ssh_user, ssh_host )
+		
+		if not ssh:
+			path = self.get_snapshot_path( snapshot_id )
+			#cmd = "chmod -R u+rwx \"%s\"" %  path
+			cmd = "find \"%s\" -type d -exec chmod u+wx {} \\;" % path #Debian patch
+			self._execute( cmd )
+			cmd = "rm -rf \"%s\"" % path
+			self._execute( cmd )
+		else:
+			path = self.get_snapshot_path_ssh( snapshot_id )
+			#cmd = "chmod -R u+rwx \"%s\"" %  path
+			cmd = cmd_ssh + '\'find \"%s\" -type d -exec chmod u+wx \"{}\" \\;\'' % path #Debian patch
+			self._execute( cmd )
+			cmd = cmd_ssh + "rm -rf \"%s\"" % path
+			self._execute( cmd )
 
 	def copy_snapshot( self, snapshot_id, new_folder ):
 		'''Copies a known snapshot to a new location'''
@@ -1016,6 +1071,22 @@
 		new_snapshot_id = 'new_snapshot'
 		new_snapshot_path = self.get_snapshot_path( new_snapshot_id )
 		
+		#ssh
+		profile_id = self.config.get_current_profile()
+		ssh = False
+		if self.config.get_snapshots_mode() == 'ssh':
+			ssh = True
+		(ssh_host, ssh_port, ssh_user, ssh_path) = self.config.get_ssh_host_port_user_path(profile_id)
+		ssh_cipher = self.config.get_ssh_cipher(profile_id)
+		if ssh_cipher == 'default':
+			ssh_cipher_suffix = ''
+		else:
+			ssh_cipher_suffix = '-c %s' % ssh_cipher
+		rsync_ssh_suffix = '--rsh="ssh -p %s %s" "%s@%s:' % ( str(ssh_port), ssh_cipher_suffix, ssh_user, ssh_host )
+		cmd_ssh = 'ssh -p %s %s %s@%s ' % ( str(ssh_port), ssh_cipher_suffix, ssh_user, ssh_host )
+		new_snapshot_path_ssh = self.get_snapshot_path_ssh( new_snapshot_id )
+		new_snapshot_path_to_ssh = self.get_snapshot_path_to_ssh( new_snapshot_id )
+		
 		if os.path.exists( new_snapshot_path ):
 			#self._execute( "find \"%s\" -type d -exec chmod +w {} \;" % new_snapshot_path )
 			#self._execute( "chmod -R u+rwx \"%s\"" %  new_snapshot_path )
@@ -1101,7 +1172,11 @@
 				logger.info( "Compare with old snapshot: %s" % prev_snapshot_id )
 				
 				prev_snapshot_folder = self.get_snapshot_path_to( prev_snapshot_id )
+				prev_snapshot_folder_ssh = self.get_snapshot_path_to_ssh( prev_snapshot_id )
 				cmd = rsync_prefix + ' -i --dry-run --out-format="BACKINTIME: %i %n%L"' + rsync_suffix + '"' + prev_snapshot_folder + '"'
+				if ssh:
+					cmd = rsync_prefix + ' -i --dry-run --out-format="BACKINTIME: %i %n%L"' + rsync_suffix 
+					cmd += rsync_ssh_suffix + prev_snapshot_folder_ssh + '"'
 				params = [ prev_snapshot_folder, False ]
 				#try_cmd = self._execute_output( cmd, self._exec_rsync_compare_callback, prev_snapshot_name )
 				self.append_to_take_snapshot_log( '[I] ' + cmd, 3 )
@@ -1135,21 +1210,33 @@
 			#if force or len( ignore_folders ) == 0:
 
 			prev_snapshot_path = self.get_snapshot_path_to( prev_snapshot_id )
+			prev_snapshot_path_ssh = self.get_snapshot_path_to_ssh( prev_snapshot_id )
 
 			#make source snapshot folders rw to allow cp -al
-			self._execute( "find \"%s\" -type d -exec chmod u+wx {} \\;" % prev_snapshot_path ) #Debian patch
+			if not ssh:
+				self._execute( "find \"%s\" -type d -exec chmod u+wx {} \\;" % prev_snapshot_path ) #Debian patch
+			else:
+				self._execute( cmd_ssh + '\'find \"%s\" -type d -exec chmod u+wx \"{}\" \\;\'' % prev_snapshot_path_ssh ) #Debian patch
 
 			#clone snapshot
 			cmd = "cp -aRl \"%s\"* \"%s\"" % ( prev_snapshot_path, new_snapshot_path_to )
+			if ssh:
+				cmd = cmd_ssh + "cp -aRl \"%s\"* \"%s\"" % ( prev_snapshot_path_ssh, new_snapshot_path_to_ssh )
 			self.append_to_take_snapshot_log( '[I] ' + cmd, 3 )
 			cmd_ret_val = self._execute( cmd )
 			self.append_to_take_snapshot_log( "[I] returns: %s" % cmd_ret_val, 3 )
 
 			#make source snapshot folders read-only
-			self._execute( "find \"%s\" -type d -exec chmod a-w {} \\;" % prev_snapshot_path ) #Debian patch
+			if not ssh:
+				self._execute( "find \"%s\" -type d -exec chmod a-w {} \\;" % prev_snapshot_path ) #Debian patch
+			else:
+				self._execute( cmd_ssh + '\'find \"%s\" -type d -exec chmod a-w \"{}\" \\;\'' % prev_snapshot_path_ssh ) #Debian patch
 
 			#make snapshot items rw to allow xopy xattr
-			self._execute( "chmod -R a+w \"%s\"" % new_snapshot_path )
+			if not ssh:
+				self._execute( "chmod -R a+w \"%s\"" % new_snapshot_path )
+			else:
+				self._execute( cmd_ssh + "chmod -R a+w \"%s\"" % new_snapshot_path_ssh )
 
 			#else:
 			#	for folder in include_folders:
@@ -1165,6 +1252,8 @@
 		#sync changed folders
 		logger.info( "Call rsync to take the snapshot" )
 		cmd = rsync_prefix + ' -v ' + rsync_suffix + '"' + new_snapshot_path_to + '"'
+		if ssh:
+			cmd = rsync_prefix + ' -v ' + rsync_suffix + rsync_ssh_suffix + new_snapshot_path_to_ssh + '"'
 		self.set_take_snapshot_message( 0, _('Take snapshot') )
 
 		params = [False]
@@ -1174,12 +1263,19 @@
 		has_errors = False
 		if params[0]:
 			if not self.config.continue_on_errors():
-				self._execute( "find \"%s\" -type d -exec chmod u+wx {} \\;" % new_snapshot_path ) #Debian patch
-				self._execute( "rm -rf \"%s\"" % new_snapshot_path )
+				if not ssh:
+					self._execute( "find \"%s\" -type d -exec chmod u+wx {} \\;" % new_snapshot_path ) #Debian patch
+					self._execute( "rm -rf \"%s\"" % new_snapshot_path )
+				else:
+					self._execute( cmd_ssh +  '\'find \"%s\" -type d -exec chmod u+wx \"{}\" \\;\'' % new_snapshot_path_ssh ) #Debian patch
+					self._execute( cmd_ssh + "rm -rf \"%s\"" % new_snapshot_path_ssh )
 
 				#fix previous snapshot: make read-only again
 				if len( prev_snapshot_id ) > 0:
-					self._execute( "chmod -R a-w \"%s\"" % self.get_snapshot_path_to( prev_snapshot_id ) )
+					if not ssh:
+						self._execute( "chmod -R a-w \"%s\"" % self.get_snapshot_path_to( prev_snapshot_id ) )
+					else:
+						self._execute( cmd_ssh + "chmod -R a-w \"%s\"" % self.get_snapshot_path_to_ssh( prev_snapshot_id ) )
 
 				return [ False, True ]
 
@@ -1199,12 +1295,34 @@
 		path_to_explore = self.get_snapshot_path_to( new_snapshot_id ).rstrip( '/' )
 		fileinfo_dict = {}
 
-		for path, dirs, files in os.walk( path_to_explore ):
-			dirs.extend( files )
-			for item in dirs:
-				item_path = os.path.join( path, item )[ len( path_to_explore ) : ]
-				fileinfo_dict[item_path] = 1
-				self._save_path_info( fileinfo, item_path )
+		permission_done = False
+		if ssh:
+			path_to_explore_ssh = self.get_snapshot_path_to_ssh( new_snapshot_id ).rstrip( '/' )
+			cmd = ['ssh', '-p', str(ssh_port)]
+			if not ssh_cipher == 'default':
+				cmd.extend(['-c', ssh_cipher])
+			cmd.extend(['%s@%s' % (ssh_user, ssh_host)])
+			cmd.extend(['find', path_to_explore_ssh, '-name', '\*', '-print'])
+			
+			find = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
+			output, err = find.communicate()
+			if len(err) > 0:
+				logger.warning('Save permission over ssh failed. Retry normal methode')
+			else:
+				for line in output.split('\n'):
+					if not len(line) == 0:
+						item_path = line[ len( path_to_explore_ssh ) : ]
+						fileinfo_dict[item_path] = 1
+						self._save_path_info( fileinfo, item_path )
+				permission_done = True
+				
+		if not permission_done:
+			for path, dirs, files in os.walk( path_to_explore ):
+				dirs.extend( files )
+				for item in dirs:
+					item_path = os.path.join( path, item )[ len( path_to_explore ) : ]
+					fileinfo_dict[item_path] = 1
+					self._save_path_info( fileinfo, item_path )
 
 		# We now copy on forehand, so copying afterwards is not necessary anymore
 		##copy ignored folders
@@ -1267,7 +1385,11 @@
 
 		#rename snapshot
 		snapshot_path = self.get_snapshot_path( snapshot_id )
-		os.system( "mv \"%s\" \"%s\"" % ( new_snapshot_path, snapshot_path ) )
+		snapshot_path_ssh = self.get_snapshot_path_ssh( snapshot_id )
+		if not ssh:
+			os.system( "mv \"%s\" \"%s\"" % ( new_snapshot_path, snapshot_path ) )
+		else:
+			os.system( cmd_ssh + "mv \"%s\" \"%s\"" % ( new_snapshot_path_ssh, snapshot_path_ssh ) )
 		if not os.path.exists( snapshot_path ):
 			logger.error( "Can't rename %s to %s" % ( new_snapshot_path, snapshot_path ) )
 			self.set_take_snapshot_message( 1, _('Can\'t rename %s to %s') % ( new_snapshot_path, snapshot_path ) )
@@ -1275,11 +1397,17 @@
 			return [ False, True ]
 
 		#make new snapshot read-only
-		self._execute( "chmod -R a-w \"%s\"" % snapshot_path )
+		if not ssh:
+			self._execute( "chmod -R a-w \"%s\"" % snapshot_path )
+		else:
+			self._execute( cmd_ssh + "chmod -R a-w \"%s\"" % snapshot_path_ssh )
 
 		#fix previous snapshot: make read-only again
 		if len( prev_snapshot_id ) > 0:
-			self._execute( "chmod -R a-w \"%s\"" % self.get_snapshot_path_to( prev_snapshot_id ) )
+			if not ssh:	
+				self._execute( "chmod -R a-w \"%s\"" % self.get_snapshot_path_to( prev_snapshot_id ) )
+			else:
+				self._execute( cmd_ssh + "chmod -R a-w \"%s\"" % self.get_snapshot_path_to_ssh( prev_snapshot_id ) )
 
 		return [ True, has_errors ]
 
 
=== added file 'common/sshtools.py'
--- common/sshtools.py	1970-01-01 00:00:00 +0000
+++ common/sshtools.py	2012-10-23 19:40:24 +0000
@@ -0,0 +1,309 @@
+#    Copyright (c) 2012 Germar Reitze
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+import os
+import grp
+import subprocess
+import gettext
+import string
+import random
+import tempfile
+from time import sleep
+
+import config
+import mount
+import logger
+import tools
+
+_=gettext.gettext
+
+class SSH(mount.MountControl):
+    """
+    Mount remote path with sshfs. The real take_snapshot process will use
+    rsync over ssh. Other commands run remote over ssh.
+    """
+    def __init__(self, cfg = None, profile_id = None, hash_id = None, tmp_mount = False, **kwargs):
+        self.config = cfg
+        if self.config is None:
+            self.config = config.Config()
+            
+        self.profile_id = profile_id
+        if not self.profile_id:
+            self.profile_id = self.config.get_current_profile()
+            
+        self.tmp_mount = tmp_mount
+        self.hash_id = hash_id
+            
+        #init MountControl
+        mount.MountControl.__init__(self)
+            
+        self.all_kwargs = {}
+            
+        #First we need to map the settings. 
+        self.setattr_kwargs('mode', self.config.get_snapshots_mode(self.profile_id), **kwargs)
+        self.setattr_kwargs('hash_collision', self.config.get_hash_collision(), **kwargs)
+        #start editing from here---------------------------------------------------------
+        self.setattr_kwargs('user', self.config.get_ssh_user(self.profile_id), **kwargs)
+        self.setattr_kwargs('host', self.config.get_ssh_host(self.profile_id), **kwargs)
+        self.setattr_kwargs('port', self.config.get_ssh_port(self.profile_id), **kwargs)
+        self.setattr_kwargs('path', self.config.get_snapshots_path_ssh(self.profile_id), **kwargs)
+        self.setattr_kwargs('cipher', self.config.get_ssh_cipher(self.profile_id), **kwargs)
+            
+        self.set_default_args()
+            
+        self.symlink_subfolder = None
+        self.user_host_path = '%s@%s:%s' % (self.user, self.host, self.path)
+        self.log_command = '%s: %s' % (self.mode, self.user_host_path)
+        
+    def _mount(self):
+        """mount the service"""
+        sshfs = ['sshfs', '-p', str(self.port)]
+        if not self.cipher == 'default':
+            sshfs.extend(['-o', 'Ciphers=%s' % self.cipher])
+        sshfs.extend([self.user_host_path, self.mountpoint])
+        #bugfix: sshfs doesn't mount if locale in LC_ALL is not available on remote host
+        #LANG or other envirnoment variable are no problem.
+        env = os.environ.copy()
+        if 'LC_ALL' in env.keys():
+            env['LC_ALL'] = 'C'
+        try:
+            subprocess.check_call(sshfs, env = env)
+        except subprocess.CalledProcessError as ex:
+            raise mount.MountException( _('Can\'t mount %s') % ' '.join(sshfs))
+        
+    def _umount(self):
+        """umount the service"""
+        try:
+            subprocess.check_call(['fusermount', '-u', self.mountpoint])
+        except subprocess.CalledProcessError as ex:
+            raise mount.MountException( _('Can\'t unmount sshfs %s') % self.mountpoint)
+        
+    def pre_mount_check(self, first_run = False):
+        """check what ever conditions must be given for the mount to be done successful
+           raise MountException( _('Error discription') ) if service can not mount
+           return True if everything is okay
+           all pre|post_[u]mount_check can also be used to prepare things or clean up"""
+        self.check_ping_host()
+        if first_run:
+            self.check_fuse()
+            self.check_known_hosts()
+        self.check_login()
+        if first_run:
+            self.check_cipher()
+        self.check_remote_folder()
+        if first_run:
+            self.check_remote_commands()
+        return True
+        
+    def post_mount_check(self):
+        """check if mount was successful
+           raise MountException( _('Error discription') ) if not"""
+        return True
+        
+    def pre_umount_check(self):
+        """check if service is safe to umount
+           raise MountException( _('Error discription') ) if not"""
+        return True
+        
+    def post_umount_check(self):
+        """check if umount successful
+           raise MountException( _('Error discription') ) if not"""
+        return True
+        
+    def check_fuse(self):
+        """check if sshfs is installed and user is part of group fuse"""
+        if not self.pathexists('sshfs'):
+            raise mount.MountException( _('sshfs not found. Please install e.g. \'apt-get install sshfs\'') )
+        user = self.config.get_user()
+        fuse_grp_members = grp.getgrnam('fuse')[3]
+        if not user in fuse_grp_members:
+            raise mount.MountException( _('%s is not member of group \'fuse\'.\n Run \'sudo adduser %s fuse\'. To apply changes logout and login again.\nLook at \'man backintime\' for further instructions.') % (user, user))
+        
+    def pathexists(self, filename):
+        """Checks if 'filename' is present in the system PATH.
+        In other words, it checks if os.execvp(filename, ...) will work.
+        shameless stolen from GnuPGInterface;)"""
+        pathenv = os.getenv("PATH")
+        path = pathenv.split(":")
+        for directory in path:
+            fullpath = os.path.join(directory, filename)
+            if (os.path.exists(fullpath)):
+                return True
+        return False
+        
+    def check_login(self):
+        """check passwordless authentication to host"""
+        ssh = ['ssh', '-o', 'PreferredAuthentications=publickey']
+        ssh.extend(['-p', str(self.port), self.user + '@' + self.host])
+        ssh.extend(['echo', '"Hello"'])
+        try:
+            subprocess.check_call(ssh, stdout=open(os.devnull, 'w'))
+        except subprocess.CalledProcessError:
+            raise mount.MountException( _('Password-less authentication for %s@%s failed. Look at \'man backintime\' for further instructions.')  % (self.user, self.host))
+        
+    def check_cipher(self):
+        """check if both host and localhost support cipher"""
+        if not self.cipher == 'default':
+            ssh = ['ssh']
+            ssh.extend(['-o', 'Ciphers=%s' % self.cipher])
+            ssh.extend(['-p', str(self.port), self.user + '@' + self.host, 'echo', '"Hello"'])
+            err = subprocess.Popen(ssh, stdout=open(os.devnull, 'w'), stderr=subprocess.PIPE).communicate()[1]
+            if err:
+                raise mount.MountException( _('Cipher %s failed for %s:\n%s')  % (self.cipher, self.host, err))
+            
+    def benchmark_cipher(self, size = '40'):
+        import tempfile
+        temp = tempfile.mkstemp()[1]
+        print('create random data file')
+        subprocess.call(['dd', 'if=/dev/urandom', 'of=%s' % temp, 'bs=1M', 'count=%s' % size])
+        keys = self.config.SSH_CIPHERS.keys()
+        keys.sort()
+        for cipher in keys:
+            if cipher == 'default':
+                continue
+            print('%s:' % cipher)
+            for i in range(2):
+                subprocess.call(['scp', '-p', str(self.port), '-c', cipher, temp, self.user_host_path])
+        subprocess.call(['ssh', '%s@%s' % (self.user, self.host), 'rm', os.path.join(self.path, os.path.basename(temp))])
+        os.remove(temp)
+        
+    def check_known_hosts(self):
+        """check ssh_known_hosts"""
+        output = subprocess.Popen(['ssh-keygen', '-F', self.host], stdout=subprocess.PIPE).communicate()[0] #subprocess.check_output doesn't exist in Python 2.6 (Debian squeeze default)
+        if output.find('Host %s found' % self.host) < 0:
+            raise mount.MountException( _('%s not found in ssh_known_hosts.') % self.host)
+        
+    def check_remote_folder(self):
+        """check if remote folder exists and is write- and executable.
+           Create folder if it doesn't exist."""
+        cmd  = 'd=0;'
+        cmd += '[[ -e %s ]] || d=1;' % self.path                 #path doesn't exist. set d=1 to indicate
+        cmd += '[[ $d -eq 1 ]] && mkdir %s; err=$?;' % self.path #create path, get errorcode from mkdir
+        cmd += '[[ $d -eq 1 ]] && exit $err;'                    #return errorcode from mkdir
+        cmd += '[[ -d %s ]] || exit 11;' % self.path #path is no directory
+        cmd += '[[ -w %s ]] || exit 12;' % self.path #path is not writeable
+        cmd += '[[ -x %s ]] || exit 13;' % self.path #path is not executable
+        cmd += 'exit 20'                             #everything is fine
+        try:
+            subprocess.check_call(['ssh', '-p', str(self.port), self.user + '@' + self.host, cmd], stdout=open(os.devnull, 'w'))
+        except subprocess.CalledProcessError as ex:
+            if ex.returncode == 20:
+                #clean exit
+                pass
+            elif ex.returncode == 11:
+                raise mount.MountException( _('Remote path exists but is not a directory:\n %s') % self.path)
+            elif ex.returncode == 12:
+                raise mount.MountException( _('Remote path is not writeable:\n %s') % self.path)
+            elif ex.returncode == 13:
+                raise mount.MountException( _('Remote path is not executable:\n %s') % self.path)
+            else:
+                raise mount.MountException( _('Couldn\'t create remote path:\n %s') % self.path)
+        else:
+            #returncode is 0
+            logger.info('Create remote folder %s' % self.path)
+            
+    def check_ping_host(self):
+        try:
+            subprocess.check_call(['ping', '-q', '-c3', '-l3', self.host], stdout = open(os.devnull, 'w') )
+        except subprocess.CalledProcessError:
+            raise mount.MountException( _('Ping %s failed. Host is down or wrong address.') % self.host)
+        
+    def check_remote_commands(self):
+        """try all relevant commands for take_snapshot on remote host.
+           specialy embedded Linux devices using 'BusyBox' sometimes doesn't
+           support everything that is need to run backintime.
+           also check for hardlink-support on remote host.
+        """
+        #check rsync
+        tmp_file = tempfile.mkstemp()[1]
+        rsync = tools.get_rsync_prefix( self.config ) + ' --dry-run --chmod=Du+wx %s ' % tmp_file
+        
+        if self.cipher == 'default':
+            ssh_cipher_suffix = ''
+        else:
+            ssh_cipher_suffix = '-c %s' % self.cipher
+        rsync += '--rsh="ssh -p %s %s" ' % ( str(self.port), ssh_cipher_suffix)
+        rsync += '"%s@%s:%s"' % (self.user, self.host, self.path)
+            
+        #use os.system for compatiblity with snapshots.py
+        err = os.system(rsync)
+        if err:
+            os.remove(tmp_file)
+            raise mount.MountException( _('Remote host %s doesn\'t support \'%s\':\n%s\nLook at \'man backintime\' for further instructions') % (self.host, rsync, err))
+        os.remove(tmp_file)
+            
+        #check cp chmod find and rm
+        remote_tmp_dir = os.path.join(self.path, 'tmp_%s' % self.random_id())
+        cmd  = 'tmp=%s ; ' % remote_tmp_dir
+        #first define a function to clean up and exit
+        cmd += 'cleanup(){ '
+        cmd += '[[ -e $tmp/a ]] && rm $tmp/a >/dev/null 2>&1; '
+        cmd += '[[ -e $tmp/b ]] && rm $tmp/b >/dev/null 2>&1; '
+        cmd += '[[ -e $tmp ]] && rmdir $tmp >/dev/null 2>&1; '
+        cmd += 'exit $1; }; '
+        #create tmp_RANDOM dir and file a
+        cmd += '[[ -e $tmp ]] || mkdir $tmp; touch $tmp/a; '
+        #try to create hardlink b from a
+        cmd += 'echo \"cp -aRl SOURCE DEST\"; cp -aRl $tmp/a $tmp/b >/dev/null; err_cp=$?; '
+        cmd += '[[ $err_cp -ne 0 ]] && cleanup $err_cp; '
+        #list inodes of a and b
+        cmd += 'ls -i $tmp/a; ls -i $tmp/b; '
+        #try to chmod
+        cmd += 'echo \"chmod u+rw FILE\"; chmod u+rw $tmp/a >/dev/null; err_chmod=$?; '
+        cmd += '[[ $err_chmod -ne 0 ]] && cleanup $err_chmod; '
+        #try to find and chmod
+        cmd += 'echo \"find PATH -type f -exec chmod u-wx \"{}\" \\;\"; '
+        cmd += 'find $tmp -type f -exec chmod u-wx \"{}\" \\; >/dev/null; err_find=$?; '
+        cmd += '[[ $err_find -ne 0 ]] && cleanup $err_find; '
+        #try to rm -rf
+        cmd += 'echo \"rm -rf PATH\"; rm -rf $tmp >/dev/null; err_rm=$?; '
+        cmd += '[[ $err_rm -ne 0 ]] && cleanup $err_rm; '
+        #if we end up here, everything should be fine
+        cmd += 'echo \"done\"'
+        output, err = subprocess.Popen(['ssh', '-p', str(self.port), self.user + '@' + self.host, cmd],
+                                        stdout=subprocess.PIPE, 
+                                        stderr=subprocess.PIPE).communicate()
+            
+##        print('ERROR: %s' % err)
+##        print('OUTPUT: %s' % output)
+        output_split = output.split('\n')
+        while True:
+            if len(output_split) > 0 and len(output_split[-1]) == 0:
+                output_split = output_split[:-1]
+            else:
+                break
+        if err or not output_split[-1].startswith('done'):
+            for command in ('cp', 'chmod', 'find', 'rm'):
+                if output_split[-1].startswith(command):
+                    raise mount.MountException( _('Remote host %s doesn\'t support \'%s\':\n%s\nLook at \'man backintime\' for further instructions') % (self.host, output_split[-1], err))
+            raise mount.MountException( _('Check commands on host %s returned unknown error:\n%s\nLook at \'man backintime\' for further instructions') % (self.host, err))
+            
+        i = 1
+        inode1 = 'ABC'
+        inode2 = 'DEF'
+        for line in output_split:
+            if line.startswith('cp'):
+                try:
+                    inode1 = output_split[i].split(' ')[0]
+                    inode2 = output_split[i+1].split(' ')[0]
+                except IndexError:
+                    pass
+                if not inode1 == inode2:
+                    raise mount.MountException( _('Remote host %s doesn\'t support hardlinks') % self.host)
+            i += 1
+        
+    def random_id(self, size=6, chars=string.ascii_uppercase + string.digits):
+        return ''.join(random.choice(chars) for x in range(size))
 
=== modified file 'common/tools.py'
--- common/tools.py	2012-02-20 13:12:41 +0000
+++ common/tools.py	2012-10-23 19:40:24 +0000
@@ -399,7 +399,27 @@
     obj  = os.stat(path)
     unique_key = (obj.st_size, int(obj.st_mtime))    
     return unique_key
-        				
+        
+def check_cron_pattern(str):
+    '''check if str look like '0,10,13,15,17,20,23' or '*/6' '''
+    if str.find(' ') >= 0:
+        return False
+    try:
+        if str.startswith('*/'):
+            if int(str[2:]) <= 24:
+                return True
+            else:
+                return False
+        list = str.split(',')
+        for s in list:
+            if int(s) <= 24:
+                continue
+            else:
+                return False
+        return True
+    except ValueError:
+        return False
+
 #
 #
 class UniquenessSet:
 
=== modified file 'gnome/app.py'
--- gnome/app.py	2012-02-22 09:55:08 +0000
+++ gnome/app.py	2012-10-23 19:40:24 +0000
@@ -44,6 +44,7 @@
 import snapshots
 import guiapplicationinstance
 import tools
+import mount
 
 import settingsdialog
 import logviewdialog
@@ -309,20 +310,31 @@
 
             if not self.config.is_configured():
                 return 
-	
-	if self.snapshots.has_old_snapshots():
-		settingsdialog.SettingsDialog( self.config, self.snapshots, self ).update_snapshots_location()
-	
-	profile_id = self.config.get_current_profile()
-	if not self.config.can_backup( profile_id ):
-            messagebox.show_error( self.window, self.config, _('Can\'t find snapshots folder.\nIf it is on a removable drive please plug it and then press OK') )
+
+        if self.snapshots.has_old_snapshots():
+            settingsdialog.SettingsDialog( self.config, self.snapshots, self ).update_snapshots_location()
+        
+        profile_id = self.config.get_current_profile()
+        
+        #mount
+        try:
+            mnt = mount.Mount(cfg = self.config, profile_id = profile_id)
+            hash_id = mnt.mount()
+        except mount.MountException as ex:
+            messagebox.show_error( self.window, self.config, str(ex) )
+            sys.exit(1)
+        else:
+            self.config.set_current_hash_id(hash_id)
+            
+        if not self.config.can_backup( profile_id ):
+                messagebox.show_error( self.window, self.config, _('Can\'t find snapshots folder.\nIf it is on a removable drive please plug it and then press OK') )
 
         self.update_profiles()
         self.update_backup_info()
         gobject.timeout_add( 1000, self.update_backup_info )
 
     def on_combo_profiles_changed( self, *params ):
-    	if self.disable_combo_changed:
+        if self.disable_combo_changed:
             return
 
         iter = self.combo_profiles.get_active_iter()
@@ -335,6 +347,7 @@
         if not first_update_all and profile_id == self.config.get_current_profile():
             return
 
+        self.remount(profile_id, self.config.get_current_profile())
         self.config.set_current_profile( profile_id )
         self.first_update_all = False
         self.update_all( first_update_all )
@@ -352,7 +365,7 @@
 			iter = self.store_profiles.append( [ self.config.get_profile_name( profile_id ), profile_id ] )
 			if profile_id == self.config.get_current_profile():
 				select_iter = iter
-            
+
 		self.disable_combo_changed = False
 
 		if not select_iter is None:
@@ -467,6 +480,15 @@
         self.fill_places()
         self.fill_time_line( False )
         self.update_folder_view( 1, selected_file, show_snapshots )
+        
+    def remount( self, new_profile_id, old_profile_id):
+        try:
+            mnt = mount.Mount(cfg = self.config, profile_id = old_profile_id)
+            hash_id = mnt.remount(new_profile_id)
+        except mount.MountException as ex:
+            messagebox.show_error( self.window, self.config, str(ex) )
+        else:
+            self.config.set_current_hash_id(hash_id)
 
     def places_pix_renderer_function( self, column, renderer, model, iter, user_data ):
         if len( model.get_value( iter, 1 ) ) == 0:
@@ -731,6 +753,13 @@
         self.config.set_int_value( 'gnome.main_window.hpaned2', main_window_hpaned2 )
         self.config.set_str_value( 'gnome.last_path', self.folder_path )
         self.config.set_bool_value( 'gnome.show_hidden_files', self.show_hidden_files )
+        
+        #mount
+        try:
+            mnt = mount.Mount(cfg = self.config)
+            mnt.umount(self.config.current_hash_id)
+        except mount.MountException as ex:
+            messagebox.show_error( self.window, self.config, str(ex) )
 
         self.config.save()
         self.window.destroy()
@@ -966,10 +995,22 @@
     def on_btn_settings_clicked( self, button ):
         snapshots_full_path = self.config.get_snapshots_full_path()
         include_folders = self.config.get_include()
+        hash_id = self.config.current_hash_id
 
         settingsdialog.SettingsDialog( self.config, self.snapshots, self ).run()
+        
+        #mount
+        try:
+            mnt = mount.Mount(cfg = self.config)
+            new_hash_id = mnt.remount(self.config.get_current_profile())
+        except mount.MountException as ex:
+            messagebox.show_error( self.window, self.config, str(ex) )
+        else:
+            self.config.set_current_hash_id(new_hash_id)
 
-        if snapshots_full_path != self.config.get_snapshots_full_path() or include_folders != self.config.get_include():
+        if snapshots_full_path != self.config.get_snapshots_full_path() \
+            or include_folders != self.config.get_include() \
+            or hash_id != self.config.current_hash_id:
             self.update_all( False )
         self.update_profiles()
 
 
=== modified file 'gnome/man/C/backintime-gnome.1.gz'
 Binary files gnome/man/C/backintime-gnome.1.gz	2012-03-06 21:23:31 +0000 and gnome/man/C/backintime-gnome.1.gz	2012-10-23 19:40:24 +0000 differ
=== modified file 'gnome/settingsdialog.glade'
--- gnome/settingsdialog.glade	2012-02-20 11:30:09 +0000
+++ gnome/settingsdialog.glade	2012-10-23 19:40:24 +0000
@@ -177,239 +177,607 @@
                 <property name="border_width">5</property>
                 <property name="spacing">5</property>
                 <child>
-                  <object class="GtkFrame" id="frame1">
+                  <object class="GtkFrame" id="select_modes">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
+                      <object class="GtkHBox" id="hbox_select_modes">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="lbl_select_modes">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">Mode:</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBox" id="combo_modes">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <signal name="changed" handler="on_combo_modes_changed" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="mode_local">
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
                       <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkVBox" id="vbox1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">2</property>
-                            <child>
-                              <object class="GtkHBox" id="hbox4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <object class="GtkEntry" id="edit_where">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="editable">False</property>
-                                    <property name="invisible_char">•</property>
-                                    <property name="primary_icon_activatable">False</property>
-                                    <property name="secondary_icon_activatable">False</property>
-                                    <property name="primary_icon_sensitive">True</property>
-                                    <property name="secondary_icon_sensitive">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="btn_where">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
+                          <object class="GtkHBox" id="hbox4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <object class="GtkEntry" id="edit_where">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
+                                <property name="invisible_char">•</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="btn_where">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
+                                <signal name="clicked" handler="on_btn_where_clicked" swapped="no"/>
+                                <child>
+                                  <object class="GtkImage" id="image1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="stock">gtk-directory</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="lbl_where">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Where to save snapshots&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">10</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="mode_ssh">
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment_ssh">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkVBox" id="vbox_ssh">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox_ssh1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <object class="GtkLabel" id="lbl_ssh_host">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Host:</property>
+                                    <property name="width_chars">8</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="txt_ssh_host">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">•</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="lbl_ssh_port">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Port:</property>
+                                    <property name="width_chars">8</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="txt_ssh_port">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">•</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="lbl_ssh_user">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">User:</property>
+                                    <property name="width_chars">8</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="txt_ssh_user">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">•</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">5</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox" id="hbox_ssh2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <object class="GtkLabel" id="lbl_ssh_path">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Path:</property>
+                                    <property name="width_chars">8</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="txt_ssh_path">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">•</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="lbl_ssh_cipher">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                    <property name="label" translatable="yes">Cipher:</property>
+                                    <property name="width_chars">8</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="combo_ssh_cipher">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="lbl_ssh">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;SSH Settings&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">20</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="mode_dummy">
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment_dummy">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkHBox" id="hbox_dummy">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <object class="GtkLabel" id="lbl_dummy_host">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">Host:</property>
+                                <property name="width_chars">8</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="txt_dummy_host">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">•</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lbl_dummy_port">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">Port:</property>
+                                <property name="width_chars">8</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="txt_dummy_port">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">•</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lbl_dummy_user">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">User:</property>
+                                <property name="width_chars">8</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="txt_dummy_user">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">•</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="lbl_dummy">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Dummy Settings&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">800</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="advanced">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkExpander" id="expander1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <child>
+                          <object class="GtkAlignment" id="alignment3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <object class="GtkVBox" id="vbox3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="cb_auto_host_user_profile">
+                                    <property name="label" translatable="yes">Auto Host / User / Profile Id</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_action_appearance">False</property>
-                                    <signal name="clicked" handler="on_btn_where_clicked" swapped="no"/>
-                                    <child>
-                                      <object class="GtkImage" id="image1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="stock">gtk-directory</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_cb_auto_host_user_profile_toggled" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" id="hbox8">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <object class="GtkLabel" id="lbl_host">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="xalign">1</property>
+                                        <property name="label" translatable="yes">Host:</property>
+                                        <property name="width_chars">8</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="txt_host">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="lbl_user">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="xalign">1</property>
+                                        <property name="label" translatable="yes">User:</property>
+                                        <property name="width_chars">8</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="txt_user">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel" id="lbl_profile">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="xalign">1</property>
+                                        <property name="label" translatable="yes">Profile Id:</property>
+                                        <property name="width_chars">8</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">4</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="txt_profile">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">5</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
                                     <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkExpander" id="expander1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <child>
-                                  <object class="GtkAlignment" id="alignment3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="left_padding">12</property>
-                                    <child>
-                                      <object class="GtkVBox" id="vbox3">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="spacing">2</property>
-                                        <child>
-                                          <object class="GtkCheckButton" id="cb_auto_host_user_profile">
-                                            <property name="label" translatable="yes">Auto Host / User / Profile Id</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="use_action_appearance">False</property>
-                                            <property name="draw_indicator">True</property>
-                                            <signal name="toggled" handler="on_cb_auto_host_user_profile_toggled" swapped="no"/>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkHBox" id="hbox8">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="spacing">2</property>
-                                            <child>
-                                              <object class="GtkLabel" id="lbl_host">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">1</property>
-                                                <property name="yalign">0.5899999737739563</property>
-                                                <property name="label" translatable="yes">Host:</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkEntry" id="txt_host">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="invisible_char">•</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="lbl_user">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">1</property>
-                                                <property name="label" translatable="yes">User:</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">2</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkEntry" id="txt_user">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="invisible_char">•</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">3</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="lbl_profile">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">1</property>
-                                                <property name="label" translatable="yes">Profile Id:</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">4</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkEntry" id="txt_profile">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="invisible_char">•</property>
-                                                <property name="primary_icon_activatable">False</property>
-                                                <property name="secondary_icon_activatable">False</property>
-                                                <property name="primary_icon_sensitive">True</property>
-                                                <property name="secondary_icon_sensitive">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">5</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">True</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                </child>
-                                <child type="label">
-                                  <object class="GtkLabel" id="label7">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Advanced</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Where to save snapshots&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label7">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Advanced</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="position">900</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkFrame" id="frame2">
+                  <object class="GtkFrame" id="shedule">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
@@ -423,7 +791,7 @@
                           <object class="GtkTable" id="grid1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="n_rows">4</property>
+                            <property name="n_rows">5</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">4</property>
@@ -438,6 +806,19 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkLabel" id="lbl_backup_time_custom">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
+                                <property name="ypad">6</property>
+                                <property name="label" translatable="yes">Hours:</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">4</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkLabel" id="lbl_backup_time">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
@@ -477,6 +858,22 @@
                               </packing>
                             </child>
                             <child>
+                              <object class="GtkEntry" id="txt_backup_time_custom">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">hours seperate by comma ( e.g. 8,12,18,23) or */3 for periodic backups every 3 hours (cron style)</property>
+                                <property name="invisible_char">•</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">4</property>
+                              </packing>
+                            </child>
+                            <child>
                               <object class="GtkComboBox" id="cb_backup_time">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
@@ -522,7 +919,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">950</property>
                   </packing>
                 </child>
                 <child>
@@ -549,7 +946,7 @@
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">1000</property>
                   </packing>
                 </child>
               </object>
 
=== modified file 'gnome/settingsdialog.py'
--- gnome/settingsdialog.py	2012-02-20 11:18:31 +0000
+++ gnome/settingsdialog.py	2012-10-23 19:40:24 +0000
@@ -30,6 +30,7 @@
 import config
 import messagebox
 import tools
+import mount
 
 
 _=gettext.gettext
@@ -74,7 +75,8 @@
 				'on_combo_profiles_changed': self.on_combo_profiles_changed,
 				'on_btn_where_clicked': self.on_btn_where_clicked,
 				'on_cb_backup_mode_changed': self.on_cb_backup_mode_changed,
-				'on_cb_auto_host_user_profile_toggled': self.update_host_user_profile
+				'on_cb_auto_host_user_profile_toggled': self.update_host_user_profile,
+				'on_combo_modes_changed': self.on_combo_modes_changed
 			}
 		
 		builder.connect_signals(signals)
@@ -98,6 +100,26 @@
 		
 		self.disable_combo_changed = False
 		
+		#snapshots mode (local, ssh, ...)
+		self.store_modes = gtk.ListStore(str, str)
+		keys = self.config.SNAPSHOT_MODES.keys()
+		keys.sort()
+		for key in keys:
+			self.store_modes.append([self.config.SNAPSHOT_MODES[key][1], key])
+			
+		self.combo_modes = get( 'combo_modes' )
+		self.combo_modes.set_model( self.store_modes )
+		
+		self.combo_modes.clear()
+		text_renderer = gtk.CellRendererText()
+		self.combo_modes.pack_start( text_renderer, True )
+		self.combo_modes.add_attribute( text_renderer, 'text', 0 )
+		
+		self.mode = None
+		self.mode_local = get('mode_local')
+		self.mode_ssh = get('mode_ssh')
+##		self.mode_dummy = get('mode_dummy')
+		
 		#set current folder
 		#self.fcb_where = get( 'fcb_where' )
 		#self.fcb_where.set_show_hidden( self.parent.show_hidden_files )
@@ -110,6 +132,31 @@
 		self.txt_user = get('txt_user')
 		self.lbl_profile = get('lbl_profile')
 		self.txt_profile = get('txt_profile')
+		
+		#ssh
+		self.txt_ssh_host = get('txt_ssh_host')
+		self.txt_ssh_port = get('txt_ssh_port')
+		self.txt_ssh_user = get('txt_ssh_user')
+		self.txt_ssh_path = get('txt_ssh_path')
+		
+		self.store_ssh_cipher = gtk.ListStore(str, str)
+		keys = self.config.SSH_CIPHERS.keys()
+		keys.sort()
+		for key in keys:
+			self.store_ssh_cipher.append([self.config.SSH_CIPHERS[key], key])
+		
+		self.combo_ssh_cipher = get( 'combo_ssh_cipher' )
+		self.combo_ssh_cipher.set_model( self.store_ssh_cipher )
+
+		self.combo_ssh_cipher.clear()
+		text_renderer = gtk.CellRendererText()
+		self.combo_ssh_cipher.pack_start( text_renderer, True )
+		self.combo_ssh_cipher.add_attribute( text_renderer, 'text', 0 )
+		
+##		#dummy
+##		self.txt_dummy_host = get('txt_dummy_host')
+##		self.txt_dummy_port = get('txt_dummy_port')
+##		self.txt_dummy_user = get('txt_dummy_user')
 
 		#automatic backup mode store
 		self.store_backup_mode = gtk.ListStore( str, int )
@@ -136,6 +183,10 @@
 		for t in xrange( 1, 8 ):
 			self.store_backup_weekday.append( [ datetime.date(2011, 11, 6 + t).strftime("%A"), t ] )
 
+		#custom backup time
+		self.txt_backup_time_custom = get('txt_backup_time_custom')
+		self.lbl_backup_time_custom = get('lbl_backup_time_custom')
+		
 		#per directory schedule
 		#self.cb_per_directory_schedule = get( 'cb_per_directory_schedule' )
 		#self.lbl_schedule = get( 'lbl_schedule' )
@@ -184,7 +235,17 @@
 		self.store_exclude = gtk.ListStore( str, str )
 		self.list_exclude.set_model( self.store_exclude )
 
-		get( 'lbl_highly_recommended_excluded' ).set_text( ', '.join(self.config.DEFAULT_EXCLUDE) )
+		exclude = ''
+		i = 1
+		prev_lines = 0
+		for ex in self.config.DEFAULT_EXCLUDE:
+			exclude += ex
+			if i < len(self.config.DEFAULT_EXCLUDE):
+				exclude += ', '
+			if len(exclude)-prev_lines > 80:
+				exclude += '\n'
+				prev_lines += len(exclude)
+		get( 'lbl_highly_recommended_excluded' ).set_text( exclude )
 
 		#setup automatic backup mode
 		self.cb_backup_mode = get( 'cb_backup_mode' )
@@ -228,6 +289,8 @@
 		
 		self.lbl_backup_weekday = get( 'lbl_backup_weekday' )
 
+		self.hbox_backup_time = get( 'hbox_backup_time' )
+		
 		#setup remove old backups older than
 		self.edit_remove_old_backup_value = get( 'edit_remove_old_backup_value' )
 		self.cb_remove_old_backup_unit = get( 'cb_remove_old_backup_unit' )
@@ -376,6 +439,15 @@
 			self.lbl_backup_day.hide()
 			self.cb_backup_day.hide()
 
+		if backup_mode == self.config.CUSTOM_HOUR:
+			self.lbl_backup_time_custom.show()
+			self.txt_backup_time_custom.show()
+			self.txt_backup_time_custom.set_sensitive( True )
+			self.txt_backup_time_custom.set_text( self.config.get_custom_backup_time( self.profile_id ) )
+		else:
+			self.lbl_backup_time_custom.hide()
+			self.txt_backup_time_custom.hide()
+
 	def update_host_user_profile( self, *params ):
 		value = not self.cb_auto_host_user_profile.get_active()
 		self.lbl_host.set_sensitive( value )
@@ -384,6 +456,20 @@
 		self.txt_user.set_sensitive( value )
 		self.lbl_profile.set_sensitive( value )
 		self.txt_profile.set_sensitive( value )
+		
+	def on_combo_modes_changed(self, *params):
+		iter = self.combo_modes.get_active_iter()
+		if iter is None:
+			return
+			
+		active_mode = self.store_modes.get_value( iter, 1 )
+		if active_mode != self.mode:
+			for mode in self.config.SNAPSHOT_MODES.keys():
+				if active_mode == mode:
+					getattr(self, 'mode_%s' % mode).show()
+				else:
+					getattr(self, 'mode_%s' % mode).hide()
+			self.mode = active_mode
 
 	def on_combo_profiles_changed( self, *params ):
 		if self.disable_combo_changed:
@@ -425,10 +511,22 @@
 		else:
 			self.btn_edit_profile.set_sensitive( True )
 			self.btn_remove_profile.set_sensitive( True )
+			
+		#set mode
+		i = 0
+		iter = self.store_modes.get_iter_first()
+		default_mode = self.config.get_snapshots_mode(self.profile_id)
+		while not iter is None:
+			if self.store_modes.get_value( iter, 1 ) == default_mode:
+				self.combo_modes.set_active( i )
+				break
+			iter = self.store_modes.iter_next( iter )
+			i = i + 1
+		self.on_combo_modes_changed()
 		
 		#set current folder
 		#self.fcb_where.set_filename( self.config.get_snapshots_path() )
-		self.edit_where.set_text( self.config.get_snapshots_path( self.profile_id ) )
+		self.edit_where.set_text( self.config.get_snapshots_path( self.profile_id, mode = 'local' ) )
 		self.cb_auto_host_user_profile.set_active( self.config.get_auto_host_user_profile( self.profile_id ) )
 		host, user, profile = self.config.get_host_user_profile( self.profile_id )
 		self.txt_host.set_text( host )
@@ -436,6 +534,27 @@
 		self.txt_profile.set_text( profile )
 		self.update_host_user_profile()
 		
+		#ssh
+		self.txt_ssh_host.set_text( self.config.get_ssh_host( self.profile_id ) )
+		self.txt_ssh_port.set_text( str(self.config.get_ssh_port( self.profile_id )) )
+		self.txt_ssh_user.set_text( self.config.get_ssh_user( self.profile_id ) )
+		self.txt_ssh_path.set_text( self.config.get_snapshots_path_ssh( self.profile_id ) )
+		#set chipher
+		i = 0
+		iter = self.store_ssh_cipher.get_iter_first()
+		default_mode = self.config.get_ssh_cipher(self.profile_id)
+		while not iter is None:
+			if self.store_ssh_cipher.get_value( iter, 1 ) == default_mode:
+				self.combo_ssh_cipher.set_active( i )
+				break
+			iter = self.store_ssh_cipher.iter_next( iter )
+			i = i + 1
+		
+##		#dummy
+##		self.txt_dummy_host.set_text( self.config.get_dummy_host( self.profile_id ) )
+##		self.txt_dummy_port.set_text( str(self.config.get_dummy_port( self.profile_id )) )
+##		self.txt_dummy_user.set_text( self.config.get_dummy_user( self.profile_id ) )
+		
 		#per directory schedule
 		#self.cb_per_directory_schedule.set_active( self.config.get_per_directory_schedule() )
 		
@@ -504,6 +623,9 @@
 		
 		self.on_cb_backup_mode_changed()
 
+		#setup custom backup time
+		self.txt_backup_time_custom.set_text( self.config.get_custom_backup_time( self.profile_id ) )
+
 		#setup remove old backups older than
 		enabled, value, unit = self.config.get_remove_old_snapshots( self.profile_id )
 		
@@ -589,7 +711,12 @@
 	def save_profile( self ):
 		#profile_id = self.config.get_current_profile()
 		#snapshots path
-		snapshots_path = self.edit_where.get_text()
+		iter = self.combo_modes.get_active_iter()
+		mode = self.store_modes.get_value( iter, 1 )
+		if self.config.SNAPSHOT_MODES[mode][0] is None:
+			snapshots_path = self.edit_where.get_text()
+		else:
+			snapshots_path = self.config.get_snapshots_path(self.profile_id, mode = mode, tmp_mount = True)
 		
 		#hack
 		if snapshots_path.startswith( '//' ):
@@ -611,6 +738,49 @@
 		while not iter is None:
 			exclude_list.append( self.store_exclude.get_value( iter, 0 ) )
 			iter = self.store_exclude.iter_next( iter )
+			
+		if self.store_backup_mode.get_value( self.cb_backup_mode.get_active_iter(), 1 ) == self.config.CUSTOM_HOUR:
+			if not tools.check_cron_pattern(self.txt_backup_time_custom.get_text()):
+				self.error_handler( _('Custom Hours can only be a comma seperate list of hours (e.g. 8,12,18,23) or */3 for periodic backups every 3 hours') )
+				return False
+
+		mount_kwargs = {}
+		
+		#ssh settings
+		ssh_host = self.txt_ssh_host.get_text()
+		ssh_port = self.txt_ssh_port.get_text()
+		ssh_user = self.txt_ssh_user.get_text()
+		ssh_path = self.txt_ssh_path.get_text()
+		iter = self.combo_ssh_cipher.get_active_iter()
+		ssh_cipher = self.store_ssh_cipher.get_value( iter, 1 )
+		if mode == 'ssh':
+			mount_kwargs = { 'host': ssh_host, 'port': int(ssh_port), 'user': ssh_user, 'path': ssh_path, 'cipher': ssh_cipher }
+		
+##		#dummy settings
+##		dummy_host = self.txt_dummy_host.get_text()
+##		dummy_port = self.txt_dummy_port.get_text()
+##		dummy_user = self.txt_dummy_user.get_text()
+##		if mode == 'dummy':
+##			#values must have exactly the same Type (str, int or bool) 
+##			#as they are set in config or you will run into false-positive
+##			#HashCollision warnings
+##			mount_kwargs = { 'host': dummy_host, 'port': int(dummy_port), 'user': dummy_user }
+			
+		if not self.config.SNAPSHOT_MODES[mode][0] is None:
+			#pre_mount_check
+			mnt = mount.Mount(cfg = self.config, profile_id = self.profile_id, tmp_mount = True)
+			try:
+				mnt.pre_mount_check(mode = mode, first_run = True, **mount_kwargs)
+			except mount.MountException as ex:
+				self.error_handler(str(ex))
+				return False
+
+			#okay, lets try to mount
+			try:
+				hash_id = mnt.mount(mode = mode, check = False, **mount_kwargs)
+			except mount.MountException as ex:
+				self.error_handler(str(ex))
+				return False
 		
 		#check if back folder changed
 		#if len( self.config.get_snapshots_path() ) > 0 and self.config.get_snapshots_path() != snapshots_path:
@@ -620,7 +790,21 @@
 		#ok let's save to config
 		self.config.set_auto_host_user_profile( self.cb_auto_host_user_profile.get_active(), self.profile_id )
 		self.config.set_host_user_profile( self.txt_host.get_text(), self.txt_user.get_text(), self.txt_profile.get_text(), self.profile_id )
-		self.config.set_snapshots_path( snapshots_path, self.profile_id )
+		self.config.set_snapshots_path( snapshots_path, self.profile_id , mode)
+		
+		self.config.set_snapshots_mode(mode, self.profile_id)
+		
+		#save ssh
+		self.config.set_ssh_host(ssh_host, self.profile_id)
+		self.config.set_ssh_port(ssh_port, self.profile_id)
+		self.config.set_ssh_user(ssh_user, self.profile_id)
+		self.config.set_snapshots_path_ssh(ssh_path, self.profile_id)
+		self.config.set_ssh_cipher(ssh_cipher, self.profile_id)
+
+##		#save dummy
+##		self.config.set_dummy_host(dummy_host, self.profile_id)
+##		self.config.set_dummy_port(dummy_port, self.profile_id)
+##		self.config.set_dummy_user(dummy_user, self.profile_id)
 
 		#if not msg is None:
 		#   messagebox.show_error( self.dialog, self.config, msg )
@@ -634,6 +818,7 @@
 		self.config.set_automatic_backup_time( self.store_backup_time.get_value( self.cb_backup_time.get_active_iter(), 1 ), self.profile_id )
 		self.config.set_automatic_backup_day( self.store_backup_day.get_value( self.cb_backup_day.get_active_iter(), 1 ), self.profile_id )
 		self.config.set_automatic_backup_weekday( self.store_backup_weekday.get_value( self.cb_backup_weekday.get_active_iter(), 1 ), self.profile_id )
+		self.config.set_custom_backup_time( self.txt_backup_time_custom.get_text(), self.profile_id )
 		
 		#auto-remove snapshots
 		self.config.set_remove_old_snapshots( 
@@ -674,6 +859,15 @@
 		self.config.set_preserve_xattr( self.cb_preserve_xattr.get_active(), self.profile_id )
 		self.config.set_copy_unsafe_links( self.cb_copy_unsafe_links.get_active(), self.profile_id )
 		self.config.set_copy_links( self.cb_copy_links.get_active(), self.profile_id )
+		
+		#umount
+		if not self.config.SNAPSHOT_MODES[mode][0] is None:
+			try:
+				mnt.umount(hash_id = hash_id)
+			except mount.MountException as ex:
+				self.error_handler(str(ex))
+				return False
+		return True
 	
 	def update_remove_old_backups( self, button ):
 		enabled = self.cb_remove_old_backup.get_active()
@@ -716,7 +910,7 @@
 		
 		self.config.clear_handlers()
 		self.dialog.destroy()
-	   
+		
 	def update_snapshots_location( self ):
 		'''Update snapshot location dialog'''
 		self.config.set_question_handler( self.question_handler )
@@ -852,7 +1046,8 @@
 		self.dialog.destroy()
 	
 	def validate( self ):
-		self.save_profile()
+		if not self.save_profile():
+			return False
 		
 		if not self.config.check_config():
 			return False
 
=== modified file 'kde4/app.py'
--- kde4/app.py	2012-03-05 16:04:13 +0000
+++ kde4/app.py	2012-10-23 19:40:24 +0000
@@ -37,6 +37,7 @@
 import logger
 import snapshots
 import guiapplicationinstance
+import mount
 
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
@@ -318,6 +319,17 @@
 			settingsdialog.SettingsDialog( self ).update_snapshots_location()
 
 		profile_id = cfg.get_current_profile()
+		
+		#mount
+		try:
+			mnt = mount.Mount(cfg = self.config, profile_id = profile_id)
+			hash_id = mnt.mount()
+		except mount.MountException as ex:
+			KMessageBox.error( self, QString.fromUtf8( str(ex) ) )
+			sys.exit(1)
+		else:
+			self.config.set_current_hash_id(hash_id)
+		
 		if not cfg.can_backup( profile_id ):
 			KMessageBox.error( self, QString.fromUtf8( _('Can\'t find snapshots folder.\nIf it is on a removable drive please plug it and then press OK') ) )
 
@@ -378,6 +390,13 @@
 		self.config.set_int_value( 'kde4.main_window.files_view.sort.column', self.list_files_view.header().sortIndicatorSection() )
 		self.config.set_bool_value( 'kde4.main_window.files_view.sort.ascending', self.list_files_view.header().sortIndicatorOrder() == Qt.AscendingOrder )
 		
+		#umount
+		try:
+			mnt = mount.Mount(cfg = self.config)
+			mnt.umount(self.config.current_hash_id)
+		except mount.MountException as ex:
+			KMessageBox.error( self, QString.fromUtf8( str(ex) ) )
+			
 		self.config.save()
 
 		event.accept()
@@ -419,8 +438,18 @@
 			return
 		
 		if profile_id != self.config.get_current_profile():
+			self.remount(profile_id, self.config.get_current_profile())
 			self.config.set_current_profile( profile_id )
 			self.update_profile()
+			
+	def remount( self, new_profile_id, old_profile_id):
+		try:
+			mnt = mount.Mount(cfg = self.config, profile_id = old_profile_id)
+			hash_id = mnt.remount(new_profile_id)
+		except mount.MountException as ex:
+			KMessageBox.error( self, QString.fromUtf8( str(ex) ) )
+		else:
+			self.config.set_current_hash_id(hash_id)
 
 	def get_default_startup_folder_and_file( self ):
 		last_path = self.config.get_str_value( 'gnome.last_path', '' )
@@ -779,6 +808,8 @@
 
 	def on_btn_settings_clicked( self ):
 		if QDialog.Accepted == settingsdialog.SettingsDialog( self ).exec_():
+			profile_id = self.config.get_current_profile()
+			self.remount(profile_id, profile_id)
 			self.update_profiles()
 
 	def on_btn_about_clicked( self ):
 
=== modified file 'kde4/man/C/backintime-kde4.1.gz'
 Binary files kde4/man/C/backintime-kde4.1.gz	2012-03-06 21:23:31 +0000 and kde4/man/C/backintime-kde4.1.gz	2012-10-23 19:40:24 +0000 differ
=== modified file 'kde4/settingsdialog.py'
--- kde4/settingsdialog.py	2012-02-20 11:30:09 +0000
+++ kde4/settingsdialog.py	2012-10-23 19:40:24 +0000
@@ -32,6 +32,7 @@
 import config
 import tools
 import kde4tools
+import mount
 
 
 _=gettext.gettext
@@ -102,9 +103,25 @@
 		tab_widget = QWidget( self )
 		self.tabs_widget.addTab( tab_widget, QString.fromUtf8( _( 'General' ) ) )
 		layout = QVBoxLayout( tab_widget )
-
+		
+		#select mode
+		self.mode = None
+		vlayout = QVBoxLayout()
+		layout.addLayout( vlayout )
+		
+		self.lbl_modes = QLabel( QString.fromUtf8( _( 'Mode:' ) ), self )
+		vlayout.addWidget( self.lbl_modes )
+		
+		self.combo_modes = KComboBox( self )
+		vlayout.addWidget( self.combo_modes )
+		store_modes = {}
+		for key in self.config.SNAPSHOT_MODES.keys():
+			store_modes[key] = self.config.SNAPSHOT_MODES[key][1]
+		self.fill_combo( self.combo_modes, store_modes )
+		
 		#Where to save snapshots
 		group_box = QGroupBox( self )
+		self.mode_local = group_box
 		group_box.setTitle( QString.fromUtf8( _( 'Where to save snapshots' ) ) )
 		layout.addWidget( group_box )
 
@@ -120,7 +137,75 @@
 		self.btn_snapshots_path = KPushButton( KIcon( 'folder' ), '', self )
 		hlayout.addWidget( self.btn_snapshots_path )
 		QObject.connect( self.btn_snapshots_path, SIGNAL('clicked()'), self.on_btn_snapshots_path_clicked )
-
+		
+		#SSH
+		group_box = QGroupBox( self )
+		self.mode_ssh = group_box
+		group_box.setTitle( QString.fromUtf8( _( 'SSH Settings' ) ) )
+		layout.addWidget( group_box )
+
+		vlayout = QVBoxLayout( group_box )
+
+		hlayout1 = QHBoxLayout()
+		vlayout.addLayout( hlayout1 )
+		hlayout2 = QHBoxLayout()
+		vlayout.addLayout( hlayout2 )
+		
+		self.lbl_ssh_host = QLabel( QString.fromUtf8( _( 'Host:' ) ), self )
+		hlayout1.addWidget( self.lbl_ssh_host )
+		self.txt_ssh_host = KLineEdit( self )
+		hlayout1.addWidget( self.txt_ssh_host )
+		
+		self.lbl_ssh_port = QLabel( QString.fromUtf8( _( 'Port:' ) ), self )
+		hlayout1.addWidget( self.lbl_ssh_port )
+		self.txt_ssh_port = KLineEdit( self )
+		hlayout1.addWidget( self.txt_ssh_port )
+		
+		self.lbl_ssh_user = QLabel( QString.fromUtf8( _( 'User:' ) ), self )
+		hlayout1.addWidget( self.lbl_ssh_user )
+		self.txt_ssh_user = KLineEdit( self )
+		hlayout1.addWidget( self.txt_ssh_user )
+		
+		self.lbl_ssh_path = QLabel( QString.fromUtf8( _( 'Path:' ) ), self )
+		hlayout2.addWidget( self.lbl_ssh_path )
+		self.txt_ssh_path = KLineEdit( self )
+		hlayout2.addWidget( self.txt_ssh_path )
+		
+		self.lbl_ssh_cipher = QLabel( QString.fromUtf8( _( 'Cipher:' ) ), self )
+		hlayout2.addWidget( self.lbl_ssh_cipher )
+		self.combo_ssh_cipher = KComboBox( self )
+		hlayout2.addWidget( self.combo_ssh_cipher )
+		self.fill_combo( self.combo_ssh_cipher, self.config.SSH_CIPHERS )
+		
+##		#Dummy
+##		group_box = QGroupBox( self )
+##		self.mode_dummy = group_box
+##		group_box.setTitle( QString.fromUtf8( _( 'Dummy Settings' ) ) )
+##		layout.addWidget( group_box )
+##
+##		vlayout = QVBoxLayout( group_box )
+##
+##		hlayout = QHBoxLayout()
+##		vlayout.addLayout( hlayout )
+##		
+##		self.lbl_dummy_host = QLabel( QString.fromUtf8( _( 'Host:' ) ), self )
+##		hlayout.addWidget( self.lbl_dummy_host )
+##		self.txt_dummy_host = KLineEdit( self )
+##		hlayout.addWidget( self.txt_dummy_host )
+##		
+##		self.lbl_dummy_port = QLabel( QString.fromUtf8( _( 'Port:' ) ), self )
+##		hlayout.addWidget( self.lbl_dummy_port )
+##		self.txt_dummy_port = KLineEdit( self )
+##		hlayout.addWidget( self.txt_dummy_port )
+##		
+##		self.lbl_dummy_user = QLabel( QString.fromUtf8( _( 'User:' ) ), self )
+##		hlayout.addWidget( self.lbl_dummy_user )
+##		self.txt_dummy_user = KLineEdit( self )
+##		hlayout.addWidget( self.txt_dummy_user )
+
+		QObject.connect( self.combo_modes, SIGNAL('currentIndexChanged(int)'), self.on_combo_modes_changed )
+		self.on_combo_modes_changed()
+		
 		#host, user, profile id
 		hlayout = QHBoxLayout()
 		layout.addLayout( hlayout )
@@ -200,6 +285,14 @@
 		for t in xrange( 0, 2300, 100 ):
 			self.combo_automatic_snapshots_time.addItem( QIcon(), QString.fromUtf8( datetime.time( t/100, t%100 ).strftime("%H:%M") ), QVariant( t ) )
 
+		self.lbl_automatic_snapshots_time_custom = QLabel( QString.fromUtf8( _( 'Hours:' ) ), self )
+		self.lbl_automatic_snapshots_time_custom.setContentsMargins( 5, 0, 0, 0 )
+		self.lbl_automatic_snapshots_time_custom.setAlignment( Qt.AlignRight | Qt.AlignVCenter )
+		glayout.addWidget( self.lbl_automatic_snapshots_time_custom, 4, 0 )
+
+		self.txt_automatic_snapshots_time_custom = KLineEdit( self )
+		glayout.addWidget( self.txt_automatic_snapshots_time_custom, 4, 1 )
+
 		QObject.connect( self.combo_automatic_snapshots, SIGNAL('currentIndexChanged(int)'), self.current_automatic_snapshot_changed )
 
 		#
@@ -470,6 +563,13 @@
 			self.update_profiles()
 
 	def update_automatic_snapshot_time( self, backup_mode ):
+		if backup_mode == self.config.CUSTOM_HOUR:
+			self.lbl_automatic_snapshots_time_custom.show()
+			self.txt_automatic_snapshots_time_custom.show()
+		else:
+			self.lbl_automatic_snapshots_time_custom.hide()
+			self.txt_automatic_snapshots_time_custom.hide()
+
 		if backup_mode == self.config.WEEK:
 			self.lbl_automatic_snapshots_weekday.show()
 			self.combo_automatic_snapshots_weekday.show()
@@ -542,7 +642,23 @@
 			self.btn_remove_profile.setEnabled( True )
 
 		#TAB: General
-		self.edit_snapshots_path.setText( QString.fromUtf8( self.config.get_snapshots_path() ) )
+		#mode
+		self.set_combo_value( self.combo_modes, self.config.get_snapshots_mode(), type = 'str' )
+		
+		#local
+		self.edit_snapshots_path.setText( QString.fromUtf8( self.config.get_snapshots_path( mode = 'local') ) )
+		
+		#ssh
+		self.txt_ssh_host.setText( QString.fromUtf8( self.config.get_ssh_host() ) )
+		self.txt_ssh_port.setText( QString.fromUtf8( str(self.config.get_ssh_port()) ) )
+		self.txt_ssh_user.setText( QString.fromUtf8( self.config.get_ssh_user() ) )
+		self.txt_ssh_path.setText( QString.fromUtf8( self.config.get_snapshots_path_ssh() ) )
+		self.set_combo_value( self.combo_ssh_cipher, self.config.get_ssh_cipher(), type = 'str' )
+		
+##		#dummy
+##		self.txt_dummy_host.setText( QString.fromUtf8( self.config.get_dummy_host() ) )
+##		self.txt_dummy_port.setText( QString.fromUtf8( self.config.get_dummy_port() ) )
+##		self.txt_dummy_user.setText( QString.fromUtf8( self.config.get_dummy_user() ) )
 
 		self.cb_auto_host_user_profile.setChecked( self.config.get_auto_host_user_profile() )
 		host, user, profile = self.config.get_host_user_profile()
@@ -555,6 +671,7 @@
 		self.set_combo_value( self.combo_automatic_snapshots_time, self.config.get_automatic_backup_time() )
 		self.set_combo_value( self.combo_automatic_snapshots_day, self.config.get_automatic_backup_day() )
 		self.set_combo_value( self.combo_automatic_snapshots_weekday, self.config.get_automatic_backup_weekday() )
+		self.txt_automatic_snapshots_time_custom.setText( self.config.get_custom_backup_time() )
 		self.update_automatic_snapshot_time( self.config.get_automatic_backup_mode() )
 
 		#TAB: Include
@@ -619,13 +736,76 @@
 		self.update_min_free_space()
 
 	def save_profile( self ):
+		if self.combo_automatic_snapshots.itemData( self.combo_automatic_snapshots.currentIndex() ).toInt()[0] == self.config.CUSTOM_HOUR:
+			if not tools.check_cron_pattern(str( self.txt_automatic_snapshots_time_custom.text().toUtf8() ) ):
+				self.error_handler( _('Custom Hours can only be a comma seperate list of hours (e.g. 8,12,18,23) or */3 for periodic backups every 3 hours') )
+				return False
+			
+		#mode
+		mode = str( self.combo_modes.itemData( self.combo_modes.currentIndex() ).toString().toUtf8() )
+		self.config.set_snapshots_mode( mode )
+		mount_kwargs = {}
+		
+		#ssh
+		ssh_host = str( self.txt_ssh_host.text().toUtf8() )
+		ssh_port = str( self.txt_ssh_port.text().toUtf8() )
+		ssh_user = str( self.txt_ssh_user.text().toUtf8() )
+		ssh_path = str( self.txt_ssh_path.text().toUtf8() )
+		ssh_cipher = str( self.combo_ssh_cipher.itemData( self.combo_ssh_cipher.currentIndex() ).toString().toUtf8() )
+		if mode == 'ssh':
+			mount_kwargs = { 'host': ssh_host, 'port': int(ssh_port), 'user': ssh_user, 'path': ssh_path, 'cipher': ssh_cipher }
+			
+##		#dummy
+##		dummy_host = str( self.txt_dummy_host.text().toUtf8() )
+##		dummy_port = str( self.txt_dummy_port.text().toUtf8() )
+##		dummy_user = str( self.txt_dummy_user.text().toUtf8() )
+##		if mode == 'dummy':
+##			#values must have exactly the same Type (str, int or bool) 
+##			#as they are set in config or you will run into false-positive
+##			#HashCollision warnings
+##			mount_kwargs = { 'host': dummy_host, 'port': int(dummy_port), 'user': dummy_user }
+			
+		if not self.config.SNAPSHOT_MODES[mode][0] is None:
+			#pre_mount_check
+			mnt = mount.Mount(cfg = self.config, tmp_mount = True)
+			try:
+				mnt.pre_mount_check(mode = mode, first_run = True, **mount_kwargs)
+			except mount.MountException as ex:
+				self.error_handler(str(ex))
+				return False
+
+			#okay, lets try to mount
+			try:
+				hash_id = mnt.mount(mode = mode, check = False, **mount_kwargs)
+			except mount.MountException as ex:
+				self.error_handler(str(ex))
+				return False
+		
 		#snapshots path
 		self.config.set_auto_host_user_profile( self.cb_auto_host_user_profile.isChecked() )
 		self.config.set_host_user_profile(
 				str( self.txt_host.text().toUtf8() ),
 				str( self.txt_user.text().toUtf8() ),
 				str( self.txt_profile.text().toUtf8() ) )
-		self.config.set_snapshots_path( str( self.edit_snapshots_path.text().toUtf8() ) )
+				
+		if self.config.SNAPSHOT_MODES[mode][0] is None:
+			snapshots_path = str( self.edit_snapshots_path.text().toUtf8() )
+		else:
+			snapshots_path = self.config.get_snapshots_path(mode = mode, tmp_mount = True)
+			
+		self.config.set_snapshots_path( snapshots_path, mode = mode )
+		
+		#save ssh
+		self.config.set_ssh_host(ssh_host)
+		self.config.set_ssh_port(ssh_port)
+		self.config.set_ssh_user(ssh_user)
+		self.config.set_snapshots_path_ssh(ssh_path)
+		self.config.set_ssh_cipher(ssh_cipher)
+		
+##		#save dummy
+##		self.config.set_dummy_host(dummy_host)
+##		self.config.set_dummy_port(dummy_port)
+##		self.config.set_dummy_user(dummy_user)
 
 		#include list 
 		include_list = []
@@ -648,6 +828,7 @@
 		self.config.set_automatic_backup_time( self.combo_automatic_snapshots_time.itemData( self.combo_automatic_snapshots_time.currentIndex() ).toInt()[0] )
 		self.config.set_automatic_backup_weekday( self.combo_automatic_snapshots_weekday.itemData( self.combo_automatic_snapshots_weekday.currentIndex() ).toInt()[0] )
 		self.config.set_automatic_backup_day( self.combo_automatic_snapshots_day.itemData( self.combo_automatic_snapshots_day.currentIndex() ).toInt()[0] )
+		self.config.set_custom_backup_time( str( self.txt_automatic_snapshots_time_custom.text().toUtf8() ) )
 
 		#auto-remove
 		self.config.set_remove_old_snapshots( 
@@ -684,6 +865,15 @@
 		self.config.set_preserve_xattr( self.cb_preserve_xattr.isChecked() )
 		self.config.set_copy_unsafe_links( self.cb_copy_unsafe_links.isChecked() )
 		self.config.set_copy_links( self.cb_copy_links.isChecked() )
+		
+		#umount
+		if not self.config.SNAPSHOT_MODES[mode][0] is None:
+			try:
+				mnt.umount(hash_id = hash_id)
+			except mount.MountException as ex:
+				self.error_handler(str(ex))
+				return False
+		return True
 
 	def error_handler( self, message ):
 		KMessageBox.error( self, QString.fromUtf8( message ) )
@@ -777,14 +967,18 @@
 		for key in keys:
 			combo.addItem( QIcon(), QString.fromUtf8( dict[ key ] ), QVariant( key ) )
 
-	def set_combo_value( self, combo, value ):
+	def set_combo_value( self, combo, value, type = 'int' ):
 		for i in xrange( combo.count() ):
-			if value == combo.itemData( i ).toInt()[0]:
+			if type == 'int' and value == combo.itemData( i ).toInt()[0]:
+				combo.setCurrentIndex( i )
+				break
+			if type == 'str' and value == combo.itemData( i ).toString():
 				combo.setCurrentIndex( i )
 				break
 
 	def validate( self ):
-		self.save_profile()
+		if not self.save_profile():
+			return False
 
 		if not self.config.check_config():
 			return False
@@ -886,7 +1080,21 @@
 				if not self.question_handler( _('Are you sure you want to change snapshots folder ?') ):
 					return
 			self.edit_snapshots_path.setText( QString.fromUtf8( self.config.prepare_path( path ) ) )
-
+		
+	def on_combo_modes_changed(self, *params):
+		if len(params) == 0:
+			index = self.combo_modes.currentIndex()
+		else:
+			index = params[0]
+		active_mode = str( self.combo_modes.itemData( index ).toString().toUtf8() )
+		if active_mode != self.mode:
+			for mode in self.config.SNAPSHOT_MODES.keys():
+				if active_mode == mode:
+					getattr(self, 'mode_%s' % mode).show()
+				else:
+					getattr(self, 'mode_%s' % mode).hide()
+			self.mode = active_mode
+		
 	def accept( self ):
 		if self.validate():
 			KDialog.accept( self )