Save profile settings to git

In order to streamline the view between desktop and mobile we need to save
selected profile related settings to git.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
This commit is contained in:
Joakim Bygdell 2017-02-04 10:13:58 +01:00 committed by Dirk Hohndel
parent 6518b0db45
commit d4dbd0bee7
5 changed files with 23 additions and 2 deletions

View file

@ -3440,6 +3440,14 @@ void set_informational_units(char *units)
}
}
void set_git_prefs(char *prefs)
{
if (strstr(prefs, "TANKBAR"))
git_prefs.tankbar = 1;
if (strstr(prefs, "DCCEILING"))
git_prefs.dcceiling = 1;
}
void average_max_depth(struct diveplan *dive, int *avg_depth, int *max_depth)
{
int integral = 0;

View file

@ -922,6 +922,7 @@ extern double strtod_flags(const char *str, const char **ptr, unsigned int flags
extern void set_save_userid_local(short value);
extern void set_userid(char *user_id);
extern void set_informational_units(char *units);
extern void set_git_prefs(char *prefs);
extern const char *get_dive_date_c_string(timestamp_t when);
extern void update_setpoint_events(struct dive *dive, struct divecomputer *dc);

View file

@ -816,6 +816,14 @@ static void parse_settings_userid(char *line, struct membuffer *str, void *_unus
}
}
static void parse_settings_prefs(char *line, struct membuffer *str, void *unused)
{
(void) str;
(void) unused;
if (line)
set_git_prefs(line);
}
/*
* Our versioning is a joke right now, but this is more of an example of what we
* *can* do some day. And if we do change the version, this warning will show if
@ -988,7 +996,7 @@ static void trip_parser(char *line, struct membuffer *str, void *_trip)
static struct keyword_action settings_action[] = {
#undef D
#define D(x) { #x, parse_settings_ ## x }
D(autogroup), D(divecomputerid), D(subsurface), D(units), D(userid), D(version),
D(autogroup), D(divecomputerid), D(subsurface), D(prefs), D(units), D(userid), D(version)
};
static void settings_parser(char *line, struct membuffer *str, void *_unused)

View file

@ -173,7 +173,7 @@ enum cloud_status {
CS_VERIFIED
};
extern struct preferences prefs, default_prefs, informational_prefs;
extern struct preferences prefs, default_prefs, informational_prefs, git_prefs;
#define PP_GRAPHS_ENABLED (prefs.pp_graphs.po2 || prefs.pp_graphs.pn2 || prefs.pp_graphs.phe)

View file

@ -861,6 +861,10 @@ static void save_settings(git_repository *repo, struct dir *tree)
call_for_each_dc(&b, save_one_device, false);
cond_put_format(autogroup, &b, "autogroup\n");
save_units(&b);
if (prefs.tankbar)
put_string(&b, "prefs TANKBAR\n");
if (prefs.dcceiling)
put_string(&b, "prefs DCCEILING\n");
blob_insert(repo, tree, &b, "00-Subsurface");
}