From 3585651be7f987e60a5d369ed645230aceddbdbb Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Fri, 26 Jan 2018 21:58:29 +0100 Subject: [PATCH] Add semantic support for network installations Closes: #1348 Approved by: alexlarsson --- common/flatpak-dir.c | 3 +++ common/flatpak-dir.h | 1 + doc/flatpak-installation.xml | 2 +- lib/flatpak-installation.c | 3 +++ lib/flatpak-installation.h | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index b36ea9c6..82693b5f 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -380,6 +380,9 @@ parse_storage_type (const char *type_string) g_autofree char *type_low = NULL; type_low = g_ascii_strdown (type_string, -1); + if (g_strcmp0 (type_low, "network") == 0) + return FLATPAK_DIR_STORAGE_TYPE_NETWORK; + if (g_strcmp0 (type_low, "mmc") == 0) return FLATPAK_DIR_STORAGE_TYPE_MMC; diff --git a/common/flatpak-dir.h b/common/flatpak-dir.h index 9a44e7f1..d78e54aa 100644 --- a/common/flatpak-dir.h +++ b/common/flatpak-dir.h @@ -135,6 +135,7 @@ typedef enum { FLATPAK_DIR_STORAGE_TYPE_HARD_DISK, FLATPAK_DIR_STORAGE_TYPE_SDCARD, FLATPAK_DIR_STORAGE_TYPE_MMC, + FLATPAK_DIR_STORAGE_TYPE_NETWORK, } FlatpakDirStorageType; GQuark flatpak_dir_error_quark (void); diff --git a/doc/flatpak-installation.xml b/doc/flatpak-installation.xml index b7b348d6..67639bee 100644 --- a/doc/flatpak-installation.xml +++ b/doc/flatpak-installation.xml @@ -76,7 +76,7 @@ (string) - The type of storage used for this installation. Possible values include: mmc, sdcard, harddisk. + The type of storage used for this installation. Possible values include: network, mmc, sdcard, harddisk. diff --git a/lib/flatpak-installation.c b/lib/flatpak-installation.c index d30e9dd0..40a0ab80 100644 --- a/lib/flatpak-installation.c +++ b/lib/flatpak-installation.c @@ -495,6 +495,9 @@ flatpak_installation_get_storage_type (FlatpakInstallation *self) case FLATPAK_DIR_STORAGE_TYPE_MMC: return FLATPAK_STORAGE_TYPE_MMC; + case FLATPAK_DIR_STORAGE_TYPE_NETWORK: + return FLATPAK_STORAGE_TYPE_NETWORK; + default: return FLATPAK_STORAGE_TYPE_DEFAULT; } diff --git a/lib/flatpak-installation.h b/lib/flatpak-installation.h index 2f857c47..b6d43ca4 100644 --- a/lib/flatpak-installation.h +++ b/lib/flatpak-installation.h @@ -81,6 +81,7 @@ typedef enum { * @FLATPAK_STORAGE_TYPE_HARD_DISK: installation is on a hard disk * @FLATPAK_STORAGE_TYPE_SDCARD: installation is on a SD card * @FLATPAK_STORAGE_TYPE_MMC: installation is on an MMC + * @FLATPAK_STORAGE_TYPE_NETWORK: installation is on the network * * Flags to alter the behavior of flatpak_installation_install_full(). * @@ -91,6 +92,7 @@ typedef enum { FLATPAK_STORAGE_TYPE_HARD_DISK, FLATPAK_STORAGE_TYPE_SDCARD, FLATPAK_STORAGE_TYPE_MMC, + FLATPAK_STORAGE_TYPE_NETWORK, } FlatpakStorageType;