diff options
| author | Papoteur <papoteur@mageia.org> | 2025-11-08 12:48:53 +0100 |
|---|---|---|
| committer | Papoteur <papoteur@mageia.org> | 2025-12-19 18:53:38 +0100 |
| commit | df07d08294994a0e9cc066df5fe8b13c772ed5bf (patch) | |
| tree | 70dbb325d830aec6b4fc7265df86313130fb905a /lib | |
| parent | 707709d26dd2dd368707606be6f86e8acc590070 (diff) | |
| download | isodumper-df07d08294994a0e9cc066df5fe8b13c772ed5bf.tar isodumper-df07d08294994a0e9cc066df5fe8b13c772ed5bf.tar.gz isodumper-df07d08294994a0e9cc066df5fe8b13c772ed5bf.tar.bz2 isodumper-df07d08294994a0e9cc066df5fe8b13c772ed5bf.tar.xz isodumper-df07d08294994a0e9cc066df5fe8b13c772ed5bf.zip | |
refact: use rename _do_persistence feature in magiback and use it for format operations.
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/isodumper.py | 58 |
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 |