Merge lp:~adreeve/backintime/samba_access into lp:backintime/1.0

[Adam Reeve]

Adds support for backing up to network shares. It currently implements samba shares but more protocols can be added by specifying commands to mount and unmount the share. This can be configured in both the Gnome and KDE GUIs.

[lp:~adreeve/backintime/samba_access]

724. By Adam Reeve on 2010-03-28

Fix problems when updating snapshot locations to new version when using samba access.

725. By Adam Reeve on 2010-03-31

Merge from trunk

726. By Adam Reeve on 2010-04-16

Merge from trunk

Unmerged revisions

726. By Adam Reeve on 2010-04-16

Merge from trunk

725. By Adam Reeve on 2010-03-31

Merge from trunk

724. By Adam Reeve on 2010-03-28

Fix problems when updating snapshot locations to new version when using samba access.

723. By Adam Reeve on 2010-03-27

Removed all my vim modelines

722. By Adam Reeve on 2010-03-27

Changed mount commands to use full path as otherwise get a command not found error when running as a cron job

721. By Adam Reeve on 2010-03-27

Work on KDE interface for network access

720. By Adam Reeve on 2010-03-27

Fixed crash when config file doesn't exist

719. By Adam Reeve on 2010-03-27

Work on samba access, GTK interface should be finished now

718. By Adam Reeve on 2010-03-26

Merged changes in trunk

717. By Adam Reeve on 2010-03-23

Work on gnome interface for network shares

=== modified file 'common/config.py'
--- common/config.py	2010-04-01 17:57:51 +0000
+++ common/config.py	2010-04-16 06:46:25 +0000
@@ -22,10 +22,12 @@
 import gettext
 import socket
 import random
+import re
 
 import configfile
 import tools
 import logger
+import network
 
 _=gettext.gettext
 
@@ -175,10 +177,41 @@
 					self.remove_profile_key( 'snapshots.include_folders', profile_id )
 					self.remove_profile_key( 'snapshots.exclude_patterns', profile_id )
 
-			self.set_int_value( 'config.version', self.CONFIG_VERSION )
+		# make sure config version is set
+		self.set_int_value( 'config.version', self.CONFIG_VERSION )
+
+		# mount required network shares
+		self.mount_shares()
+
+	def mount_shares( self, profile=None ):
+		self.network_mounts = {}
+		if profile is None:
+			profiles = self.get_profiles()
+		else:
+			profiles = [profile]
+		for profile_id in profiles:
+			if (self.get_snapshot_access_mode(profile_id) in network.NETWORK_ACCESS_MODES):
+				# mount network share now if the snapshots are stored on a network share
+				path = self.get_profile_str_value('snapshots.network_path','',profile_id)
+				protocol = self.get_snapshot_access_mode(profile_id)
+				username = self.get_profile_str_value('snapshots.username','',profile_id)
+				password = network.password_decode(self.get_profile_str_value('snapshots.password','',profile_id))
+				self.network_mounts[profile_id] = network.NetworkMount(path,protocol,username,password)
+
+	def unmount_shares( self ):
+		for mount in self.network_mounts.values():
+			mount.unmount()
+		self.network_mounts.clear()
+
+	def update_shares( self ):
+		self.unmount_shares()
+		self.mount_shares()
 
 	def save( self ):
 		configfile.ConfigFile.save( self, self._LOCAL_CONFIG_PATH )
+		# make sure no other users can read the config file 
+		# as it may contain encoded passwords for network shares
+		os.chmod(self._LOCAL_CONFIG_PATH,0600)
 
 	def check_config( self ):
 		profiles = self.get_profiles()
@@ -252,8 +285,27 @@
 		return user
 
 	def get_snapshots_path( self, profile_id = None ):
+		if (self.get_snapshot_access_mode(profile_id) in network.NETWORK_ACCESS_MODES):
+			if profile_id is None:
+				profile_id = self.get_current_profile()
+			if profile_id not in self.network_mounts.keys():
+				self.mount_shares(profile_id)
+			return self.network_mounts[profile_id].path()
+		else:
+			return self.get_snapshots_local_path( profile_id )
+
+	def get_snapshots_local_path( self, profile_id = None ):
 		return self.get_profile_str_value( 'snapshots.path', '', profile_id )
 
