Merge pull request #221 from matejak/sort_content

Sort content labels lexicographically and allow setting of default product

Author: jan-cerny

CMakeLists.txt

@@ -332,6 +332,8 @@ if (CPPCHECK_EXECUTABLE)
     )
 endif()
 
+set(SCAP_WORKBENCH_PREFERRED_DATASTREAM_BASENAMES "ssg-<productname1>-ds.xml" CACHE STRING "Comma-separated list of datastream that should be the first ones on the selection list in the initial dialogue.")
+
 # only CPack should follow
 set(CPACK_CMAKE_GENERATOR "Unix Makefiles")
 set(CPACK_SOURCE_GENERATOR "TBZ2")

include/Config.h.in

@@ -35,6 +35,7 @@
 #define SCAP_WORKBENCH_SCAP_CONTENT_DIRECTORY "@SCAP_WORKBENCH_SCAP_CONTENT_DIRECTORY@"
 
 #cmakedefine SCAP_WORKBENCH_LOCAL_SCAN_ENABLED
+#define SCAP_WORKBENCH_PREFERRED_DATASTREAM_BASENAMES "@SCAP_WORKBENCH_PREFERRED_DATASTREAM_BASENAMES@"
 #define SCAP_WORKBENCH_LOCAL_OSCAP_PATH "oscap"
 #define SCAP_WORKBENCH_LOCAL_PKEXEC_OSCAP_PATH "@CMAKE_INSTALL_FULL_LIBEXECDIR@/scap-workbench-pkexec-oscap.sh"
 #define SCAP_WORKBENCH_LOCAL_RPM_EXTRACT_PATH "@CMAKE_INSTALL_FULL_LIBEXECDIR@/scap-workbench-rpm-extract.sh"

src/SSGIntegrationDialog.cpp

@@ -89,13 +89,48 @@ void SSGIntegrationDialog::loadContent()
     accept();
 }
 
+/*
+ * Given the string list passed as the first argument,
+ * either make sure that the passed value is the first item,
+ * or don't do anything (if the value is not present in the string).
+ *
+ * Returns true if the priority item matched a list item, returns false otherwise.
+ */
+static bool put_value_as_first_item(QStringList& list, const QString& value)
+{
+    const int value_index = list.indexOf(value);
+    if (value_index == -1)
+    {
+        return false;
+    }
+    list.removeAt(value_index);
+    list.push_front(value);
+    return true;
+}
+
+static void ensure_good_string_list_ordering(QStringList& list, const QStringList& priority_items, int& matched_priority_items)
+{
+    list.sort();
+    for (QStringList::const_reverse_iterator it = priority_items.rbegin();
+         it != priority_items.rend(); ++it)
+    {
+        if (put_value_as_first_item(list, * it))
+        {
+            matched_priority_items++;
+        }
+    }
+}
+
 void SSGIntegrationDialog::scrapeSSGVariants()
 {
     const QDir& dir = getSSGDirectory();
-    const QStringList variants = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+    QStringList variants = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
     QComboBox* cBox = mUI.contentComboBox;
 
-    int lastFavoriteIndex = 0;
+    const QString first_items = QString(SCAP_WORKBENCH_PREFERRED_DATASTREAM_BASENAMES);
+    const QStringList priority_products = first_items.split(",");
+    int matched_priority_items = 0;
+    ensure_good_string_list_ordering(variants, priority_products, matched_priority_items);
     for (QStringList::const_iterator it = variants.constBegin();
          it != variants.constEnd(); ++it)
     {
@@ -109,13 +144,11 @@ void SSGIntegrationDialog::scrapeSSGVariants()
 
         QString label = name;
 
-        bool favorite = false;
         // Make the label nicer for known variants
         if (label.startsWith("rhel") || label.startsWith("ol"))
         {
             // use RHEL instead of rhel and OL instead of ol
             label = name.toUpper();
-            favorite = true;
         }
         else if (label.startsWith("centos")) // use CentOS instead of centos
             label.replace(0, 6, "CentOS");
@@ -129,19 +162,15 @@ void SSGIntegrationDialog::scrapeSSGVariants()
         else
             label[0] = label[0].toUpper(); // Capitalize first letter
 
-        if (label.startsWith("Fedora"))
-            favorite = true;
-
-        if (favorite)
-            cBox->insertItem(lastFavoriteIndex++, label, QVariant(name));
-
-        else
-            cBox->addItem(label, QVariant(name));
+        cBox->addItem(label, QVariant(name));
 
     }
+    if (matched_priority_items)
+    {
+        cBox->insertSeparator(matched_priority_items);
+    }
     cBox->insertSeparator(cBox->count());
     cBox->addItem(QString("Other SCAP Content"), QVariant(QString("other-scap-content")));
 
-    cBox->insertSeparator(lastFavoriteIndex);
     cBox->setCurrentIndex(0);
 }