diff --git a/src/commands.c b/src/commands.c index f248ff3c770d63976fc585f5271963fe0bfe3c49..196fe65897fc90821918f5e88fe1cfd50ffa5232 100644 --- a/src/commands.c +++ b/src/commands.c @@ -739,7 +739,7 @@ sticker_send(struct lkt_state *srv, size_t c, char *name, int id, int value) bool command_sticker_create(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]) { - UNUSED(c); + LOG_INFO_SCT("COMMAND", "Client %ld is using the sticker create command", c); RETURN_UNLESS(argv[0], "Invalid argument", false); if (!database_sticker_create(srv->db, argv[0])) { LOG_ERROR_SCT("COMMAND", "Failed to create sticker '%s'", argv[0]); @@ -752,13 +752,13 @@ command_sticker_create(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_A bool command_sticker_set(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]) { - UNUSED(c); RETURN_UNLESS(argv[0] && argv[1] && argv[2] && argv[3] && !argv[4], "Invalid argument", false); int uri, value, err1, err2; char *endptr; STRTOL(uri, argv[1], endptr, err1); STRTOL(value, argv[4], endptr, err2); RETURN_IF(err1 || err2, "STRTOL failed", false); + LOG_INFO_SCT("COMMAND", "Client %ld is using the sticker set command", c); RETURN_UNLESS(database_sticker_set(srv->db, argv[0], argv[2], uri, value), "Failed to get sticker", false); srv->mpd_idle_events |= MPD_IDLE_STICKER; return true; @@ -767,6 +767,7 @@ command_sticker_set(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS bool command_sticker_get(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]) { + LOG_INFO_SCT("COMMAND", "Client %ld is using the sticker get command", c); struct lkt_search callback = { .srv = srv, .c = c, @@ -824,7 +825,7 @@ unknown: bool command_sticker_delete(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]) { - UNUSED(c); + LOG_INFO_SCT("COMMAND", "Client %ld is using the sticker delete command", c); RETURN_UNLESS(argv[0] && argv[1] && argv[2], "Invalid argument", false); int uri = atoi(argv[1]); srv->mpd_idle_events |= MPD_IDLE_STICKER; @@ -834,7 +835,7 @@ command_sticker_delete(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_A bool command_sticker_destroy(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]) { - UNUSED(c); + LOG_INFO_SCT("COMMAND", "Client %ld is using the sticker destroy command", c); RETURN_UNLESS(argv[0], "Invalid argument", false); return database_sticker_delete(srv->db, argv[0]); } diff --git a/src/database/update.c b/src/database/update.c index bef7c3f913cc4003a0287517db550e1eab010f00..4966e6302c20e2120315289506f051d600934bde 100644 --- a/src/database/update.c +++ b/src/database/update.c @@ -115,7 +115,6 @@ database_update_set_available(volatile sqlite3 *db, int id) if (sqlite3_step(stmt) != SQLITE_DONE) goto error; sqlite3_finalize(stmt); - LOG_INFO_SCT("DB", "Kara %d is now available", id); return true; error: sqlite3_finalize(stmt); diff --git a/src/net/downloader.c b/src/net/downloader.c index b4cfa451224c534499985fe9d50e952764049461..d0d58690ed052d6cf32c3b70c1f31ade34f2468f 100644 --- a/src/net/downloader.c +++ b/src/net/downloader.c @@ -370,6 +370,7 @@ __handle_got_json(volatile sqlite3 *db, struct lkt_repo *repo, struct json_objec if (db_timestamp >= filestamp && filestamp > timestamp && ! kara_metadata_equals(&kara.mdt, kara.filename)) { database_update_touch(db, kara.id); + database_update_set_available(db, kara.id); LOG_INFO_SCT("REPO", "Ignore kara '%ld' with path '%s'", kara.id, kara.filename); continue; } @@ -391,7 +392,7 @@ __handle_got_json(volatile sqlite3 *db, struct lkt_repo *repo, struct json_objec continue; } - if (!database_update_set_available((sqlite3 *) db, kara.id)) { + if (!database_update_set_available(db, kara.id)) { LOG_WARN_SCT("REPO", "Could not set kara %ld available", kara.id); continue; }