+	def get_snapshots_username( self, profile_id = None ):
+		return self.get_profile_str_value( 'snapshots.username', '', profile_id )
+
+	def get_snapshots_password( self, profile_id = None ):
+		return network.password_decode(self.get_profile_str_value( 'snapshots.password', '', profile_id ))
+
+	def get_snapshots_network_path( self, profile_id = None ):
+		return self.get_profile_str_value( 'snapshots.network_path', '', profile_id )
+
 	def get_snapshots_full_path( self, profile_id = None, version = None ):
 		'''Returns the full path for the snapshots: .../backintime/machine/user/profile_id/'''
 		if version is None:
@@ -304,6 +356,54 @@
 		
 		os.rmdir( check_path )
 		self.set_profile_str_value( 'snapshots.path', value, profile_id )
+		self.set_profile_int_value( 'snapshots.access', network.LOCAL, profile_id )
+		return True
+
+	def set_snapshots_network_details( self, location, protocol, username, password, profile_id = None ):
+		"""Sets network access details and checks that they work"""
+		# remove anything like smb: at the start
+		match = re.compile(r"^([a-zA-Z]+:)?(//)?(.+)$").match(location)
+		if not match: # only occurs if location is empty
+			self.notify_error( _( 'Invalid network location, %s' ) % location )
+			return False
+		location = "//"+match.group(3)
+
+		if profile_id == None:
+			profile_id = self.get_current_profile()
+
+		test_mount = network.NetworkMount(location, protocol, username, password)
+		if not test_mount.mounted():
+			test_mount.unmount() #removes directory
+			self.notify_error( _( 'Can\'t mount network share: %s\nAre you sure you sure your settings are correct?' % location ) )
+			return False
+
+		#Initialize the snapshots folder
+		print "Check snapshot mount: %s" % location
+		machine = socket.gethostname()
+		user = self.get_user()
+		full_path = os.path.join( test_mount.path(), '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 ?' % location ) )
+				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.replace(test_mount.path(),location) ) )
+			return False
+		os.rmdir( check_path )
+
+		test_mount.unmount()
+
+		encoded_pw = network.password_encode(password)
+		self.set_profile_int_value( 'snapshots.access', protocol, profile_id )
+		self.set_profile_str_value( 'snapshots.network_path', location, profile_id )
+		self.set_profile_str_value( 'snapshots.username', username, profile_id )
+		self.set_profile_str_value( 'snapshots.password', encoded_pw, profile_id )
 		return True
 
 	def get_other_folders_paths( self, profile_id = None ):
@@ -418,6 +518,12 @@
 	def get_tag( self, profile_id = None ):
 		return self.get_profile_str_value( 'snapshots.tag', str(random.randint(100, 999)), profile_id )
 
+	def get_snapshot_access_mode( self, profile_id = None ):
+		return self.get_profile_int_value( 'snapshots.access', network.LOCAL, profile_id )
+
+	def set_snapshot_access_mode( self, value, profile_id = None ):
+		self.set_profile_int_value( 'snapshots.access', value, 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 )
 

=== modified file 'common/debian_specific/control'
--- common/debian_specific/control	2010-04-01 17:57:51 +0000
+++ common/debian_specific/control	2010-04-16 06:46:25 +0000
@@ -7,7 +7,7 @@
 Homepage: http://backintime.le-web.org
 Architecture: all
 Depends: python, rsync, cron
-Recommends: powermgmt-base
+Recommends: powermgmt-base, smbfs
 Conflicts: backintime
 Replaces: backintime
 Description: Simple backup system (common)

