rewrite uninstall

3 files changed, 47 insertions, 30 deletions

diff --git a/src/backend/uninstall.py b/src/backend/uninstall.py
index 23cd2c5..c2e777b 100644
--- a/src/backend/uninstall.py
+++ b/src/backend/uninstall.py
@@ -2,6 +2,7 @@
 
 import atexit
 import io
+import signal
 import subprocess
 import sys
 import sisyphus.checkenv
@@ -10,38 +11,54 @@ import sisyphus.killemerge
 import sisyphus.syncdb
 
 
-def start(pkgname):
-    if sisyphus.checkenv.root():
-        p_exe = subprocess.Popen(
-            ['emerge', '--quiet', '--depclean', '--ask'] + list(pkgname))
-        p_exe.wait()
-        sisyphus.syncdb.lcl_tbl()
-    else:
-        print(sisyphus.getcolor.bright_red +
-              "\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset)
-        sys.exit()
+def sigint_handler(signal, frame):
+    sys.exit(0)
 
 
-def fstart(pkgname):
-    if sisyphus.checkenv.root():
-        p_exe = subprocess.Popen(
-            ['emerge', '--quiet', '--unmerge', '--ask'] + list(pkgname))
-        p_exe.wait()
-        sisyphus.syncdb.lcl_tbl()
-    else:
+signal.signal(signal.SIGINT, sigint_handler)
+
+
+def start(pkgname, force=False, gfx_ui=False, normal=False):
+    args = ['--quiet', '--depclean']
+
+    if not sisyphus.checkenv.root() and (force or normal):
         print(sisyphus.getcolor.bright_red +
               "\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset)
         sys.exit()
 
+    if force:
+        p_exe = subprocess.Popen(
+            ['emerge', '--quiet', '--unmerge', '--ask'] + list(pkgname))
+        try:
+            p_exe.wait()
+            sisyphus.syncdb.lcl_tbl()
+        except KeyboardInterrupt:
+            p_exe.terminate()
+            try:
+                p_exe.wait(1)
+            except subprocess.TimeoutExpired:
+                p_exe.kill()
+            sys.exit()
+    elif gfx_ui:
+        p_exe = subprocess.Popen(
+            ['emerge'] + args + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        # kill portage if the program dies or it's terminated by the user
+        atexit.register(sisyphus.killemerge.start, p_exe)
 
-def xstart(pkgname):
-    p_exe = subprocess.Popen(['emerge', '--depclean'] + pkgname,
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    # kill portage if the program dies or it's terminated by the user
-    atexit.register(sisyphus.killemerge.start, p_exe)
-
-    for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"):
-        print(p_out.rstrip())
+        for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"):
+            print(p_out.rstrip())
 
-    p_exe.wait()
-    sisyphus.syncdb.lcl_tbl()
+        p_exe.wait()
+        sisyphus.syncdb.lcl_tbl()
+    elif normal:
+        p_exe = subprocess.Popen(['emerge'] + args + ['--ask'] + list(pkgname))
+        try:
+            p_exe.wait()
+            sisyphus.syncdb.lcl_tbl()
+        except KeyboardInterrupt:
+            p_exe.terminate()
+            try:
+                p_exe.wait(1)
+            except subprocess.TimeoutExpired:
+                p_exe.kill()
+            sys.exit()
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index a761b70..6b3a351 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -161,9 +161,9 @@ def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", "
     will succeed, but the system will be broken
     """
     if not force:
-        sisyphus.uninstall.start(pkgname)
+        sisyphus.uninstall.start(pkgname, force=False, gfx_ui=False, normal=True)
     else:
-        sisyphus.uninstall.fstart(pkgname)
+        sisyphus.uninstall.start(pkgname, force=True, gfx_ui=False, normal=False)
 
 @app.command("autoremove")
 def autoremove():
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 30bcdb4..8c55772 100644
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -405,7 +405,7 @@ class MainWorker(QtCore.QObject):
     def startUninstall(self):
         self.started.emit()
         pkgname = Sisyphus.pkgname
-        sisyphus.uninstall.xstart(pkgname)
+        sisyphus.uninstall.start(pkgname, force=False, gfx_ui=True, normal=False)
         self.finished.emit()
 
     @QtCore.pyqtSlot()