From f730fe0a876965ec656232ef838d7077bf00d89a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 8 Apr 2018 01:08:53 +0100 Subject: hook timestamps, run even faster --- src/frontend/gui/sisyphus-gui.py | 12 ++++-------- src/helpers/make_local_csv | 8 ++++++++ src/helpers/make_local_csv_post | 8 -------- src/helpers/make_local_csv_pre | 8 -------- 4 files changed, 12 insertions(+), 24 deletions(-) create mode 100755 src/helpers/make_local_csv delete mode 100755 src/helpers/make_local_csv_post delete mode 100755 src/helpers/make_local_csv_pre diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index 13dbda1..f695456 100755 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -372,13 +372,12 @@ class MainWorker(QtCore.QObject): def startInstall(self): self.started.emit() pkgList = Sisyphus.pkgList - makeLocalDatabaseCSVpre() portageExec = subprocess.Popen( ['emerge', '-q'] + pkgList, stdout=subprocess.PIPE) atexit.register(portageKill, portageExec) for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): self.strReady.emit(portageOutput.rstrip()) - makeLocalDatabaseCSVpost() + makeLocalDatabaseCSV() syncLocalDatabaseTable() self.finished.emit() @@ -386,39 +385,36 @@ class MainWorker(QtCore.QObject): def startUninstall(self): self.started.emit() pkgList = Sisyphus.pkgList - makeLocalDatabaseCSVpre() portageExec = subprocess.Popen( ['emerge', '--depclean', '-q'] + pkgList, stdout=subprocess.PIPE) atexit.register(portageKill, portageExec) for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): self.strReady.emit(portageOutput.rstrip()) - makeLocalDatabaseCSVpost() + makeLocalDatabaseCSV() syncLocalDatabaseTable() self.finished.emit() @QtCore.pyqtSlot() def startUpgrade(self): self.started.emit() - makeLocalDatabaseCSVpre() portageExec = subprocess.Popen( ['emerge', '-uDNq', '--backtrack=100', '--with-bdeps=y', '@world'], stdout=subprocess.PIPE) atexit.register(portageKill, portageExec) for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): self.strReady.emit(portageOutput.rstrip()) - makeLocalDatabaseCSVpost() + makeLocalDatabaseCSV() syncLocalDatabaseTable() self.finished.emit() @QtCore.pyqtSlot() def cleanOrphans(self): self.started.emit() - makeLocalDatabaseCSVpre() portageExec = subprocess.Popen( ['emerge', '--depclean', '-q'], stdout=subprocess.PIPE) atexit.register(portageKill, portageExec) for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): self.strReady.emit(portageOutput.rstrip()) - makeLocalDatabaseCSVpost() + makeLocalDatabaseCSV() syncLocalDatabaseTable() self.finished.emit() diff --git a/src/helpers/make_local_csv b/src/helpers/make_local_csv new file mode 100755 index 0000000..91e00bb --- /dev/null +++ b/src/helpers/make_local_csv @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +makecsv() { + qlist -ICScv|sed -e "s/\//\,/" -e "s/[\t ]/\,/" -e "s/\:/\,/" >> /tmp/localPackagesPre.csv + mv /tmp/localPackagesPre.csv /var/lib/sisyphus/csv/ +} + +makecsv diff --git a/src/helpers/make_local_csv_post b/src/helpers/make_local_csv_post deleted file mode 100755 index 438ef64..0000000 --- a/src/helpers/make_local_csv_post +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -makecsv() { - qlist -ICScv|sed -e "s/\//\,/" -e "s/[\t ]/\,/" -e "s/\:/\,/" >> /tmp/localPackagesPost.csv - mv /tmp/localPackagesPost.csv /var/lib/sisyphus/csv/ -} - -makecsv diff --git a/src/helpers/make_local_csv_pre b/src/helpers/make_local_csv_pre deleted file mode 100755 index 91e00bb..0000000 --- a/src/helpers/make_local_csv_pre +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -makecsv() { - qlist -ICScv|sed -e "s/\//\,/" -e "s/[\t ]/\,/" -e "s/\:/\,/" >> /tmp/localPackagesPre.csv - mv /tmp/localPackagesPre.csv /var/lib/sisyphus/csv/ -} - -makecsv -- cgit v1.2.3