=== added file 'common/network.py'
--- common/network.py	1970-01-01 00:00:00 +0000
+++ common/network.py	2010-04-16 06:46:25 +0000
@@ -0,0 +1,105 @@
+#    Back In Time
+#    Copyright (C) 2008-2009 Oprea Dan, Bart de Koning, Richard Bailey
+#
+#    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.path
+import os
+import tempfile
+import base64
+import gettext
+
+import tools
+
+_=gettext.gettext
+
+LOCAL = 0
+SAMBA = 1
+
+NETWORK_ACCESS_MODES = [SAMBA]
+
+SNAPSHOT_ACCESS = {
+            LOCAL : _('Local folder'),
+            SAMBA : _('Windows network share (Samba)')
+            }
+
+def password_encode(password):
+	"""encode a password using base64 but remove extra
+	   equals signs from the end so they can be stored
+	   in the config file"""
+	# this is not secure at all but means that the password
+	# isn't human readable in the config file. A more secure
+	# alternative would be to use the python keyring module 
+	# to store the password using the KDE or Gnome keyring manager
+	# but this isn't available in most distros yet
+	return base64.urlsafe_b64encode(password).strip("=")
+
+def password_decode(password):
+	"""return the base64 decoded password and pad with equals
+	   signs first so that the string is a multiple of 4 long"""
+	return base64.urlsafe_b64decode(password+'='*(4-len(password)%4))
+
+class NetworkMount:
+	def __init__( self, location, protocol, username="", password="" ):
+		self.location = location
+		self.username = username
+		self.password = password
+		supported_protocols = [SAMBA]
+		if protocol in supported_protocols:
+			self.protocol = protocol
+		else:
+			raise RuntimeError, "Unsupported network protocol, "+protocol
+		self.mount()
+
+	def __del__( self ):
+		self.unmount()
+
+	def mount( self ):
+		self.mount_dir = tempfile.mkdtemp(prefix="backintime_mount_")
+		# need to use full paths to mount and unmount commands so that they work in cron
+		if (self.protocol == SAMBA):
+			cmd = "/sbin/mount.cifs "+self.location+" "+self.mount_dir
+			if (self.username != "" and self.password != ""):
+				cmd += " -o username="+self.username+",password="+self.password
+		ret = _execute(cmd)
+		if (ret != 0):
+			print "Error mounting network share "+self.location
+
+	def unmount( self ):
+		"""Unmount a network share and delete the mount directory.
+		You can't rely on python to delete the NetworkMount object so
+		this should be called manually when finished with a network share"""
+		if self.mounted():
+			if (self.protocol == SAMBA):
+				cmd = "/sbin/umount.cifs "+self.mount_dir
+			_execute(cmd)
+		if os.path.isdir(self.mount_dir):
+			os.rmdir(self.mount_dir)
+
+	def path( self ):
+		return self.mount_dir
+
+	def mounted( self ):
+		if not os.path.isdir(self.mount_dir):
+			return False
+		ret = _execute("mountpoint "+self.mount_dir)
+		if (ret == 0):
+			return True
+		else:
+			return False
+
+def _execute( cmd ):
+	ret_val = os.system( cmd )
+	return ret_val

=== modified file 'common/snapshots.py'
--- common/snapshots.py	2010-03-29 14:27:12 +0000
+++ common/snapshots.py	2010-04-16 06:46:25 +0000
@@ -34,6 +34,7 @@
 import applicationinstance
 import tools
 import pluginmanager
+import network
 
 
 _=gettext.gettext
@@ -514,26 +515,45 @@
 				#print answer_same
 				profile_id = profiles[0]
 				#print profile_id
-				#old_folder = self.get_snapshots_path( profile_id )
-				#print old_folder
+				main_snapshot_access = self.config.get_snapshot_access_mode(profile_id)
+				if main_snapshot_access in network.NETWORK_ACCESS_MODES:
+					main_network_path=self.config.get_snapshots_network_path(profile_id)
+					main_username=self.config.get_snapshots_username(profile_id)
+					main_password=self.config.get_snapshots_password(profile_id)
+
 				main_folder = self.config.get_snapshots_path( profile_id )
-				old_snapshots_paths=[]
+				old_snapshots_paths = []
+				old_snapshot_access = []
+				old_network_path = {}
+				old_username = {}
+				old_password = {}
 				counter = 0
 				success = []
 				
 				for profile_id in profiles:
 					#print counter
+					old_snapshot_access.append(self.config.get_snapshot_access_mode(profile_id))
+					if old_snapshot_access[counter] in network.NETWORK_ACCESS_MODES:
+						old_network_path[counter] = self.config.get_snapshots_network_path(profile_id)
+						old_username[counter] = self.config.get_snapshots_username(profile_id)
+						old_password[counter] = self.config.get_snapshots_password(profile_id)
 					old_snapshots_paths.append( self.config.get_snapshots_path( profile_id ) )
 					#print old_snapshots_paths
 					old_folder = os.path.join( self.config.get_snapshots_path( profile_id ), 'backintime' )
 					#print old_folder
 					if profile_id != "1" and answer_same == True:
 						#print 'profile_id != 1, answer = True'
