diff --git a/inc/common/macro.h b/inc/common/macro.h
index 99e756c10b7dc822b57e7852296c5d1944394d7a..ef58f202a25ebf5460fc2b9a5135c2a3c3a2d354 100644
--- a/inc/common/macro.h
+++ b/inc/common/macro.h
@@ -62,10 +62,10 @@ enum log_level {
__func__, \
__VA_ARGS__); \
}
-#define LOG_INFO(section, format, ...) LOG(format, INFO, section, __VA_ARGS__)
-#define LOG_WARN(section, format, ...) LOG(format, WARN, section, __VA_ARGS__)
-#define LOG_ERROR(section, format, ...) LOG(format, ERROR, section, __VA_ARGS__)
-#define LOG_DEBUG(section, format, ...) LOG(format, DEBUG, section, __VA_ARGS__)
+#define LOG_INFO(section, format, ...) LOG(format, INFO, section, __VA_ARGS__)
+#define LOG_WARN(section, format, ...) LOG(format, WARN, section, __VA_ARGS__)
+#define LOG_ERROR(section, format, ...) LOG(format, ERROR, section, __VA_ARGS__)
+#define LOG_DEBUG(section, format, ...) LOG(format, DEBUG, section, __VA_ARGS__)
/* Defines for lektor */
@@ -90,7 +90,6 @@ enum log_level {
#define LKT_DATABASE_NAME_KCAT "category"
#define LKT_DATABASE_NAME_KTYPE "song_type"
#define LKT_DATABASE_NAME_KAUTHOR "author_name"
-#define LKT_DATABASE_NAME_KAUTHOR_YEAR "author_year"
#define LKT_DATABASE_NAME_KLANG "language"
#define LKT_DATABASE_KARA_COLUMNT_ANY "any_col"
#define LKT_DATABASE_KARA_ALL "string"
diff --git a/src/database/disk.sql b/src/database/disk.sql
index ed2fbb8aba5f493861b13642f7ee46a14aeaa42f..d1e356f6bb2ac14244e3931dcbd3e0510d65aed9 100644
--- a/src/database/disk.sql
+++ b/src/database/disk.sql
@@ -16,7 +16,6 @@ CREATE TABLE IF NOT EXISTS kara
, file_path TEXT NOT NULL UNIQUE
, is_new INTEGER NOT NULL
, author_name TEXT
- , author_year INTEGER CHECK(author_year > 0)
, available INTEGER CHECK(available = 0 OR available = 1) DEFAULT 1 NOT NULL
, string TEXT GENERATED ALWAYS AS
( category || ' - ' || language || ' / ' || source_name || ' - ' || song_type ||
diff --git a/src/database/update.c b/src/database/update.c
index d2fe7e5f4a288e3824617e4f0ee3b1278694565b..32448a6689229ef3fd4606eeb0e129c34841b4e1 100644
--- a/src/database/update.c
+++ b/src/database/update.c
@@ -39,24 +39,17 @@ __database_add_kara(volatile sqlite3 *db, const char *filename)
static const char *SQL_STMT =
"INSERT INTO "
"kara (song_name, source_name, category, song_type, language, "
- "file_path, is_new, author_name, author_year, song_number)"
- "SELECT ?, ?, ?, ?, ?, ?, ?, ?, strftime('%s','now'), ?";
+ "file_path, is_new, author_name, song_number)"
+ "SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?";
static const char *SQL_STMT_WITH_ID =
"INSERT INTO "
"kara (song_name, source_name, category, song_type, language, "
- "file_path, is_new, author_name, author_year, song_number, id)"
- "SELECT ?, ?, ?, ?, ?, ?, ?, ?, strftime('%s','now'), ?, ?";
+ "file_path, is_new, author_name, song_number, id)"
+ "SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ?";
sqlite3_stmt *stmt = NULL;
- long code = SQLITE_OK, status = false, kara_id = 0;
+ long status = false, kara_id = 0;
struct kara_metadata data;
- time_t the_time = time(NULL);
- struct tm *the_local_time = localtime(&the_time);
- char year[10], path[PATH_MAX], *saveptr = NULL, *token, *id = NULL;
-
- /* A timestamp */
- code = safe_snprintf(year, 10, "%d", the_local_time->tm_year + 1900);
- if (code < 0 || code >= 10)
- return false;
+ char path[PATH_MAX], *saveptr = NULL, *token, *id = NULL;
/* Metadata */
if (kara_metadata_read(&data, filename) != 0) {
@@ -90,7 +83,7 @@ __database_add_kara(volatile sqlite3 *db, const char *filename)
(sqlite3_bind_text(stmt, 4, data.song_type, -1, 0) != SQLITE_OK) ||
(sqlite3_bind_text(stmt, 5, data.language, -1, 0) != SQLITE_OK) ||
(sqlite3_bind_text(stmt, 6, filename, -1, 0) != SQLITE_OK) ||
- (sqlite3_bind_int (stmt, 7, 0) != SQLITE_OK) ||
+ (sqlite3_bind_int (stmt, 7, 0) /* TODO */ != SQLITE_OK) ||
(sqlite3_bind_text(stmt, 8, data.author_name, -1, 0) != SQLITE_OK) ||
(sqlite3_bind_int (stmt, 9, data.song_number) != SQLITE_OK)
) {
@@ -136,17 +129,11 @@ database_update_add(volatile sqlite3 *db, const char *kara_path,
RETURN_UNLESS(db && kara_path && mdt && id, "Invalid argument", false);
static const char *SQL_STMT =
"INSERT OR REPLACE INTO kara (song_name, source_name, category, "
- "song_type, language, file_path, is_new, author_name, author_year, "
+ "song_type, language, file_path, is_new, author_name, "
"song_number, id, available)"
- "SELECT ?, ?, ?, ?, ?, ?, ?, ?, strftime('%s','now'), ?, ?, ?";
+ "SELECT ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?";
sqlite3_stmt *stmt = NULL;
- int code = SQLITE_OK, ret = false;
- time_t the_time = time(NULL);
- struct tm *the_local_time = localtime(&the_time);
- char year[10];
- code = safe_snprintf(year, 10, "%d", the_local_time->tm_year + 1900);
- if (code < 0 || code >= 10)
- return false;
+ int ret = false;
/* From here we initialize the sqlite stmt. */
@@ -158,7 +145,7 @@ database_update_add(volatile sqlite3 *db, const char *kara_path,
(sqlite3_bind_text(stmt, 4, mdt->song_type, -1, 0) != SQLITE_OK) ||
(sqlite3_bind_text(stmt, 5, mdt->language, -1, 0) != SQLITE_OK) ||
(sqlite3_bind_text(stmt, 6, kara_path, -1, 0) != SQLITE_OK) ||
- (sqlite3_bind_int (stmt, 7, 0) != SQLITE_OK) /* TODO */ || /* No new kara added (TODO). */
+ (sqlite3_bind_int (stmt, 7, 0) /* TODO */ != SQLITE_OK) ||
(sqlite3_bind_text(stmt, 8, mdt->author_name, -1, 0) != SQLITE_OK) ||
(sqlite3_bind_int (stmt, 9, mdt->song_number) != SQLITE_OK) ||
(sqlite3_bind_int (stmt, 10, id) != SQLITE_OK) ||