From 66b4e82d4c63afd6a60869b430a15b32b2e78a56 Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Wed, 15 Apr 2020 23:52:42 +0200
Subject: [PATCH] Fix Cabinet day variant

---
 src/modules/Variants.js | 8 ++++++--
 tests/Cabinet.js        | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/modules/Variants.js b/src/modules/Variants.js
index 05539c1..0668527 100644
--- a/src/modules/Variants.js
+++ b/src/modules/Variants.js
@@ -52,10 +52,14 @@ var Variants = class {
 			variants.set('day', name.replace('-Nokto', ''));
 			variants.set('night', variants.get('day').replace('Adapta', 'Adapta-Nokto'));
 		}
-		else if ( name.match(/^(Arc|Cabinet)/) ) {
+		else if ( name.match('Arc') ) {
 			const basename = name.split('-')[0];
 			variants.set('day', name.replace(/-Dark(?!er)/, ''));
-			variants.set('night', variants.get('day').replace(new RegExp(`${basename}(-Darker)?`), `${basename}-Dark`));
+			variants.set('night', variants.get('day').replace(/Arc(-Darker)?/, 'Arc-Dark'));
+		}
+		else if ( name.match('Cabinet') ) {
+			variants.set('day', name.replace(/-Dark(?!er)/, '-Light'));
+			variants.set('night', variants.get('day').replace(/(-Light|-Darker)/, '-Dark'))
 		}
 		else if ( name.match(/^(Canta|ChromeOS|Materia|Orchis).*-compact/) ) {
 			variants.set('day', name.replace('-dark', ''));
diff --git a/tests/Cabinet.js b/tests/Cabinet.js
index 337bfa3..015423e 100644
--- a/tests/Cabinet.js
+++ b/tests/Cabinet.js
@@ -22,14 +22,14 @@ const { Variants } = require('./_variants');
 
 ['Blue', 'Green', 'Orange'].forEach(color => {
 	test(`Cabinet-${color}`, t => {
-		const variants = Variants.guess_from(`Cabinet-${color}`);
-		t.is(variants.get('day'), `Cabinet-${color}`);
+		const variants = Variants.guess_from(`Cabinet-Light-${color}`);
+		t.is(variants.get('day'), `Cabinet-Light-${color}`);
 		t.is(variants.get('night'), `Cabinet-Dark-${color}`);
 	});
 
 	test(`Cabinet-Dark-${color}`, t => {
 		const variants = Variants.guess_from(`Cabinet-Dark-${color}`);
-		t.is(variants.get('day'), `Cabinet-${color}`);
+		t.is(variants.get('day'), `Cabinet-Light-${color}`);
 		t.is(variants.get('night'), `Cabinet-Dark-${color}`);
 	});