-						self.config.set_snapshots_path( main_folder, profile_id )
+						if main_snapshot_access in network.NETWORK_ACCESS_MODES:
+							self.config.set_snapshots_network_details( main_network_path, main_snapshot_access, main_username, main_password, profile_id )
+						else:
+							self.config.set_snapshots_path( main_folder, profile_id )
 						logger.info( 'Folder of profile %s is set to %s' %( profile_id, main_folder ) )
 					else:
-						self.config.set_snapshots_path( self.config.get_snapshots_path( profile_id ), profile_id )
-						logger.info( 'Folder of profile %s is set to %s' %( profile_id, main_folder ) )
+						if old_snapshot_access[counter] in network.NETWORK_ACCESS_MODES:
+							self.config.set_snapshots_network_details( old_network_path[counter], old_snapshot_access[counter], old_username[counter], old_password[counter], profile_id )
+						else:
+							self.config.set_snapshots_path( self.config.get_snapshots_path( profile_id ), profile_id )
+						logger.info( 'Folder of profile %s is set to %s' %( profile_id, old_folder ) )
 					new_folder = self.config.get_snapshots_full_path( profile_id )
 					#print new_folder
 					#snapshots_to_move = tools.get_snapshots_list_in_folder( old_folder )
@@ -560,7 +580,10 @@
 							success.append( False )
 							# restore
 							logger.info( 'Restore former settings' )
-							self.config.set_snapshots_path( old_snapshots_paths[counter], profile_id )
+							if old_snapshot_access[counter] in network.NETWORK_ACCESS_MODES:
+								self.config.set_snapshots_network_details( old_network_path[counter], old_snapshot_access[counter], old_username[counter], old_password[counter], profile_id )
+							else:
+								self.config.set_snapshots_path( old_snapshots_paths[counter], profile_id )
 							#print self.get_snapshots_path( profile_id )
 							self.config.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 ) )
 					
@@ -584,9 +607,16 @@
 				if answer_continue == True:
 					#self.set_update_other_folders( False )
 					for profile_id in profiles:
-						old_folder = self.config.get_snapshots_path( profile_id )
-						self.config.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 ) ) )
+						old_snapshot_access = self.config.get_snapshot_access_mode(profile_id)
+						if old_snapshot_access in network.NETWORK_ACCESS_MODES:
+							old_network_path = self.config.get_snapshots_network_path(profile_id)
+							old_username = self.config.get_snapshots_username(profile_id)
+							old_password = self.config.get_snapshots_password(profile_id)
+							self.config.set_snapshots_network_details( old_network_path, old_snapshot_access, old_username, old_password, profile_id )
+						else:
+							old_folder = self.config.get_snapshots_path( profile_id )
+							self.config.set_snapshots_path( old_folder, profile_id )
+						logger.info( 'Folder of profile %s is set to %s' %( profile_id, self.get_snapshot_path( profile_id ) ) )
 					
 					logger.info( 'BackinTime will be able to make new snapshots again!' )
 					self.config.error_handler( _('BackinTime will continue taking snapshots again as scheduled' ) )
@@ -1276,4 +1306,5 @@
 	config = config.Config()
 	snapshots = Snapshots( config )
 	snapshots.take_snapshot()
+	config.unmount_shares()
 

=== modified file 'common/tools.py'
--- common/tools.py	2010-02-14 13:47:14 +0000
+++ common/tools.py	2010-04-16 06:46:25 +0000
@@ -21,12 +21,10 @@
 import sys
 import subprocess
 
-
 ON_AC = 0
 ON_BATTERY = 1
 POWER_ERROR = 255
 
-
 def get_backintime_path( path ):
 	return os.path.join( os.path.dirname( os.path.abspath( os.path.dirname( __file__ ) ) ), path )
 
@@ -268,7 +266,7 @@
 		return False
 
 
-def _execute( cmd, callback = None, user_data = None ):
+def _execute( cmd, callback = None, user_data = None):
 	ret_val = 0
 
 	if callback is None:

=== modified file 'gnome/app.py'
--- gnome/app.py	2010-03-23 09:34:13 +0000
+++ gnome/app.py	2010-04-16 06:46:25 +0000
@@ -452,6 +452,7 @@
         #fill lists
         selected_file = None
         show_snapshots = False
+        self.config.update_shares()
         if init:
             self.folder_path, selected_file, show_snapshots = self.get_startup_folder_and_file()
         self.snapshot_id = '/'
@@ -925,12 +926,17 @@
             self.on_help()
 
     def on_btn_settings_clicked( self, button ):
