mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-02 12:01:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add flatpak_dir_list_refs_for_name_decomposed

Browse Source
This commit is contained in:
Alexander Larsson
2020-11-05 14:02:57 +01:00
committed by Alexander Larsson
parent d7377f33bd
commit fbcef76a37
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/flatpak-dir-private.h
View File

@@ -641,6 +641,11 @@ gboolean flatpak_dir_list_refs (FlatpakDir *self,
char ***refs,
GCancellable *cancellable,
GError **error);
GPtrArray * flatpak_dir_list_refs_for_name_decomposed (FlatpakDir *self,
FlatpakKinds kind,
const char *name,
GCancellable *cancellable,
GError **error);
GPtrArray *flatpak_dir_list_refs_decomposed (FlatpakDir *self,
FlatpakKinds kind,
GCancellable *cancellable,

45
common/flatpak-dir.c
View File

@@ -6307,21 +6307,20 @@ out:
}
static gboolean
flatpak_dir_list_refs_for_name_decomposed (FlatpakDir *self,
FlatpakKinds kind,
const char *name,
GPtrArray *refs,
GCancellable *cancellable,
GError **error)
_flatpak_dir_list_refs_for_name_decomposed (FlatpakDir *self,
GFile *base_dir,
FlatpakKinds kind,
const char *name,
GPtrArray *refs,
GCancellable *cancellable,
GError **error)
{
g_autoptr(GFile) base = NULL;
g_autoptr(GFile) dir = NULL;
g_autoptr(GFileEnumerator) dir_enum = NULL;
g_autoptr(GFileInfo) child_info = NULL;
GError *temp_error = NULL;
base = g_file_get_child (flatpak_dir_get_path (self), kind == FLATPAK_KINDS_APP ? "app" : "runtime");
dir = g_file_get_child (base, name);
dir = g_file_get_child (base_dir, name);
if (!g_file_query_exists (dir, cancellable))
return TRUE;
@@ -6393,6 +6392,32 @@ flatpak_dir_list_refs_for_name_decomposed (FlatpakDir *self,
return TRUE;
}
GPtrArray *
flatpak_dir_list_refs_for_name_decomposed (FlatpakDir *self,
FlatpakKinds kind,
const char *name,
GCancellable *cancellable,
GError **error)
{
g_autoptr(GFile) base = NULL;
g_autoptr(GFile) dir = NULL;
g_autoptr(GFileEnumerator) dir_enum = NULL;
g_autoptr(GFileInfo) child_info = NULL;
GError *temp_error = NULL;
g_autoptr(GPtrArray) refs = NULL;
refs = g_ptr_array_new_with_free_func ((GDestroyNotify)flatpak_decomposed_unref);
base = g_file_get_child (flatpak_dir_get_path (self), kind == FLATPAK_KINDS_APP ? "app" : "runtime");
if (!_flatpak_dir_list_refs_for_name_decomposed (self, base, kind, name, refs, cancellable, error))
return NULL;
g_ptr_array_sort (refs, (GCompareFunc)flatpak_decomposed_strcmp_p);
return g_steal_pointer (&refs);
}
GPtrArray *
flatpak_dir_list_refs_decomposed (FlatpakDir *self,
FlatpakKinds kind,
@@ -6430,7 +6455,7 @@ flatpak_dir_list_refs_decomposed (FlatpakDir *self,
name = g_file_info_get_name (child_info);
if (!flatpak_dir_list_refs_for_name_decomposed (self, kind, name, refs, cancellable, error))
if (!_flatpak_dir_list_refs_for_name_decomposed (self, base, kind, name, refs, cancellable, error))
return NULL;
g_clear_object (&child_info);