merge upgradepkg && upgradesrc

5 files changed, 85 insertions, 101 deletions

diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index 0edabc5..3cd1b2e 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -18,5 +18,4 @@ from .syncspm import *
 from .sysinfo import *
 from .uninstall import *
 from .update import *
-from .upgradepkg import *
-from .upgradesrc import *
+from .upgrade import *
diff --git a/src/backend/upgradesrc.py b/src/backend/upgrade.py
index e12da8e..f205c2b 100644
--- a/src/backend/upgradesrc.py
+++ b/src/backend/upgrade.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():
                 else:
                     sys.exit("\n" + "No package upgrades found; Quitting." + "\n")
             else:
+                sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus upgrade --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 upgrade --ebuild" + "'" + ";" + " " + "Quitting." + "\n")
+    else:
+        sys.exit("\nYou need root permissions to do this, exiting!\n")
+
+def estart():
+    if sisyphus.checkenv.root():
+        sisyphus.update.start()
+
+        binhostURL = sisyphus.getenv.binhostURL()
+        areBinaries,areSources,needsConfig = sisyphus.solvedeps.world()
+
+        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', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+                        portageExec.wait()
+                        sisyphus.syncdb.localTable()
+                    else:
+                        sys.exit("\n" + "Ok; Quitting." + "\n")
+                else:
+                    sys.exit("\n" + "No package upgrades 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")
@@ -97,3 +142,38 @@ def start():
     else:
         sys.exit("\nYou need root permissions to do this, exiting!\n")
 
+def startx():
+    binhostURL = sisyphus.getenv.binhostURL()
+    areBinaries,areSources,needsConfig = sisyphus.solvedeps.world.__wrapped__() #undecorate
+
+    if not len(areSources) == 0:
+        print("\n" + "Source package(s) found in the mix;" + " " + "Use sisyphus CLI:" +  " " + "'" + "sisyphus upgrade --ebuild" + "'" + " " + "to perform the upgrade;" + " " + "Aborting." + "\n")
+    else:
+        if not len(areBinaries) == 0:
+            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', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@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, portageExec)
+
+            for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
+                print(portageOutput.rstrip())
+
+            portageExec.wait()
+            sisyphus.syncdb.localTable()
+        else:
+            print("\n" + "No package upgrades found; Quitting." + "\n")
diff --git a/src/backend/upgradepkg.py b/src/backend/upgradepkg.py
deleted file mode 100644
index 0062bbf..0000000
--- a/src/backend/upgradepkg.py
+++ /dev/null
@@ -1,95 +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():
-    if sisyphus.checkenv.root():
-        sisyphus.update.start()
-
-        binhostURL = sisyphus.getenv.binhostURL()
-        areBinaries,areSources,needsConfig = sisyphus.solvedeps.world()
-
-        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', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-                        portageExec.wait()
-                        sisyphus.syncdb.localTable()
-                    else:
-                        sys.exit("\n" + "Ok; Quitting." + "\n")
-                else:
-                    sys.exit("\n" + "No package upgrades found; Quitting." + "\n")
-            else:
-                sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus upgrade --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 upgrade --ebuild" + "'" + ";" + " " + "Quitting." + "\n")
-    else:
-        sys.exit("\nYou need root permissions to do this, exiting!\n")
-
-def startx():
-    binhostURL = sisyphus.getenv.binhostURL()
-    areBinaries,areSources,needsConfig = sisyphus.solvedeps.world.__wrapped__() #undecorate
-
-    if not len(areSources) == 0:
-        print("\n" + "Source package(s) found in the mix;" + " " + "Use sisyphus CLI:" +  " " + "'" + "sisyphus upgrade --ebuild" + "'" + " " + "to perform the upgrade;" + " " + "Aborting." + "\n")
-    else:
-        if not len(areBinaries) == 0:
-            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', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@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, portageExec)
-
-            for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"):
-                print(portageOutput.rstrip())
-
-            portageExec.wait()
-            sisyphus.syncdb.localTable()
-        else:
-            print("\n" + "No package upgrades found; Quitting." + "\n")
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index 88e6378..3124fd0 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -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.upgradepkg.start()
+        sisyphus.upgrade.start()
     else:
-        sisyphus.upgradesrc.start()
+        sisyphus.upgrade.estart()
 
 @app.command("spmsync")
 def spmsync():
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 3d07b34..45a2dc3 100644
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -411,7 +411,7 @@ class MainWorker(QtCore.QObject):
     @QtCore.pyqtSlot()
     def startUpgrade(self):
         self.started.emit()
-        sisyphus.upgradepkg.startx()
+        sisyphus.upgrade.startx()
         self.finished.emit()
 
     @QtCore.pyqtSlot()