Merge lp:~trent-trentonadams/backintime/human-readable into lp:backintime/1.0

[Trenton D. Adams]

I've added rsync --human-readable support

- modified gnome and kde applications to set the configuration
- tested both gnome and kde applications, making sure they can toggle human_readable flag in ~/.config/backintime/config
- backup runs with --human-readable.

I think this is a simple enough change to consider it "stable".

I wanted this feature so that when I twitter the summary of how much data was transferred, it is easily readable.

For example, now I get this...
sent 150.30M bytes received 2.62M bytes 719.59K bytes/sec

Instead of something like this...
sent 150123456 bytes received 2621325 bytes 719591 bytes/sec

I grab the 150M awk, and send that value out with my tweet.

[lp:~trent-trentonadams/backintime/human-readable]

782. By Trenton D. Adams on 2011-05-12

- oops, removed use_checksum capability by accident

783. By Trenton D. Adams on 2011-05-12

- and apparently they use tabs

[Trenton D. Adams (trent-trentonadams)]

oops, I accidentally messed up the kde app by removing checksum capability. Should I cancel this merge request, and make a new one?

[Germar (germar)]

Thanks for the code and sorry it took that long before someone looked at it. I added -h flag (same as --human-readable) permanently for next major version 1.0. So this is obsolete by now.

review: Disapprove

Unmerged revisions

783. By Trenton D. Adams on 2011-05-12

- and apparently they use tabs

782. By Trenton D. Adams on 2011-05-12

- oops, removed use_checksum capability by accident

781. By Trenton D. Adams on 2011-05-10

- add --human-readable support for kde app

780. By Trenton D. Adams on 2011-05-10

- add rsync --human-readable support

=== modified file 'common/config.py'
--- common/config.py	2011-01-05 20:09:02 +0000
+++ common/config.py	2011-05-12 04:41:10 +0000
@@ -641,6 +641,12 @@
 	def set_use_checksum( self, value, profile_id = None ):
 		return self.set_profile_bool_value( 'snapshots.use_checksum', value, profile_id )
 
+	def human_readable( self, profile_id = None ):
+		return self.get_profile_bool_value( 'snapshots.human_readable', False, profile_id )
+
+	def set_human_readable( self, value, profile_id = None ):
+		return self.set_profile_bool_value( 'snapshots.human_readable', value, profile_id )
+
 	def log_level( self, profile_id = None ):
 		return self.get_profile_int_value( 'snapshots.log_level', 3, profile_id )
 

=== modified file 'common/tools.py'
--- common/tools.py	2010-11-16 20:32:10 +0000
+++ common/tools.py	2011-05-12 04:41:10 +0000
@@ -348,6 +348,9 @@
 	if config.use_checksum():
 		cmd = cmd + ' --checksum'
 
+	if config.human_readable():
+		cmd = cmd + ' --human-readable'
+
 	if config.copy_unsafe_links():
 		cmd = cmd + ' --copy-unsafe-links'
 

=== modified file 'gnome/settingsdialog.glade'
--- gnome/settingsdialog.glade	2011-02-13 21:10:04 +0000
+++ gnome/settingsdialog.glade	2011-05-12 04:41:10 +0000
@@ -1011,6 +1011,19 @@
                   </packing>
                 </child>
                 <child>
+                  <object class="GtkCheckButton" id="cb_human_readable">
+                    <property name="label" translatable="yes">Output numbers in human readable format</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+                <child>
                   <object class="GtkHBox" id="hbox9">
                     <property name="visible">True</property>
                     <property name="spacing">5</property>
@@ -1035,7 +1048,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">5</property>
+                    <property name="position">6</property>
                   </packing>
                 </child>
                 <child>

=== modified file 'gnome/settingsdialog.py'
--- gnome/settingsdialog.py	2010-11-02 20:51:40 +0000
+++ gnome/settingsdialog.py	2011-05-12 04:41:10 +0000
@@ -254,6 +254,9 @@
 		self.cb_use_gloobus_preview.set_active( self.config.get_bool_value( 'gnome.use_gloobus_preview', True ) )
 		self.cb_use_checksum = get( 'cb_use_checksum' )
 
+    #enable human readable format
+		self.cb_human_readable= get( 'cb_human_readable' )
+
 		#log level
 		self.store_log_level = gtk.ListStore( int, str )
 		self.combo_log_level = get( 'combo_log_level' )
@@ -493,6 +496,9 @@
 		#use checksum
 		self.cb_use_checksum.set_active( self.config.use_checksum( self.profile_id ) )
 		
+    #human readable format
+		self.cb_human_readable.set_active( self.config.human_readable( self.profile_id ) )
+
 		#log level
 		self.combo_log_level.set_active( self.config.log_level( self.profile_id ) )
 
@@ -586,6 +592,7 @@
 		self.config.set_backup_on_restore( self.cb_backup_on_restore.get_active(), self.profile_id )
 		self.config.set_continue_on_errors( self.cb_continue_on_errors.get_active(), self.profile_id )
 		self.config.set_use_checksum( self.cb_use_checksum.get_active(), self.profile_id )
+		self.config.set_human_readable( self.cb_human_readable.get_active(), self.profile_id )
 		self.config.set_log_level( self.store_log_level.get_value( self.combo_log_level.get_active_iter(), 0 ), self.profile_id )
 		
 		#expert options

=== modified file 'kde4/settingsdialog.py'
--- kde4/settingsdialog.py	2011-02-13 21:10:04 +0000
+++ kde4/settingsdialog.py	2011-05-12 04:41:10 +0000
@@ -352,6 +352,9 @@
 		self.cb_use_checksum = QCheckBox( QString.fromUtf8( _( 'Use checksum to detect changes' ) ), self )
 		layout.addWidget( self.cb_use_checksum )
 
+		self.cb_human_readable = QCheckBox( QString.fromUtf8( _( 'Output numbers in human readable format' ) ), self )
+		layout.addWidget( self.cb_human_readable)
+
 		#log level
 		hlayout = QHBoxLayout()
 		layout.addLayout( hlayout )
@@ -557,6 +560,7 @@
 		self.cb_backup_on_restore.setChecked( self.config.is_backup_on_restore_enabled() )
 		self.cb_continue_on_errors.setChecked( self.config.continue_on_errors() )
 		self.cb_use_checksum.setChecked( self.config.use_checksum() )
+		self.cb_human_readable.setChecked( self.config.human_readable() )
 		self.set_combo_value( self.combo_log_level, self.config.log_level() )
 
 		#TAB: Expert Options
@@ -626,6 +630,7 @@
 		self.config.set_backup_on_restore( self.cb_backup_on_restore.isChecked() )
 		self.config.set_continue_on_errors( self.cb_continue_on_errors.isChecked() )
 		self.config.set_use_checksum( self.cb_use_checksum.isChecked() )
+		self.config.set_human_readable( self.cb_human_readable.isChecked() )
 		self.config.set_log_level( self.combo_log_level.itemData( self.combo_log_level.currentIndex() ).toInt()[0] )
 
 		#expert options