support for waved repkg runs and sort rebuilds

Author: Skycoder42

clicontroller.cpp

@@ -52,9 +52,10 @@ void CliController::run()
 			clear(args);
 		else if(_parser->enterContext(QStringLiteral("frontend"))) {
 			testEmpty(args);
-			if(_parser->isSet(QStringLiteral("set")))
-				setFrontend(_parser->value(QStringLiteral("set")).split(QLatin1Char(' ')));
-			else
+			if(_parser->isSet(QStringLiteral("set"))) {
+				setFrontend(_parser->value(QStringLiteral("set")).split(QLatin1Char(' ')),
+							_parser->isSet(QStringLiteral("waved")));
+			} else
 				frontend();
 		} else
 			throw QStringLiteral("Invalid arguments");
@@ -106,6 +107,11 @@ void CliController::setup()
 							 {QStringLiteral("s"), QStringLiteral("short")},
 							 QStringLiteral("Only display the package names, not the path to the rule file.")
 						 });
+	rulesNode->addOption({
+							 QStringLiteral("waved"),
+							 QStringLiteral("Instead of passing all packages at once, split the into waves to avoid multiple "
+											"rebuilds for frontends that do not support orderd parameters.")
+						 });
 
 
 	auto clearNode = _parser->addLeafNode(QStringLiteral("clear"),
@@ -124,7 +130,7 @@ void CliController::setup()
 
 void CliController::rebuild()
 {
-	qApp->exit(_runner->run(_resolver->listPkgs()));
+	qApp->exit(_runner->run(_resolver->listPkgWaves()));
 }
 
 void CliController::update(const QStringList &pks)
@@ -173,13 +179,13 @@ void CliController::clear(const QStringList &pkgs)
 
 void CliController::frontend()
 {
-	qInfo().noquote() << _runner->frontend().join(QStringLiteral(" "));
+	qInfo().noquote() << _runner->frontendDescription();
 	qApp->quit();
 }
 
-void CliController::setFrontend(const QStringList &frontend)
+void CliController::setFrontend(const QStringList &frontend, bool waved)
 {
-	_runner->setFrontend(frontend);
+	_runner->setFrontend(frontend, waved);
 	qApp->quit();
 }
 

clicontroller.h

@@ -33,7 +33,7 @@ private slots:
 	void listRules(bool listShort);
 	void clear(const QStringList &pkgs);
 	void frontend();
-	void setFrontend(const QStringList &frontend);
+	void setFrontend(const QStringList &frontend, bool waved);
 
 	void testEmpty(const QStringList &args);
 

completitions/bash/repkg

@@ -36,10 +36,10 @@ function _repkg {
 						optargs="$optargs -s --short"
 						;;
 					frontend)
-						optargs="$optargs -s --set"
+						optargs="$optargs -s --set --waved"
 						;;
 				esac
-				
+
 				## find the prefix: check if prefix was in prev list
 				if _repkg_contains_element $arg $prefix; then
 					case "$arg" in
@@ -60,7 +60,7 @@ function _repkg {
 			COMPREPLY=($(compgen -W "$prefix $optargs" -- $cur))
 			;;
 	esac
-	
+
 
 	return 0
 }

pacmanrunner.cpp

@@ -10,35 +10,46 @@ PacmanRunner::PacmanRunner(QObject *parent) :
 	QObject(parent)
 {}
 
-QStringList PacmanRunner::frontend() const
+std::tuple<QStringList, bool> PacmanRunner::frontend() const
 {
 	QSettings settings;
-	if(settings.contains(QStringLiteral("frontend")))
-	   return settings.value(QStringLiteral("frontend")).toStringList();
-	else {
-		QList<QStringList> defaultFn = {
-			{QStringLiteral("trizen")},
-			{QStringLiteral("pacaur"), QStringLiteral("--rebuild")},
-			{QStringLiteral("yaourt")}
+	if(settings.contains(QStringLiteral("frontend"))) {
+		return std::make_tuple(settings.value(QStringLiteral("frontend")).toStringList(),
+							   settings.value(QStringLiteral("frontend/waved"), false).toBool());
+	} else {
+		static const QList<std::tuple<QStringList, bool>> defaultFn = {
+			std::make_tuple(QStringList{QStringLiteral("trizen")}, false),
+			std::make_tuple(QStringList{QStringLiteral("pacaur"), QStringLiteral("--rebuild")}, false),
+			std::make_tuple(QStringList{QStringLiteral("yaourt")}, true)
 		};
 		for(auto fn : defaultFn) {
-			if(!QStandardPaths::findExecutable(fn.first()).isNull())
+			if(!QStandardPaths::findExecutable(std::get<0>(fn).first()).isNull())
 				return fn;
 		}
-		return {QStringLiteral("pacman")};
+		return std::make_tuple(QStringList{QStringLiteral("pacman")}, true);
 	}
 }
 
-void PacmanRunner::setFrontend(const QStringList &cli)
+QString PacmanRunner::frontendDescription() const
+{
+	auto fn = frontend();
+	return QStringLiteral("%1 (%2)")
+			.arg(std::get<0>(fn).join(QLatin1Char(' ')))
+			.arg(std::get<1>(fn) ? QStringLiteral("waved") : QStringLiteral("grouped"));
+}
+
+void PacmanRunner::setFrontend(const QStringList &cli, bool waved)
 {
 	QSettings settings;
 	settings.setValue(QStringLiteral("frontend"), cli);
-	qDebug() << "Updated pacman frontend to" << cli.first();
+	settings.setValue(QStringLiteral("frontend/waved"), waved);
+	qDebug() << "Updated pacman frontend to" << cli.first()
+			 << (waved ? "(waved)" : "(sorted)");
 }
 
-int PacmanRunner::run(const QStringList &pkgs)
+int PacmanRunner::run(const QList<QStringList> &waves)
 {
-	if(pkgs.isEmpty()) {
+	if(waves.isEmpty()) {
 		qWarning() << "No packages need to be rebuilt";
 		return EXIT_SUCCESS;
 	}
@@ -50,7 +61,8 @@ int PacmanRunner::run(const QStringList &pkgs)
 		throw QStringLiteral("Unable to find pacman binary in PATH");
 	proc.setProgram(pacman);
 	QStringList pacArgs {QStringLiteral("-Qi")};
-	pacArgs.append(pkgs);
+	for(auto pkgs : waves)
+		pacArgs.append(pkgs);
 	proc.setArguments(pacArgs);
 	proc.setProcessChannelMode(QProcess::ForwardedErrorChannel);
 	proc.setStandardOutputFile(QProcess::nullDevice());
@@ -62,11 +74,25 @@ int PacmanRunner::run(const QStringList &pkgs)
 		throw QStringLiteral("Please remove repkg files of uninstalled packages and mark the unchanged via `repkg clear <pkg>`");
 
 	// run the frontend to reinstall packages
-	auto cliArgs = frontend();
+	QStringList cliArgs;
+	bool waved;
+	std::tie(cliArgs, waved) = frontend();
 	auto bin = QStandardPaths::findExecutable(cliArgs.takeFirst());
 	if(bin.isNull())
 		throw QStringLiteral("Unable to find binary \"%1\" in PATH").arg(bin);
 	cliArgs.append(QStringLiteral("-S"));
-	cliArgs.append(pkgs);
-	return QProcess::execute(bin, cliArgs);
+	if(waved) {
+		for(auto pkgs : waves) {
+			auto args = cliArgs;
+			args.append(pkgs);
+			auto res = QProcess::execute(bin, args);
+			if(res != EXIT_SUCCESS)
+				return res;
+		}
+		return EXIT_SUCCESS;
+	} else {
+		for(auto pkgs : waves)
+			cliArgs.append(pkgs);
+		return QProcess::execute(bin, cliArgs);
+	}
 }

pacmanrunner.h

@@ -1,18 +1,22 @@
 #ifndef PACMANRUNNER_H
 #define PACMANRUNNER_H
 
+#include <tuple>
 #include <QObject>
 
 class PacmanRunner : public QObject
 {
 	Q_OBJECT
+
 public:
 	explicit PacmanRunner(QObject *parent = nullptr);
 
-	QStringList frontend() const;
-	void setFrontend(const QStringList &cli);
+	std::tuple<QStringList, bool> frontend() const; //(frontend, waved)
+	QString frontendDescription() const;
+	void setFrontend(const QStringList &cli, bool waved);
+	bool isWaved() const;
 
-	int run(const QStringList &pkgs);
+	int run(const QList<QStringList> &pkgs);
 
 private:
 	void checkInstalled(const QString &pkg);

pkgresolver.cpp

@@ -16,10 +16,7 @@ PkgResolver::PkgResolver(QObject *parent) :
 
 QStringList PkgResolver::listPkgs() const
 {
-	QStringList pkgs;
-	for(auto pkg : readPkgs().keys())
-		pkgs.append(pkg);
-	return pkgs;
+	return readPkgs().keys();
 }
 
 QString PkgResolver::listDetailPkgs() const
@@ -39,6 +36,34 @@ QString PkgResolver::listDetailPkgs() const
 	return pkgs.join(QLatin1Char('\n'));
 }
 
+QList<QStringList> PkgResolver::listPkgWaves() const
+{
+	auto pkgs = readPkgs();
+
+	QList<QStringList> waves;
+	while(!pkgs.isEmpty()) {
+		//find all packages that dont have a trigger that needs to be rebuild as well
+		const auto keys = QSet<QString>::fromList(pkgs.keys());
+		QStringList wave;
+		for(auto it = pkgs.begin(); it != pkgs.end();) {
+			if(keys.intersects(it.value()))
+				it++; //has a trigger dep, postpone for later
+			else {
+				wave.append(it.key());
+				it = pkgs.erase(it);
+			}
+		}
+		if(wave.isEmpty()) {
+			throw QStringLiteral("Cyclic dependencies detected! Is within packages: %1")
+					.arg(keys.toList().join(QLatin1Char(' ')));
+		}
+		waves.append(wave);
+		qDebug() << "Calculated wave:" << wave.join(QLatin1Char(' '));
+	}
+
+	return waves;
+}
+
 void PkgResolver::updatePkgs(const QStringList &pkgs, RuleController *rules)
 {
 	if(!isRoot())

pkgresolver.h

@@ -15,12 +15,13 @@ class PkgResolver : public QObject
 
 	QStringList listPkgs() const;
 	QString listDetailPkgs() const;
+	QList<QStringList> listPkgWaves() const;
 
 	void updatePkgs(const QStringList &pkgs, RuleController *rules);
 	void clear(const QStringList &pkgs);
 
 private:
-	typedef QMap<QString, QSet<QString>> PkgInfos;
+	typedef QMap<QString, QSet<QString>> PkgInfos; //package -> triggered by
 
 	QSettings *_settings;
 

repkg.pro

@@ -40,7 +40,8 @@ SOURCES += main.cpp \
 DISTFILES += \
 	README.md \
 	repkg.sh \
-	repkg.hook
+	repkg.hook \
+	completitions/bash/repkg
 
 unix {
 	target.path = $$[QT_INSTALL_BINS]