mirror/flatpak
1
0 Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-10-22 23:55:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add locale-subset property of extensions to match *.Locale behaviour

Browse Source 
This way other types of extensions can also be subset by locale.
For instance, documentation.
This commit is contained in:
Alexander Larsson committed 2017-09-21 16:39:53 +02:00
1 parent 622a8d7cf6
commit 440389bc8e
3 files changed
+24 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

common/flatpak-dir.c
+14 -6
View File
@@ -9547,7 +9547,8 @@ add_related (FlatpakDir *self,
const char *checksum,
gboolean no_autodownload,
const char *download_if,
gboolean autodelete)
gboolean autodelete,
gboolean locale_subset)
{
g_autoptr(GVariant) deploy_data = NULL;
g_autofree const char **old_subpaths = NULL;
@@ -9579,13 +9580,16 @@ add_related (FlatpakDir *self,
delete = TRUE;
}
if (g_str_has_suffix (extension, ".Locale"))
locale_subset = TRUE;
if (old_subpaths)
{
for (i = 0; old_subpaths[i] != NULL; i++)
g_ptr_array_add (subpaths, g_strdup (old_subpaths[i]));
}
if (g_str_has_suffix (extension, ".Locale"))
if (locale_subset)
{
g_autofree char ** current_subpaths = flatpak_dir_get_locale_subpaths (self);
for (i = 0; current_subpaths[i] != NULL; i++)
@@ -9679,6 +9683,8 @@ flatpak_dir_find_remote_related (FlatpakDir *self,
FLATPAK_METADATA_KEY_DOWNLOAD_IF, NULL);
gboolean autodelete = g_key_file_get_boolean (metakey, groups[i],
FLATPAK_METADATA_KEY_AUTODELETE, NULL);
gboolean locale_subset = g_key_file_get_boolean (metakey, groups[i],
FLATPAK_METADATA_KEY_LOCALE_SUBSET, NULL);
g_autofree char *extension_collection_id = NULL;
const char *branch;
g_autofree char *extension_ref = NULL;
@@ -9712,7 +9718,7 @@ flatpak_dir_find_remote_related (FlatpakDir *self,
if (flatpak_summary_lookup_ref (summary, extension_collection_id, extension_ref, &checksum, NULL))
{
add_related (self, related, extension, extension_collection_id, extension_ref, checksum, no_autodownload, download_if, autodelete);
add_related (self, related, extension, extension_collection_id, extension_ref, checksum, no_autodownload, download_if, autodelete, locale_subset);
}
else if (subdirectories)
{
@@ -9721,7 +9727,7 @@ flatpak_dir_find_remote_related (FlatpakDir *self,
for (j = 0; refs[j] != NULL; j++)
{
if (flatpak_summary_lookup_ref (summary, extension_collection_id, refs[j], &checksum, NULL))
add_related (self, related, extension, extension_collection_id, refs[j], checksum, no_autodownload, download_if, autodelete);
add_related (self, related, extension, extension_collection_id, refs[j], checksum, no_autodownload, download_if, autodelete, locale_subset);
}
}
}
@@ -9837,6 +9843,8 @@ flatpak_dir_find_local_related (FlatpakDir *self,
FLATPAK_METADATA_KEY_DOWNLOAD_IF, NULL);
gboolean autodelete = g_key_file_get_boolean (metakey, groups[i],
FLATPAK_METADATA_KEY_AUTODELETE, NULL);
gboolean locale_subset = g_key_file_get_boolean (metakey, groups[i],
FLATPAK_METADATA_KEY_LOCALE_SUBSET, NULL);
const char *branch;
g_autofree char *extension_ref = NULL;
g_autofree char *prefixed_extension_ref = NULL;
@@ -9877,7 +9885,7 @@ flatpak_dir_find_local_related (FlatpakDir *self,
NULL))
{
add_related (self, related, extension, extension_collection_id, extension_ref,
checksum, no_autodownload, download_if, autodelete);
checksum, no_autodownload, download_if, autodelete, locale_subset);
}
else if (subdirectories)
{
@@ -9899,7 +9907,7 @@ flatpak_dir_find_local_related (FlatpakDir *self,
{
add_related (self, related, extension,
extension_collection_id, match, match_checksum,
no_autodownload, download_if, autodelete);
no_autodownload, download_if, autodelete, locale_subset);
}
}
}
common/flatpak-run.h
+1
View File
@@ -71,6 +71,7 @@ gboolean flatpak_run_in_transient_unit (const char *app_id,
#define FLATPAK_METADATA_KEY_NO_AUTODOWNLOAD "no-autodownload"
#define FLATPAK_METADATA_KEY_SUBDIRECTORIES "subdirectories"
#define FLATPAK_METADATA_KEY_SUBDIRECTORY_SUFFIX "subdirectory-suffix"
#define FLATPAK_METADATA_KEY_LOCALE_SUBSET "locale-subset"
#define FLATPAK_METADATA_KEY_VERSION "version"
#define FLATPAK_METADATA_KEY_VERSIONS "versions"
doc/flatpak-metadata.xml
+9
View File
@@ -637,6 +637,15 @@
Available since 0.6.7.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>locale-subset</option> (boolean)</term>
<listitem><para>
If set, then the extensions are partially downloaded by default,
based on the currently configured locales. This means that the extension
contents should be a set of directories with the language code as name.
Available since 0.9.13 (and 0.6.6 for any extensions called *.Locale)
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>autodelete</option> (boolean)</term>
<listitem><para>