13 files changed, 51 insertions, 51 deletions
diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index b820950..6da1678 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -1,24 +1,24 @@
-from .autoremove import *
+from .autormpkgsrc import *
 from .checkenv import *
-from .dlpkg import *
+from .dlbinpkg import *
 from .getclr import *
 from .getenv import *
 from .getfs import *
-from .install import *
+from .instpkgsrc import *
 from .killemerge import *
-from .mirrors import *
 from .purgeenv import *
 from .recoverdb import *
+from .rmpkgsrc import *
 from .solvedeps import *
-from .solverdeps import *
+from .solverevdeps import *
 from .searchdb import *
 from .setbranch import *
 from .setjobs import *
+from .setmirror import *
 from .setprofile import *
+from .syncall import *
 from .syncdb import *
 from .syncenv import *
 from .syncspm import *
 from .sysinfo import *
-from .uninstall import *
-from .update import *
-from .upgrade import *
+from .sysupgrade import *
diff --git a/src/backend/autoremove.py b/src/backend/autormpkgsrc.py
index 3f0c852..3f0c852 100644
--- a/src/backend/autoremove.py
+++ b/src/backend/autormpkgsrc.py
diff --git a/src/backend/dlpkg.py b/src/backend/dlbinpkg.py
index ce089ad..ce089ad 100644
--- a/src/backend/dlpkg.py
+++ b/src/backend/dlbinpkg.py
diff --git a/src/backend/install.py b/src/backend/instpkgsrc.py
index 6a95bee..26e5132 100644
--- a/src/backend/install.py
+++ b/src/backend/instpkgsrc.py
@@ -11,13 +11,13 @@ import subprocess
 import sys
 import time
 import sisyphus.checkenv
-import sisyphus.dlpkg
+import sisyphus.dlbinpkg
 import sisyphus.getclr
 import sisyphus.getfs
 import sisyphus.killemerge
 import sisyphus.solvedeps
 import sisyphus.syncdb
-import sisyphus.update
+import sisyphus.syncall
 
 
 def set_nonblocking(fd):
@@ -56,7 +56,7 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
         if gfx_ui:
             sisyphus.solvedeps.start.__wrapped__(pkgname)  # undecorate
         else:
