refact: use rename _do_persistence feature in magiback and use it for format operations.

1 files changed, 45 insertions, 13 deletions

diff --git a/lib/isodumper.py b/lib/isodumper.py
index e0dc2e3..3bc9f4f 100755
--- a/lib/isodumper.py
+++ b/lib/isodumper.py
@@ -458,6 +458,7 @@ class IsoDumper(basedialog.BaseDialog):
 
     def do_format(self):
         # code, format_type, name = self.ask_format()
+        self.init_iface()
         if self.partition_cb.value() != "":
             self.operation = True
             format_type = list(self.format_type.keys())[
@@ -480,16 +481,42 @@ class IsoDumper(basedialog.BaseDialog):
                     name = name.upper()[:11]
                 elif format_type == "ntfs":
                     name = name[:32]
-                rc = self.raw_format(target, format_type, name)
-                self.operation = False
-                if rc == 0:
-                    return True, _("The device was formatted successfully.")
-                elif rc == 5:
-                    return False, _("An error occurred while creating a partition.")
-                elif rc == 127:
-                    return False, _("Authentication error.")
+                # rc = self.raw_format(target, format_type, name)
+                print(
+                    target,
+                    name,
+                    self.cryptkey.value(),
+                    self.partition_cb.value(),
+                    "1")
+                self.iface.do_format(
+                    target,
+                    name,
+                    self.cryptkey.value(),
+                    self.partition_cb.value(),
+                    "1"
+                )
+                while not self.iface.done:
+                    progress = self.iface.progress
+                    self.progress.setValue(progress)
+                    self.dialog.pollEvent()
+                    time.sleep(0.5)
+                if self.iface.state:
+                    message = _("The device was formatted successfully.")
+                    rc = True
                 else:
-                    return False, _("An error {} occurred.".format(rc))
+                    message =  _("An error occurred while creating a partition.")
+                    self.logger.warning(self.iface.message)
+                    nowarning = False
+                    rc = False
+                self.logger.warning(message)
+                self.operation = False
+                return rc, message
+                # elif rc == 5:
+                #     return False, _("An error occurred while creating a partition.")
+                # elif rc == 127:
+                #     return False, _("Authentication error.")
+                # else:
+                #     return False, _("An error {} occurred.".format(rc))
 
     def initial_state(self):
         self.update_list()
@@ -694,11 +721,12 @@ class IsoDumper(basedialog.BaseDialog):
                                     )
                                     self.logger.warning(message)
                                 else:
-                                    self.iface.do_persistence(
+                                    self.iface.do_format(
                                         target,
                                         self.partition_label.value(),
                                         self.cryptkey.value(),
-                                        self.partition_cb.value()
+                                        self.partition_cb.value(),
+                                        "3"
                                     )
                                     while not self.iface.done:
                                         progress = self.iface.progress
@@ -720,8 +748,12 @@ class IsoDumper(basedialog.BaseDialog):
                                         self.logger.error(self.iface.message)
                                         nowarning = False
                             else:
-                                self.iface.do_persistence(
-                                    target, self.partition_label.value(), "", self.partition_cb.value()
+                                self.iface.do_format(
+                                    target,
+                                    self.partition_label.value(),
+                                    "",
+                                    self.partition_cb.value(),
+                                    "3"
                                 )
                                 while not self.iface.done:
                                     progress = self.iface.progress