Update package manager

Author: CrSjimo

src/plugins/packagemanager/CMakeLists.txt

@@ -25,3 +25,9 @@ diffscope_add_builtin_plugin(${PROJECT_NAME}
     INCLUDE_PRIVATE
         internal/**
 )
+
+if(DEFINED DIFFSCOPE_PACKAGE_MANAGER_COMMAND_LINE_TOOL)
+    ck_add_attached_files(${PROJECT_NAME}
+        SRC ${DIFFSCOPE_PACKAGE_MANAGER_COMMAND_LINE_TOOL} DEST ./dspm
+    )
+endif()

src/plugins/packagemanager/internal/PackageManagerSettings.cpp

@@ -103,7 +103,7 @@ namespace PackageManager {
     void PackageManagerSettings::load() {
         auto settings = Core::RuntimeInterface::settings();
         settings->beginGroup(staticMetaObject.className());
-        m_dspmPath = settings->value("dspmPath", defaultDspmPath()).toString();
+        m_dspmPath = settings->value("dspmPath", QString()).toString();
         m_packageDir = settings->value("packageDir", defaultPackageDir()).toString();
         m_timeoutSeconds = std::max(1, settings->value("timeoutSeconds", 5).toInt());
         settings->endGroup();

src/plugins/packagemanager/internal/PackageManagerUtils.cpp

@@ -4,11 +4,14 @@
 
 #include <QCoreApplication>
 #include <QEventLoop>
+#include <QFileInfo>
 #include <QLoggingCategory>
 #include <QProcess>
 #include <QTimer>
 #include <QtGlobal>
 
+#include <packagemanager/internal/PackageManagerSettings.h>
+
 namespace PackageManager {
 
     Q_STATIC_LOGGING_CATEGORY(lcPackageManagerUtils, "diffscope.packagemanager.utils")
@@ -22,9 +25,20 @@ namespace PackageManager {
 
     }
 
-    CommandResult runCommandLineTool(const QString &executablePath, const QStringList &arguments, int timeoutSeconds) {
+    CommandResult runCommandLineTool(const QString &executablePath_, const QStringList &arguments, int timeoutSeconds) {
         CommandResult result;
         QProcess process;
+
+        QString executablePath = executablePath_;
+        if (executablePath.isEmpty()) {
+            executablePath = PackageManagerSettings::defaultDspmPath();
+        }
+
+        if (!QFileInfo::exists(executablePath)) {
+            result.errorMessage = QCoreApplication::translate("PackageManager::CommandLineTool", "The command line tool does not exist:\n\n%1\n\nPlease install dspm and configure it in Settings > Package Manager.").arg(executablePath);
+            return result;
+        }
+
         process.setProgram(executablePath);
         process.setArguments(arguments);
 

src/plugins/packagemanager/internal/addons/PackageManagerAddOn.cpp

@@ -60,6 +60,10 @@ namespace PackageManager {
             return QStringLiteral("--packages-dir");
         }
 
+        QString languageOptionName() {
+            return QStringLiteral("--language");
+        }
+
         QString jsonText(const QJsonValue &value) {
             if (value.isString()) {
                 return value.toString();
@@ -153,6 +157,8 @@ namespace PackageManager {
                 QStringLiteral("--json"),
                 packageDirOptionName(),
                 PackageManagerSettings::packageDir(),
+                languageOptionName(),
+                QLocale().name()
             };
         }
 

src/plugins/packagemanager/qml/PackageManagerPage.qml

@@ -60,16 +60,23 @@ ScrollView {
 
                 GridLayout {
                     anchors.fill: parent
-                    columns: 3
+                    columns: 4
 
                     Label {
-                        text: qsTr("Command")
+                        text: qsTr("Package manager tool")
                         TextMatcherItem on text { matcher: page.matcher }
                     }
                     TextField {
                         Layout.fillWidth: true
                         readOnly: true
                         text: page.dspmPath
+                        placeholderText: qsTr("Bundled dspm")
+                    }
+                    ToolButton {
+                        text: qsTr("Reset to Bundled dspm")
+                        icon.source: "image://fluent-system-icons/arrow_reset"
+                        display: AbstractButton.IconOnly
+                        onClicked: page.dspmPath = ""
                     }
                     ToolButton {
                         text: qsTr("Browse")
@@ -84,6 +91,7 @@ ScrollView {
                     }
                     TextField {
                         Layout.fillWidth: true
+                        Layout.columnSpan: 2
                         text: page.packageDir
                         onTextEdited: page.packageDir = text
                     }
@@ -99,7 +107,7 @@ ScrollView {
                         TextMatcherItem on text { matcher: page.matcher }
                     }
                     RowLayout {
-                        Layout.columnSpan: 2
+                        Layout.columnSpan: 3
                         SpinBox {
                             from: 1
                             to: 300