-            sisyphus.update.start(gfx_ui=False)
+            sisyphus.syncall.start(gfx_ui=False)
             sisyphus.solvedeps.start(pkgname)
 
         bin_list, src_list, is_vague, need_cfg = pickle.load(
@@ -178,7 +178,7 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
                     user_input = input(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.dlpkg.start(dl_world=False, gfx_ui=False)
+                        sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=False)
                         os.chdir(sisyphus.getfs.p_cch_dir)
                         p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--rebuilt-binaries', '--with-bdeps=y',
                                                  '--misspell-suggestion=n', '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
@@ -226,7 +226,7 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
                     user_input = input(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.dlpkg.start(dl_world=False, gfx_ui=False)
+                        sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=False)
                         os.chdir(sisyphus.getfs.p_cch_dir)
                         p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
                                                  '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
@@ -304,7 +304,7 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
                         "\n" + "These are the binary packages that will be merged, in order:" + "\n")
                     print("\n" + ", ".join(bin_list) + "\n\n" + "Total:" + " " +
                           str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
-                    sisyphus.dlpkg.start(dl_world=False, gfx_ui=True)
+                    sisyphus.dlbinpkg.start(dl_world=False, gfx_ui=True)
                     os.chdir(sisyphus.getfs.p_cch_dir)
                     p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y',
                                              '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -327,7 +327,7 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
                         user_input = input(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.dlpkg.start(
+                            sisyphus.dlbinpkg.start(
                                 dl_world=False, gfx_ui=False)
                             os.chdir(sisyphus.getfs.p_cch_dir)
                             p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
diff --git a/src/backend/uninstall.py b/src/backend/rmpkgsrc.py
index e3e6135..17d5a12 100644
--- a/src/backend/uninstall.py
+++ b/src/backend/rmpkgsrc.py
@@ -11,7 +11,7 @@ import sisyphus.checkenv
 import sisyphus.getclr
 import sisyphus.getfs
 import sisyphus.killemerge
-import sisyphus.solverdeps
+import sisyphus.solverevdeps
 import sisyphus.syncdb
 
 
@@ -31,12 +31,12 @@ def start(pkgname, depclean=False, gfx_ui=False, unmerge=False):
         sys.exit()
     else:
         if gfx_ui:
-            sisyphus.solverdeps.start.__wrapped__(pkgname)
+            sisyphus.solverevdeps.start.__wrapped__(pkgname)
         else:
-            sisyphus.solverdeps.start(pkgname)
+            sisyphus.solverevdeps.start(pkgname)
 
         is_needed = pickle.load(
-            open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_pkgrdeps.pickle"), "rb"))
+            open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_pkgrevdeps.pickle"), "rb"))
 
     if is_needed != 0:
         if gfx_ui:
diff --git a/src/backend/searchdb.py b/src/backend/searchdb.py
index e344cb2..a99a471 100644
--- a/src/backend/searchdb.py
+++ b/src/backend/searchdb.py
@@ -6,7 +6,7 @@ import subprocess
 import sisyphus.checkenv
 import sisyphus.getclr
 import sisyphus.getfs
-import sisyphus.update
+import sisyphus.syncall
 
 
 def sigint_handler(signal, frame):
@@ -162,7 +162,7 @@ def start(filter, cat, pn, desc, single):
             user_input = input(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.update.start(gfx_ui=False)
+                sisyphus.syncall.start(gfx_ui=False)
                 break
             elif user_input.lower() in ['no', 'n']:
                 print(sisyphus.getclr.bright_red +
diff --git a/src/backend/setbranch.py b/src/backend/setbranch.py
index 05b6c5c..4763b60 100644
--- a/src/backend/setbranch.py
+++ b/src/backend/setbranch.py
@@ -9,9 +9,9 @@ import sys
 import sisyphus.checkenv
 import sisyphus.getclr
 import sisyphus.getfs
-import sisyphus.mirrors
 import sisyphus.purgeenv
 import sisyphus.setjobs
+import sisyphus.setmirror
 import sisyphus.setprofile
 
 
@@ -82,17 +82,17 @@ def ins_p_cfg_repo(branch, remote):
 
 
 def set_brch_master_index():
-    mirrorList = sisyphus.mirrors.getList()
+    mirrorList = sisyphus.setmirror.getList()
     odd_indices = [i + 1 for i in range(len(mirrorList)) if (i + 1) % 2 == 1]
     chosen_index = random.choice(odd_indices)
-    sisyphus.mirrors.setActive(chosen_index)
+    sisyphus.setmirror.setActive(chosen_index)
 
 
 def set_brch_next_index():
-    mirrorList = sisyphus.mirrors.getList()
+    mirrorList = sisyphus.setmirror.getList()
     even_indices = [i + 1 for i in range(len(mirrorList)) if (i + 1) % 2 == 0]
     chosen_index = random.choice(even_indices)
-    sisyphus.mirrors.setActive(chosen_index)
+    sisyphus.setmirror.setActive(chosen_index)
 
 
 def set_bhst_index(branch, remote):
diff --git a/src/backend/mirrors.py b/src/backend/setmirror.py
index 83d83f1..83d83f1 100644
--- a/src/backend/mirrors.py
+++ b/src/backend/setmirror.py
diff --git a/src/backend/solverdeps.py b/src/backend/solverevdeps.py
index 97d19dd..bd90e2f 100644
--- a/src/backend/solverdeps.py
+++ b/src/backend/solverevdeps.py
@@ -31,7 +31,7 @@ def start(pkgname=None):
                 is_needed = int(1)
 
         pickle.dump(is_needed, open(os.path.join(
-            sisyphus.getfs.p_mtd_dir, "sisyphus_pkgrdeps.pickle"), "wb"))
+            sisyphus.getfs.p_mtd_dir, "sisyphus_pkgrevdeps.pickle"), "wb"))
     except KeyboardInterrupt:
         p_exe.terminate()
         try:
diff --git a/src/backend/update.py b/src/backend/syncall.py
index d6db8ff..d6db8ff 100644
--- a/src/backend/update.py
+++ b/src/backend/syncall.py
diff --git a/src/backend/upgrade.py b/src/backend/sysupgrade.py
index 31e3463..f85b2a6 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/sysupgrade.py
@@ -11,13 +11,13 @@ import subprocess
 import sys
 import time
 import sisyphus.checkenv
-import sisyphus.dlpkg
+import sisyphus.dlbinpkg
 import sisyphus.getclr
 import sisyphus.getfs
 import sisyphus.killemerge
 import sisyphus.solvedeps
 import sisyphus.syncdb
-import sisyphus.update
+import sisyphus.syncall
 
 
 def set_nonblocking(fd):
@@ -56,7 +56,7 @@ def start(ebuild=False, gfx_ui=False):
         if gfx_ui:
             sisyphus.solvedeps.start.__wrapped__()  # undecorate
         else:
-            sisyphus.update.start(gfx_ui=False)
+            sisyphus.syncall.start(gfx_ui=False)
             sisyphus.solvedeps.start()
 
         bin_list, src_list, is_vague, need_cfg = pickle.load(
@@ -164,7 +164,7 @@ def start(ebuild=False, gfx_ui=False):
                     user_input = input(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.dlpkg.start(dl_world=True, gfx_ui=False)
+                        sisyphus.dlbinpkg.start(dl_world=True, gfx_ui=False)
                         os.chdir(sisyphus.getfs.p_cch_dir)
                         p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg',
                                                  '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
@@ -212,7 +212,7 @@ def start(ebuild=False, gfx_ui=False):
                     user_input = input(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.dlpkg.start(dl_world=True, gfx_ui=False)
+                        sisyphus.dlbinpkg.start(dl_world=True, gfx_ui=False)
                         os.chdir(sisyphus.getfs.p_cch_dir)
                         p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly',
                                                  '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
@@ -290,7 +290,7 @@ def start(ebuild=False, gfx_ui=False):
                         "\n" + "These are the binary packages that will be merged, in order:" + "\n")
                     print("\n" + ", ".join(bin_list) + "\n\n" + "Total:" + " " +
                           str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
-                    sisyphus.dlpkg.start(dl_world=True, gfx_ui=True)
+                    sisyphus.dlbinpkg.start(dl_world=True, gfx_ui=True)
                     os.chdir(sisyphus.getfs.p_cch_dir)
                     p_exe = 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)
@@ -313,7 +313,7 @@ def start(ebuild=False, gfx_ui=False):
                         user_input = input(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.dlpkg.start(
+                            sisyphus.dlbinpkg.start(
                                 dl_world=True, gfx_ui=False)
                             os.chdir(sisyphus.getfs.p_cch_dir)
                             p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly',
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index 82773d3..3813e25 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -123,10 +123,10 @@ def install(pkgname: List[str],
         sisyphus install vivaldi --oneshot --ebuild\n
     """
     if ebuild:
-        sisyphus.install.start(pkgname, ebuild=True,
+        sisyphus.instpkgsrc.start(pkgname, ebuild=True,
                                gfx_ui=False, oneshot=oneshot)
     else:
-        sisyphus.install.start(pkgname, ebuild=False,
+        sisyphus.instpkgsrc.start(pkgname, ebuild=False,
                                gfx_ui=False, oneshot=oneshot)
 
 
@@ -147,10 +147,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.uninstall.start(
+        sisyphus.rmpkgsrc.start(
             pkgname, depclean=False, gfx_ui=False, unmerge=True)
     else:
-        sisyphus.uninstall.start(
+        sisyphus.rmpkgsrc.start(
             pkgname, depclean=True, gfx_ui=False, unmerge=False)
 
 
@@ -166,7 +166,7 @@ def autoremove():
     * Examples:\n
         sisyphus autoremove\n
     """
-    sisyphus.autoremove.start(gfx_ui=False)
+    sisyphus.autormpkgsrc.start(gfx_ui=False)
 
 
 @app.command("autoclean")
@@ -192,7 +192,7 @@ def update():
         sisyphus update\n
     """
     if sisyphus.checkenv.root():
-        sisyphus.update.start(gfx_ui=False)
+        sisyphus.syncall.start(gfx_ui=False)
     else:
         sys.exit("\nYou need root permissions to do this, exiting!\n")
 
@@ -213,9 +213,9 @@ def upgrade(
         sisyphus upgrade -e\n
     """
     if ebuild:
-        sisyphus.upgrade.start(ebuild=True, gfx_ui=False)
+        sisyphus.sysupgrade.start(ebuild=True, gfx_ui=False)
     else:
-        sisyphus.upgrade.start(ebuild=False, gfx_ui=False)
+        sisyphus.sysupgrade.start(ebuild=False, gfx_ui=False)
 
 
 @app.command("spmsync")
@@ -309,7 +309,7 @@ def mirrorlist():
     * Examples:\n
         sisyphus mirror list\n
     """
-    sisyphus.mirrors.printList()
+    sisyphus.setmirror.printList()
 
 
 @mirrorSetup.command("set")
@@ -321,7 +321,7 @@ def mirrorset(index: int):
         sisyphus mirror set 2\n
         sisyphus mirror set 5\n
     """
-    sisyphus.mirrors.setActive(index)
+    sisyphus.setmirror.setActive(index)
 
 
 if __name__ == "__main__":
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index d5c7aff..44820f7 100644
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -363,7 +363,7 @@ class MirrorConfiguration(QtWidgets.QMainWindow):
         super(MirrorConfiguration, self).__init__()
         uic.loadUi('/usr/share/sisyphus/ui/mirrorcfg.ui', self)
         self.centerOnScreen()
-        self.MIRRORLIST = sisyphus.mirrors.getList()
+        self.MIRRORLIST = sisyphus.setmirror.getList()
         self.updateMirrorList()
         self.applyButton.pressed.connect(self.mirrorCfgApply)
         self.applyButton.released.connect(self.mirrorCfgExit)
@@ -394,7 +394,7 @@ class MirrorConfiguration(QtWidgets.QMainWindow):
         self.MIRRORLIST[self.ACTIVEMIRRORINDEX]['isActive'] = True
 
     def mirrorCfgApply(self):
-        sisyphus.mirrors.writeList(self.MIRRORLIST)
+        sisyphus.setmirror.writeList(self.MIRRORLIST)
 
     def mirrorCfgExit(self):
         self.close()
@@ -434,33 +434,33 @@ class MainWorker(QtCore.QObject):
     def startUpdate(self):
         self.started.emit()
         sisyphus.setjobs.start()
-        sisyphus.update.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.install.start(pkgname, ebuild=False, gfx_ui=True, oneshot=False)
+        sisyphus.instpkgsrc.start(pkgname, ebuild=False, gfx_ui=True, oneshot=False)
         self.finished.emit()
 
     @QtCore.pyqtSlot()
     def startUninstall(self):
         self.started.emit()
         pkgname = Sisyphus.pkgname
-        sisyphus.uninstall.start(pkgname, depclean=True, gfx_ui=True, unmerge=False)
+        sisyphus.rmpkgsrc.start(pkgname, depclean=True, gfx_ui=True, unmerge=False)
         self.finished.emit()
 
     @QtCore.pyqtSlot()
     def startUpgrade(self):
         self.started.emit()
-        sisyphus.upgrade.start(ebuild=False, gfx_ui=True)
+        sisyphus.sysupgrade.start(ebuild=False, gfx_ui=True)
         self.finished.emit()
 
     @QtCore.pyqtSlot()
     def startAutoremove(self):
         self.started.emit()
-        sisyphus.autoremove.start(gfx_ui=True)
+        sisyphus.autormpkgsrc.start(gfx_ui=True)
         self.finished.emit()