Merge lp:~rmjb/backintime/bug-388178 into lp:backintime/1.0

[Richard Bailey]

=== modified file 'CHANGES'
--- CHANGES	2009-05-27 14:52:37 +0000
+++ CHANGES	2009-08-27 01:38:19 +0000
@@ -3,6 +3,7 @@
 Version 1.0.0
 * update Slovak translation (Tomáš Vadina <[e-mail]>)
 * multiple profiles support
+* added expert option to disable snapshots when on battery
 * GNOME: fix notification
 * fix small bugs
 

=== modified file 'common/config.py'
--- common/config.py	2009-06-23 07:18:58 +0000
+++ common/config.py	2009-08-27 01:38:19 +0000
@@ -349,6 +349,12 @@
 	def set_run_nice_from_cron_enabled( self, value, profile_id = None ):
 		self.set_profile_bool_value( 'snapshots.cron.nice', value, profile_id )
 
+	def is_no_on_battery_enabled( self, profile_id = None ):
+		return self.get_profile_bool_value( 'snapshots.no_on_battery', False, profile_id )
+
+	def set_no_on_battery_enabled( self, value, profile_id = None ):
+		self.set_profile_bool_value( 'snapshots.no_on_battery', value, profile_id )
+
 	def get_take_snapshot_user_script( self, step, profile_id = None ):
 		return self.get_str_value( "snapshots.take_snapshot.%s.user.script" % step, profile_id )
 

=== modified file 'common/debian_specific/control'
--- common/debian_specific/control	2009-06-23 07:18:58 +0000
+++ common/debian_specific/control	2009-08-27 01:38:19 +0000
@@ -6,6 +6,7 @@
 Architecture: all
 Homepage: http://backintime.le-web.org
 Depends: python, rsync, cron
+Recommends: powermgmt-base
 Conflicts: backintime
 Replaces: backintime
 Description: Simple backup system (common)

=== modified file 'common/snapshots.py'
--- common/snapshots.py	2009-05-14 13:27:37 +0000
+++ common/snapshots.py	2009-08-27 01:38:19 +0000
@@ -371,12 +371,18 @@
 		if not self.config.is_configured():
 			logger.warning( 'Not configured' )
 			self.plugin_manager.on_error( 1 ) #not configured
+		elif self.config.is_no_on_battery_enabled() and tools.on_battery():
+			logger.info( 'Deferring backup while on battery' )
+			logger.warning( 'Backup not performed' )
 		else:
 			instance = applicationinstance.ApplicationInstance( self.config.get_take_snapshot_instance_file(), False )
 			if not instance.check():
 				logger.warning( 'A backup is already running' )
 				self.plugin_manager.on_error( 2 ) #a backup is already running
 			else:
+				if self.config.is_no_on_battery_enabled () and not tools.power_status_available():
+					logger.warning( 'Backups disabled on battery but power status is not available' )
+								
 				instance.start_application()
 				logger.info( 'Lock' )
 

=== modified file 'common/tools.py'
--- common/tools.py	2009-06-10 11:33:16 +0000
+++ common/tools.py	2009-08-27 01:38:19 +0000
@@ -19,7 +19,12 @@
 import os.path
 import os
 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 )
@@ -117,3 +122,22 @@
 	return path
 
 
+def power_status_available():
+	"""Uses the on_ac_power command to detect if the the system is able
+	to return the power status."""
+	try:
+		rt = subprocess.call( 'on_ac_power' )
+		if rt == ON_AC or rt == ON_BATTERY:
+			return True
+	except:
+		pass
+	return False
+
+
+def on_battery():
+	"""Checks if the system is on battery power."""
+	if power_status_available ():
+		return subprocess.call ( 'on_ac_power' ) == ON_BATTERY
+	else:
+		return False
+

=== modified file 'gnome/settingsdialog.glade'
--- gnome/settingsdialog.glade	2009-05-27 12:43:59 +0000
+++ gnome/settingsdialog.glade	2009-08-27 01:38:19 +0000
@@ -658,11 +658,25 @@
                   </packing>
                 </child>
                 <child>
