Merge lp:~bratdaking/backintime/snapshot-location into lp:backintime/1.0

[Bart de Koning]

[Bart de Koning (bratdaking)]

Hey, its ready for merging! The GNOME and the KDE versions are tested and working as supposed and stable. So let me know what you think about it!
In short:

1) New Snapshot folder: backintime/machine/user/profile_id
2) Update process: blocks the creation of new snapshots until GUI is started (logs warnings)
   When GUI is launched asks you whether you like to move your old snaphots
   If you do not ask again if you are sure, if not BiT cannot take snapshots, if you do BiT can take snapshots (on new location), but snapshots are still on their old spot
   If you do want to move, your snapshots are moved (when more than 1 profile it asks you if you like it to have them all in the same folder), and BiT will take new snapshots again.
3) Snapshots can be left on the old spot, to be able to distinguish between snapshots snapshots_ids end with an unique random based tag (basically it is now able to show and recover from snapshots from other locations than the snapshot folder)
4) To test whether a snapshot path is a real snapshot it tests whether the folder backup exists within a snapshot (instead of only a name with 15 or 19 characters)

Cheers,
Bart

=== modified file 'common/backintime.py'
--- common/backintime.py	2009-11-02 13:52:00 +0000
+++ common/backintime.py	2009-11-09 11:15:22 +0000
@@ -25,6 +25,7 @@
 import config
 import logger
 import snapshots
+import tools
 
 _=gettext.gettext
 
@@ -41,6 +42,7 @@
 
 
 def print_version( cfg, app_name ):
+	print ''
 	print 'Back In Time'
 	print 'Version: ' + cfg.VERSION
 	print ''
@@ -83,7 +85,7 @@
 
 	skip = False
 	index = 0
-
+	
 	for arg in sys.argv[ 1 : ]:
 		index = index + 1
 

=== modified file 'common/config.py'
--- common/config.py	2009-11-02 13:52:00 +0000
+++ common/config.py	2009-11-09 11:15:23 +0000
@@ -20,10 +20,12 @@
 import os
 import datetime
 import gettext
+import socket
+import random
 
 import configfile
 import tools
-
+import logger
 
 _=gettext.gettext
 
@@ -35,7 +37,7 @@
 	APP_NAME = 'Back In Time'
 	VERSION = '0.9.99beta1'
 	COPYRIGHT = 'Copyright (c) 2008-2009 Oprea Dan, Bart de Koning, Richard Bailey'
-	CONFIG_VERSION = 3
+	CONFIG_VERSION = 4
 
 	NONE = 0
 	_5_MIN = 2
@@ -135,6 +137,25 @@
 			self.remap_key( 'snapshots.min_free_space.unit', 'profile1.snapshots.min_free_space.unit' )
 			self.remap_key( 'snapshots.dont_remove_named_snapshots', 'profile1.snapshots.dont_remove_named_snapshots' )
 			self.set_int_value( 'config.version', 3 )
+			
+		if self.get_int_value( 'config.version', 1 ) < 4:
+			# version 4 uses as path backintime/machine/user/profile_id
+			# but must be able to read old paths
+			profiles = self.get_profiles()
+			self.set_bool_value( 'update.other_folders', True )
+			logger.info( "Update to config version 4: other snapshot locations" )
+									
+			for profile_id in profiles:
+				old_folder = self.get_snapshots_path( profile_id )
+				other_folder = os.path.join( old_folder, 'backintime' )
+				other_folder_key = 'profile' + str( profile_id ) + '.snapshots.other_folders'
+				self.set_str_value( other_folder_key, other_folder )
+				#self.set_snapshots_path( old_folder, profile_id )
+				tag = str( random.randint(100, 999) )
+				logger.info( "Random tag for profile %s: %s" %( profile_id, tag ) )
+				self.set_profile_str_value( 'snapshots.tag', tag, profile_id ) 
+	
+			self.set_int_value( 'config.version', 4 )
 
 	def save( self ):
 		configfile.ConfigFile.save( self, self._LOCAL_CONFIG_PATH )
@@ -153,11 +174,12 @@
 				self.notify_error( _('Profile: "%s"') % profile_name + '\n' + _('Snapshots folder is not valid !') )
 				return False
 
-			for other_profile in checked_profiles:
-				if snapshots_path == self.get_snapshots_path( other_profile[0] ):
-					self.notify_error( _('Profiles "%s" and "%s" have the same snapshots path !') % ( profile_name, other_profile[1] ) )
-					return False
-
+			## Should not check for similar snapshot paths any longer! 
+			#for other_profile in checked_profiles:
+			#	if snapshots_path == self.get_snapshots_path( other_profile[0] ):
+			#		self.notify_error( _('Profiles "%s" and "%s" have the same snapshots path !') % ( profile_name, other_profile[1] ) )
+			#		return False
+			#
 			#if not os.path.isdir( snapshots_path ):
 			#	return ( 0, _('Snapshots folder is not valid !') )
 
