Skip to content

Commit

Permalink
Add autoremovable filter
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdrianTM
AdrianTM committed Aug 1, 2024
1 parent 36a4ee4 commit d8517bb
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 18 deletions.
67 changes: 57 additions & 10 deletions mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ void MainWindow::setup()
qDebug() << "+++" << __PRETTY_FUNCTION__ << "+++";
ui->tabWidget->blockSignals(true);
ui->tabWidget->setCurrentWidget(ui->tabPopular);
ui->pushRemoveOrphan->setHidden(true);
ui->pushRemoveAutoremovable->setHidden(true);

QFont font("monospace");
font.setStyleHint(QFont::Monospace);
Expand Down Expand Up @@ -629,7 +629,7 @@ void MainWindow::setConnections() const
connect(ui->pushHelp, &QPushButton::clicked, this, &MainWindow::pushHelp_clicked);
connect(ui->pushInstall, &QPushButton::clicked, this, &MainWindow::pushInstall_clicked);
connect(ui->pushRemotes, &QPushButton::clicked, this, &MainWindow::pushRemotes_clicked);
connect(ui->pushRemoveOrphan, &QPushButton::clicked, this, &MainWindow::pushRemoveOrphan_clicked);
connect(ui->pushRemoveAutoremovable, &QPushButton::clicked, this, &MainWindow::pushRemoveAutoremovable_clicked);
connect(ui->pushRemoveUnused, &QPushButton::clicked, this, &MainWindow::pushRemoveUnused_clicked);
connect(ui->pushUninstall, &QPushButton::clicked, this, &MainWindow::pushUninstall_clicked);
connect(ui->pushUpgradeAll, &QPushButton::clicked, this, &MainWindow::pushUpgradeAll_clicked);
Expand Down Expand Up @@ -819,19 +819,30 @@ void MainWindow::displayPackages()
newtree->sortItems(TreeCol::Name, Qt::AscendingOrder);

updateTreeItems(newtree);
displayAutoRemoveOrphans(newtree);
displayAutoRemoveAutoremovable(newtree);

newtree->blockSignals(false);
newtree->setUpdatesEnabled(true);
displayPackagesIsRunning = false;
emit displayPackagesFinished();
}

void MainWindow::displayAutoRemoveOrphans(const QTreeWidget *newtree) const
void MainWindow::displayAutoRemoveAutoremovable(const QTreeWidget *newtree)
{
if (newtree == ui->treeEnabled) {
ui->pushRemoveOrphan->setVisible(
Cmd().run(R"lit(test -n "$(apt-get --dry-run autoremove |grep -Po '^Remv \K[^ ]+' )")lit"));
QStringList names = cmd.getOutAsRoot(R"(apt-get --dry-run autoremove | grep -Po '^Remv \K[^ ]+' | tr '\n' ' ')")
.split(' ', Qt::SkipEmptyParts);
if (!names.isEmpty()) {
ui->pushRemoveAutoremovable->setVisible(true);
for (const QString &name : names) {
auto matchingItems = newtree->findItems(name, Qt::MatchExactly | Qt::MatchRecursive, TreeCol::Name);
for (QTreeWidgetItem *item : matchingItems) {
item->setData(TreeCol::Status, Qt::UserRole, Status::Autoremovable);
}
}
} else {
ui->pushRemoveAutoremovable->setVisible(false);
}
}
}

Expand Down Expand Up @@ -1460,6 +1471,15 @@ bool MainWindow::installSelected()
return result;
}

bool MainWindow::markKeep()
{
qDebug() << "+++" << __PRETTY_FUNCTION__ << "+++";
ui->tabWidget->setTabEnabled(ui->tabWidget->indexOf(ui->tabOutput), true);
QString names = change_list.join(' ');
enableOutput();
return cmd.runAsRoot("apt-mark manual " + names);
}

