ahill/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-26 14:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

dir: Refactor compute_extra_data_download_size to not depend on ostree

Browse Source 
It took in a ostree commit before, but it really only needs the detached
metadata. The single caller now converts it correctly.

This will become useful when we want to know the size of the extra data
when the metadata is coming from an OCI image.
This commit is contained in:
Sebastian Wick 2025-08-29 20:48:04 +02:00
parent 5640e5bf59
commit ac0b61a0f1
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/flatpak-dir.c
View File

@ -6224,16 +6224,14 @@ extra_data_progress_report (guint64 downloaded_bytes,
}
static void
compute_extra_data_download_size (GVariant *commitv,
guint64 *out_n_extra_data,
guint64 *out_total_download_size)
compute_extra_data_download_size (GVariant *extra_data_sources,
guint64 *out_n_extra_data,
guint64 *out_total_download_size)
{
guint64 i;
guint64 n_extra_data = 0;
guint64 total_download_size = 0;
g_autoptr(GVariant) extra_data_sources = NULL;
extra_data_sources = flatpak_commit_get_extra_data_sources (commitv, NULL);
if (extra_data_sources != NULL)
{
n_extra_data = g_variant_n_children (extra_data_sources);
@ -6301,11 +6299,16 @@ flatpak_dir_setup_extra_data (FlatpakDir *self,
else
{
/* No summary/cache or old cache version, download commit and get size from there */
g_autoptr(GVariant) commitv = flatpak_remote_state_load_ref_commit (state, self, ref, rev, token, NULL, cancellable, error);
g_autoptr(GVariant) commitv = NULL;
g_autoptr(GVariant) extra_data_sources = NULL;
commitv = flatpak_remote_state_load_ref_commit (state, self, ref, rev,
token, NULL, cancellable, error);
if (commitv == NULL)
return FALSE;
compute_extra_data_download_size (commitv, &n_extra_data, &total_download_size);
extra_data_sources = flatpak_commit_get_extra_data_sources (commitv, NULL);
compute_extra_data_download_size (extra_data_sources, &n_extra_data, &total_download_size);
}
}