Skip to content

Commit 5b71675

Browse files
Less log lines while reporting wb_presets for readability
1 parent 62041c9 commit 5b71675

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

src/common/wb_presets.c

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,16 @@ void dt_wb_presets_init(const char *alternative)
140140
else
141141
g_strlcpy(filename, alternative, sizeof(filename));
142142

143-
dt_print(DT_DEBUG_CONTROL, "[wb_presets] loading wb_presets from `%s'", filename);
144-
if(!g_file_test(filename, G_FILE_TEST_EXISTS)) return;
143+
const gboolean preset_file = g_file_test(filename, G_FILE_TEST_EXISTS);
144+
dt_print(DT_DEBUG_CONTROL, "[wb_presets] loading wb_presets from `%s'%s",
145+
filename, preset_file ? "" : " missing");
146+
if(!preset_file) return;
145147

146148
JsonParser *parser = json_parser_new();
147149
if(!json_parser_load_from_file(parser, filename, &error))
148150
{
149151
dt_print(DT_DEBUG_ALWAYS,
150-
"[wb_presets] error: parsing json from `%s' failed\n%s", filename, error->message);
152+
"[wb_presets] error: parsing json from `%s' failed: %s", filename, error->message);
151153
g_error_free(error);
152154
g_object_unref(parser);
153155
return;
@@ -158,8 +160,6 @@ void dt_wb_presets_init(const char *alternative)
158160
JsonReader *reader = NULL;
159161
gboolean valid = TRUE;
160162

161-
dt_print(DT_DEBUG_CONTROL, "[wb_presets] loading noiseprofile file");
162-
163163
JsonNode *root = json_parser_get_root(parser);
164164
if(!root) _ERROR("can't get the root node");
165165

@@ -198,15 +198,13 @@ void dt_wb_presets_init(const char *alternative)
198198
g_strdup(json_reader_get_string_value(reader));
199199
json_reader_end_member(reader);
200200

201-
dt_print(DT_DEBUG_CONTROL, "[wb_presets] found maker `%s'",
202-
wb_presets[wb_presets_count].make);
203201
// go through all models and check those
204202

205203
if(!json_reader_read_member(reader, "models"))
206204
_ERROR("missing `models`");
207205

208206
const int n_models = json_reader_count_elements(reader);
209-
dt_print(DT_DEBUG_CONTROL, "[wb_presets] found %d models", n_models);
207+
dt_print(DT_DEBUG_CONTROL, "[wb_presets] found %d models for maker `%s'", n_models, wb_presets[wb_presets_count].make);
210208

211209
for(int j = 0; j < n_models; j++)
212210
{
@@ -223,15 +221,12 @@ void dt_wb_presets_init(const char *alternative)
223221

224222
json_reader_end_member(reader);
225223

226-
dt_print(DT_DEBUG_CONTROL, "[wb_presets] found %s",
227-
wb_presets[wb_presets_count].model);
228-
229224
if(!json_reader_read_member(reader, "presets"))
230225
_ERROR("missing `presets`");
231226

232227
const int n_presets = json_reader_count_elements(reader);
233-
dt_print(DT_DEBUG_CONTROL, "[wb_presets] found %d presets",
234-
n_presets);
228+
dt_print(DT_DEBUG_CONTROL, "[wb_presets] found %d presets for `%s'",
229+
n_presets, wb_presets[wb_presets_count].model);
235230

236231
for(int k = 0; k < n_presets; k++)
237232
{

0 commit comments

Comments
 (0)