-        snapshots_path = self.config.get_snapshots_path()
+        snapshots_local_path = self.config.get_snapshots_local_path()
+        snapshots_network_path = self.config.get_snapshots_network_path()
+        snapshots_access = self.config.get_snapshot_access_mode()
         include_folders = self.config.get_include()
 
         settingsdialog.SettingsDialog( self.config, self.snapshots, self ).run()
 
-        if snapshots_path != self.config.get_snapshots_path() or include_folders != self.config.get_include():
+        if (snapshots_local_path != self.config.get_snapshots_local_path() or 
+                snapshots_network_path != self.config.get_snapshots_network_path() or
+                snapshots_access != self.config.get_snapshot_access_mode() or
+                include_folders != self.config.get_include()):
             self.update_all( False )
         self.update_profiles()
 
@@ -1173,5 +1179,7 @@
         gtk.main()
     logger.closelog()
 
+    cfg.unmount_shares()
+
     app_instance.exit_application()
 

=== modified file 'gnome/settingsdialog.glade'
--- gnome/settingsdialog.glade	2010-03-05 20:41:59 +0000
+++ gnome/settingsdialog.glade	2010-04-16 06:46:25 +0000
@@ -123,42 +123,167 @@
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment1">
+                      <object class="GtkVBox" id="vbox1">
                         <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox4">
-                            <property name="visible">True</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">&#x25CF;</property>
-                              </object>
-                              <packing>
-                                <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>
-                                <signal name="clicked" handler="on_btn_where_clicked"/>
-                                <child>
-                                  <object class="GtkImage" id="image1">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-directory</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">3</property>
+                        <child>
+                          <object class="GtkAlignment" id="alignment3">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox8">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">True</property>
+                                <child>
+                                  <object class="GtkComboBox" id="cb_snapshot_access">
+                                    <property name="visible">True</property>
+                                    <signal name="changed" handler="on_cb_snapshot_access_changed"/>
+                                  </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment_where">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox4">
+                                <property name="visible">True</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">&#x2022;</property>
+                                  </object>
+                                  <packing>
+                                    <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>
+                                    <signal name="clicked" handler="on_btn_where_clicked"/>
+                                    <child>
+                                      <object class="GtkImage" id="image1">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-directory</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="alignment_network">
+                            <property name="left_padding">12</property>
+                            <child>
+                              <object class="GtkTable" id="table1">
+                                <property name="visible">True</property>
+                                <property name="n_rows">3</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">25</property>
+                                <child>
+                                  <object class="GtkEntry" id="edit_where_network">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">&#x2022;</property>
+                                    <property name="caps_lock_warning">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label7">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Network location</property>
+                                  </object>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label8">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Username</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="edit_username">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">&#x2022;</property>
+                                    <property name="caps_lock_warning">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label9">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Password</property>
+                                  </object>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="edit_password">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="visibility">False</property>
+                                    <property name="invisible_char">&#x2022;</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
                         </child>
                       </object>
                     </child>

=== modified file 'gnome/settingsdialog.py'
--- gnome/settingsdialog.py	2010-03-05 20:41:59 +0000
+++ gnome/settingsdialog.py	2010-04-16 06:46:25 +0000
@@ -30,6 +30,7 @@
 import config
 import messagebox
 import tools
+import network
 
 
 _=gettext.gettext
@@ -74,6 +75,7 @@
 				'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_snapshot_access_changed': self.on_cb_snapshot_access_changed,
 			}
 		
 		builder.connect_signals(signals)
@@ -102,6 +104,19 @@
 		#self.fcb_where = get( 'fcb_where' )
 		#self.fcb_where.set_show_hidden( self.parent.show_hidden_files )
 		self.edit_where = get( 'edit_where' )
+
+		#snapshot location access
+		self.store_snapshot_access_mode = gtk.ListStore( str, int )
+		map = network.SNAPSHOT_ACCESS
+		self.rev_snapshot_access_modes = {}
+		keys = map.keys()
+		keys.sort()
+		for key in keys:
+			self.rev_snapshot_access_modes[ map[key] ] = key
+			self.store_snapshot_access_mode.append( [ map[key], key ] )
+		self.edit_where_network = get( 'edit_where_network' )
+		self.edit_username = get( 'edit_username' )
+		self.edit_password = get( 'edit_password' )
 		
 		#automatic backup mode store
 		self.store_backup_mode = gtk.ListStore( str, int )