@@ -191,20 +213,35 @@
 		return self.get_profile_str_value( 'snapshots.path', '', profile_id )
 
 	def get_snapshots_full_path( self, profile_id = None ):
-		return os.path.join( self.get_snapshots_path( profile_id ), 'backintime' ) 
+		'''Returns the full path for the snapshots: .../backintime/machine/user/profile_id/'''
+		if self.get_int_value( 'config.version', 1 ) < 4:
+			return os.path.join( self.get_snapshots_path( profile_id ), 'backintime' )
+		else:
+			machine = socket.gethostname()
+			user = os.environ['LOGNAME']
+			return os.path.join( self.get_snapshots_path( profile_id ), 'backintime', machine, user, profile_id ) 
 
 	def set_snapshots_path( self, value, profile_id = None ):
 		"""Sets the snapshot path to value, initializes, and checks it"""
 		if len( value ) <= 0:
 			return False
 
+		if profile_id == None:
+			print "BUG: calling set_snapshots_path without profile_id!"
+			tjoep
+			return False
+			
 		if not os.path.isdir( value ):
 			self.notify_error( _( '%s is not a folder !' ) )
 			return False
 
 		#Initialize the snapshots folder
-		full_path = os.path.join( value, 'backintime' ) 
+		print "Check snapshot folder: %s" % value
+		machine = socket.gethostname()
+		user = os.environ['LOGNAME']
+		full_path = os.path.join( value, 'backintime', machine, user, profile_id ) 
 		if not os.path.isdir( full_path ):
+			print "Create folder: %s" % full_path
 			tools.make_dirs( full_path )
 			if not os.path.isdir( full_path ):
 				self.notify_error( _( 'Can\'t write to: %s\nAre you sure you have write access ?' % value ) )
@@ -221,6 +258,24 @@
 		self.set_profile_str_value( 'snapshots.path', value, profile_id )
 		return True
 
+	def get_other_folders_paths( self, profile_id = None ):
+		'''Returns the other snapshots folders paths as a list'''
+		value = self.get_profile_str_value( 'snapshots.other_folders', '', profile_id )
+		if len( value ) <= 0:
+			return []
+			
+		paths = []
+
+		for item in value.split(':'):
+			fields = item.split( '|' )
+
+			path = os.path.expanduser( item )
+			path = os.path.abspath( path )
+
+			paths.append( ( path ) )
+
+		return paths
+	
 	def get_include_folders( self, profile_id = None ):
 		value = self.get_profile_str_value( 'snapshots.include_folders', '', profile_id )
 		if len( value ) <= 0:
@@ -252,9 +307,9 @@
 			value = value + item[0] + '|' + str( item[1] )
 
 		self.set_profile_str_value( 'snapshots.include_folders', value, profile_id )
-
-	# Sets the default exclude patterns: caches, thumbnails, trashbins, and backups 
+ 
 	def get_exclude_patterns( self, profile_id = None ):
+		'''Gets the exclude patterns (default: caches, thumbnails, trashbins, and backups)'''
 		value = self.get_profile_str_value( 'snapshots.exclude_patterns', '.cache*:[Cc]ache*:.thumbnails*:[Tt]rash*:*.backup*:*~', profile_id )
 		if len( value ) <= 0:
 			return []
@@ -263,6 +318,9 @@
 	def set_exclude_patterns( self, list, profile_id = None ):
 		self.set_profile_str_value( 'snapshots.exclude_patterns', ':'.join( list ), profile_id )
 
+	def get_tag( self, profile_id = None ):
+		return self.get_profile_str_value( 'snapshots.tag', str(random.randint(100, 999)), profile_id )
+
 	def get_automatic_backup_mode( self, profile_id = None ):
 		return self.get_profile_int_value( 'snapshots.automatic_backup_mode', self.NONE, profile_id )
 
@@ -440,6 +498,7 @@
 		return path
 
 	def is_configured( self, profile_id = None ):
+		'''Checks if the program is configured''' 
 		if len( self.get_snapshots_path( profile_id ) ) == 0:
 			return False
 
@@ -447,12 +506,126 @@
 			return False
 
 		return True
