Merge lp:~flimm/usb-creator/warn-before-format into lp:usb-creator

[David D Lowe]

[lp:~flimm/usb-creator/warn-before-format]

259. By David D Lowe on 2010-01-13

Merged with trunk.

260. By David D Lowe on 2010-01-13

Display partition name instead of drive name if only one partition is going to be deleted.

[Dimitri John Ledkov (xnox)]

Now we do have a warning dialog box "Are you sure you want to erase this drive?" (at least in gtk).
Also we erase individual partitions now.
Is this still necessary? I see that you make more informative dialog boxes.

review: Needs Information

[David D Lowe (flimm)]

Seeing as USB Creator only erases individual partitions now, this fix is no longer necessary.

Any ideas what I could have done different to get this patch reviewed sooner? If it's just a matter of usb-creator developers being busy, I understand.

[Dimitri John Ledkov (xnox)]

I am so sorry, the review delay was a failure on our side. In the recent times, the core developer of usb-creator started working on other projects and this one got less attention. I am hoping to do timely reviews of usb-creator merge proposals.

Unmerged revisions

260. By David D Lowe on 2010-01-13

Display partition name instead of drive name if only one partition is going to be deleted.

259. By David D Lowe on 2010-01-13

Merged with trunk.

258. By David D Lowe on 2010-01-11

