diff --git a/src/database/disk.sql b/src/database/disk.sql index f923ad5282f29721e4e39f00d11de483b1c1b706..befc1a343296db97161fbf1da6d39d483faaf645 100644 --- a/src/database/disk.sql +++ b/src/database/disk.sql @@ -30,8 +30,8 @@ CREATE TABLE IF NOT EXISTS kara_type ); INSERT OR REPLACE INTO kara_type (id, name) VALUES - (1, 'ED/d*'), (2, 'OP/d*'), (3, 'AMV'), (4, 'IS'), (5, 'VOCA'), (6, 'LIVE'), - (7, 'CDG'), (8, 'PV'), (9, 'MV'), (10, 'VT'); + (1, 'ED/d*'), (2, 'OP/d*'), (3, 'AMV'), (4, 'IS'), (6, 'LIVE'), + (7, 'CDG'), (8, 'PV'), (9, 'MV'); CREATE TABLE IF NOT EXISTS kara_category ( id INTEGER PRIMARY KEY @@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS kara_category ); INSERT OR REPLACE INTO kara_category (id, name) VALUES - (1, 'vo'), (2, 'va'), (3, 'amv'), (4, 'cdg'), (5, 'autres'); + (1, 'vo'), (2, 'va'), (3, 'amv'), (4, 'cdg'), (5, 'autres'), (6, 'vocaloid'); CREATE TABLE IF NOT EXISTS language ( id INTEGER PRIMARY KEY diff --git a/src/mkv/write.c b/src/mkv/write.c index cb4773c4dea5c0c1650a523db5598e558f9de41e..9429eba423a8916dadf2ca8d72eac09d1ce810be 100644 --- a/src/mkv/write.c +++ b/src/mkv/write.c @@ -154,9 +154,9 @@ metadata_from_path(char *const mkvfile, struct kara_metadata *meta) /* TODO: Import types and categories from the db */ static const char *rgx = - "^/(.+)/(vo|va|amv|cdg|autres)/" + "^/(.+)/(vo|va|amv|cdg|autres|vocaloid)/" "(jp|fr|en|ru|sp|it|ch|latin|multi|undefined)/(.+)/" - "(.+) - (OP|ED|IS|AMV|VOCA|PV|MV|LIVE|VT)([[:digit:]]*) - (.+)\\.mkv$"; + "(.+) - (OP|ED|IS|AMV|PV|MV|LIVE)([[:digit:]]*) - (.+)\\.mkv$"; if (!regex_init && regcomp(®ex, rgx, REG_EXTENDED)) { LOG_ERROR("MPV", "Failed to compile regex");