Fix os._exit(1) preventing normal cleanup

Author: bitdruid

pyproject.toml

@@ -7,7 +7,7 @@ packages = ["pywaybackup"]
 
 [project]
 name = "pywaybackup"
-version = "3.4.0"
+version = "3.4.1"
 description = "Query and download archive.org as simple as possible."
 authors = [
     { name = "bitdruid", email = "[email protected]" }

pywaybackup/PyWaybackup.py renamed to pywaybackup/PyWayBackup.py

@@ -190,46 +190,45 @@ def run(self):
 
         if self.save:
             archive_save.save_page(self.url)
-            os._exit(1)
-
-        db.init(self.dbfile, self.query_identifier)
-        sc.init(self.mode)
-
-        if not self.save:
-            archive_download.startup()
-
-            try:
-                archive_download.query_list(
-                    self.csvfile,
-                    self.cdxfile,
-                    self.range,
-                    self.limit,
-                    self.start,
-                    self.end,
-                    self.explicit,
-                    self.filetype,
-                    self.statuscode,
-                    self.domain,
-                    self.subdir,
-                    self.filename,
-                )
-                archive_download.download_list(self.output, self.retry, self.no_redirect, self.delay, self.workers)
-            except KeyboardInterrupt:
-                print("\nInterrupted by user\n")
-                self.keep = True
-                signal.signal(signal.SIGINT, signal.SIG_IGN)
-
-            except Exception as e:
-                self.keep = True
-                ex.exception(message="", e=e)
-
-            finally:
-                sc.csv_create(self.csvfile)
-                sc.fini()
-                vb.fini()
-
-                if not self.keep:
-                    os.remove(self.dbfile) if os.path.exists(self.dbfile) else None
-                    os.remove(self.cdxfile) if os.path.exists(self.cdxfile) else None
-
-                os._exit(1)
+
+        else:
+
+            db.init(self.dbfile, self.query_identifier)
+            sc.init(self.mode)
+
+            if not self.save:
+                archive_download.startup()
+
+                try:
+                    archive_download.query_list(
+                        self.csvfile,
+                        self.cdxfile,
+                        self.range,
+                        self.limit,
+                        self.start,
+                        self.end,
+                        self.explicit,
+                        self.filetype,
+                        self.statuscode,
+                        self.domain,
+                        self.subdir,
+                        self.filename,
+                    )
+                    archive_download.download_list(self.output, self.retry, self.no_redirect, self.delay, self.workers)
+                except KeyboardInterrupt:
+                    print("\nInterrupted by user\n")
+                    self.keep = True
+                    signal.signal(signal.SIGINT, signal.SIG_IGN)
+
+                except Exception as e:
+                    self.keep = True
+                    ex.exception(message="", e=e)
+
+                finally:
+                    sc.csv_create(self.csvfile)
+                    sc.fini()
+                    vb.fini()
+
+                    if not self.keep:
+                        os.remove(self.dbfile) if os.path.exists(self.dbfile) else None
+                        os.remove(self.cdxfile) if os.path.exists(self.cdxfile) else None

pywaybackup/__init__.py

@@ -1 +1 @@
-from .PyWaybackup import PyWayBackup
+from .PyWayBackup import PyWayBackup