-
+	
+	def update_snapshot_location( self ):
+		'''Updates to location: backintime/machine/user/profile_id'''
+		if self.get_update_other_folders() == True:
+			logger.info( 'Snapshot location update flag detected' )
+			logger.warning( 'Snapshot location needs update' ) 
+			profiles = self.get_profiles()
+
+			answer_change = self.question_handler( _('BackinTime changed its backup format.\n\nYour old snapshots can be moved according to this new format. OK?') )
+			#print answer_change
+			if answer_change == True:
+				logger.info( 'Update snapshot locations' )
+				#print len( profiles )
+				
+				if len( profiles ) == 1:
+					logger.info( 'Only 1 profile found' )
+					answer_same = True
+				elif len( profiles ) > 1:
+					answer_same = self.question_handler( _('%s profiles found. \n\nThe new backup format supports storage of different users and profiles on the same location. Do you want the same location for both profiles? \n\n(The program will still be able to discriminate between them)') % len( profiles ) )
+				else:
+					logger.warning( 'No profiles are found!' )
+					self.notify_error( _( 'No profiles are found. Will have to update to profiles first, please restart BackinTime' ) )
+					logger.info( 'Config version is %s' % str( self.get_int_value( 'config.version', 1 ) ) )
+					
+					if self.get_int_value( 'config.version', 1 ) > 1:
+						self.set_int_value( 'config.version', 2 )
+						logger.info( 'Config version set to 2' )
+						return False
+					
+				# Moving old snapshots per profile_id
+				#print answer_same
+				profile_id = profiles[0]
+				#print profile_id
+				#old_folder = self.get_snapshots_path( profile_id )
+				#print old_folder
+				main_folder = self.get_snapshots_path( profile_id )
+				old_snapshots_paths=[]
+				counter = 0
+				success = []
+				
+				for profile_id in profiles:
+					#print counter
+					old_snapshots_paths.append( self.get_snapshots_path( profile_id ) )
+					#print old_snapshots_paths
+					old_folder = os.path.join( self.get_snapshots_path( profile_id ), 'backintime' )
+					#print old_folder
+					if profile_id != "1" and answer_same == True:
+						#print 'profile_id != 1, answer = True'
+						self.set_snapshots_path( main_folder, profile_id )
+						logger.info( 'Folder of profile %s is set to %s' %( profile_id, main_folder ) )
+					else:
+						self.set_snapshots_path( self.get_snapshots_path( profile_id ), profile_id )
+						logger.info( 'Folder of profile %s is set to %s' %( profile_id, main_folder ) )
+					new_folder = self.get_snapshots_full_path( profile_id )
+					#print new_folder
+					#snapshots_to_move = tools.get_snapshots_list_in_folder( old_folder )
+					#print snapshots_to_move
+
+					output = tools.move_snapshots_folder( old_folder, new_folder )
+
+					snapshots_left = tools.get_snapshots_list_in_folder( old_folder )
+					if output == True:
+						success.append( True )
+						if len( snapshots_left ) == 0:
+							logger.info( 'Update was successful. Snapshots of profile %s are moved to their new location' % profile_id )
+						else:
+							logger.warning( 'Not all snapshots are removed from the original folder!' )
+							logger.info( 'The following snapshots are still present: %s' % snapshots_left )
+							logger.info( 'You could move them manually or leave them where they are now' )
+					else:
+						logger.warning( '%s: are not moved to their new location!' %snapshots_left )
+						
+						answer_unsuccessful = self.question_handler( _('%s\nof profile %s are not moved to their new location\nDo you want to proceed?\n(BackinTime will be able to continue taking snapshots, however the remaining snapshots will not be considered for automatic removal)\n\nIf not BackinTime will restore former settings for this profile, however cannot continue taking snapshots' %( snapshots_left, profile_id ) ) )
+						if answer_unsuccessful == True:
+							success.append( True )
+						else:
+							success.append( False )
+							# restore
+							logger.info( 'Restore former settings' )
+							self.set_snapshots_path( old_snapshots_paths[counter], profile_id )
+							#print self.get_snapshots_path( profile_id )
+							self.error_handler( _('Former settings of profile %s are restored.\nBackinTime cannot continue taking new snapshots.\n\nYou can manually move the snapshots, \nif you are done restart BackinTime to proceed' %profile_id ) )
+					
+					counter = counter + 1
+				
+				#print success
+				overall_success = True
+				for item in success:
+					if item == False:
+						overall_success = False	
+				if overall_success == True:
+					self.set_update_other_folders( False )
+					#print self.get_update_other_folders()
+					logger.info( 'BackinTime will be able to make new snapshots again!' )
+					self.error_handler( _('Update was successful!\n\nBackinTime will continue taking snapshots again as scheduled' ) )
+			elif answer_change == False:
+				logger.info( 'Move refused by user' )
+				logger.warning( 'Old snapshots are not taken into account by smart-remove' )
+				answer_continue = self.question_handler( _('Are you sure you do not want to move your old snapshots?\n\n\nIf you do, you will not see these questions again next time, BackinTime will continue making snapshots again, but smart-remove cannot take your old snapshots into account any longer!\n\nIf you do not, you will be asked again next time you start BackinTime.') )
+				if answer_continue == True:
+					self.set_update_other_folders( False )
+					for profile_id in profiles:
+						old_folder = self.get_snapshots_path( profile_id )
+						self.set_snapshots_path( old_folder, profile_id )
+						logger.info( 'Folder of profile %s is set to %s' %( profile_id, self.get_snapshots_path( profile_id ) ) )
+					
+					logger.info( 'BackinTime will be able to make new snapshots again!' )
+					self.error_handler( _('BackinTime will continue taking snapshots again as scheduled' ) )
+				else: 
+					self.error_handler( _( 'BackinTime still cannot continue taking new snapshots.\nRestart BackinTime to see the questions again' ) )
+			else:
+				return False
+		
 	def can_backup( self, profile_id = None ):
