Trees with "all" architecture are used as a fallback when guessing an OS from a tree. Knowing that, any entry with "all" architecture should not be considered when first comparing the trees, thus those are skipped and, later on, if no match has been found, those are used. https://gitlab.com/libosinfo/libosinfo/issues/20 Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx> --- osinfo/osinfo_db.c | 82 +++++++++++++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/osinfo/osinfo_db.c b/osinfo/osinfo_db.c index b6d9282..ff731ed 100644 --- a/osinfo/osinfo_db.c +++ b/osinfo/osinfo_db.c @@ -742,24 +742,12 @@ gboolean osinfo_db_identify_media(OsinfoDb *db, OsinfoMedia *media) return TRUE; } - -/** - * osinfo_db_guess_os_from_tree: - * @db: the database - * @tree: the installation tree - * @matched_tree: (out) (transfer none) (allow-none): the matched operating - * system tree - * - * Guess operating system given an #OsinfoTree object. - * - * Returns: (transfer none): the operating system, or NULL if guessing failed - */ -OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db, - OsinfoTree *tree, - OsinfoTree **matched_tree) +static gboolean compare_tree(OsinfoTree *tree, + GList *oss, + OsinfoOs **ret_os, + OsinfoTree **matched, + GList **fallback_oss) { - OsinfoOs *ret = NULL; - GList *oss = NULL; GList *os_iter; const gchar *tree_arch; const gchar *treeinfo_family; @@ -767,27 +755,21 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db, const gchar *treeinfo_version; const gchar *treeinfo_arch; - g_return_val_if_fail(OSINFO_IS_DB(db), NULL); - g_return_val_if_fail(tree != NULL, NULL); - tree_arch = osinfo_tree_get_architecture(tree); treeinfo_family = osinfo_tree_get_treeinfo_family(tree); treeinfo_variant = osinfo_tree_get_treeinfo_variant(tree); treeinfo_version = osinfo_tree_get_treeinfo_version(tree); treeinfo_arch = osinfo_tree_get_treeinfo_arch(tree); - oss = osinfo_list_get_elements(OSINFO_LIST(db->priv->oses)); for (os_iter = oss; os_iter; os_iter = os_iter->next) { OsinfoOs *os = OSINFO_OS(os_iter->data); OsinfoTreeList *tree_list = osinfo_os_get_tree_list(os); GList *trees = osinfo_list_get_elements(OSINFO_LIST(tree_list)); GList *tree_iter; - //trees = g_list_sort(trees, tree_family_compare); - for (tree_iter = trees; tree_iter; tree_iter = tree_iter->next) { OsinfoTree *os_tree = OSINFO_TREE(tree_iter->data); - const gchar *os_tree_arch; + const gchar *os_tree_arch = NULL; const gchar *os_treeinfo_family; const gchar *os_treeinfo_variant; const gchar *os_treeinfo_version; @@ -797,19 +779,26 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db, continue; os_tree_arch = osinfo_tree_get_architecture(os_tree); + if (fallback_oss != NULL) { + if (g_str_equal(os_tree_arch, "all")) { + *fallback_oss = g_list_prepend(*fallback_oss, os); + continue; + } + } + os_treeinfo_family = osinfo_tree_get_treeinfo_family(os_tree); os_treeinfo_variant = osinfo_tree_get_treeinfo_variant(os_tree); os_treeinfo_version = osinfo_tree_get_treeinfo_version(os_tree); os_treeinfo_arch = osinfo_tree_get_treeinfo_arch(os_tree); - if (match_regex(os_tree_arch, tree_arch) && + if ((g_str_equal(os_tree_arch, "all") || match_regex(os_tree_arch, tree_arch)) && match_regex(os_treeinfo_family, treeinfo_family) && match_regex(os_treeinfo_variant, treeinfo_variant) && match_regex(os_treeinfo_version, treeinfo_version) && match_regex(os_treeinfo_arch, treeinfo_arch)) { - ret = os; - if (matched_tree != NULL) - *matched_tree = os_tree; + *ret_os = os; + if (matched != NULL) + *matched = os_tree; break; } } @@ -817,11 +806,44 @@ OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db, g_list_free(trees); g_object_unref(tree_list); - if (ret) - break; + if (*ret_os != NULL) + return TRUE; } + return FALSE; +} + +/** + * osinfo_db_guess_os_from_tree: + * @db: the database + * @tree: the installation tree + * @matched_tree: (out) (transfer none) (allow-none): the matched operating + * system tree + * + * Guess operating system given an #OsinfoTree object. + * + * Returns: (transfer none): the operating system, or NULL if guessing failed + */ +OsinfoOs *osinfo_db_guess_os_from_tree(OsinfoDb *db, + OsinfoTree *tree, + OsinfoTree **matched_tree) +{ + OsinfoOs *ret = NULL; + GList *oss = NULL; + GList *fallback_oss = NULL; + + g_return_val_if_fail(OSINFO_IS_DB(db), NULL); + g_return_val_if_fail(tree != NULL, NULL); + + oss = osinfo_list_get_elements(OSINFO_LIST(db->priv->oses)); + if (compare_tree(tree, oss, &ret, matched_tree, &fallback_oss)) + goto end; + + compare_tree(tree, fallback_oss, &ret, matched_tree, NULL); + + end: g_list_free(oss); + g_list_free(fallback_oss); return ret; } -- 2.20.1 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