@@ -165,6 +180,18 @@
 		
 		self.store_exclude = gtk.ListStore( str, str )
 		self.list_exclude.set_model( self.store_exclude )
+
+		#setup snapshot access mode
+		self.cb_snapshot_access = get( 'cb_snapshot_access' )
+		self.cb_snapshot_access.set_model( self.store_snapshot_access_mode)
+
+		self.cb_snapshot_access.clear()
+		renderer = gtk.CellRendererText()
+		self.cb_snapshot_access.pack_start( renderer, True )
+		self.cb_snapshot_access.add_attribute( renderer, 'text', 0 )
+
+		self.alignment_where = get( 'alignment_where' )
+		self.alignment_network = get( 'alignment_network' )
 		
 		#setup automatic backup mode
 		self.cb_backup_mode = get( 'cb_backup_mode' )
@@ -306,6 +333,17 @@
 			self.profile_id = profile_id
 		
 		self.update_profile()
+
+	def on_cb_snapshot_access_changed( self, *params ):
+		iter = self.cb_snapshot_access.get_active_iter()
+		access = self.store_snapshot_access_mode.get_value( iter, 1 )
+
+		if access in network.NETWORK_ACCESS_MODES:
+			self.alignment_where.hide()
+			self.alignment_network.show()
+		else:
+			self.alignment_where.show()
+			self.alignment_network.hide()
 	
 	def update_profiles( self ):
 		self.disable_combo_changed = True
@@ -335,7 +373,12 @@
 		
 		#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_local_path( self.profile_id ) )
+
+		#setup network paths
+		self.edit_where_network.set_text( self.config.get_snapshots_network_path( self.profile_id ) )
+		self.edit_username.set_text( self.config.get_snapshots_username( self.profile_id ) )
+		self.edit_password.set_text( self.config.get_snapshots_password( self.profile_id ) )
 		
 		#per directory schedule
 		#self.cb_per_directory_schedule.set_active( self.config.get_per_directory_schedule() )
@@ -358,6 +401,17 @@
 		if len( exclude_patterns ) > 0:
 			for exclude_pattern in exclude_patterns:
 				self.store_exclude.append( [exclude_pattern, gtk.STOCK_DELETE] )
+
+		#setup snapshot access mode
+		i = 0
+		iter = self.store_snapshot_access_mode.get_iter_first()
+		default_mode = self.config.get_snapshot_access_mode( self.profile_id )
+		while not iter is None:
+			if self.store_snapshot_access_mode.get_value( iter, 1 ) == default_mode:
+				self.cb_snapshot_access.set_active( i )
+				break
+			iter = self.store_snapshot_access_mode.iter_next( iter )
+			i = i + 1
 		
 		#setup automatic backup mode
 		i = 0
@@ -443,13 +497,26 @@
 	
 	def save_profile( self ):
 		#profile_id = self.config.get_current_profile()
-		#snapshots path
-		snapshots_path = self.edit_where.get_text()
-		
-		#hack
-		if snapshots_path.startswith( '//' ):
-			snapshots_path = snapshots_path[ 1 : ]
-		
+
+		iter = self.cb_snapshot_access.get_active_iter()
+		access = self.store_snapshot_access_mode.get_value( iter, 1 )
+		if access in network.NETWORK_ACCESS_MODES:
+			network_path = self.edit_where_network.get_text()
+			username = self.edit_username.get_text()
+			password = self.edit_password.get_text()
+			if not self.config.set_snapshots_network_details(network_path,access,username,password):
+				return False
+			self.config.update_shares()
+		else:
+			#snapshots path
+			snapshots_path = self.edit_where.get_text()
+			#hack
+			if snapshots_path.startswith( '//' ):
+				snapshots_path = snapshots_path[ 1 : ]
+			#ok let's save to config
+			if not self.config.set_snapshots_path( snapshots_path, self.profile_id ):
+				return False
+
 		#include list 
 		include_list = []
 		iter = self.store_include.get_iter_first()
@@ -471,12 +538,6 @@
 		#if len( self.config.get_snapshots_path() ) > 0 and self.config.get_snapshots_path() != snapshots_path:
 		#   if gtk.RESPONSE_YES != messagebox.show_question( self.dialog, self.config, _('Are you sure you want to change snapshots folder ?') ):
 		#	   return False 
