merge installpkg && installsrc

5 files changed, 80 insertions, 95 deletions

diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index cd82005..0edabc5 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -2,8 +2,7 @@ from .autoremove import *
 from .checkenv import *
 from .getenv import *
 from .getfs import *
-from .installpkg import *
-from .installsrc import *
+from .install import *
 from .killemerge import *
 from .purgeenv import *
 from .recoverdb import *
diff --git a/src/backend/installsrc.py b/src/backend/install.py
index 5eedda2..4104a25 100644
--- a/src/backend/installsrc.py
+++ b/src/backend/install.py
@@ -1,7 +1,8 @@
 #!/usr/bin/python3
 
-import os
+import atexit
 import io
+import os
 import shutil
 import subprocess
 import sys
@@ -9,6 +10,7 @@ import wget
 import sisyphus.checkenv
 import sisyphus.getenv
 import sisyphus.getfs
+import sisyphus.killemerge
 import sisyphus.solvedeps
 import sisyphus.syncdb
 import sisyphus.update
@@ -49,6 +51,49 @@ def start(pkgname):
                 else:
                     sys.exit("\n" + "No package found; Quitting." + "\n")
             else:
+                sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus install" + " " + " ".join(pkgname) + " " + "--ebuild" + "'" + ";" + " " + "Quitting." + "\n")
+        else:
+            # don't silently fail if a source package requested without the --ebuild option needs a keyword, mask, REQUIRED_USE or USE change
+            sys.exit("\n" + "Invalid request;" " " + "Use" + " " + "'" + "sisyphus install" + " " + " ".join(pkgname) + " " + "--ebuild" + "'" + ";" + " " + "Quitting." + "\n")
+    else:
+        sys.exit("\nYou need root permissions to do this, exiting!\n")
+
+def estart(pkgname):
+    if sisyphus.checkenv.root():
+        sisyphus.update.start()
+
+        binhostURL = sisyphus.getenv.binhostURL()
+        areBinaries,areSources,needsConfig = sisyphus.solvedeps.package(pkgname)
+
+        if needsConfig == 0:
+            if len(areSources) == 0:
+                if not len(areBinaries) == 0:
+                    os.chdir(sisyphus.getfs.portageCacheDir)
+                    print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n"  + "  ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
+                    if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
+                        for index, binary in enumerate([package + '.tbz2' for package in areBinaries], start=1):
+                            print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
+                            wget.download(binhostURL + binary)
+                            print("\n")
+
+                            if os.path.isdir(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0])):
+                                shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]), os.path.basename(binary.rstrip().split("/")[1])))
+                            else:
+                                os.makedirs(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]))
+                                shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]), 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', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+                        portageExec.wait()
+                        sisyphus.syncdb.localTable()
+                    else:
+                        sys.exit("\n" + "Ok; Quitting." + "\n")
+                else:
+                    sys.exit("\n" + "No package found; Quitting." + "\n")
+            else:
                 if not len(areBinaries) == 0:
                     os.chdir(sisyphus.getfs.portageCacheDir)
                     print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + "  ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
@@ -96,3 +141,33 @@ def start(pkgname):
             sys.exit("\n" + "Cannot proceed; Apply the above changes to your portage configuration files and try again; Quitting." + "\n")
     else:
         sys.exit("\nYou need root permissions to do this, exiting!\n")
+
+def startx(pkgname):
+	binhostURL = sisyphus.getenv.binhostURL()
+	areBinaries,areSources,needsConfig = sisyphus.solvedeps.package.__wrapped__(pkgname) #undecorate
+
+	os.chdir(sisyphus.getfs.portageCacheDir)
+	print("\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], start=1):
+		print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
+		wget.download(binhostURL + binary)
+		print("\n")
+
+		if os.path.isdir(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0])):
+			shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]), os.path.basename(binary.rstrip().split("/")[1])))
+		else:
+			os.makedirs(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]))
+			shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]), 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', '--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, portageExec)
+
+	for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+		print(portageOutput.rstrip())
+
+	portageExec.wait()
+	sisyphus.syncdb.localTable()
diff --git a/src/backend/installpkg.py b/src/backend/installpkg.py
deleted file mode 100644
index 4dba1e5..0000000
--- a/src/backend/installpkg.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/python3
-
-import atexit
-import io
-import os
-import shutil
-import subprocess
-import sys
-import wget
-import sisyphus.checkenv
-import sisyphus.getenv
-import sisyphus.getfs
-import sisyphus.killemerge
-import sisyphus.solvedeps
-import sisyphus.syncdb
-import sisyphus.update
-
-def start(pkgname):
-    if sisyphus.checkenv.root():
-        sisyphus.update.start()
-
-        binhostURL = sisyphus.getenv.binhostURL()
-        areBinaries,areSources,needsConfig = sisyphus.solvedeps.package(pkgname)
-
-        if needsConfig == 0:
-            if len(areSources) == 0:
-                if not len(areBinaries) == 0:
-                    os.chdir(sisyphus.getfs.portageCacheDir)
-                    print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n"  + "  ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
-                    if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
-                        for index, binary in enumerate([package + '.tbz2' for package in areBinaries], start=1):
-                            print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
-                            wget.download(binhostURL + binary)
-                            print("\n")
-
-                            if os.path.isdir(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0])):
-                                shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]), os.path.basename(binary.rstrip().split("/")[1])))
-                            else:
-                                os.makedirs(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]))
-                                shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]), 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', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-                        portageExec.wait()
-                        sisyphus.syncdb.localTable()
-                    else:
-                        sys.exit("\n" + "Ok; Quitting." + "\n")
-                else:
-                    sys.exit("\n" + "No package found; Quitting." + "\n")
-            else:
-                sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus install" + " " + " ".join(pkgname) + " " + "--ebuild" + "'" + ";" + " " + "Quitting." + "\n")
-        else:
-            # don't silently fail if a source package requested without the --ebuild option needs a keyword, mask, REQUIRED_USE or USE change
-            sys.exit("\n" + "Invalid request;" " " + "Use" + " " + "'" + "sisyphus install" + " " + " ".join(pkgname) + " " + "--ebuild" + "'" + ";" + " " + "Quitting." + "\n")
-    else:
-        sys.exit("\nYou need root permissions to do this, exiting!\n")
-
-def startx(pkgname):
-    binhostURL = sisyphus.getenv.binhostURL()
-    areBinaries,areSources,needsConfig = sisyphus.solvedeps.package.__wrapped__(pkgname) #undecorate
-
-    os.chdir(sisyphus.getfs.portageCacheDir)
-    print("\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], start=1):
-        print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
-        wget.download(binhostURL + binary)
-        print("\n")
-
-        if os.path.isdir(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0])):
-            shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]), os.path.basename(binary.rstrip().split("/")[1])))
-        else:
-            os.makedirs(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]))
-            shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]), 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', '--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, portageExec)
-
-    for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
-        print(portageOutput.rstrip())
-
-    portageExec.wait()
-    sisyphus.syncdb.localTable()
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index b8f500a..88e6378 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -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.installpkg.start(pkgname)
+        sisyphus.install.start(pkgname)
     else:
-        sisyphus.installsrc.start(pkgname)
+        sisyphus.install.estart(pkgname)
 
 @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 67a8d97..3d07b34 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.installpkg.startx(pkgname)
+        sisyphus.install.startx(pkgname)
         self.finished.emit()
 
     @QtCore.pyqtSlot()