rename some functionsv6.2402.0

2 files changed, 17 insertions, 17 deletions

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()