+		'''Checks if snapshots_path exists''' 
 		if not self.is_configured( profile_id ):
 			return False
 
 		if not os.path.isdir( self.get_snapshots_full_path( profile_id ) ):
+			print "%s does not exist" % self.get_snapshots_full_path( profile_id )
 			return False
 
 		return True
@@ -534,7 +707,12 @@
 				os.system( "( crontab -l; %s ) | crontab -" % cron_line )
 
 		return True
-
+	
+	def get_update_other_folders( self ):
+		return self.get_bool_value( 'update.other_folders', True )
+		
+	def set_update_other_folders( self, value ):
+		self.set_bool_value( 'update.other_folders', value )
 
 if __name__ == "__main__":
 	config = Config()

=== modified file 'common/snapshots.py'
--- common/snapshots.py	2009-11-02 13:52:00 +0000
+++ common/snapshots.py	2009-11-09 11:15:23 +0000
@@ -40,6 +40,8 @@
 
 
 class Snapshots:
+	SNAPSHOT_VERSION = 3
+
 	def __init__( self, cfg = None ):
 		self.config = cfg
 		if self.config is None:
@@ -48,19 +50,64 @@
 		self.plugin_manager = pluginmanager.PluginManager()
 
 	def get_snapshot_id( self, date ):
-		if type( date ) is datetime.datetime:
-			return date.strftime( '%Y%m%d-%H%M%S' )
-
-		if type( date ) is datetime.date:
-			return date.strftime( '%Y%m%d-000000' )
-
-		if type( date ) is str:
-			return date
+		profile_id = self.config.get_current_profile()
+		tag = self.config.get_tag( profile_id )
+		
+		if type( date ) is datetime.datetime:
+			snapshot_id = date.strftime( '%Y%m%d-%H%M%S' ) + '-' + tag
+			return snapshot_id
+
+		if type( date ) is datetime.date:
+			snapshot_id = date.strftime( '%Y%m%d-000000' ) + '-' + tag
+			return snapshot_id
+
+		if type( date ) is str:
+			snapshot_id = date
+			return snapshot_id
+		
+		return ""
+
+	def get_snapshot_old_id( self, date ):
+		profile_id = self.config.get_current_profile()
+		
+		if type( date ) is datetime.datetime:
+			snapshot_id = date.strftime( '%Y%m%d-%H%M%S' )
+			return snapshot_id
+
+		if type( date ) is datetime.date:
+			snapshot_id = date.strftime( '%Y%m%d-000000' )
+			return snapshot_id
+
+		if type( date ) is str:
+			snapshot_id = date
+			return snapshot_id
 		
 		return ""
 
 	def get_snapshot_path( self, date ):
-		return os.path.join( self.config.get_snapshots_full_path(), self.get_snapshot_id( date ) )
+		profile_id = self.config.get_current_profile()
+		path = os.path.join( self.config.get_snapshots_full_path( profile_id ), self.get_snapshot_id( date ) )
+		if os.path.exists( path ):
+			#print path
+			return path
+		other_folders = self.config.get_other_folders_paths()
+		for folder in other_folders:
+			path_other = os.path.join( folder, self.get_snapshot_id( date ) )
+			if os.path.exists( path_other ):
+				#print path_other
+				return path_other
+		old_path = os.path.join( self.config.get_snapshots_full_path( profile_id ), self.get_snapshot_old_id( date ) )
+		if os.path.exists( path ):
+			#print path
+			return path
+		other_folders = self.config.get_other_folders_paths()
+		for folder in other_folders:
+			path_other = os.path.join( folder, self.get_snapshot_old_id( date ) )
+			if os.path.exists( path_other ):
+				#print path_other
+				return path_other				
+		#print path
+		return path
 
 	def get_snapshot_info_path( self, date ):
 		return os.path.join( self.get_snapshot_path( date ), 'info' )
@@ -258,11 +305,12 @@
 		backup_suffix = '.backup.' + datetime.date.today().strftime( '%Y%m%d' )
 		#cmd = "rsync -avR --copy-unsafe-links --whole-file --backup --suffix=%s --chmod=+w %s/.%s %s" % ( backup_suffix, self.get_snapshot_path_to( snapshot_id ), path, '/' )
 		cmd = "rsync -avRAXE --whole-file --backup --suffix=%s " % backup_suffix
-		cmd = cmd + '--chmod=+w '
+		#cmd = cmd + '--chmod=+w '
 		cmd = cmd + "\"%s.%s\" %s" % ( self.get_snapshot_path_to( snapshot_id ), path, '/' )
 		self._execute( cmd )
 
 		#restore permissions
