From ace4c1fb095f4e55f8f8e7693057404a98ab6e4d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Mar 2024 13:40:55 +0000 Subject: rename some functions --- src/backend/__init__.py | 8 +- src/backend/autormpkgsrc.py | 100 ----------- src/backend/binpkgsrcautorm.py | 100 +++++++++++ src/backend/binpkgsrcinst.py | 363 +++++++++++++++++++++++++++++++++++++++ src/backend/binpkgsrcunst.py | 253 +++++++++++++++++++++++++++ src/backend/binpkgsrcupgd.py | 349 +++++++++++++++++++++++++++++++++++++ src/backend/instpkgsrc.py | 363 --------------------------------------- src/backend/rmpkgsrc.py | 253 --------------------------- src/backend/sysupgrade.py | 349 ------------------------------------- src/frontend/cli/sisyphus-cli.py | 14 +- src/frontend/gui/sisyphus-gui.py | 72 +++++--- 11 files changed, 1123 insertions(+), 1101 deletions(-) delete mode 100644 src/backend/autormpkgsrc.py create mode 100644 src/backend/binpkgsrcautorm.py create mode 100644 src/backend/binpkgsrcinst.py create mode 100644 src/backend/binpkgsrcunst.py create mode 100644 src/backend/binpkgsrcupgd.py delete mode 100644 src/backend/instpkgsrc.py delete mode 100644 src/backend/rmpkgsrc.py delete mode 100644 src/backend/sysupgrade.py diff --git a/src/backend/__init__.py b/src/backend/__init__.py index 6da1678..aedf50b 100644 --- a/src/backend/__init__.py +++ b/src/backend/__init__.py @@ -1,14 +1,15 @@ -from .autormpkgsrc import * +from .binpkgsrcautorm import * +from .binpkgsrcinst import * +from .binpkgsrcunst import * +from .binpkgsrcupgd import * from .checkenv import * from .dlbinpkg import * from .getclr import * from .getenv import * from .getfs import * -from .instpkgsrc import * from .killemerge import * from .purgeenv import * from .recoverdb import * -from .rmpkgsrc import * from .solvedeps import * from .solverevdeps import * from .searchdb import * @@ -21,4 +22,3 @@ from .syncdb import * from .syncenv import * from .syncspm import * from .sysinfo import * -from .sysupgrade import * diff --git a/src/backend/autormpkgsrc.py b/src/backend/autormpkgsrc.py deleted file mode 100644 index 1036f66..0000000 --- a/src/backend/autormpkgsrc.py +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/python3 - -import atexit -import fcntl -import io -import os -import signal -import selectors -import subprocess -import sys -import sisyphus.checkenv -import sisyphus.getclr -import sisyphus.killemerge -import sisyphus.syncdb - - -def set_nonblocking(fd): - flags = fcntl.fcntl(fd, fcntl.F_GETFL) - fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK) - - -def spinner_animation(): - spinner = ['-', '\\', '|', '/'] - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - for _ in range(10): - for char in spinner: - sys.stdout.write('\b' + char) - sys.stdout.flush() - events = sel.select(timeout=0.1) - if events: - return - sys.stdout.write('\b') - - -def sigint_handler(signal, frame): - sys.exit(0) - - -signal.signal(signal.SIGINT, sigint_handler) - - -def start(gfx_ui=False): - args = ['--quiet', '--depclean'] - - if sisyphus.checkenv.root() and not gfx_ui: - print(f"\n{sisyphus.getclr.bright_white}Packages identified as orphaned and no longer needed are slated for{sisyphus.getclr.reset} {sisyphus.getclr.green}'safe'{sisyphus.getclr.reset} {sisyphus.getclr.bright_white}removal.{sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - p_exe = subprocess.Popen(['emerge'] + args) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue - elif gfx_ui: - p_exe = subprocess.Popen( - ['emerge'] + args, 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() - else: - print(f"{sisyphus.getclr.bright_red}\nRoot permissions are required for this operation.\n{sisyphus.getclr.reset}") - sys.exit() diff --git a/src/backend/binpkgsrcautorm.py b/src/backend/binpkgsrcautorm.py new file mode 100644 index 0000000..1036f66 --- /dev/null +++ b/src/backend/binpkgsrcautorm.py @@ -0,0 +1,100 @@ +#!/usr/bin/python3 + +import atexit +import fcntl +import io +import os +import signal +import selectors +import subprocess +import sys +import sisyphus.checkenv +import sisyphus.getclr +import sisyphus.killemerge +import sisyphus.syncdb + + +def set_nonblocking(fd): + flags = fcntl.fcntl(fd, fcntl.F_GETFL) + fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK) + + +def spinner_animation(): + spinner = ['-', '\\', '|', '/'] + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + for _ in range(10): + for char in spinner: + sys.stdout.write('\b' + char) + sys.stdout.flush() + events = sel.select(timeout=0.1) + if events: + return + sys.stdout.write('\b') + + +def sigint_handler(signal, frame): + sys.exit(0) + + +signal.signal(signal.SIGINT, sigint_handler) + + +def start(gfx_ui=False): + args = ['--quiet', '--depclean'] + + if sisyphus.checkenv.root() and not gfx_ui: + print(f"\n{sisyphus.getclr.bright_white}Packages identified as orphaned and no longer needed are slated for{sisyphus.getclr.reset} {sisyphus.getclr.green}'safe'{sisyphus.getclr.reset} {sisyphus.getclr.bright_white}removal.{sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + p_exe = subprocess.Popen(['emerge'] + args) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue + elif gfx_ui: + p_exe = subprocess.Popen( + ['emerge'] + args, 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() + else: + print(f"{sisyphus.getclr.bright_red}\nRoot permissions are required for this operation.\n{sisyphus.getclr.reset}") + sys.exit() diff --git a/src/backend/binpkgsrcinst.py b/src/backend/binpkgsrcinst.py new file mode 100644 index 0000000..091502b --- /dev/null +++ b/src/backend/binpkgsrcinst.py @@ -0,0 +1,363 @@ +#!/usr/bin/python3 + +import atexit +import fcntl +import io +import os +import pickle +import selectors +import signal +import subprocess +import sys +import time +import sisyphus.checkenv +import sisyphus.dlbinpkg +import sisyphus.getclr +import sisyphus.getfs +import sisyphus.killemerge +import sisyphus.solvedeps +import sisyphus.syncdb +import sisyphus.syncall + + +def set_nonblocking(fd): + flags = fcntl.fcntl(fd, fcntl.F_GETFL) + fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK) + + +def spinner_animation(): + spinner = ['-', '\\', '|', '/'] + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + for _ in range(10): + for char in spinner: + sys.stdout.write('\b' + char) + sys.stdout.flush() + events = sel.select(timeout=0.1) + if events: + return + sys.stdout.write('\b') + + +def sigint_handler(signal, frame): + sys.exit(0) + + +signal.signal(signal.SIGINT, sigint_handler) + + +def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False, nodeps=False): + go_args = ['--quiet', '--verbose', + '--misspell-suggestion=n', '--fuzzy-search=n'] + nogo_args = ['--quiet', '--pretend', '--getbinpkg', + '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] + if not sisyphus.checkenv.root(): + print(f"{sisyphus.getclr.bright_red}\nRoot permissions are required for this operation.\n{sisyphus.getclr.reset}") + sys.exit() + else: + if gfx_ui: + sisyphus.solvedeps.start.__wrapped__( + pkgname, nodeps=False) # undecorate + else: + sisyphus.syncall.start(gfx_ui=False) + if nodeps: + sisyphus.solvedeps.start(pkgname, nodeps=True) + else: + sisyphus.solvedeps.start(pkgname, nodeps=False) + + bin_list, src_list, is_vague, need_cfg = pickle.load( + open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb")) + + if is_vague != 0: # catch ambiguous packages + p_exe = subprocess.Popen( + ['emerge'] + nogo_args + (['--nodeps'] if nodeps else ['--with-bdeps=y']) + list(pkgname)) + try: + p_exe.wait() + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + if gfx_ui: + pass # GUI always calls /, no ambiguity + else: + sys.exit() + + elif need_cfg != 0: # catch aliens + p_exe = subprocess.Popen( + ['emerge'] + nogo_args + (['--nodeps'] if nodeps else ['--with-bdeps=y']) + list(pkgname)) + try: + p_exe.wait() + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + if gfx_ui: + print("\nCannot proceed!\nPlease apply the above changes to your portage configuration files and try again.") + for i in range(9, 0, -1): + print(f"Killing application in : {i} seconds!") + time.sleep(1) + + sys.exit(app.exec_()) # kill GUI window + else: + print(f"{sisyphus.getclr.bright_red}\nCannot proceed!\n{sisyphus.getclr.reset}{sisyphus.getclr.bright_yellow}Please apply the above changes to your portage configuration files and try again!{sisyphus.getclr.reset}") + sys.exit() + else: + if len(bin_list) == 0 and len(src_list) == 0: + print(f"{sisyphus.getclr.bright_red}\nOne or more of the selected packages cannot be located for installation.\n{sisyphus.getclr.reset}") + if ebuild: # ebuild mode + if len(bin_list) == 0 and len(src_list) != 0: # source mode, ignore aliens + print( + f"\n{sisyphus.getclr.green}These are the source packages that would be merged, in order:{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.green}{', '.join(src_list)}{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.bright_white}Total: {len(src_list)} source package(s){sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + p_exe = subprocess.Popen(['emerge'] + go_args + (['--nodeps'] if nodeps else [ + '--with-bdeps=y']) + (['--oneshot'] if oneshot else []) + list(pkgname)) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue + elif len(bin_list) != 0 and len(src_list) != 0: # hybrid mode, ignore aliens + print( + f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") + + print( + f"\n{sisyphus.getclr.green}These are the source packages that would be merged, in order:{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.green}{', '.join(src_list)}{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.bright_white}Total: {len(src_list)} source package(s){sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=False) + os.chdir(sisyphus.getfs.p_cch_dir) + p_exe = subprocess.Popen(['emerge'] + go_args + ['--usepkg', '--rebuilt-binaries'] + ( + ['--nodeps'] if nodeps else ['--with-bdeps=y']) + (['--oneshot'] if oneshot else []) + list(pkgname)) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue + elif len(bin_list) != 0 and len(src_list) == 0: # binary mode, fallback + print( + f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=False) + os.chdir(sisyphus.getfs.p_cch_dir) + p_exe = subprocess.Popen(['emerge'] + go_args + ['--usepkg', '--usepkgonly', '--rebuilt-binaries'] + ( + ['--nodeps'] if nodeps else ['--with-bdeps=y']) + (['--oneshot'] if oneshot else []) + list(pkgname)) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue + else: # non-ebuild mode + if len(bin_list) == 0 and len(src_list) != 0: # source mode (noop), catch aliens + if gfx_ui: + print("\nSource package(s) found in the mix!\n") + print( + f"Use the Sisyphus CLI command: 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.") + + for i in range(9, 0, -1): + print(f"Killing application in : {i} seconds!") + time.sleep(1) + + sys.exit(app.exec_()) # kill GUI window + else: + print( + f"{sisyphus.getclr.bright_red}\nSource package(s) found in the mix!\n{sisyphus.getclr.reset}") + print(f"{sisyphus.getclr.bright_yellow}Use{sisyphus.getclr.reset} 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.") + sys.exit() + elif len(bin_list) != 0 and len(src_list) != 0: # hybrid mode (noop), catch aliens + if gfx_ui: + print("\nSource package(s) found in the mix!\n") + print( + f"Use the Sisyphus CLI command:: 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.") + + for i in range(9, 0, -1): + print(f"Killing application in : {i} seconds!") + time.sleep(1) + + sys.exit(app.exec_()) # kill GUI window + else: + print( + f"{sisyphus.getclr.bright_red}\nSource package(s) found in the mix!\n{sisyphus.getclr.reset}") + print(f"{sisyphus.getclr.bright_yellow}Use{sisyphus.getclr.reset} 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.") + sys.exit() + elif len(bin_list) != 0 and len(src_list) == 0: # binary mode + if gfx_ui: + print( + "\nThese are the binary packages that will be merged, in order:\n") + print(", ".join(bin_list) + "\n\nTotal: " + + str(len(bin_list)) + " binary package(s)\n\n") + sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=True) + os.chdir(sisyphus.getfs.p_cch_dir) + p_exe = subprocess.Popen(['emerge'] + go_args + ['--usepkg', '--usepkgonly', '--rebuilt-binaries'] + ( + ['--nodeps'] if nodeps else ['--with-bdeps=y']) + (['--oneshot'] if oneshot else []) + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # --nodeps && --oneshot are set to False in the graphical client + # 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() + else: + print( + f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + sisyphus.dlbinpkg.start( + dl_world=False, gfx_ui=False) + os.chdir(sisyphus.getfs.p_cch_dir) + p_exe = subprocess.Popen(['emerge'] + go_args + ['--usepkg', '--usepkgonly', '--rebuilt-binaries'] + ( + ['--nodeps'] if nodeps else ['--with-bdeps=y']) + (['--oneshot'] if oneshot else []) + list(pkgname)) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue diff --git a/src/backend/binpkgsrcunst.py b/src/backend/binpkgsrcunst.py new file mode 100644 index 0000000..b039f96 --- /dev/null +++ b/src/backend/binpkgsrcunst.py @@ -0,0 +1,253 @@ +#!/usr/bin/python3 + +import atexit +import fcntl +import io +import os +import pickle +import signal +import selectors +import subprocess +import sys +import sisyphus.checkenv +import sisyphus.getclr +import sisyphus.getfs +import sisyphus.killemerge +import sisyphus.solverevdeps +import sisyphus.syncdb + + +def set_nonblocking(fd): + flags = fcntl.fcntl(fd, fcntl.F_GETFL) + fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK) + + +def spinner_animation(): + spinner = ['-', '\\', '|', '/'] + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + for _ in range(10): + for char in spinner: + sys.stdout.write('\b' + char) + sys.stdout.flush() + events = sel.select(timeout=0.1) + if events: + return + sys.stdout.write('\b') + + +def sigint_handler(signal, frame): + sys.exit(0) + + +signal.signal(signal.SIGINT, sigint_handler) + + +def start(pkgname, depclean=False, gfx_ui=False, unmerge=False): + args = ['--quiet', '--depclean'] + + if not sisyphus.checkenv.root() and (unmerge or depclean): + print(f"{sisyphus.getclr.bright_red}\nRoot permissions are required to perform this action.\n{sisyphus.getclr.reset}") + sys.exit() + else: + if gfx_ui: + sisyphus.solverevdeps.start.__wrapped__( + pkgname, depclean=True, unmerge=False) + else: + if unmerge: + sisyphus.solverevdeps.start.__wrapped__( + pkgname, depclean=False, unmerge=True) + else: + sisyphus.solverevdeps.start( + pkgname, depclean=True, unmerge=False) + + is_installed, is_needed, is_vague = pickle.load(open(os.path.join( + sisyphus.getfs.p_mtd_dir, "sisyphus_pkgrevdeps.pickle"), "rb")) + + if is_vague != 0: # catch ambiguous packages + if unmerge: + p_exe = subprocess.Popen( + ['emerge', '--unmerge', '--quiet', '--pretend', '--verbose'] + list(pkgname)) + try: + p_exe.wait() + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + else: + if gfx_ui: + pass # GUI always calls /, no ambiguity + else: + p_exe = subprocess.Popen( + ['emerge'] + args + ['--pretend', '--verbose'] + list(pkgname)) + try: + p_exe.wait() + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + + elif is_needed != 0: + if unmerge: + pass + else: + if gfx_ui: + p_exe = subprocess.Popen(['emerge'] + args + ['--pretend', '--verbose'] + list( + 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() + print( + "\nUnable to proceed! There are other packages with dependencies that prevent removal.") + else: + p_exe = subprocess.Popen( + ['emerge'] + args + ['--pretend', '--verbose'] + list(pkgname)) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + print(f"{sisyphus.getclr.bright_red}\nUnable to proceed! Other packages have dependencies preventing removal.{sisyphus.getclr.reset}") + print(f"{sisyphus.getclr.bright_white}Use the {sisyphus.getclr.reset}{sisyphus.getclr.green}'--force'{sisyphus.getclr.reset}{sisyphus.getclr.bright_white} option to override at your own risk!{sisyphus.getclr.reset}\n") + else: + if is_installed == 0: + print(f"{sisyphus.getclr.bright_red}\nUnable to proceed! One or more selected packages could not be located for removal.\n{sisyphus.getclr.reset}") + sys.exit() + else: + if unmerge: + print(f"\n{sisyphus.getclr.bright_white}Selected packages are slated for{sisyphus.getclr.reset} {sisyphus.getclr.green}'forced'{sisyphus.getclr.reset} {sisyphus.getclr.bright_white}removal.{sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + while True: + confirmation_input = input( + f"{sisyphus.getclr.bright_white}Are you sure you would like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if confirmation_input.lower() in ['yes', 'y', '']: + p_exe = subprocess.Popen( + ['emerge', '--quiet', '--unmerge'] + list(pkgname)) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register( + sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif confirmation_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{confirmation_input}' was not recognized.\n") + continue + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue + else: + if 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) + + for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): + print(p_out.rstrip()) + + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + else: + print(f"\n{sisyphus.getclr.bright_white}Selected packages are slated for{sisyphus.getclr.reset} {sisyphus.getclr.green}'safe'{sisyphus.getclr.reset} {sisyphus.getclr.bright_white}removal.{sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + p_exe = subprocess.Popen( + ['emerge'] + args + list(pkgname)) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue diff --git a/src/backend/binpkgsrcupgd.py b/src/backend/binpkgsrcupgd.py new file mode 100644 index 0000000..f8b01d2 --- /dev/null +++ b/src/backend/binpkgsrcupgd.py @@ -0,0 +1,349 @@ +#!/usr/bin/python3 + +import atexit +import fcntl +import io +import os +import pickle +import selectors +import signal +import subprocess +import sys +import time +import sisyphus.checkenv +import sisyphus.dlbinpkg +import sisyphus.getclr +import sisyphus.getfs +import sisyphus.killemerge +import sisyphus.solvedeps +import sisyphus.syncdb +import sisyphus.syncall + + +def set_nonblocking(fd): + flags = fcntl.fcntl(fd, fcntl.F_GETFL) + fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK) + + +def spinner_animation(): + spinner = ['-', '\\', '|', '/'] + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + for _ in range(10): + for char in spinner: + sys.stdout.write('\b' + char) + sys.stdout.flush() + events = sel.select(timeout=0.1) + if events: + return + sys.stdout.write('\b') + + +def sigint_handler(signal, frame): + sys.exit(0) + + +signal.signal(signal.SIGINT, sigint_handler) + + +def start(ebuild=False, gfx_ui=False): + go_args = ['--quiet', '--verbose', '--update', '--deep', '--newuse', + '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + nogo_args = ['--quiet', '--update', '--deep', '--newuse', '--pretend', '--getbinpkg', + '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n',] + if not sisyphus.checkenv.root(): + print(f"{sisyphus.getclr.bright_red}\nRoot permissions are required for this operation.\n{sisyphus.getclr.reset}") + sys.exit() + else: + if gfx_ui: + sisyphus.solvedeps.start.__wrapped__() # undecorate + else: + sisyphus.syncall.start(gfx_ui=False) + sisyphus.solvedeps.start() + + bin_list, src_list, is_vague, need_cfg = pickle.load( + open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb")) + + if need_cfg != 0: # catch aliens + p_exe = subprocess.Popen(['emerge'] + nogo_args + ['@world']) + try: + p_exe.wait() + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + if gfx_ui: + print("\nCannot proceed!\nPlease apply the above changes to your portage configuration files and try again.") + for i in range(9, 0, -1): + print(f"Killing application in : {i} seconds!") + time.sleep(1) + + sys.exit(app.exec_()) # kill GUI window + else: + print(f"{sisyphus.getclr.bright_red}\nCannot proceed!\n{sisyphus.getclr.reset}{sisyphus.getclr.bright_yellow}Please apply the above changes to your portage configuration files and try again!{sisyphus.getclr.reset}") + sys.exit() + else: + if len(bin_list) == 0 and len(src_list) == 0: + if gfx_ui: + print("\nThe system is up to date; no package upgrades are required.\n") + else: + print( + f"{sisyphus.getclr.bright_red}\nThe system is up to date; no package upgrades are required.\n{sisyphus.getclr.reset}") + sys.exit() + + if ebuild: # ebuild mode + if len(bin_list) == 0 and len(src_list) != 0: # source mode, ignore aliens + print( + f"\n{sisyphus.getclr.green}These are the source packages that would be merged, in order:{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.green}{', '.join(src_list)}{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.bright_white}Total: {len(src_list)} source package(s){sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + p_exe = subprocess.Popen( + ['emerge'] + go_args + ['@world']) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue + elif len(bin_list) != 0 and len(src_list) != 0: # hybrid mode, ignore aliens + print( + f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") + + print( + f"\n{sisyphus.getclr.green}These are the source packages that would be merged, in order:{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.green}{', '.join(src_list)}{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.bright_white}Total: {len(src_list)} source package(s){sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + sisyphus.dlbinpkg.start(dl_world=True, gfx_ui=False) + os.chdir(sisyphus.getfs.p_cch_dir) + p_exe = subprocess.Popen( + ['emerge'] + go_args + ['--usepkg', '--rebuilt-binaries', '@world']) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue + elif len(bin_list) != 0 and len(src_list) == 0: # binary mode, fallback + print( + f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + sisyphus.dlbinpkg.start(dl_world=True, gfx_ui=False) + os.chdir(sisyphus.getfs.p_cch_dir) + p_exe = subprocess.Popen( + ['emerge'] + go_args + ['--usepkg', '--usepkgonly', '--rebuilt-binaries', '@world']) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue + else: # non-ebuild mode + if len(bin_list) == 0 and len(src_list) != 0: # source mode (noop), catch aliens + if gfx_ui: + print("\nSource package(s) found in the mix!\n") + print( + f"Use the Sisyphus CLI command: 'sisyphus upgrade --ebuild' to perform the upgrade; Aborting.") + + for i in range(9, 0, -1): + print(f"Killing application in : {i} seconds!") + time.sleep(1) + + sys.exit(app.exec_()) # kill GUI window + else: + print( + f"{sisyphus.getclr.bright_red}\nSource package(s) found in the mix!{sisyphus.getclr.reset}") + print( + f"{sisyphus.getclr.bright_yellow}Use{sisyphus.getclr.reset} 'sisyphus upgrade --ebuild' to perform the upgrade; Aborting.") + sys.exit() + elif len(bin_list) != 0 and len(src_list) != 0: # hybrid mode (noop), catch aliens + if gfx_ui: + print("\nSource package(s) found in the mix!\n") + print( + f"Use the Sisyphus CLI command: 'sisyphus upgrade --ebuild' to perform the upgrade; Aborting.") + + for i in range(9, 0, -1): + print(f"Killing application in : {i} seconds!") + time.sleep(1) + + sys.exit(app.exec_()) # kill GUI window + else: + print( + f"{sisyphus.getclr.bright_red}\nSource package(s) found in the mix!{sisyphus.getclr.reset}") + print( + f"{sisyphus.getclr.bright_yellow}Use{sisyphus.getclr.reset} 'sisyphus upgrade --ebuild' to perform the upgrade; Aborting.") + sys.exit() + elif len(bin_list) != 0 and len(src_list) == 0: # binary mode + if gfx_ui: + print( + f"\nThese are the binary packages that will be merged, in order:\n") + print(", ".join(bin_list) + + f"\n\nTotal: {len(bin_list)} binary package(s)\n") + sisyphus.dlbinpkg.start(dl_world=True, gfx_ui=True) + os.chdir(sisyphus.getfs.p_cch_dir) + p_exe = subprocess.Popen(['emerge'] + go_args + ['--usepkg', '--usepkgonly', + '--rebuilt-binaries', '@world'], 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() + else: + print( + f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") + print( + f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") + while True: + user_input = input( + f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") + if user_input.lower() in ['yes', 'y', '']: + sisyphus.dlbinpkg.start( + dl_world=True, gfx_ui=False) + os.chdir(sisyphus.getfs.p_cch_dir) + p_exe = subprocess.Popen( + ['emerge'] + go_args + ['--usepkg', '--usepkgonly', '--rebuilt-binaries', '@world']) + try: + set_nonblocking(sys.stdout.fileno()) + spinner_animation() + + sel = selectors.DefaultSelector() + sel.register(sys.stdin, selectors.EVENT_READ) + + while True: + events = sel.select(timeout=0.1) + for key, mask in events: + if key.fileobj == sys.stdin: + line = sys.stdin.readline().strip() + if line.lower() == 'q': + sys.exit() + if p_exe.poll() is not None: + break + except KeyboardInterrupt: + p_exe.terminate() + try: + p_exe.wait(1) + except subprocess.TimeoutExpired: + p_exe.kill() + sys.exit() + finally: + p_exe.wait() + sisyphus.syncdb.lcl_tbl() + break + elif user_input.lower() in ['no', 'n']: + break + else: + print( + f"\nApologies, the response '{user_input}' was not recognized.\n") + continue diff --git a/src/backend/instpkgsrc.py b/src/backend/instpkgsrc.py deleted file mode 100644 index 091502b..0000000 --- a/src/backend/instpkgsrc.py +++ /dev/null @@ -1,363 +0,0 @@ -#!/usr/bin/python3 - -import atexit -import fcntl -import io -import os -import pickle -import selectors -import signal -import subprocess -import sys -import time -import sisyphus.checkenv -import sisyphus.dlbinpkg -import sisyphus.getclr -import sisyphus.getfs -import sisyphus.killemerge -import sisyphus.solvedeps -import sisyphus.syncdb -import sisyphus.syncall - - -def set_nonblocking(fd): - flags = fcntl.fcntl(fd, fcntl.F_GETFL) - fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK) - - -def spinner_animation(): - spinner = ['-', '\\', '|', '/'] - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - for _ in range(10): - for char in spinner: - sys.stdout.write('\b' + char) - sys.stdout.flush() - events = sel.select(timeout=0.1) - if events: - return - sys.stdout.write('\b') - - -def sigint_handler(signal, frame): - sys.exit(0) - - -signal.signal(signal.SIGINT, sigint_handler) - - -def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False, nodeps=False): - go_args = ['--quiet', '--verbose', - '--misspell-suggestion=n', '--fuzzy-search=n'] - nogo_args = ['--quiet', '--pretend', '--getbinpkg', - '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] - if not sisyphus.checkenv.root(): - print(f"{sisyphus.getclr.bright_red}\nRoot permissions are required for this operation.\n{sisyphus.getclr.reset}") - sys.exit() - else: - if gfx_ui: - sisyphus.solvedeps.start.__wrapped__( - pkgname, nodeps=False) # undecorate - else: - sisyphus.syncall.start(gfx_ui=False) - if nodeps: - sisyphus.solvedeps.start(pkgname, nodeps=True) - else: - sisyphus.solvedeps.start(pkgname, nodeps=False) - - bin_list, src_list, is_vague, need_cfg = pickle.load( - open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb")) - - if is_vague != 0: # catch ambiguous packages - p_exe = subprocess.Popen( - ['emerge'] + nogo_args + (['--nodeps'] if nodeps else ['--with-bdeps=y']) + list(pkgname)) - try: - p_exe.wait() - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - if gfx_ui: - pass # GUI always calls /, no ambiguity - else: - sys.exit() - - elif need_cfg != 0: # catch aliens - p_exe = subprocess.Popen( - ['emerge'] + nogo_args + (['--nodeps'] if nodeps else ['--with-bdeps=y']) + list(pkgname)) - try: - p_exe.wait() - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - if gfx_ui: - print("\nCannot proceed!\nPlease apply the above changes to your portage configuration files and try again.") - for i in range(9, 0, -1): - print(f"Killing application in : {i} seconds!") - time.sleep(1) - - sys.exit(app.exec_()) # kill GUI window - else: - print(f"{sisyphus.getclr.bright_red}\nCannot proceed!\n{sisyphus.getclr.reset}{sisyphus.getclr.bright_yellow}Please apply the above changes to your portage configuration files and try again!{sisyphus.getclr.reset}") - sys.exit() - else: - if len(bin_list) == 0 and len(src_list) == 0: - print(f"{sisyphus.getclr.bright_red}\nOne or more of the selected packages cannot be located for installation.\n{sisyphus.getclr.reset}") - if ebuild: # ebuild mode - if len(bin_list) == 0 and len(src_list) != 0: # source mode, ignore aliens - print( - f"\n{sisyphus.getclr.green}These are the source packages that would be merged, in order:{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.green}{', '.join(src_list)}{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.bright_white}Total: {len(src_list)} source package(s){sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - p_exe = subprocess.Popen(['emerge'] + go_args + (['--nodeps'] if nodeps else [ - '--with-bdeps=y']) + (['--oneshot'] if oneshot else []) + list(pkgname)) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue - elif len(bin_list) != 0 and len(src_list) != 0: # hybrid mode, ignore aliens - print( - f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") - - print( - f"\n{sisyphus.getclr.green}These are the source packages that would be merged, in order:{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.green}{', '.join(src_list)}{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.bright_white}Total: {len(src_list)} source package(s){sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=False) - os.chdir(sisyphus.getfs.p_cch_dir) - p_exe = subprocess.Popen(['emerge'] + go_args + ['--usepkg', '--rebuilt-binaries'] + ( - ['--nodeps'] if nodeps else ['--with-bdeps=y']) + (['--oneshot'] if oneshot else []) + list(pkgname)) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue - elif len(bin_list) != 0 and len(src_list) == 0: # binary mode, fallback - print( - f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=False) - os.chdir(sisyphus.getfs.p_cch_dir) - p_exe = subprocess.Popen(['emerge'] + go_args + ['--usepkg', '--usepkgonly', '--rebuilt-binaries'] + ( - ['--nodeps'] if nodeps else ['--with-bdeps=y']) + (['--oneshot'] if oneshot else []) + list(pkgname)) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue - else: # non-ebuild mode - if len(bin_list) == 0 and len(src_list) != 0: # source mode (noop), catch aliens - if gfx_ui: - print("\nSource package(s) found in the mix!\n") - print( - f"Use the Sisyphus CLI command: 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.") - - for i in range(9, 0, -1): - print(f"Killing application in : {i} seconds!") - time.sleep(1) - - sys.exit(app.exec_()) # kill GUI window - else: - print( - f"{sisyphus.getclr.bright_red}\nSource package(s) found in the mix!\n{sisyphus.getclr.reset}") - print(f"{sisyphus.getclr.bright_yellow}Use{sisyphus.getclr.reset} 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.") - sys.exit() - elif len(bin_list) != 0 and len(src_list) != 0: # hybrid mode (noop), catch aliens - if gfx_ui: - print("\nSource package(s) found in the mix!\n") - print( - f"Use the Sisyphus CLI command:: 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.") - - for i in range(9, 0, -1): - print(f"Killing application in : {i} seconds!") - time.sleep(1) - - sys.exit(app.exec_()) # kill GUI window - else: - print( - f"{sisyphus.getclr.bright_red}\nSource package(s) found in the mix!\n{sisyphus.getclr.reset}") - print(f"{sisyphus.getclr.bright_yellow}Use{sisyphus.getclr.reset} 'sisyphus install {' '.join(pkgname)} --ebuild' to perform the install; Aborting.") - sys.exit() - elif len(bin_list) != 0 and len(src_list) == 0: # binary mode - if gfx_ui: - print( - "\nThese are the binary packages that will be merged, in order:\n") - print(", ".join(bin_list) + "\n\nTotal: " + - str(len(bin_list)) + " binary package(s)\n\n") - sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=True) - os.chdir(sisyphus.getfs.p_cch_dir) - p_exe = subprocess.Popen(['emerge'] + go_args + ['--usepkg', '--usepkgonly', '--rebuilt-binaries'] + ( - ['--nodeps'] if nodeps else ['--with-bdeps=y']) + (['--oneshot'] if oneshot else []) + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # --nodeps && --oneshot are set to False in the graphical client - # 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() - else: - print( - f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - sisyphus.dlbinpkg.start( - dl_world=False, gfx_ui=False) - os.chdir(sisyphus.getfs.p_cch_dir) - p_exe = subprocess.Popen(['emerge'] + go_args + ['--usepkg', '--usepkgonly', '--rebuilt-binaries'] + ( - ['--nodeps'] if nodeps else ['--with-bdeps=y']) + (['--oneshot'] if oneshot else []) + list(pkgname)) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue diff --git a/src/backend/rmpkgsrc.py b/src/backend/rmpkgsrc.py deleted file mode 100644 index b039f96..0000000 --- a/src/backend/rmpkgsrc.py +++ /dev/null @@ -1,253 +0,0 @@ -#!/usr/bin/python3 - -import atexit -import fcntl -import io -import os -import pickle -import signal -import selectors -import subprocess -import sys -import sisyphus.checkenv -import sisyphus.getclr -import sisyphus.getfs -import sisyphus.killemerge -import sisyphus.solverevdeps -import sisyphus.syncdb - - -def set_nonblocking(fd): - flags = fcntl.fcntl(fd, fcntl.F_GETFL) - fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK) - - -def spinner_animation(): - spinner = ['-', '\\', '|', '/'] - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - for _ in range(10): - for char in spinner: - sys.stdout.write('\b' + char) - sys.stdout.flush() - events = sel.select(timeout=0.1) - if events: - return - sys.stdout.write('\b') - - -def sigint_handler(signal, frame): - sys.exit(0) - - -signal.signal(signal.SIGINT, sigint_handler) - - -def start(pkgname, depclean=False, gfx_ui=False, unmerge=False): - args = ['--quiet', '--depclean'] - - if not sisyphus.checkenv.root() and (unmerge or depclean): - print(f"{sisyphus.getclr.bright_red}\nRoot permissions are required to perform this action.\n{sisyphus.getclr.reset}") - sys.exit() - else: - if gfx_ui: - sisyphus.solverevdeps.start.__wrapped__( - pkgname, depclean=True, unmerge=False) - else: - if unmerge: - sisyphus.solverevdeps.start.__wrapped__( - pkgname, depclean=False, unmerge=True) - else: - sisyphus.solverevdeps.start( - pkgname, depclean=True, unmerge=False) - - is_installed, is_needed, is_vague = pickle.load(open(os.path.join( - sisyphus.getfs.p_mtd_dir, "sisyphus_pkgrevdeps.pickle"), "rb")) - - if is_vague != 0: # catch ambiguous packages - if unmerge: - p_exe = subprocess.Popen( - ['emerge', '--unmerge', '--quiet', '--pretend', '--verbose'] + list(pkgname)) - try: - p_exe.wait() - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - else: - if gfx_ui: - pass # GUI always calls /, no ambiguity - else: - p_exe = subprocess.Popen( - ['emerge'] + args + ['--pretend', '--verbose'] + list(pkgname)) - try: - p_exe.wait() - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - - elif is_needed != 0: - if unmerge: - pass - else: - if gfx_ui: - p_exe = subprocess.Popen(['emerge'] + args + ['--pretend', '--verbose'] + list( - 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() - print( - "\nUnable to proceed! There are other packages with dependencies that prevent removal.") - else: - p_exe = subprocess.Popen( - ['emerge'] + args + ['--pretend', '--verbose'] + list(pkgname)) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - print(f"{sisyphus.getclr.bright_red}\nUnable to proceed! Other packages have dependencies preventing removal.{sisyphus.getclr.reset}") - print(f"{sisyphus.getclr.bright_white}Use the {sisyphus.getclr.reset}{sisyphus.getclr.green}'--force'{sisyphus.getclr.reset}{sisyphus.getclr.bright_white} option to override at your own risk!{sisyphus.getclr.reset}\n") - else: - if is_installed == 0: - print(f"{sisyphus.getclr.bright_red}\nUnable to proceed! One or more selected packages could not be located for removal.\n{sisyphus.getclr.reset}") - sys.exit() - else: - if unmerge: - print(f"\n{sisyphus.getclr.bright_white}Selected packages are slated for{sisyphus.getclr.reset} {sisyphus.getclr.green}'forced'{sisyphus.getclr.reset} {sisyphus.getclr.bright_white}removal.{sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - while True: - confirmation_input = input( - f"{sisyphus.getclr.bright_white}Are you sure you would like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if confirmation_input.lower() in ['yes', 'y', '']: - p_exe = subprocess.Popen( - ['emerge', '--quiet', '--unmerge'] + list(pkgname)) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register( - sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif confirmation_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{confirmation_input}' was not recognized.\n") - continue - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue - else: - if 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) - - for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): - print(p_out.rstrip()) - - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - else: - print(f"\n{sisyphus.getclr.bright_white}Selected packages are slated for{sisyphus.getclr.reset} {sisyphus.getclr.green}'safe'{sisyphus.getclr.reset} {sisyphus.getclr.bright_white}removal.{sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - p_exe = subprocess.Popen( - ['emerge'] + args + list(pkgname)) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue diff --git a/src/backend/sysupgrade.py b/src/backend/sysupgrade.py deleted file mode 100644 index f8b01d2..0000000 --- a/src/backend/sysupgrade.py +++ /dev/null @@ -1,349 +0,0 @@ -#!/usr/bin/python3 - -import atexit -import fcntl -import io -import os -import pickle -import selectors -import signal -import subprocess -import sys -import time -import sisyphus.checkenv -import sisyphus.dlbinpkg -import sisyphus.getclr -import sisyphus.getfs -import sisyphus.killemerge -import sisyphus.solvedeps -import sisyphus.syncdb -import sisyphus.syncall - - -def set_nonblocking(fd): - flags = fcntl.fcntl(fd, fcntl.F_GETFL) - fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK) - - -def spinner_animation(): - spinner = ['-', '\\', '|', '/'] - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - for _ in range(10): - for char in spinner: - sys.stdout.write('\b' + char) - sys.stdout.flush() - events = sel.select(timeout=0.1) - if events: - return - sys.stdout.write('\b') - - -def sigint_handler(signal, frame): - sys.exit(0) - - -signal.signal(signal.SIGINT, sigint_handler) - - -def start(ebuild=False, gfx_ui=False): - go_args = ['--quiet', '--verbose', '--update', '--deep', '--newuse', - '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] - nogo_args = ['--quiet', '--update', '--deep', '--newuse', '--pretend', '--getbinpkg', - '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n',] - if not sisyphus.checkenv.root(): - print(f"{sisyphus.getclr.bright_red}\nRoot permissions are required for this operation.\n{sisyphus.getclr.reset}") - sys.exit() - else: - if gfx_ui: - sisyphus.solvedeps.start.__wrapped__() # undecorate - else: - sisyphus.syncall.start(gfx_ui=False) - sisyphus.solvedeps.start() - - bin_list, src_list, is_vague, need_cfg = pickle.load( - open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb")) - - if need_cfg != 0: # catch aliens - p_exe = subprocess.Popen(['emerge'] + nogo_args + ['@world']) - try: - p_exe.wait() - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - if gfx_ui: - print("\nCannot proceed!\nPlease apply the above changes to your portage configuration files and try again.") - for i in range(9, 0, -1): - print(f"Killing application in : {i} seconds!") - time.sleep(1) - - sys.exit(app.exec_()) # kill GUI window - else: - print(f"{sisyphus.getclr.bright_red}\nCannot proceed!\n{sisyphus.getclr.reset}{sisyphus.getclr.bright_yellow}Please apply the above changes to your portage configuration files and try again!{sisyphus.getclr.reset}") - sys.exit() - else: - if len(bin_list) == 0 and len(src_list) == 0: - if gfx_ui: - print("\nThe system is up to date; no package upgrades are required.\n") - else: - print( - f"{sisyphus.getclr.bright_red}\nThe system is up to date; no package upgrades are required.\n{sisyphus.getclr.reset}") - sys.exit() - - if ebuild: # ebuild mode - if len(bin_list) == 0 and len(src_list) != 0: # source mode, ignore aliens - print( - f"\n{sisyphus.getclr.green}These are the source packages that would be merged, in order:{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.green}{', '.join(src_list)}{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.bright_white}Total: {len(src_list)} source package(s){sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - p_exe = subprocess.Popen( - ['emerge'] + go_args + ['@world']) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue - elif len(bin_list) != 0 and len(src_list) != 0: # hybrid mode, ignore aliens - print( - f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") - - print( - f"\n{sisyphus.getclr.green}These are the source packages that would be merged, in order:{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.green}{', '.join(src_list)}{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.bright_white}Total: {len(src_list)} source package(s){sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - sisyphus.dlbinpkg.start(dl_world=True, gfx_ui=False) - os.chdir(sisyphus.getfs.p_cch_dir) - p_exe = subprocess.Popen( - ['emerge'] + go_args + ['--usepkg', '--rebuilt-binaries', '@world']) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue - elif len(bin_list) != 0 and len(src_list) == 0: # binary mode, fallback - print( - f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - sisyphus.dlbinpkg.start(dl_world=True, gfx_ui=False) - os.chdir(sisyphus.getfs.p_cch_dir) - p_exe = subprocess.Popen( - ['emerge'] + go_args + ['--usepkg', '--usepkgonly', '--rebuilt-binaries', '@world']) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue - else: # non-ebuild mode - if len(bin_list) == 0 and len(src_list) != 0: # source mode (noop), catch aliens - if gfx_ui: - print("\nSource package(s) found in the mix!\n") - print( - f"Use the Sisyphus CLI command: 'sisyphus upgrade --ebuild' to perform the upgrade; Aborting.") - - for i in range(9, 0, -1): - print(f"Killing application in : {i} seconds!") - time.sleep(1) - - sys.exit(app.exec_()) # kill GUI window - else: - print( - f"{sisyphus.getclr.bright_red}\nSource package(s) found in the mix!{sisyphus.getclr.reset}") - print( - f"{sisyphus.getclr.bright_yellow}Use{sisyphus.getclr.reset} 'sisyphus upgrade --ebuild' to perform the upgrade; Aborting.") - sys.exit() - elif len(bin_list) != 0 and len(src_list) != 0: # hybrid mode (noop), catch aliens - if gfx_ui: - print("\nSource package(s) found in the mix!\n") - print( - f"Use the Sisyphus CLI command: 'sisyphus upgrade --ebuild' to perform the upgrade; Aborting.") - - for i in range(9, 0, -1): - print(f"Killing application in : {i} seconds!") - time.sleep(1) - - sys.exit(app.exec_()) # kill GUI window - else: - print( - f"{sisyphus.getclr.bright_red}\nSource package(s) found in the mix!{sisyphus.getclr.reset}") - print( - f"{sisyphus.getclr.bright_yellow}Use{sisyphus.getclr.reset} 'sisyphus upgrade --ebuild' to perform the upgrade; Aborting.") - sys.exit() - elif len(bin_list) != 0 and len(src_list) == 0: # binary mode - if gfx_ui: - print( - f"\nThese are the binary packages that will be merged, in order:\n") - print(", ".join(bin_list) + - f"\n\nTotal: {len(bin_list)} binary package(s)\n") - sisyphus.dlbinpkg.start(dl_world=True, gfx_ui=True) - os.chdir(sisyphus.getfs.p_cch_dir) - p_exe = subprocess.Popen(['emerge'] + go_args + ['--usepkg', '--usepkgonly', - '--rebuilt-binaries', '@world'], 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() - else: - print( - f"\n{sisyphus.getclr.green}These are the binary packages that would be merged, in order:{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.magenta}{', '.join(bin_list)}{sisyphus.getclr.reset}\n") - print( - f"\n{sisyphus.getclr.bright_white}Total: {len(bin_list)} binary package(s){sisyphus.getclr.reset}\n") - while True: - user_input = input( - f"{sisyphus.getclr.bright_white}Would you like to proceed?{sisyphus.getclr.reset} [{sisyphus.getclr.bright_green}Yes{sisyphus.getclr.reset}/{sisyphus.getclr.bright_red}No{sisyphus.getclr.reset}] ") - if user_input.lower() in ['yes', 'y', '']: - sisyphus.dlbinpkg.start( - dl_world=True, gfx_ui=False) - os.chdir(sisyphus.getfs.p_cch_dir) - p_exe = subprocess.Popen( - ['emerge'] + go_args + ['--usepkg', '--usepkgonly', '--rebuilt-binaries', '@world']) - try: - set_nonblocking(sys.stdout.fileno()) - spinner_animation() - - sel = selectors.DefaultSelector() - sel.register(sys.stdin, selectors.EVENT_READ) - - while True: - events = sel.select(timeout=0.1) - for key, mask in events: - if key.fileobj == sys.stdin: - line = sys.stdin.readline().strip() - if line.lower() == 'q': - sys.exit() - if p_exe.poll() is not None: - break - except KeyboardInterrupt: - p_exe.terminate() - try: - p_exe.wait(1) - except subprocess.TimeoutExpired: - p_exe.kill() - sys.exit() - finally: - p_exe.wait() - sisyphus.syncdb.lcl_tbl() - break - elif user_input.lower() in ['no', 'n']: - break - else: - print( - f"\nApologies, the response '{user_input}' was not recognized.\n") - continue diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index 541d610..8e6ec04 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -135,10 +135,10 @@ def install(pkgname: List[str], sisyphus install -e --nodeps vivaldi\n """ if ebuild: - sisyphus.instpkgsrc.start( + sisyphus.binpkgsrcinst.start( pkgname, ebuild=True, gfx_ui=False, oneshot=oneshot, nodeps=nodeps) else: - sisyphus.instpkgsrc.start( + sisyphus.binpkgsrcinst.start( pkgname, ebuild=False, gfx_ui=False, oneshot=oneshot, nodeps=nodeps) @@ -165,10 +165,10 @@ def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", " sisyphus uninstall openrc -f # this will succeed, but the system will no longer boot\n """ if force: - sisyphus.rmpkgsrc.start( + sisyphus.binpkgsrcunst.start( pkgname, depclean=False, gfx_ui=False, unmerge=True) else: - sisyphus.rmpkgsrc.start( + sisyphus.binpkgsrcunst.start( pkgname, depclean=True, gfx_ui=False, unmerge=False) @@ -186,7 +186,7 @@ def autoremove(): * Examples:\n sisyphus autoremove\n """ - sisyphus.autormpkgsrc.start(gfx_ui=False) + sisyphus.binpkgsrcautorm.start(gfx_ui=False) @app.command("autoclean") @@ -233,9 +233,9 @@ def upgrade( sisyphus upgrade -e\n """ if ebuild: - sisyphus.sysupgrade.start(ebuild=True, gfx_ui=False) + sisyphus.binpkgsrcupgd.start(ebuild=True, gfx_ui=False) else: - sisyphus.sysupgrade.start(ebuild=False, gfx_ui=False) + sisyphus.binpkgsrcupgd.start(ebuild=False, gfx_ui=False) @app.command("spmsync") diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index 684a780..b86561e 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -21,7 +21,8 @@ class Sisyphus(QtWidgets.QMainWindow): ]) self.applicationFilter.addItems(self.filterApplications.keys()) self.applicationFilter.setCurrentText('Package Name') - self.applicationFilter.currentIndexChanged.connect(self.setApplicationFilter) + self.applicationFilter.currentIndexChanged.connect( + self.setApplicationFilter) Sisyphus.applicationView = self.filterApplications['Package Name'] self.filterDatabases = OrderedDict([ @@ -45,7 +46,8 @@ class Sisyphus(QtWidgets.QMainWindow): self.settingsButton.clicked.connect(self.showMirrorWindow) self.licenseButton.clicked.connect(self.showLicenseWindow) - sys.stdout = MainWorker(workerOutput=self.updateProgress) # capture stdout + sys.stdout = MainWorker( + workerOutput=self.updateProgress) # capture stdout self.updateWorker = MainWorker() self.updateThread = QtCore.QThread() @@ -70,7 +72,8 @@ class Sisyphus(QtWidgets.QMainWindow): self.uninstallThread = QtCore.QThread() self.uninstallWorker.moveToThread(self.uninstallThread) self.uninstallWorker.started.connect(self.showProgress) - self.uninstallThread.started.connect(self.uninstallWorker.startUninstall) + self.uninstallThread.started.connect( + self.uninstallWorker.startUninstall) self.uninstallWorker.workerOutput.connect(self.updateProgress) self.uninstallThread.finished.connect(self.hideProgress) self.uninstallWorker.finished.connect(self.uninstallThread.quit) @@ -90,7 +93,8 @@ class Sisyphus(QtWidgets.QMainWindow): self.autoremoveThread = QtCore.QThread() self.autoremoveWorker.moveToThread(self.autoremoveThread) self.autoremoveWorker.started.connect(self.showProgress) - self.autoremoveThread.started.connect(self.autoremoveWorker.startAutoremove) + self.autoremoveThread.started.connect( + self.autoremoveWorker.startAutoremove) self.autoremoveWorker.workerOutput.connect(self.updateProgress) self.autoremoveThread.finished.connect(self.hideProgress) self.autoremoveWorker.finished.connect(self.autoremoveThread.quit) @@ -104,23 +108,29 @@ class Sisyphus(QtWidgets.QMainWindow): def centerOnScreen(self): screenGeometry = QtWidgets.QDesktopWidget().screenGeometry() windowGeometry = self.geometry() - horizontalPosition = int(( screenGeometry.width() - windowGeometry.width() ) / 2) - verticalPosition = int(( screenGeometry.height() - windowGeometry.height() ) / 2) + horizontalPosition = int( + (screenGeometry.width() - windowGeometry.width()) / 2) + verticalPosition = int( + (screenGeometry.height() - windowGeometry.height()) / 2) self.move(horizontalPosition, verticalPosition) def rowClicked(self): - Sisyphus.pkgSelect = len(self.databaseTable.selectionModel().selectedRows()) + Sisyphus.pkgSelect = len( + self.databaseTable.selectionModel().selectedRows()) self.showPackageCount() def showPackageCount(self): - self.statusBar().showMessage("Found: %d, Selected: %d packages" % (Sisyphus.pkgCount, Sisyphus.pkgSelect)) + self.statusBar().showMessage("Found: %d, Selected: %d packages" % + (Sisyphus.pkgCount, Sisyphus.pkgSelect)) def setApplicationFilter(self): - Sisyphus.applicationView = self.filterApplications[self.applicationFilter.currentText()] + Sisyphus.applicationView = self.filterApplications[self.applicationFilter.currentText( + )] self.loadDatabase() def setDatabaseFilter(self): - Sisyphus.databaseView = self.filterDatabases[self.databaseFilter.currentText()] + Sisyphus.databaseView = self.filterDatabases[self.databaseFilter.currentText( + )] Sisyphus.SELECT = self.databaseFilter.currentText() self.loadDatabase() @@ -220,7 +230,8 @@ class Sisyphus(QtWidgets.QMainWindow): Sisyphus.pkgCount = len(rows) Sisyphus.pkgSelect = 0 model = QtGui.QStandardItemModel(len(rows), 5) - model.setHorizontalHeaderLabels(['Category', 'Name', 'Installed Version', 'Available Version', 'Description']) + model.setHorizontalHeaderLabels( + ['Category', 'Name', 'Installed Version', 'Available Version', 'Description']) for row in rows: indx = rows.index(row) for column in range(0, 5): @@ -243,12 +254,15 @@ class Sisyphus(QtWidgets.QMainWindow): def byRow(e): return e['row'] - pkg_categs = [{'row': pkg.row(), 'cat': pkg.data()} for pkg in self.databaseTable.selectionModel().selectedRows(0)] - pkg_names = [{'row': pkg.row(), 'name': pkg.data()} for pkg in self.databaseTable.selectionModel().selectedRows(1)] + pkg_categs = [{'row': pkg.row(), 'cat': pkg.data()} + for pkg in self.databaseTable.selectionModel().selectedRows(0)] + pkg_names = [{'row': pkg.row(), 'name': pkg.data()} + for pkg in self.databaseTable.selectionModel().selectedRows(1)] pkg_categs = sorted(pkg_categs, key=byRow) pkg_names = sorted(pkg_names, key=byRow) - selected_pkgs = [pkg_categs[i]['cat'] + '/' + pkg_names[i]['name'] for i in range(len(pkg_categs))] - return(selected_pkgs) + selected_pkgs = [pkg_categs[i]['cat'] + '/' + + pkg_names[i]['name'] for i in range(len(pkg_categs))] + return (selected_pkgs) def packageInstall(self): if not self.databaseTable.selectionModel().hasSelection(): @@ -355,9 +369,11 @@ class Sisyphus(QtWidgets.QMainWindow): self.close() def __del__(self): - sys.stdout = sys.__stdout__ # restore stdout + sys.stdout = sys.__stdout__ # restore stdout # mirror configuration window + + class MirrorConfiguration(QtWidgets.QMainWindow): def __init__(self): super(MirrorConfiguration, self).__init__() @@ -372,8 +388,10 @@ class MirrorConfiguration(QtWidgets.QMainWindow): def centerOnScreen(self): screenGeometry = QtWidgets.QDesktopWidget().screenGeometry() windowGeometry = self.geometry() - horizontalPosition = int(( screenGeometry.width() - windowGeometry.width() ) / 2) - verticalPosition = int(( screenGeometry.height() - windowGeometry.height() ) / 2) + horizontalPosition = int( + (screenGeometry.width() - windowGeometry.width()) / 2) + verticalPosition = int( + (screenGeometry.height() - windowGeometry.height()) / 2) self.move(horizontalPosition, verticalPosition) def updateMirrorList(self): @@ -410,8 +428,10 @@ class LicenseInformation(QtWidgets.QMainWindow): def centerOnScreen(self): screenGeometry = QtWidgets.QDesktopWidget().screenGeometry() windowGeometry = self.geometry() - horizontalPosition = int(( screenGeometry.width() - windowGeometry.width() ) / 2) - verticalPosition = int(( screenGeometry.height() - windowGeometry.height() ) / 2) + horizontalPosition = int( + (screenGeometry.width() - windowGeometry.width()) / 2) + verticalPosition = int( + (screenGeometry.height() - windowGeometry.height()) / 2) self.move(horizontalPosition, verticalPosition) @@ -434,33 +454,35 @@ class MainWorker(QtCore.QObject): def startUpdate(self): self.started.emit() sisyphus.setjobs.start() - sisyphus.syncall.start.__wrapped__(gfx_ui=True) # undecorate + sisyphus.syncall.start.__wrapped__(gfx_ui=True) # undecorate self.finished.emit() @QtCore.pyqtSlot() def startInstall(self): self.started.emit() pkgname = Sisyphus.pkgname - sisyphus.instpkgsrc.start(pkgname, ebuild=False, gfx_ui=True, oneshot=False, nodeps=False) + sisyphus.binpkgsrcinst.start( + pkgname, ebuild=False, gfx_ui=True, oneshot=False, nodeps=False) self.finished.emit() @QtCore.pyqtSlot() def startUninstall(self): self.started.emit() pkgname = Sisyphus.pkgname - sisyphus.rmpkgsrc.start(pkgname, depclean=True, gfx_ui=True, unmerge=False) + sisyphus.binpkgsrcunst.start( + pkgname, depclean=True, gfx_ui=True, unmerge=False) self.finished.emit() @QtCore.pyqtSlot() def startUpgrade(self): self.started.emit() - sisyphus.sysupgrade.start(ebuild=False, gfx_ui=True) + sisyphus.binpkgsrcupgd.start(ebuild=False, gfx_ui=True) self.finished.emit() @QtCore.pyqtSlot() def startAutoremove(self): self.started.emit() - sisyphus.autormpkgsrc.start(gfx_ui=True) + sisyphus.binpkgsrcautorm.start(gfx_ui=True) self.finished.emit() -- cgit v1.2.3