Warn user before formatting, listing all partitions that are going to be lost if more than one. (Fixes bug #446891

257. By David D Lowe on 2010-01-11

Warn user before formatting drive. (Fixes bug #443330)

=== modified file 'bin/usb-creator-helper'
--- bin/usb-creator-helper	2009-12-08 08:58:46 +0000
+++ bin/usb-creator-helper	2010-01-13 18:33:15 +0000
@@ -100,7 +100,7 @@
     def Format(self, device, sender=None, conn=None):
         self.check_polkit(sender, conn, 'com.ubuntu.usbcreator.format')
         check_system_internal(device)
-        # TODO evand 2009-08-25: Needs a confirmation dialog.
+        # TODO evand 2009-08-25: Needs a confirmation dialog. (Note: completed for gtk)
         # XXX test with a device that doesn't have a partition table.
         bus = dbus.SystemBus()
         devkit = bus.get_object('org.freedesktop.DeviceKit.Disks',
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-01-11 19:28:39 +0000
+++ debian/changelog	2010-01-13 18:33:15 +0000
@@ -1,9 +1,13 @@
 usb-creator (0.2.15) UNRELEASED; urgency=low
 
+  [Mario Limonciello]
   * Ensure that the download_dir is really a directory before scanning it for 
     ISOs to include in the list.  Fixes launching usb-creator-gtk as root.
 
- -- Mario Limonciello <[e-mail]>  Mon, 11 Jan 2010 13:27:36 -0600
+  [ David D Lowe ]
+  * Warn users before formatting entire drive. (LP: #443330)
+ 
+ -- David D Lowe <[e-mail]>  Wed, 13 Jan 2010 18:11:08 +0000
 
 usb-creator (0.2.14) lucid; urgency=low
 
 
=== modified file 'debian/copyright'
--- debian/copyright	2009-08-26 19:26:08 +0000
+++ debian/copyright	2010-01-13 18:33:15 +0000
@@ -8,6 +8,11 @@
 
     Copyright (C) 2008 Canonical Ltd.
 
+To the extent possible under law, David D Lowe has waived all copyright and
+related or neighboring rights to his modifications to this work, according to
+http://creativecommons.org/publicdomain/zero/1.0/
+You may delete this line and the three before it.
+
 KDE/Qt port Details
 -------------------
 
 
=== modified file 'usbcreator/backends/devicekit/backend.py'
--- usbcreator/backends/devicekit/backend.py	2009-10-19 09:53:52 +0000
+++ usbcreator/backends/devicekit/backend.py	2010-01-13 18:33:15 +0000
@@ -243,7 +243,7 @@
         return mp
     
     def format(self, device):
-        # TODO evand 2009-08-25: Needs a confirmation dialog.
+        # TODO evand 2009-08-25: Needs a confirmation dialog. (Note: completed for gtk)
         try:
             dk = self.bus.get_object('org.freedesktop.DeviceKit.Disks', device)
             device = dk.Get(device, 'device-file', dbus_interface=PROPS_IFACE)
 
=== modified file 'usbcreator/frontends/gtk/frontend.py'
--- usbcreator/frontends/gtk/frontend.py	2010-01-11 19:28:39 +0000
+++ usbcreator/frontends/gtk/frontend.py	2010-01-13 18:33:15 +0000
@@ -659,13 +659,83 @@
                                    message)
         dialog.run()
         dialog.destroy()
+    
+    def _confirm(self, message, buttons, default=0, secondary_markup=None):
+        dialog = gtk.MessageDialog(self.window, gtk.DIALOG_MODAL | 
+                            gtk.DIALOG_DESTROY_WITH_PARENT,
+                            gtk.MESSAGE_WARNING, gtk.BUTTONS_NONE, message)
+        for ii in xrange(len(buttons)):
+            dialog.add_button(buttons[ii], ii)
+        dialog.set_default_response(default)
+        if not secondary_markup is None:
+            dialog.format_secondary_markup(secondary_markup)
+        response = dialog.run()
+        if response == gtk.RESPONSE_DELETE_EVENT:
+            response = -1
+        dialog.destroy()
+        return response
+    
+    @staticmethod
+    def get_drive(dev):
+        drive = None
+        monitor = gio.volume_monitor_get()
+        for item in monitor.get_connected_drives():
+            if 'unix-device' in item.enumerate_identifiers():
+                if item.get_identifier('unix-device') == dev:
+                    drive = item
+        if drive is None:
+            for item in monitor.get_volumes():
+                if 'unix-device' in item.enumerate_identifiers():
+                    if item.get_identifier('unix-device') == dev:
+                        drive = item.get_drive()
+        return drive
+        
+        if 'unix-device' in item.enumerate_identifiers():
+            driveStr = drive.get_identifier('unix-device')
+        vols = drive.get_volumes()
+        volsStr = ""
+        for vol in vols:
+            if 'unix-device' in item.enumerate_identifiers():
+                volsStr += vol.get_identifier('unix-device') + "\t"
+        volsStr += vol.get_name() + "\n"
 
     def format_dest_clicked(self, *args):
-        # FIXME evand 2009-04-30: This needs a big warning dialog.
         model, iterator = self.dest_treeview.get_selection().get_selected()
         if not iterator:
             return
         udi = model[iterator][0]
+        
+        # warn user before continuing
+        drive = self.get_drive(self.backend.targets[udi]['device'])
+        details = ''
+        drive_title = udi
+        if not drive is None:
+            if 'unix-device' in drive.enumerate_identifiers():
+                drive_title = ' (' + drive.get_identifier('unix-device') + ')'
+            drive_title = '<i>' + drive.get_name() + drive_title + '</i>'
+            if len(drive.get_volumes()) > 1:
+                details = '\n\n' + \
+                    _('The following partitions will be deleted:') + '\n<tt>'
+                for vol in drive.get_volumes():
+                    details += '\t'
+                    if 'unix-device' in vol.enumerate_identifiers():
+                        details += vol.get_identifier('unix-device')
+                    details += '\t' + vol.get_name() + '\n'
+                details += '</tt>'
+            elif len(drive.get_volumes()) == 1:
+                vol = drive.get_volumes()[0]
+                if 'unix-device' in vol.enumerate_identifiers():
+                    drive_title = '<i>%s (%s)</i>' % (vol.get_name(), 
+                                vol.get_identifier('unix-device'))
+        rv = self._confirm(_('Formatting the drive will erase it in its '
+                            'entirety.'), (gtk.STOCK_CANCEL, 
+                            _('_Format entire drive')), 1,( _('Make a backup '
+                            'copy of any valuable data on %s before '
+                            'continuing.') % drive_title)
+                            + details)
+        if rv != 1:
+            return
+
         self.backend.format(udi)
 
     def open_dest_folder(self, *args):