+		logger.info( "Restore permissions" )
 		file_info_dict = self.load_fileinfo_dict( snapshot_id, info_file.get_int_value( 'snapshot_version' ) )
 		if len( file_info_dict ) > 0:
 			#explore items
@@ -290,23 +338,67 @@
 			for item_path in all_dirs:
 				self._restore_path_info( item_path, file_info_dict )
 
+
 	def get_snapshots_list( self, sort_reverse = True ):
-		biglist = []
-		snapshots_path = self.config.get_snapshots_full_path()
-
-		try:
-			biglist = os.listdir( snapshots_path )
-		except:
-			pass
-
-		list = []
-
-		for item in biglist:
-			if len( item ) != 15:
-				continue
-			if os.path.isdir( os.path.join( snapshots_path, item ) ):
-				list.append( item )
-
+		'''Returns a list with the snapshot_ids of all snapshots in the snapshots folder'''
+		biglist = []
+		profile_id = self.config.get_current_profile()
+		snapshots_path = self.config.get_snapshots_full_path( profile_id )
+		
+		try:
+			biglist = os.listdir( snapshots_path )
+		except:
+			pass
+
+		list = []
+
+		for item in biglist:
+			if len( item ) != 15 and len( item ) != 19:
+				continue
+			if os.path.isdir( os.path.join( snapshots_path, item, 'backup' ) ):
+				list.append( item )
+
+		list.sort( reverse = sort_reverse )
+		return list
+		
+	def get_snapshots_and_other_list( self, sort_reverse = True ):
+		'''Returns a list with the snapshot_ids, and paths, of all snapshots in the snapshots_folder and the other_folders'''
+
+		biglist = []
+		profile_id = self.config.get_current_profile()
+		snapshots_path = self.config.get_snapshots_full_path( profile_id )
+		snapshots_other_paths = self.config.get_other_folders_paths()
+		
+		try:
+			biglist = os.listdir( snapshots_path )
+		except:
+			pass
+			
+		list = []
+
+		for item in biglist:
+			if len( item ) != 15 and len( item ) != 19:
+				continue
+			if os.path.isdir( os.path.join( snapshots_path, item, 'backup' ) ):
+				#a = ( item, snapshots_path )
+				list.append( item )
+
+				
+		if len( snapshots_other_paths ) > 0:	
+			for folder in snapshots_other_paths:
+				folderlist = []
+				try:
+					folderlist = os.listdir( folder )
+				except:
+					pass
+				
+				for member in folderlist:
+					if len( member ) != 15 and len( member ) != 19:
+						continue
+					if os.path.isdir( os.path.join( folder, member,  'backup' ) ):
+						#a = ( member, folder )
+						list.append( member )
+		
 		list.sort( reverse = sort_reverse )
 		return list
 
@@ -321,6 +413,14 @@
 		cmd = "rm -rfv \"%s\"" % path
 		self._execute( cmd )
 
+	def copy_snapshot( self, snapshot_id, new_folder ):
+		'''Copies a known snapshot to a new location'''
+		current.path = self.get_snapshot_path( snapshot_id )
+		#need to implement hardlinking to existing folder -> cp newest snapshot folder, rsync -aEAXHv --delete to this folder
+		cmd = "cp -al \"%s\"* \"%s\"" % ( current_path, new_folder )
+		logger.info( '%s is copied to folder %s' %( snapshot_id, new_folder ) )
+		self._execute( cmd )
+
 	def _get_last_snapshot_info( self ):
 		lines = ''
 		dict = {}
@@ -376,6 +476,9 @@
 		elif self.config.is_no_on_battery_enabled() and tools.on_battery():
 			logger.info( 'Deferring backup while on battery' )
 			logger.warning( 'Backup not performed' )
+		elif self.config.get_update_other_folders() == True:
+			logger.info( 'The application needs to change the backup format. Start the GUI to proceed. (As long as you do not you will not be able to make new snapshots!)' )
+			logger.warning( 'Backup not performed' )
 		else:
 			instance = applicationinstance.ApplicationInstance( self.config.get_take_snapshot_instance_file(), False )
 			if not instance.check():
@@ -396,15 +499,17 @@
 					now = now.replace( second = 0 )
 
 				include_folders, ignore_folders, dict = self._get_backup_folders( now, force )
-
+				
 				if len( include_folders ) <= 0:
 					logger.info( 'Nothing to do' )
 				else:
 					self.plugin_manager.on_process_begins() #take snapshot process begin
-
+					logger.info( "on process begins" )
 					self.set_take_snapshot_message( 0, '...' )
