From 515171c670ed6ae373002196b8cd3dd1154cd5cc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Jan 2021 14:41:20 +0000 Subject: ui : move package operations into the backend --- src/frontend/cli/sisyphus-cli.py | 14 ++--- src/frontend/gui/sisyphus-gui.py | 113 ++------------------------------------- 2 files changed, 11 insertions(+), 116 deletions(-) (limited to 'src/frontend') diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index e69a547..5c87698 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -97,12 +97,12 @@ def search(package: List[str] = typer.Argument(...), cat, pn = package[0].split('/') else: cat, pn = '', package[0] - sisyphus.searchbinary.start(filter.value, cat, pn, desc, quiet) + sisyphus.search.start(filter.value, cat, pn, desc, quiet) else: if not package: raise typer.Exit('No search term provided, try: sisyphus search --help') else: - sisyphus.searchebuild.start(package) + sisyphus.ebuildsearch.start(package) @app.command("install") def install(pkgname: List[str], ebuild: bool = typer.Option(False, "--ebuild", "-e")): @@ -124,9 +124,9 @@ def install(pkgname: List[str], ebuild: bool = typer.Option(False, "--ebuild", " You can use the --ebuild option even if you don't want to install any ebuild(source) packages; It will fall back to binary packages only. """ if not ebuild: - sisyphus.installbinary.start(pkgname) + sisyphus.install.start(pkgname) else: - sisyphus.installebuild.start(pkgname) + sisyphus.ebuildinstall.start(pkgname) @app.command("uninstall") def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", "-f")): @@ -163,7 +163,7 @@ def uninstall(pkgname: List[str], force: bool = typer.Option(False, "--force", " if not force: sisyphus.uninstall.start(pkgname) else: - sisyphus.uninstallforce.start(pkgname) + sisyphus.forceuninstall.start(pkgname) @app.command("autoremove") def autoremove(): @@ -203,9 +203,9 @@ def upgrade(ebuild: bool = typer.Option(False, "--ebuild", "-e")): You can use the --ebuild option even if you don't have any ebuild(source) packages installed; It will fall back to binary packages only. """ if not ebuild: - sisyphus.upgradebinary.start() + sisyphus.upgrade.start() else: - sisyphus.upgradeebuild.start() + sisyphus.ebuildupgrade.start() @app.command("spmsync") def spmsync(): diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index fa2b057..8930f6c 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -1,13 +1,7 @@ #!/usr/bin/python3 -import os import sys -import subprocess import sqlite3 -import io -import atexit -import wget -import shutil import sisyphus from collections import OrderedDict from PyQt5 import QtCore, QtGui, QtWidgets, uic @@ -398,125 +392,26 @@ class MainWorker(QtCore.QObject): def startInstall(self): self.started.emit() pkgname = Sisyphus.pkgname - - binhostURL = sisyphus.binhost.getURL() - areBinaries,areSources,needsConfig = sisyphus.solvedeps.package.__wrapped__(pkgname) #undecorate - - os.chdir(sisyphus.filesystem.portageCacheDir) - self.workerOutput.emit("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n\n") - for index, binary in enumerate([package + '.tbz2' for package in areBinaries]): - self.workerOutput.emit(">>> Fetching" + " " + binhostURL + binary) - wget.download(binhostURL + binary) - self.workerOutput.emit("\n") - - subprocess.call(['qtbz2', '-x'] + binary.rstrip().split("/")[1].split()) - CATEGORY = subprocess.check_output(['qxpak', '-x', '-O'] + binary.rstrip().split("/")[1].replace('tbz2', 'xpak').split() + ['CATEGORY']) - - if os.path.exists(binary.rstrip().split("/")[1].replace('tbz2', 'xpak')): - os.remove(binary.rstrip().split("/")[1].replace('tbz2', 'xpak')) - - if os.path.isdir(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip())): - shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip()), os.path.basename(binary.rstrip().split("/")[1]))) - else: - os.makedirs(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip())) - shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip()), os.path.basename(binary.rstrip().split("/")[1]))) - - if os.path.exists(binary.rstrip().split("/")[1]): - os.remove(binary.rstrip().split("/")[1]) - - portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE) - - # kill portage if the program dies or it's terminated by the user - atexit.register(sisyphus.killportage.start, portageExec) - - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): - if not "These are the packages that would be merged, in order:" in portageOutput.rstrip(): - if not "Calculating dependencies" in portageOutput.rstrip(): - self.workerOutput.emit(portageOutput.rstrip() + "\n") - - portageExec.wait() - sisyphus.database.syncLocal() + sisyphus.install.startqt(pkgname) self.finished.emit() @QtCore.pyqtSlot() def startUninstall(self): self.started.emit() pkgname = Sisyphus.pkgname - portageExec = subprocess.Popen(['emerge', '--depclean'] + pkgname, stdout=subprocess.PIPE) - - # kill portage if the program dies or it's terminated by the user - atexit.register(sisyphus.killportage.start, portageExec) - - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): - self.workerOutput.emit(portageOutput.rstrip() + "\n") - - portageExec.wait() - sisyphus.database.syncLocal() + sisyphus.uninstall.startqt(pkgname) self.finished.emit() @QtCore.pyqtSlot() def startUpgrade(self): self.started.emit() - - binhostURL = sisyphus.binhost.getURL() - areBinaries,areSources,needsConfig = sisyphus.solvedeps.world.__wrapped__() #undecorate - - if not len(areSources) == 0: - self.workerOutput.emit("\n" + "Source package upgrades detected; Use sisyphus CLI to perform the upgrade; Aborting." + "\n") - else: - if not len(areBinaries) == 0: - self.workerOutput.emit("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n\n") - os.chdir(sisyphus.filesystem.portageCacheDir) - for index, binary in enumerate([package + '.tbz2' for package in areBinaries]): - self.workerOutput.emit(">>> Fetching" + " " + binhostURL + binary) - wget.download(binhostURL + binary) - self.workerOutput.emit("\n") - - subprocess.call(['qtbz2', '-x'] + binary.rstrip().split("/")[1].split()) - CATEGORY = subprocess.check_output(['qxpak', '-x', '-O'] + binary.rstrip().split("/")[1].replace('tbz2', 'xpak').split() + ['CATEGORY']) - - if os.path.exists(binary.rstrip().split("/")[1].replace('tbz2', 'xpak')): - os.remove(binary.rstrip().split("/")[1].replace('tbz2', 'xpak')) - - if os.path.isdir(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip())): - shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip()), os.path.basename(binary.rstrip().split("/")[1]))) - else: - os.makedirs(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip())) - shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.filesystem.portageCacheDir, CATEGORY.decode().strip()), os.path.basename(binary.rstrip().split("/")[1]))) - - if os.path.exists(binary.rstrip().split("/")[1]): - os.remove(binary.rstrip().split("/")[1]) - - portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE) - - # kill portage if the program dies or it's terminated by the user - atexit.register(sisyphus.killportage.start, portageExec) - - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): - if not "These are the packages that would be merged, in order:" in portageOutput.rstrip(): - if not "Calculating dependencies" in portageOutput.rstrip(): - self.workerOutput.emit(portageOutput.rstrip() + "\n") - - portageExec.wait() - sisyphus.database.syncLocal() - else: - self.workerOutput.emit("\n" + "No package upgrades found; Quitting." + "\n") - + sisyphus.upgrade.startqt() self.finished.emit() @QtCore.pyqtSlot() def startAutoremove(self): self.started.emit() - portageExec = subprocess.Popen(['emerge', '--depclean'], stdout=subprocess.PIPE) - - # kill portage if the program dies or it's terminated by the user - atexit.register(sisyphus.killportage.start, portageExec) - - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): - self.workerOutput.emit(portageOutput.rstrip() + "\n") - - portageExec.wait() - sisyphus.database.syncLocal() + sisyphus.autoremove.startqt() self.finished.emit() -- cgit v1.2.3