From 23488f61dc5650b8b0b2bee31277ffe3ad92c996 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Tue, 17 Nov 2020 09:55:33 +0100
Subject: [PATCH] Don't need to add VT, just deletes VOCA

---
 src/database/disk.sql | 6 +++---
 src/mkv/write.c       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/database/disk.sql b/src/database/disk.sql
index f923ad52..befc1a34 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 cb4773c4..9429eba4 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(&regex, rgx, REG_EXTENDED)) {
         LOG_ERROR("MPV", "Failed to compile regex");
-- 
GitLab