-
-					if not self.config.can_backup():
+					profile_id = self.config.get_current_profile()
+					logger.info( "Profile_id: %s" % profile_id )
+					
+					if not self.config.can_backup( profile_id ):
 						if self.plugin_manager.has_gui_plugins() and self.config.is_notify_enabled():
 							for counter in xrange( 30, 0, -1 ):
 								self.set_take_snapshot_message( 1, 
@@ -415,13 +520,13 @@
 								if self.config.can_backup():
 									break
 
-					if not self.config.can_backup():
+					if not self.config.can_backup( profile_id ):
 						logger.warning( 'Can\'t find snapshots folder !' )
 						self.plugin_manager.on_error( 3 ) #Can't find snapshots directory (is it on a removable drive ?)
 					else:
 						snapshot_id = self.get_snapshot_id( now )
 						snapshot_path = self.get_snapshot_path( snapshot_id )
-
+						
 						if os.path.exists( snapshot_path ):
 							logger.warning( "Snapshot path \"%s\" already exists" % snapshot_path )
 							self.plugin_manager.on_error( 4, snapshot_id ) #This snapshots already exists
@@ -580,7 +685,7 @@
 
 		new_snapshot_id = 'new_snapshot'
 		new_snapshot_path = self.get_snapshot_path( 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 a+rwx \"%s\"" %  new_snapshot_path )
@@ -594,7 +699,7 @@
 				return False
 
 		new_snapshot_path_to = self.get_snapshot_path_to( new_snapshot_id )
-
+		
 		#create exclude patterns string
 		items = []
 		for exclude in self.config.get_exclude_patterns():
@@ -629,9 +734,17 @@
 			self._set_last_snapshot_info( dict )
 
 		#check previous backup
+		#snapshots = self.get_snapshots_and_other_list() -> should only contain the personal snapshots
 		snapshots = self.get_snapshots_list()
 		prev_snapshot_id = ''
-
+		
+		if len( snapshots ) == 0:
+			snapshots = self.get_snapshots_and_other_list()
+			# When there is no snapshots it takes the last snapshot from the other folders
+			# It should delete the excluded folders then
+			rsync_prefix = rsync_prefix + '--delete-excluded '
+			
+			
 		if len( snapshots ) > 0:
 			prev_snapshot_id = snapshots[0]
 			prev_snapshot_name = self.get_snapshot_display_id( prev_snapshot_id )
@@ -731,17 +844,19 @@
 
 		fileinfo.close()
 
-		#create info file
+		#create info file 
 		logger.info( "Create info file" ) 
 		machine = socket.gethostname()
 		user = os.environ['LOGNAME']
 		profile_id = self.config.get_current_profile()
+		tag = self.config.get_tag( profile_id )
 		info_file = configfile.ConfigFile()
-		info_file.set_int_value( 'snapshot_version', 2 )
-		info_file.set_str_value( 'snapshot_date', snapshot_id )
+		info_file.set_int_value( 'snapshot_version', self.SNAPSHOT_VERSION )
+		info_file.set_str_value( 'snapshot_date', snapshot_id[0:15] )
 		info_file.set_str_value( 'snapshot_machine', machine )
 		info_file.set_str_value( 'snapshot_user', user )
 		info_file.set_int_value( 'snapshot_profile_id', profile_id )
+		info_file.set_int_value( 'snapshot_tag', tag )
 		info_file.save( self.get_snapshot_info_path( new_snapshot_id ) )
 		info_file = None
 
@@ -787,6 +902,7 @@
 
 	def smart_remove( self, now_full = None ):
 		snapshots = self.get_snapshots_list()
+		logger.info( "[smart remove] considered: %s" % snapshots )
 		if len( snapshots ) <= 1:
 			logger.info( "[smart remove] There is only one snapshots, so keep it" )
 			return
@@ -849,7 +965,7 @@
 			snapshots = self.get_snapshots_list( False )
 
 			old_backup_id = self.get_snapshot_id( self.config.get_remove_old_snapshots_date() )
-			logger.info( "Remove backups older than: %s" % old_backup_id )
+			logger.info( "Remove backups older than: %s" % old_backup_id[0:15] )
 
 			while True:
 				if len( snapshots ) <= 1:

=== modified file 'common/tools.py'
--- common/tools.py	2009-11-02 13:52:00 +0000
+++ common/tools.py	2009-11-09 11:15:23 +0000
@@ -141,3 +141,149 @@
 	else:
 		return False
 
+def get_snapshots_list_in_folder( folder, sort_reverse = True ):
+	biglist = []
+	#print folder
+
+	try:
+		biglist = os.listdir( folder )
+		#print biglist
+	except:
+		pass
+
+	list = []
+
+	for item in biglist:
+		#print item + ' ' + str(len( item ))
+		if len( item ) != 15 and len( item ) != 19:
+			continue
+		if os.path.isdir( os.path.join( folder, item, 'backup' ) ):
+			#print item
+			list.append( item )
+
+	list.sort( reverse = sort_reverse )
+	return list
+
+def get_nonsnapshots_list_in_folder( folder, sort_reverse = True ):
+	biglist = []
+	#print folder
+
+	try:
+		biglist = os.listdir( folder )
+		#print biglist
+	except:
+		pass
+
+	list = []
+
+	for item in biglist:
+		#print item + ' ' + str(len( item ))
+		if len( item ) != 15 and len( item ) != 19:
+			list.append( item )
+		else: 
+			if os.path.isdir( os.path.join( folder, item, 'backup' ) ):
+				#print item
+				continue
+			else:
+				list.append( item )
+
+	list.sort( reverse = sort_reverse )
+	return list
+	
+def move_snapshots_folder( old_folder, new_folder ):
+	'''Moves all the snapshots from one folder to another'''
+	print "\nMove snapshots from %s to %s" %( old_folder, new_folder )	
+
+	# Fetch a list with snapshots for verification
+	snapshots_to_move = get_snapshots_list_in_folder( old_folder )
+	snapshots_already_there = []
+	if os.path.exists( new_folder ) == True:
+		snapshots_already_there = get_snapshots_list_in_folder( new_folder )
+	else:
+		tools.make_dirs( new_folder )	
+	print "To move: %s" % snapshots_to_move
+	print "Already there: %s" % snapshots_already_there
+	snapshots_expected = snapshots_to_move + snapshots_already_there
+	print "Snapshots expected: %s" % snapshots_expected
+	
+	# Check if both folders are within the same os
+	device_old = os.stat( old_folder ).st_dev
+	device_new = os.stat( new_folder ).st_dev
+	if device_old == device_new:
+		# Use move
+		for snapshot in snapshots_to_move:
+			cmd = "mv -f \"%s/%s\" \"%s\"" %( old_folder, snapshot, new_folder )
+			_execute( cmd )
+	else:
+		# Use rsync
+		# Prepare hardlinks 
+		if len( snapshots_already_there ) > 0:
+			first_snapshot_path = os.path.join( new_folder, snapshots_to_move[ len( snapshots_to_move ) - 1 ] )
+			snapshot_to_hardlink_path =  os.path.join( new_folder, snapshots_already_there[0] )
+			cmd = "cp -al \"%s\" \"%s\"" % ( snapshot_to_hardlink_path, first_snapshot_path )
+			_execute( cmd )
+	
+		# Prepare excludes
+		nonsnapshots = get_nonsnapshots_list_in_folder( old_folder )
+		print "Nonsnapshots: %s" % nonsnapshots
+		items = []
+		for nonsnapshot in nonsnapshots:
+			for item in items:
+				if nonsnapshot == item:
+					break
+			items.append( "--exclude=\"%s\"" % nonsnapshot )
+		rsync_exclude = ' '.join( items )
+		#print rsync_exclude
+		
+		# Move move move
+		cmd = "rsync -aEAXHv --delete " + old_folder + " " + new_folder + " " + rsync_exclude
+		_execute( cmd )
+		
+	# Remove old ones
+	snapshots_not_moved = []
+	for snapshot in snapshots_to_move:
+		if os.path.exists( os.path.join( new_folder, snapshot, "backup" ) ):
+			if os.path.exists( os.path.join( old_folder, snapshot) ):
+				print "Remove: %s" %snapshot
+				path_to_remove = os.path.join( old_folder, snapshot )
+				cmd = "find \"%s\" -type d -exec chmod u+wx {} \\;" % path_to_remove #Debian patch
+				_execute( cmd )
+				cmd = "rm -rfv \"%s\"" % path_to_remove
+				_execute( cmd )
+			else:
+				print "%s was already removed" %snapshot
+		else: 
+			snapshots_not_moved.append( snapshot )
+				
+	# Check snapshot list
+	if len( snapshots_not_moved ) == 0:
+		print "Succes!\n"
+		return True
+	else:
+		print "Error! Not moved: %s\n" %snapshots_not_moved
+		return False
+		
+def _execute( cmd, callback = None, user_data = None ):
+	ret_val = 0
+
+	if callback is None:
+		ret_val = os.system( cmd )
+	else:
+		pipe = os.popen( cmd, 'r' )
+
+		while True:
+			line = pipe.readline()
+			if len( line ) == 0:
+				break
+			callback( line.strip(), user_data )
+
+		ret_val = pipe.close()
+		if ret_val is None:
+			ret_val = 0
+
+	if ret_val != 0:
+		print "Command \"%s\" returns %s" % ( cmd, ret_val ) 
+	else:
+		print "Command \"%s\" returns %s" % ( cmd, ret_val ) 
+
+	return ret_val

=== modified file 'gnome/app.py'
--- gnome/app.py	2009-11-02 13:52:00 +0000
+++ gnome/app.py	2009-11-09 11:15:23 +0000
@@ -301,8 +301,12 @@
 
             if not self.config.is_configured():
                 return 
-
-        if not self.config.can_backup():
+	
+	if self.config.get_update_other_folders() == True:
+		settingsdialog.SettingsDialog( self.config, self ).update_snapshot_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') )
 
         self.update_profiles()
@@ -617,7 +621,12 @@
         self.store_time_line.clear()
         self.store_time_line.append( [ gnometools.get_snapshot_display_markup( self.snapshots, '/' ), '/' ] )
 
-        self.snapshots_list = self.snapshots.get_snapshots_list() 
+        self.snapshots_list = self.snapshots.get_snapshots_and_other_list()
+
+        #print self.snapshots_list
+        #self.snapshots_list = []
+        #for item in  self.snapshots_list_complete:
+        #	self.snapshots_list.append( item[0] )
 
         groups = []
         now = datetime.date.today()
@@ -1126,6 +1135,7 @@
 
     logger.openlog()
     main_window = MainWindow( cfg, app_instance )
+    		
     if cfg.is_configured():
         gtk.main()
     logger.closelog()

=== modified file 'gnome/settingsdialog.glade'
--- gnome/settingsdialog.glade	2009-10-07 10:01:30 +0000
+++ gnome/settingsdialog.glade	2009-11-09 11:15:23 +0000
@@ -421,7 +421,7 @@
               <object class="GtkTable" id="table2">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
-                <property name="n_rows">5</property>
+                <property name="n_rows">6</property>
                 <property name="n_columns">3</property>
                 <property name="column_spacing">5</property>
                 <property name="row_spacing">5</property>
@@ -550,6 +550,20 @@
                     <property name="x_padding">20</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="label5">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Auto-remove only removes snapshots from the selected snapshots folder</property>
+                    <attributes>
+                      <attribute name="style" value="italic"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="position">3</property>

=== modified file 'gnome/settingsdialog.py'
--- gnome/settingsdialog.py	2009-11-02 13:52:00 +0000
+++ gnome/settingsdialog.py	2009-11-09 11:15:23 +0000
@@ -379,6 +379,7 @@
 		self.cb_no_on_battery.set_active( self.config.is_no_on_battery_enabled() )
 	
 	def save_profile( self ):
+		profile_id = self.config.get_current_profile()
 		#snapshots path
 		snapshots_path = self.edit_where.get_text()
 		
@@ -406,7 +407,7 @@
 		#	   return False 
 		
 		#ok let's save to config
-		self.config.set_snapshots_path( snapshots_path )
+		self.config.set_snapshots_path( snapshots_path, profile_id )
 		#if not msg is None:
 		#   messagebox.show_error( self.dialog, self.config, msg )
 		#   return False
@@ -482,7 +483,13 @@
 		self.config.clear_handlers()
 		
 		self.dialog.destroy()
-	
+	   
+	def update_snapshot_location( self ):
+		'''Update snapshot location dialog'''
+		self.config.set_question_handler( self.question_handler )
+		self.config.set_error_handler( self.error_handler )
+		self.config.update_snapshot_location()
+
 	def on_add_profile(self, button, data=None):
 		
 		name = messagebox.text_input_dialog( self.dialog, self.config, _('New profile'), None )

=== modified file 'kde4/app.py'
--- kde4/app.py	2009-11-02 13:52:00 +0000
+++ kde4/app.py	2009-11-09 11:15:23 +0000
@@ -297,8 +297,13 @@
 
 		if not cfg.is_configured():
 			return
+	
+		if self.config.get_update_other_folders() == True:
+			settingsdialog.SettingsDialog( self ).update_snapshot_location()
 
-		if not cfg.can_backup():
+		
+		profile_id = cfg.get_current_profile()
+		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') ) )
 
 		QObject.connect( self.list_files_view_model.dirLister(), SIGNAL('completed()'), self.on_dir_lister_completed )
@@ -497,7 +502,7 @@
 		elif not self.btn_take_snapshot.isEnabled():
 			self.btn_take_snapshot.setEnabled( True )
 			
-			snapshots_list = self.snapshots.get_snapshots_list()
+			snapshots_list = self.snapshots.get_snapshots_and_other_list()
 
 			if snapshots_list != self.snapshots_list:
 				self.snapshots_list = snapshots_list
@@ -617,7 +622,7 @@
 		self.add_time_line( QString.fromUtf8( self.snapshots.get_snapshot_display_name( '/' ) ), '/' )
 
 		if get_snapshots_list:
-			self.snapshots_list = self.snapshots.get_snapshots_list() 
+			self.snapshots_list = self.snapshots.get_snapshots_and_other_list() 
 
 		groups = []
 		now = datetime.date.today()

=== modified file 'kde4/settingsdialog.py'
--- kde4/settingsdialog.py	2009-11-02 13:52:00 +0000
+++ kde4/settingsdialog.py	2009-11-09 11:15:23 +0000
@@ -457,6 +457,12 @@
 
 		return ret_val
 
+    	def update_snapshot_location( self ):
+		'''Update snapshot location dialog'''
+		self.config.set_question_handler( self.question_handler )
+        	self.config.set_error_handler( self.error_handler )
+		self.config.update_snapshot_location()
+	
 	def update_include_columns( self ):
 		if self.cb_per_diretory_schedule.isChecked():
 			self.list_include.showColumn( 1 )