Add as_utils_vercmp_full() for gnome-software

Sometimes we don't want to do the firmware-style heuristics.

2 files changed, 47 insertions, 9 deletions

diff --git a/libappstream-glib/as-utils.c b/libappstream-glib/as-utils.c
index 29f1637..62d411a 100644
--- a/libappstream-glib/as-utils.c
+++ b/libappstream-glib/as-utils.c
@@ -1388,22 +1388,23 @@ as_utils_vercmp_chunk (const gchar *str1, const gchar *str2)
 }
 
 /**
- * as_utils_vercmp:
+ * as_utils_vercmp_full:
  * @version_a: the release version, e.g. 1.2.3
  * @version_b: the release version, e.g. 1.2.3.1
+ * @flags: some #AsVersionCompareFlag
  *
  * Compares version numbers for sorting.
  *
  * Returns: -1 if a < b, +1 if a > b, 0 if they are equal, and %G_MAXINT on error
  *
- * Since: 0.3.5
+ * Since: 0.7.14
  */
 gint
-as_utils_vercmp (const gchar *version_a, const gchar *version_b)
+as_utils_vercmp_full (const gchar *version_a,
+		      const gchar *version_b,
+		      AsVersionCompareFlag flags)
 {
 	guint longest_split;
-	g_autofree gchar *str_a = NULL;
-	g_autofree gchar *str_b = NULL;
 	g_auto(GStrv) split_a = NULL;
 	g_auto(GStrv) split_b = NULL;
 
@@ -1416,10 +1417,15 @@ as_utils_vercmp (const gchar *version_a, const gchar *version_b)
 		return 0;
 
 	/* split into sections, and try to parse */
-	str_a = as_utils_version_parse (version_a);
-	str_b = as_utils_version_parse (version_b);
-	split_a = g_strsplit (str_a, ".", -1);
-	split_b = g_strsplit (str_b, ".", -1);
+	if (flags & AS_VERSION_COMPARE_FLAG_USE_HEURISTICS) {
+		g_autofree gchar *str_a = as_utils_version_parse (version_a);
+		g_autofree gchar *str_b = as_utils_version_parse (version_b);
+		split_a = g_strsplit (str_a, ".", -1);
+		split_b = g_strsplit (str_b, ".", -1);
+	} else {
+		split_a = g_strsplit (version_a, ".", -1);
+		split_b = g_strsplit (version_b, ".", -1);
+	}
 	longest_split = MAX (g_strv_length (split_a), g_strv_length (split_b));
 	for (guint i = 0; i < longest_split; i++) {
 		gchar *endptr_a = NULL;
@@ -1457,6 +1463,24 @@ as_utils_vercmp (const gchar *version_a, const gchar *version_b)
 }
 
 /**
+ * as_utils_vercmp:
+ * @version_a: the release version, e.g. 1.2.3
+ * @version_b: the release version, e.g. 1.2.3.1
+ *
+ * Compares version numbers for sorting.
+ *
+ * Returns: -1 if a < b, +1 if a > b, 0 if they are equal, and %G_MAXINT on error
+ *
+ * Since: 0.3.5
+ */
+gint
+as_utils_vercmp (const gchar *version_a, const gchar *version_b)
+{
+	return as_utils_vercmp_full (version_a, version_b,
+				     AS_VERSION_COMPARE_FLAG_USE_HEURISTICS);
+}
+
+/**
  * as_ptr_array_find_string:
  * @array: gchar* array
  * @value: string to find
diff --git a/libappstream-glib/as-utils.h b/libappstream-glib/as-utils.h
index ecb7cdd..8401df8 100644
--- a/libappstream-glib/as-utils.h
+++ b/libappstream-glib/as-utils.h
@@ -96,6 +96,20 @@ typedef enum {
 } AsVersionParseFlag;
 
 /**
+ * AsVersionCompareFlag:
+ * @AS_VERSION_COMPARE_FLAG_NONE:		No flags set
+ * @AS_VERSION_COMPARE_FLAG_USE_HEURISTICS:	Use a heuristic to parse version numbers
+ *
+ * The flags used when comparing version numbers.
+ **/
+typedef enum {
+	AS_VERSION_COMPARE_FLAG_NONE		= 0,
+	AS_VERSION_COMPARE_FLAG_USE_HEURISTICS	= 1 << 0,
+	/*< private >*/
+	AS_VERSION_COMPARE_FLAG_LAST
+} AsVersionCompareFlag;
+
+/**
  * AsUniqueIdMatchFlags:
  * @AS_UNIQUE_ID_MATCH_FLAG_NONE:		No flags set
  * @AS_UNIQUE_ID_MATCH_FLAG_SCOPE:		Scope, e.g. a #AsAppScope