From a4c8fd6688a816db133bc8533a33b65ff636e163 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Wed, 5 Feb 2020 12:43:43 +0200
Subject: [PATCH] Helpers: fix color conversion functions and add tests.

---
 src/journal-processors.test.ts | 22 ++++++++++++++++++++++
 src/journal-processors.ts      | 28 ++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 src/journal-processors.test.ts

diff --git a/src/journal-processors.test.ts b/src/journal-processors.test.ts
new file mode 100644
index 0000000..bcbe3b4
--- /dev/null
+++ b/src/journal-processors.test.ts
@@ -0,0 +1,22 @@
+import { colorHtmlToInt, colorIntToHtml } from './journal-processors';
+
+it('Color conversion', () => {
+  const testColors = [
+    '#aaaaaaaa',
+    '#00aaaaaa',
+    '#0000aaaa',
+    '#000000aa',
+    '#00000000',
+    '#bb00bbbb',
+    '#bb0000bb',
+    '#bb000000',
+    '#11110011',
+    '#11110000',
+    '#11111100',
+  ];
+
+  for (const color of testColors) {
+    expect(color).toEqual(colorIntToHtml(colorHtmlToInt(color)));
+  }
+});
+
diff --git a/src/journal-processors.ts b/src/journal-processors.ts
index 10c7c4c..b684d2b 100644
--- a/src/journal-processors.ts
+++ b/src/journal-processors.ts
@@ -36,9 +36,11 @@ export function syncEntriesToItemMap(
   return items;
 }
 
-function colorIntToHtml(color: number) {
+export const defaultColor = '#8BC34A';
+
+export function colorIntToHtml(color?: number) {
   if (color === undefined) {
-    return '#8BC34A';
+    return defaultColor;
   }
 
   // tslint:disable:no-bitwise
@@ -53,8 +55,26 @@ function colorIntToHtml(color: number) {
     return (ret.length === 1) ? '0' + ret : ret;
   }
 
-  return '#' + toHex(red) + toHex(green) + toHex(blue) +
-    ((alpha > 0) ? toHex(alpha) : '');
+  return '#' + toHex(red) + toHex(green) + toHex(blue) + toHex(alpha);
+}
+
+export function colorHtmlToInt(color?: string) {
+  if (!color) {
+    color = defaultColor;
+  }
+
+  const match = color.match(/^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})?$/i);
+
+  if (!match) {
+    return undefined;
+  }
+
+  const r = parseInt(match[1], 16);
+  const g = parseInt(match[2], 16);
+  const b = parseInt(match[3], 16);
+  const a = (match[4]) ? parseInt(match[4], 16) : 0xFF;
+
+  return (b | (g << 8) | (r << 16) | (a << 24));
 }
 
 function syncEntriesToCalendarItemMap<T extends EventType>(