Merge lp:~bratdaking/backintime/bug-423086 into lp:backintime/1.0

[Bart de Koning]

[Bart de Koning (bratdaking)]

This branch contains a check whether there is write access to the snapshots folder, and more info is added to the info file, to facilitate future ideas

=== modified file 'CHANGES'
--- CHANGES	2009-10-15 01:35:38 +0000
+++ CHANGES	2009-10-16 21:00:28 +0000
@@ -13,6 +13,7 @@
 * fix exclude patterns in KDE4 (LP:#432537)
 * fix opening german files with external applications in KDE (LP: #404652)
 * changed default exclude patterns to caches, thumbnails, trashbins, and backups (LP: #422132)
+* write access to snapshot folder is checked & change to snapshot version 2 (LP: #423086)
 * fix small bugs
 * Fix bug in schedule per included folder (LP: #412470)
 * Used a more standard crontab syntax (LP: #409783)

=== modified file 'common/config.py'
--- common/config.py	2009-10-15 01:35:38 +0000
+++ common/config.py	2009-10-16 21:00:28 +0000
@@ -194,6 +194,7 @@
 		return os.path.join( self.get_snapshots_path( profile_id ), 'backintime' ) 
 
 	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
 
@@ -201,13 +202,22 @@
 			self.notify_error( _( '%s is not a folder !' ) )
 			return False
 
+		#Initialize the snapshots folder
 		full_path = os.path.join( value, 'backintime' ) 
 		if not os.path.isdir( 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 have write access ?' ) )
+				self.notify_error( _( 'Can\'t write to: %s\nAre you sure you have write access ?' % value ) )
 				return False
-
+		
+		#Test write access for the folder
+		check_path = os.path.join( full_path, 'check' )
+		tools.make_dirs( check_path )
+		if not os.path.isdir( check_path ):
+			self.notify_error( _( 'Can\'t write to: %s\nAre you sure you have write access ?' % full_path ) )
+			return False
+		
+		os.rmdir( check_path )
 		self.set_profile_str_value( 'snapshots.path', value, profile_id )
 		return True
 

=== modified file 'common/snapshots.py'
--- common/snapshots.py	2009-10-14 20:54:05 +0000
+++ common/snapshots.py	2009-10-16 21:00:28 +0000
@@ -26,6 +26,7 @@
 import bz2
 import pwd
 import grp
+import socket
 
 import config
 import configfile
@@ -731,8 +732,16 @@
 		fileinfo.close()
 
 		#create info file
+		logger.info( "Create info file" ) 
+		machine = socket.gethostname()
+		user = os.environ['LOGNAME']
+		profile_id = self.config.get_current_profile()
 		info_file = configfile.ConfigFile()
-		info_file.set_int_value( 'snapshot_version', 1 )
+		info_file.set_int_value( 'snapshot_version', 2 )
+		info_file.set_str_value( 'snapshot_date', snapshot_id )
+		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.save( self.get_snapshot_info_path( new_snapshot_id ) )
 		info_file = None
 

=== modified file 'gnome/app.py'
--- gnome/app.py	2009-10-15 15:28:29 +0000
+++ gnome/app.py	2009-10-16 21:00:28 +0000
@@ -311,7 +311,7 @@
         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()
@@ -329,10 +329,11 @@
         self.update_all( first_update_all )
 
     def update_profiles( self ):
+    	"""Populates the profile list"""
         self.disable_combo_changed = True
 
         profiles = self.config.get_profiles_sorted_by_name()
-
+		
         select_iter = None
         self.store_profiles.clear()
 
@@ -893,6 +894,7 @@
 
         if snapshots_path != self.config.get_snapshots_path() or include_folders != self.config.get_include_folders():
             self.update_all( False )
+        self.update_profiles()
 
     def on_btn_snapshot_name_clicked( self, button ):
         iter = self.list_time_line.get_selection().get_selected()[1]