diff --git a/src/base/json.c b/src/base/json.c index 037bc3193764098bafef979b953408935dfdfd4b..976854f4cfcfd747a548c594da727888bf88d0ef 100644 --- a/src/base/json.c +++ b/src/base/json.c @@ -31,7 +31,7 @@ len = (end - str); \ is_paren = 1; \ } else \ - len = strcspn(str, __JSON_SPACE); \ + len = strcspn(str, __JSON_SPACE __JSON_END); \ if (level == asked_level && len < LKT_LINE_MAX - 1) \ strncpy(dest, str, len); \ str += len; \ diff --git a/src/module/module_repo.c b/src/module/module_repo.c index 322261686d66e45899570f12b5408a58cd7bb764..ad0a0277503b39be654eb95780f457502d6519b8 100644 --- a/src/module/module_repo.c +++ b/src/module/module_repo.c @@ -311,6 +311,7 @@ __handle_got_json_dl(struct kara *kara, int current_id) safe_snprintf(kara->url, LKT_LINE_MAX, kara->repo->get_id_file, kara->id); + LOG_INFO("REPO", "Start downloading kara %ld to %s", kara->id, kara->filename); if (__download_kara(kara->url, kara->filename, true)) { LOG_WARN("REPO", "Could not download kara %ld at path '%s'", kara->id, kara->filename); @@ -396,7 +397,7 @@ __handle_got_json_internal_callback(const char *key, const char *val, int comp, ++(kara->ignored_count); database_update_touch(kara->db, kara->id); database_update_set_available(kara->db, kara->id); - LOG_DEBUG("REPO", "Ignore kara '%ld' with path '%s'", kara->id, kara->filename); + LOG_DEBUG("REPO", "Ignore kara %ld", kara->id); return; } @@ -411,7 +412,7 @@ __handle_got_json_internal_callback(const char *key, const char *val, int comp, static inline void __handle_got_json(volatile sqlite3 *db, struct module_repo_internal *repo, const char *json) { - size_t len = json_parse_get_count(json, 1); + size_t len = json_parse_get_count(json, 2); struct kara kara = { .repo = repo, .db = db, @@ -435,7 +436,7 @@ __handle_got_json(volatile sqlite3 *db, struct module_repo_internal *repo, const /* Handle the json */ LOG_INFO("REPO", "Starting to process json for repo %s", repo->name); - json_parse(json, 1, __handle_got_json_internal_callback, (void *) &kara); + json_parse(json, 2, __handle_got_json_internal_callback, (void *) &kara); LOG_INFO("REPO", "Updated %ld karas and ignored %ld karas, total is %ld", kara.update_count, kara.ignored_count, len); }