mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-03 13:36:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add internal API: flatpak_dir_get_name()

Browse Source 
This will allow us to refactor some code using in the CLI, when
we want to print the name of a FlatpakDir for detailed listings.
This commit is contained in:
Mario Sanchez Prada
2016-12-16 19:17:59 +00:00
parent d3a9982837
commit ed1b0e2b23
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/flatpak-builtins-list-remotes.c
View File

@@ -150,16 +150,7 @@ flatpak_builtin_list_remotes (int argc, char **argv, GCancellable *cancellable,
if ((opt_user && opt_system) || (opt_user && opt_installation != NULL)
|| (opt_system && opt_installation != NULL))
{
g_autofree char *dir_id = NULL;
if (flatpak_dir_is_user (dir))
{
dir_id = g_strdup ("user");
}
else
{
const char *system_dir_id = flatpak_dir_get_id (dir);
dir_id = g_strdup_printf ("system (%s)", system_dir_id ? system_dir_id : "default");
}
g_autofree char *dir_id = flatpak_dir_get_name (dir);
flatpak_table_printer_append_with_comma (printer, dir_id);
}
}

12
app/flatpak-builtins-list.c
View File

@@ -198,17 +198,7 @@ print_table_for_refs (gboolean print_apps, GPtrArray* refs_array, const char *ar
if (refs_array->len > 1)
{
g_autofree char *source = NULL;
if (flatpak_dir_is_user (dir))
{
source = g_strdup ("user");
}
else
{
const char *system_source = flatpak_dir_get_id (dir);
source = g_strdup_printf ("system (%s)", system_source ? system_source : "default");
}
g_autofree char *source = flatpak_dir_get_name (dir);
flatpak_table_printer_append_with_comma (printer, source);
}

15
common/flatpak-dir.c
View File

@@ -780,6 +780,21 @@ flatpak_dir_get_id (FlatpakDir *self)
return NULL;
}
char *
flatpak_dir_get_name (FlatpakDir *self)
{
const char *id = NULL;
if (self->user)
return g_strdup ("user");
id = flatpak_dir_get_id (self);
if (id != NULL && g_strcmp0 (id, "default") != 0)
return g_strdup_printf ("system (%s)", id);
return g_strdup ("system");
}
const char *
flatpak_dir_get_display_name (FlatpakDir *self)
{

1
common/flatpak-dir.h
View File

@@ -165,6 +165,7 @@ GFile * flatpak_dir_get_path (FlatpakDir *self);
GFile * flatpak_dir_get_changed_path (FlatpakDir *self);
const char *flatpak_dir_get_id (FlatpakDir *self);
const char *flatpak_dir_get_display_name (FlatpakDir *self);
char * flatpak_dir_get_name (FlatpakDir *self);
gint flatpak_dir_get_priority (FlatpakDir *self);
FlatpakDirStorageType flatpak_dir_get_storage_type (FlatpakDir *self);
GFile * flatpak_dir_get_deploy_dir (FlatpakDir *self,