bool MainWindow::isFilteredName(const QString &name)
{
static const QRegularExpression filterRegex(R"((^lib(?!reoffice|rewolf))|(-dev$)|(-dbg$)|(-dbgsym$)|(-libs$))",
Expand Down Expand Up @@ -2368,7 +2388,14 @@ void MainWindow::pushInstall_clicked()
tr("Problem detected while installing, please inspect the console output."));
}
} else {
bool success = currentTree == ui->treePopularApps ? installPopularApps() : installSelected();
bool success = false;
if (currentTree == ui->treePopularApps) {
success = installPopularApps();
} else if (ui->comboFilterEnabled->currentText() == tr("Autoremovable")) {
success = markKeep();
} else {
success = installSelected();
}
setDirty();
buildPackageLists();
refreshPopularApps();
Expand Down Expand Up @@ -2600,7 +2627,7 @@ void MainWindow::handleTab(const QString &search_str, int filter_idx, QComboBox
const QString &warningMessage, bool &dirtyFlag)
{
if (filterCombo) {
filterCombo->setCurrentIndex(filter_idx);
filterCombo->setCurrentIndex(qMin(filter_idx, 2));
}
searchBox->setText(search_str);
enableTabs(true);
Expand Down Expand Up @@ -2764,6 +2791,13 @@ void MainWindow::filterChanged(const QString &arg1)
change_list.clear();
};

auto blockSignalsForAll = [this](bool block) {
ui->checkHideLibs->blockSignals(block);
ui->checkHideLibsBP->blockSignals(block);
ui->checkHideLibsMX->blockSignals(block);
};

bool isAutoremovable = (arg1 == tr("Autoremovable"));
if (currentTree == ui->treeFlatpak) {
if (arg1 == tr("Installed runtimes")) {
handleFlatpakFilter(installed_runtimes_fp, false);
Expand Down Expand Up @@ -2804,12 +2838,21 @@ void MainWindow::filterChanged(const QString &arg1)
findPackage();
setSearchFocus();
} else if (arg1 == tr("All packages")) {
blockSignalsForAll(true);
ui->checkHideLibs->setChecked(!isAutoremovable && hideLibsChecked);
blockSignalsForAll(false);
resetTree();
clearChangeListAndButtons();
ui->pushInstall->setText(isAutoremovable ? tr("Mark keep") : tr("Install"));
} else {
blockSignalsForAll(true);
ui->checkHideLibs->setChecked(!isAutoremovable && hideLibsChecked);
blockSignalsForAll(false);
ui->pushInstall->setText(isAutoremovable ? tr("Mark keep") : tr("Install"));
const QMap<QString, int> statusMap {{tr("Upgradable"), Status::Upgradable},
{tr("Installed"), Status::Installed},
{tr("Not installed"), Status::NotInstalled}};
{tr("Not installed"), Status::NotInstalled},
{tr("Autoremovable"), Status::Autoremovable}};

auto itStatus = statusMap.find(arg1);
if (itStatus != statusMap.end()) {
Expand Down Expand Up @@ -2894,6 +2937,9 @@ void MainWindow::buildChangeList(QTreeWidgetItem *item)
if (currentTree != ui->treeFlatpak) {
ui->pushUninstall->setEnabled(checkInstalled(change_list));
ui->pushInstall->setText(checkUpgradable(change_list) ? tr("Upgrade") : tr("Install"));
if (ui->comboFilterEnabled->currentText() == tr("Autoremovable")) {
ui->pushInstall->setText(tr("Mark keep"));
}
} else { // For Flatpaks allow selection only of installed or not installed items so one clicks
// on an installed item only installed items should be displayed and the other way round
ui->pushInstall->setText(tr("Install"));
Expand Down Expand Up @@ -2954,6 +3000,7 @@ void MainWindow::pushForceUpdateBP_clicked()
void MainWindow::checkHideLibs_toggled(bool checked)
{
ui->treeEnabled->setUpdatesEnabled(false);
hideLibsChecked = checked;
ui->checkHideLibsMX->setChecked(checked);
ui->checkHideLibsBP->setChecked(checked);

Expand Down Expand Up @@ -3190,7 +3237,7 @@ void MainWindow::pushRemoveUnused_clicked()
enableTabs(true);
}

void MainWindow::pushRemoveOrphan_clicked()
void MainWindow::pushRemoveAutoremovable_clicked()
{
QString names = cmd.getOutAsRoot(R"(apt-get --dry-run autoremove |grep -Po '^Remv \K[^ ]+' |tr '\n' ' ')");
QMessageBox::warning(this, tr("Warning"),
Expand Down
8 changes: 5 additions & 3 deletions mainwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class MainWindow;

namespace Status
{
enum { NotInstalled, Installed, Upgradable };
enum { NotInstalled, Installed, Upgradable, Autoremovable };
}

namespace Tab
Expand Down Expand Up @@ -155,7 +155,7 @@ private slots:
void pushHelp_clicked();
void pushInstall_clicked();
void pushRemotes_clicked();
void pushRemoveOrphan_clicked();
void pushRemoveAutoremovable_clicked();
void pushRemoveUnused_clicked();
void pushUninstall_clicked();
void pushUpgradeAll_clicked();
Expand All @@ -181,6 +181,7 @@ private slots:
bool displayFlatpaksIsRunning {false};
bool displayPackagesIsRunning {false};
bool firstRunFP {true};
bool hideLibsChecked {true};
bool test_initially_enabled {false};
bool updated_once {false};
bool warning_backports {false};
Expand Down Expand Up @@ -256,6 +257,7 @@ private slots:
bool installPopularApp(const QString &name);
bool installPopularApps();
bool installSelected();
bool markKeep();
bool readPackageList(bool force_download = false);
bool uninstall(const QString &names, const QString &preuninstall = QLatin1String(""),
const QString &postuninstall = QLatin1String(""));
Expand All @@ -268,7 +270,7 @@ private slots:
void cancelDownload();
void centerWindow();
void clearUi();
void displayAutoRemoveOrphans(const QTreeWidget *newtree) const;
void displayAutoRemoveAutoremovable(const QTreeWidget *newtree);
void displayFilteredFP(QStringList list, bool raw = false);
void displayFlatpaks(bool force_update = false);
void displayPackages();
Expand Down
18 changes: 13 additions & 5 deletions mainwindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>800</width>
<height>600</height>
<width>844</width>
<height>607</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -35,7 +35,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>4</number>
<number>1</number>
</property>
<property name="documentMode">
<bool>false</bool>
Expand Down Expand Up @@ -230,9 +230,12 @@
</widget>
</item>
<item row="0" column="6" colspan="2">
<widget class="QPushButton" name="pushRemoveOrphan">
<widget class="QPushButton" name="pushRemoveAutoremovable">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove all the packages that are marked as &amp;quot;autoremovable&amp;quot;. If you want to manage them, select Autoremovable from drop-down selection box.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Remove orphan packages</string>
<string>Autoremove packages</string>
</property>
<property name="icon">
<iconset theme="remove"/>
Expand Down Expand Up @@ -407,6 +410,11 @@
<string>Not installed</string>
</property>
</item>
<item>
<property name="text">
<string>Autoremovable</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0" colspan="2">
Expand Down

0 comments on commit d8517bb

Please sign in to comment.