-		
-		#ok let's save to config
-		self.config.set_snapshots_path( snapshots_path, self.profile_id )
-		#if not msg is None:
-		#   messagebox.show_error( self.dialog, self.config, msg )
-		#   return False
 
 		self.config.set_include( include_list, self.profile_id )
 		self.config.set_exclude( exclude_list, self.profile_id )
@@ -509,6 +570,8 @@
 		self.config.set_run_ionice_from_cron_enabled( self.cb_run_ionice_from_cron.get_active(), self.profile_id )
 		self.config.set_run_ionice_from_user_enabled( self.cb_run_ionice_from_user.get_active(), self.profile_id )
 		self.config.set_no_on_battery_enabled( self.cb_no_on_battery.get_active(), self.profile_id )
+
+		return True
 	
 	def update_remove_old_backups( self, button ):
 		enabled = self.cb_remove_old_backup.get_active()
@@ -687,7 +750,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	2010-04-01 17:57:51 +0000
+++ kde4/app.py	2010-04-16 06:46:25 +0000
@@ -389,6 +389,8 @@
 
 		self.disable_profile_changed = False
 
+		self.config.update_shares()
+
 	def update_profile( self ):
 		self.update_time_line()
 		self.update_places()
@@ -1098,5 +1100,7 @@
 
 	logger.closelog()
 
+	cfg.unmount_shares()
+
 	app_instance.exit_application()
 

=== modified file 'kde4/settingsdialog.py'
--- kde4/settingsdialog.py	2010-03-05 20:41:59 +0000
+++ kde4/settingsdialog.py	2010-04-16 06:46:25 +0000
@@ -32,6 +32,7 @@
 import config
 import tools
 import kde4tools
+import network
 
 
 _=gettext.gettext
@@ -108,8 +109,15 @@
 		group_box.setTitle( QString.fromUtf8( _( 'Where to save snapshots' ) ) )
 		layout.addWidget( group_box )
 
-		hlayout = QHBoxLayout( group_box )
-
+		vlayout = QVBoxLayout( group_box )
+
+		self.combo_snapshot_access = KComboBox( self )
+		vlayout.addWidget(self.combo_snapshot_access)
+		self.fill_combo( self.combo_snapshot_access, network.SNAPSHOT_ACCESS )
+		QObject.connect( self.combo_snapshot_access, SIGNAL('currentIndexChanged(int)'), self.current_snapshot_access_changed )
+
+		# - In a local folder
+		hlayout = QHBoxLayout()
 		self.edit_snapshots_path = KLineEdit( self )
 		self.edit_snapshots_path.setReadOnly( True )
 		hlayout.addWidget( self.edit_snapshots_path )
@@ -118,6 +126,38 @@
 		hlayout.addWidget( self.btn_snapshots_path )
 		QObject.connect( self.btn_snapshots_path, SIGNAL('clicked()'), self.on_btn_snapshots_path_clicked )
 
+		self.local_path_widgets = [self.edit_snapshots_path, self.btn_snapshots_path]
+
+		vlayout.addLayout(hlayout)
+
+		# - Over the network
+		glayout = QGridLayout()
+		self.edit_snapshots_network_path = KLineEdit( self )
+		self.label_snapshots_network_path = QLabel(QString.fromUtf8( _( 'Network location')), self )
+		self.label_snapshots_network_path.setBuddy(self.edit_snapshots_network_path)
+		glayout.addWidget(self.label_snapshots_network_path,0,0)
+		glayout.addWidget(self.edit_snapshots_network_path,0,1)
+
+		self.edit_snapshots_username = KLineEdit( self )
+		self.label_snapshots_username = QLabel(QString.fromUtf8( _( 'Username')), self )
+		self.label_snapshots_username.setBuddy(self.edit_snapshots_username)
+		glayout.addWidget(self.label_snapshots_username,1,0)
+		glayout.addWidget(self.edit_snapshots_username,1,1)
+
+		self.edit_snapshots_password = KLineEdit( self )
+		self.edit_snapshots_password.setEchoMode(KLineEdit.EchoMode(KLineEdit.Password))
+		self.label_snapshots_password = QLabel(QString.fromUtf8( _( 'Password')), self )
+		self.label_snapshots_password.setBuddy(self.edit_snapshots_password)
+		glayout.addWidget(self.label_snapshots_password,2,0)
+		glayout.addWidget(self.edit_snapshots_password,2,1)
+
+		self.network_widgets = [self.edit_snapshots_network_path, self.label_snapshots_network_path,
+				self.edit_snapshots_username, self.label_snapshots_username,
+				self.edit_snapshots_password, self.label_snapshots_password]
+
+		glayout.setHorizontalSpacing(35)
+		vlayout.addLayout(glayout)
+
 		#Schedule
 		group_box = QGroupBox( self )
 		self.global_schedule_group_box = group_box
