rewrite install; cleaner API : one entrypoint instead of three, handle keyboard interrupt gracefully

3 files changed, 162 insertions, 140 deletions

diff --git a/src/backend/install.py b/src/backend/install.py
index 4493d6e..d9f3e61 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -5,6 +5,7 @@ import io
 import os
 import pickle
 import subprocess
+import signal
 import sys
 import sisyphus.checkenv
 import sisyphus.download
@@ -16,71 +17,166 @@ import sisyphus.syncdb
 import sisyphus.update
 
 
-def start(pkgname, oneshot=False):
-    if sisyphus.checkenv.root():
-        sisyphus.update.start(gfx_ui=False)
-        sisyphus.solvedeps.start(pkgname)
+def sigint_handler(signal, frame):
+    sys.exit(0)
+
+
+signal.signal(signal.SIGINT, sigint_handler)
+
+
+def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
+    if not sisyphus.checkenv.root():
+        print(sisyphus.getcolor.bright_red +
+              "\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset)
+        sys.exit()
+    else:
+        if gfx_ui:
+            sisyphus.solvedeps.start.__wrapped__(pkgname)  # undecorate
+        else:
+            sisyphus.update.start(gfx_ui=False)
+            sisyphus.solvedeps.start(pkgname)
+
         bin_list, src_list, need_cfg = pickle.load(
             open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
 
-        if need_cfg == 0:
-            if len(src_list) == 0:
-                if not len(bin_list) == 0:
-                    os.chdir(sisyphus.getfs.p_cch_dir)
-                    print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
-                        bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
-                    while True:
-                        user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
-                                           "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
-                        if user_input.lower() in ['yes', 'y', '']:
-                            sisyphus.download.start(
-                                dl_world=False, gfx_ui=False)
-                            p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
-                                                     '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
+    if need_cfg != 0:
+        p_exe = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries',
+                                 '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
+        try:
+            p_exe.wait()
+        except KeyboardInterrupt:
+            p_exe.terminate()
+            try:
+                p_exe.wait(1)
+            except subprocess.TimeoutExpired:
+                p_exe.kill()
+            sys.exit()
+        print(sisyphus.getcolor.bright_red +
+              "\nCannot proceed!\n" + sisyphus.getcolor.reset)
+        print(sisyphus.getcolor.bright_yellow +
+              "Apply the above changes to your portage configuration files and try again" + sisyphus.getcolor.reset)
+        sys.exit()
+    else:
+        if len(bin_list) == 0 and len(src_list) == 0:
+            print(sisyphus.getcolor.bright_red +
+                  "\nNo package found!\n" + sisyphus.getcolor.reset)
+            sys.exit()
+
+        if ebuild:  # ebuild mode
+            if len(bin_list) == 0 and len(src_list) != 0:  # source only
+                print("\n" + sisyphus.getcolor.green + "These are the source packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.green + ", ".join(
+                    src_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(src_list)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n")
+                while True:
+                    user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
+                                       "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
+                    if user_input.lower() in ['yes', 'y', '']:
+                        p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--with-bdeps=y', '--misspell-suggestion=n',
+                                                 '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
+                        try:
                             p_exe.wait()
-                            sisyphus.syncdb.lcl_tbl()
-                            break
-                        elif user_input.lower() in ['no', 'n']:
-                            break
+                        except KeyboardInterrupt:
+                            p_exe.terminate()
+                            try:
+                                p_exe.wait(1)
+                            except subprocess.TimeoutExpired:
+                                p_exe.kill()
                             sys.exit()
-                        else:
-                            print("\nSorry, response" + " " + "'" +
-                                  user_input + "'" + " " + "not understood.\n")
-                            continue
-                else:
-                    print(sisyphus.getcolor.bright_red +
-                          "\nNo package found!\n" + sisyphus.getcolor.reset)
-                    sys.exit()
-            else:
+                        sisyphus.syncdb.lcl_tbl()
+                        break
+                    elif user_input.lower() in ['no', 'n']:
+                        break
+                    else:
+                        print("\nSorry, response" + " " + "'" +
+                              user_input + "'" + " " + "not understood.\n")
+                        continue
+            elif len(bin_list) != 0 and len(src_list) != 0:  # binary and source
+                print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
+                    bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
+                print("\n" + sisyphus.getcolor.green + "These are the source packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.green + ", ".join(
+                    src_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(src_list)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n")
+                while True:
+                    user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
+                                       "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
+                    if user_input.lower() in ['yes', 'y', '']:
+                        sisyphus.download.start(dl_world=False, gfx_ui=False)
+                        os.chdir(sisyphus.getfs.p_cch_dir)
+                        p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--rebuilt-binaries', '--with-bdeps=y',
+                                                 '--misspell-suggestion=n', '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
+                        try:
+                            p_exe.wait()
+                        except KeyboardInterrupt:
+                            p_exe.terminate()
+                            try:
+                                p_exe.wait(1)
+                            except subprocess.TimeoutExpired:
+                                p_exe.kill()
+                            sys.exit()
+                        sisyphus.syncdb.lcl_tbl()
+                        break
+                    elif user_input.lower() in ['no', 'n']:
+                        break
+                    else:
+                        print("\nSorry, response" + " " + "'" +
+                              user_input + "'" + " " + "not understood.\n")
+                        continue
+            elif len(bin_list) != 0 and len(src_list) == 0:  # binary only (fallback)
+                print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
+                    bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
+                while True:
+                    user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
+                                       "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
+                    if user_input.lower() in ['yes', 'y', '']:
+                        sisyphus.download.start(dl_world=False, gfx_ui=False)
+                        os.chdir(sisyphus.getfs.p_cch_dir)
+                        p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
+                                                 '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
+                        try:
+                            p_exe.wait()
+                        except KeyboardInterrupt:
+                            p_exe.terminate()
+                            try:
+                                p_exe.wait(1)
+                            except subprocess.TimeoutExpired:
+                                p_exe.kill()
+                            sys.exit()
+                        sisyphus.syncdb.lcl_tbl()
+                        break
+                    elif user_input.lower() in ['no', 'n']:
+                        break
+                    else:
+                        print("\nSorry, response" + " " + "'" +
+                              user_input + "'" + " " + "not understood.\n")
+                        continue
+        else:  # non-ebuild mode
+            if len(bin_list) == 0 and len(src_list) != 0:  # source only (noop)
                 print(sisyphus.getcolor.bright_red +
                       "\nSource package(s) found in the mix!\n" + sisyphus.getcolor.reset)
                 print(sisyphus.getcolor.bright_yellow + "Use" + sisyphus.getcolor.reset + " " +
                       "'" + "sisyphus install" + " " + " ".join(pkgname) + " " + "--ebuild" + "'")
                 sys.exit()
-        else:
-            # don't silently fail if a source package requested without the --ebuild option needs a keyword, mask, REQUIRED_USE or USE change
-            print(sisyphus.getcolor.bright_red +
-                  "\nInvalid request!\n" + sisyphus.getcolor.reset)
-            print(sisyphus.getcolor.bright_yellow + "Use" + sisyphus.getcolor.reset + " " +
-                  "'" + "sisyphus install" + " " + " ".join(pkgname) + " " + "--ebuild" + "'")
-            sys.exit()
-    else:
-        print(sisyphus.getcolor.bright_red +
-              "\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset)
-        sys.exit()
-
+            elif len(bin_list) != 0 and len(src_list) != 0:  # binary and source (noop)
+                print(sisyphus.getcolor.bright_red +
+                      "\nSource package(s) found in the mix!\n" + sisyphus.getcolor.reset)
+                print(sisyphus.getcolor.bright_yellow + "Use" + sisyphus.getcolor.reset + " " +
+                      "'" + "sisyphus install" + " " + " ".join(pkgname) + " " + "--ebuild" + "'")
+                sys.exit()
+            elif len(bin_list) != 0 and len(src_list) == 0:  # binary only
+                if gfx_ui:
+                    print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + ", ".join(
+                        bin_list) + "\n\n" + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
+                    sisyphus.download.start(dl_world=False, gfx_ui=True)
+                    os.chdir(sisyphus.getfs.p_cch_dir)
+                    p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y',
+                                             '--misspell-suggestion=n', '--fuzzy-search=n'] + 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 estart(pkgname, oneshot=False):
-    if sisyphus.checkenv.root():
-        sisyphus.update.start(gfx_ui=False)
-        sisyphus.solvedeps.start(pkgname)
-        bin_list, src_list, need_cfg = pickle.load(
-            open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
+                    for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"):
+                        print(p_out.rstrip())
 
-        if need_cfg == 0:
-            if len(src_list) == 0:
-                if not len(bin_list) == 0:
-                    os.chdir(sisyphus.getfs.p_cch_dir)
+                    p_exe.wait()
+                    sisyphus.syncdb.lcl_tbl()
+                else:
                     print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
                         bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
                     while True:
@@ -89,97 +185,23 @@ def estart(pkgname, oneshot=False):
                         if user_input.lower() in ['yes', 'y', '']:
                             sisyphus.download.start(
                                 dl_world=False, gfx_ui=False)
+                            os.chdir(sisyphus.getfs.p_cch_dir)
                             p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
                                                      '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
-                            p_exe.wait()
+                            try:
+                                p_exe.wait()
+                            except KeyboardInterrupt:
+                                p_exe.terminate()
+                                try:
+                                    p_exe.wait(1)
+                                except subprocess.TimeoutExpired:
+                                    p_exe.kill()
+                                sys.exit()
                             sisyphus.syncdb.lcl_tbl()
                             break
                         elif user_input.lower() in ['no', 'n']:
                             break
-                            sys.exit()
-                        else:
-                            print("\nSorry, response" + " " + "'" +
-                                  user_input + "'" + " " + "not understood.\n")
-                            continue
-                else:
-                    print(sisyphus.getcolor.bright_red +
-                          "\nNo package found!\n" + sisyphus.getcolor.reset)
-                    sys.exit()
-            else:
-                if not len(bin_list) == 0:
-                    os.chdir(sisyphus.getfs.p_cch_dir)
-                    print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
-                        bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
-                    print("\n" + sisyphus.getcolor.green + "These are the source packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.green + ", ".join(
-                        src_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(src_list)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n")
-                    while True:
-                        user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
-                                           "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
-                        if user_input.lower() in ['yes', 'y', '']:
-                            sisyphus.download.start(
-                                dl_world=False, gfx_ui=False)
-                            p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--rebuilt-binaries', '--with-bdeps=y',
-                                                     '--misspell-suggestion=n', '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
-                            p_exe.wait()
-                            sisyphus.syncdb.lcl_tbl()
-                            break
-                        elif user_input.lower() in ['no', 'n']:
-                            break
-                            sys.exit()
                         else:
                             print("\nSorry, response" + " " + "'" +
                                   user_input + "'" + " " + "not understood.\n")
                             continue
-                else:
-                    print("\n" + sisyphus.getcolor.green + "These are the source packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.green + ", ".join(
-                        src_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(src_list)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n")
-                    while True:
-                        user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
-                                           "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
-                        if user_input.lower() in ['yes', 'y', '']:
-                            p_exe = subprocess.Popen(
-                                ['emerge', '--quiet', '--verbose', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
-                            p_exe.wait()
-                            sisyphus.syncdb.lcl_tbl()
-                            break
-                        elif user_input.lower() in ['no', 'n']:
-                            break
-                            sys.exit()
-                        else:
-                            print("\nSorry, response" + " " + "'" +
-                                  user_input + "'" + " " + "not understood!\n")
-                            continue
-        else:
-            p_exe = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries',
-                                     '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
-            p_exe.wait()
-            print(sisyphus.getcolor.bright_red +
-                  "\nCannot proceed!\n" + sisyphus.getcolor.reset)
-            print(sisyphus.getcolor.bright_yellow +
-                  "Apply the above changes to your portage configuration files and try again" + sisyphus.getcolor.reset)
-            sys.exit()
-    else:
-        print(sisyphus.getcolor.bright_red +
-              "\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset)
-        sys.exit()
-
-
-def xstart(pkgname):
-    sisyphus.solvedeps.start.__wrapped__(pkgname)  # undecorate
-    bin_list, src_list, need_cfg = pickle.load(
-        open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
-
-    os.chdir(sisyphus.getfs.p_cch_dir)
-    print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" +
-          ", ".join(bin_list) + "\n\n" + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
-    sisyphus.download.start(dl_world=False, gfx_ui=True)
-    p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y',
-                             '--misspell-suggestion=n', '--fuzzy-search=n'] + 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())
-
-    p_exe.wait()
-    sisyphus.syncdb.lcl_tbl()
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index e273419..76a8cb2 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -131,9 +131,9 @@ def install(pkgname: List[str],
     and packages will be installed straight away.
     """
     if ebuild:
-        sisyphus.install.estart(pkgname, oneshot=oneshot)
+        sisyphus.install.start(pkgname, ebuild=True, gfx_ui=False, oneshot=oneshot)
     else:
-        sisyphus.install.start(pkgname, oneshot=oneshot)
+        sisyphus.install.start(pkgname, ebuild=False, gfx_ui=False, oneshot=oneshot)
 
 @app.command("uninstall")
 def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", "-f")):
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 72c6cf7..8b8f451 100644
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -398,7 +398,7 @@ class MainWorker(QtCore.QObject):
     def startInstall(self):
         self.started.emit()
         pkgname = Sisyphus.pkgname
-        sisyphus.install.xstart(pkgname)
+        sisyphus.install.start(pkgname, ebuild=False, gfx_ui=True, oneshot=False)
         self.finished.emit()
 
     @QtCore.pyqtSlot()