+                  <widget class="GtkCheckButton" id="cb_no_on_battery">
+                    <property name="label" translatable="yes">Disable snapshots when on battery</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
                   <widget class="GtkLabel" id="label16">
                     <property name="visible">True</property>
                   </widget>
                   <packing>
-                    <property name="position">3</property>
+                    <property name="position">4</property>
                   </packing>
                 </child>
               </widget>

=== modified file 'gnome/settingsdialog.py'
--- gnome/settingsdialog.py	2009-06-10 11:33:16 +0000
+++ gnome/settingsdialog.py	2009-08-27 01:38:19 +0000
@@ -206,6 +206,12 @@
 
 		#enable notifications
 		self.cb_enable_notifications = self.glade.get_widget( 'cb_enable_notifications' )
+		
+		#don't run when on battery
+		self.cb_no_on_battery = self.glade.get_widget( 'cb_no_on_battery' )
+		if not tools.power_status_available ():
+			self.cb_no_on_battery.set_sensitive( False )
+			self.cb_no_on_battery.set_tooltip_text( 'Power status not available from system' )
 
 		self.update_profiles()
 
@@ -358,6 +364,9 @@
 		#run 'nice' from cron
 		self.cb_run_nice_from_cron = self.glade.get_widget( 'cb_run_nice_from_cron' )
 		self.cb_run_nice_from_cron.set_active( self.config.is_run_nice_from_cron_enabled() )
+		
+		#don't run when on battery
+		self.cb_no_on_battery.set_active( self.config.is_no_on_battery_enabled() )
 
 	def save_profile( self ):
 		#snapshots path
@@ -416,6 +425,7 @@
 		#expert options
 		self.config.set_per_directory_schedule( self.cb_per_directory_schedule.get_active() )
 		self.config.set_run_nice_from_cron_enabled( self.cb_run_nice_from_cron.get_active() )
+		self.config.set_no_on_battery_enabled( self.cb_no_on_battery.get_active() )
 
 	def update_remove_old_backups( self, button ):
 		enabled = self.cb_remove_old_backup.get_active()

=== modified file 'kde4/settingsdialog.py'
--- kde4/settingsdialog.py	2009-06-23 08:37:33 +0000
+++ kde4/settingsdialog.py	2009-08-27 01:38:19 +0000
@@ -30,6 +30,7 @@
 from PyKDE4.kio import *
 
 import config
+import tools
 import kde4tools
 
 
@@ -265,6 +266,12 @@
 		self.cb_run_nice_from_cron = QCheckBox( QString.fromUtf8( _( 'Run \'nice\' as cron job (default: enabled)' ) ), self )
 		layout.addWidget( self.cb_run_nice_from_cron )
 
+		self.cb_no_on_battery = QCheckBox( QString.fromUtf8( _( 'Disable snapshots when on battery' ) ), self )
+		if not tools.power_status_available ():
+			self.cb_no_on_battery.setEnabled ( False )
+			self.cb_no_on_battery.setToolTip ( QString.fromUtf8 ( _( 'Power status not available from system' ) ) )
+		layout.addWidget( self.cb_no_on_battery )
+
 		#
 		layout.addStretch()
 
@@ -382,6 +389,7 @@
 		#TAB: Expert Options
 		self.cb_per_diretory_schedule.setChecked( self.config.get_per_directory_schedule() )
 		self.cb_run_nice_from_cron.setChecked( self.config.is_run_nice_from_cron_enabled() )
+		self.cb_no_on_battery.setChecked( self.config.is_no_on_battery_enabled() )
 
 		#update
 		self.update_include_columns()
@@ -428,6 +436,7 @@
 		#expert options
 		self.config.set_per_directory_schedule( self.cb_per_diretory_schedule.isChecked() )
 		self.config.set_run_nice_from_cron_enabled( self.cb_run_nice_from_cron.isChecked() )
+		self.config.set_no_on_battery_enabled( self.cb_no_on_battery.isChecked() )
 
 	def error_handler( self, message ):
 		KMessageBox.error( self, QString.fromUtf8( message ) )