@@ -130,7 +170,7 @@
 		hlayout.addWidget( self.combo_automatic_snapshots, 2 )
 		self.fill_combo( self.combo_automatic_snapshots, self.config.AUTOMATIC_BACKUP_MODES )
 
-		hlayout_time = QHBoxLayout( group_box )
+		hlayout_time = QHBoxLayout()
 		hlayout.addLayout( hlayout_time )
 
 		self.lbl_automatic_snapshots_time = QLabel( QString.fromUtf8( _( 'Hour:' ) ), self )
@@ -356,6 +396,17 @@
 	def current_automatic_snapshot_changed( self, index ):
 		backup_mode = self.combo_automatic_snapshots.itemData( index ).toInt()[0]
 		self.update_automatic_snapshot_time( backup_mode )
+	
+	def update_snapshot_access_mode( self, access_mode ):
+		network_access = (access_mode in network.NETWORK_ACCESS_MODES)
+		for widget in self.local_path_widgets:
+			widget.setVisible(not network_access)
+		for widget in self.network_widgets:
+			widget.setVisible(network_access)
+
+	def current_snapshot_access_changed( self, index ):
+		access = self.combo_snapshot_access.itemData( index ).toInt()[0]
+		self.update_snapshot_access_mode( access )
 
 	def current_profile_changed( self, index ):
 		if self.disable_profile_changed:
@@ -395,7 +446,15 @@
 			self.btn_remove_profile.setEnabled( True )
 
 		#TAB: General
-		self.edit_snapshots_path.setText( QString.fromUtf8( self.config.get_snapshots_path() ) )
+		self.set_combo_value( self.combo_snapshot_access, self.config.get_snapshot_access_mode() )
+		self.update_snapshot_access_mode( self.config.get_snapshot_access_mode() )
+
+		self.edit_snapshots_path.setText( QString.fromUtf8( self.config.get_snapshots_local_path() ) )
+
+		self.edit_snapshots_network_path.setText( QString.fromUtf8( self.config.get_snapshots_network_path() ))
+		self.edit_snapshots_username.setText( QString.fromUtf8( self.config.get_snapshots_username() ))
+		self.edit_snapshots_password.setText( QString.fromUtf8( self.config.get_snapshots_password() ))
+
 		self.set_combo_value( self.combo_automatic_snapshots, self.config.get_automatic_backup_mode() )
 		self.set_combo_value( self.combo_automatic_snapshots_time, self.config.get_automatic_backup_time() )
 		self.update_automatic_snapshot_time( self.config.get_automatic_backup_mode() )
@@ -450,7 +509,17 @@
 
 	def save_profile( self ):
 		#snapshots path
-		self.config.set_snapshots_path( str( self.edit_snapshots_path.text().toUtf8() ) )
+		access = self.combo_snapshot_access.itemData( self.combo_snapshot_access.currentIndex() ).toInt()[0]
+		if access in network.NETWORK_ACCESS_MODES:
+			network_path = str( self.edit_snapshots_network_path.text().toUtf8() )
+			username = str( self.edit_snapshots_username.text().toUtf8() )
+			password = str( self.edit_snapshots_password.text().toUtf8() )
+			if not self.config.set_snapshots_network_details(network_path,access,username,password):
+				return False
+			self.config.update_shares()
+		else:
+			if not self.config.set_snapshots_path( str( self.edit_snapshots_path.text().toUtf8() ) ):
+				return False
 		
 		#include list 
 		include_list = []
@@ -495,6 +564,8 @@
 		self.config.set_run_ionice_from_user_enabled( self.cb_run_ionice_from_user.isChecked() )
 		self.config.set_no_on_battery_enabled( self.cb_no_on_battery.isChecked() )
 
+		return True
+
 	def error_handler( self, message ):
 		KMessageBox.error( self, QString.fromUtf8( message ) )
 
@@ -594,7 +665,8 @@
 				break
 
 	def validate( self ):
-		self.save_profile()
+		if not self.save_profile():
+			return False
 
 		if not self.config.check_config():
 			return False