From 84b10f0e668409c0cc892b06f3487d0df0bddd7d Mon Sep 17 00:00:00 2001 From: dbarzin Date: Wed, 15 Feb 2023 18:26:50 +0100 Subject: [PATCH] fix bug --- pandora-box.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pandora-box.py b/pandora-box.py index c6decf4..9233d4f 100755 --- a/pandora-box.py +++ b/pandora-box.py @@ -424,15 +424,13 @@ class PandoraBox: except Exception as ex : self._log(f"Unexpected error: {ex}") self._log("Scan failed !") - if not self.has_curses: - self.display_image("ERROR") - raise + return "ERROR" self._update_bar(100) self._log( f'duration="{int(time.time() - scan_start_time)}s", '\ f'files_scanned="{file_count}", '\ f'files_infected="{len(self.infected_files)}"') - return self.infected_files + return "CLEAN" # -------------------------------------- @@ -518,9 +516,16 @@ class PandoraBox: return "WAIT" self._print_size(self._human_readable_size(statvfs.f_frsize * statvfs.f_blocks)) self._print_used( - self._human_readable_size(statvfs.f_frsize * (statvfs.f_blocks - statvfs.f_bfree))) - self.scan(statvfs.f_frsize * (statvfs.f_blocks - statvfs.f_bfree)) - return "CLEAN" + self._human_readable_size(statvfs.f_frsize * (statvfs.f_blocks - statvfs.f_bfree))) + return self.scan(statvfs.f_frsize * (statvfs.f_blocks - statvfs.f_bfree)) + + # -------------------------------------- + + def error(self): + """ Display error message """ + if not self.has_curses: + self.display_image("ERROR") + return "WAIT" # -------------------------------------- @@ -594,6 +599,8 @@ class PandoraBox: return self.scan_device() case "CLEAN": return self.clean() + case "ERROR": + return self.error() case _: return "STOP"