From 2457cccb06e7c70b214d56eea5e963f675ed3ccb Mon Sep 17 00:00:00 2001
From: Lonami Exo <totufals@hotmail.com>
Date: Mon, 10 Apr 2017 10:25:15 +0200
Subject: [PATCH] Fix generate_theme.py not finding the fill color

---
 themes/generate_theme.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/themes/generate_theme.py b/themes/generate_theme.py
index 233513a..31fab81 100755
--- a/themes/generate_theme.py
+++ b/themes/generate_theme.py
@@ -5,8 +5,11 @@ import re
 import os
 import subprocess
 
-color_re = \
-    re.compile('<g\s+id="export_(\w+)"\s+style=".*?fill:#([0-9a-f]+)[\S\s]*?')
+group_id_re = \
+    re.compile('<g[\S\s]+?id="export_(\w+)"[\S\s]+?>')
+
+fill_re = \
+    re.compile('fill:#([0-9a-f]+)')
 
 template = '''{{
     "name": "{name}",
@@ -90,9 +93,14 @@ def work(filename):
         xml = f.read().replace('\n', '')
 
     replacements = {}
-    for m in color_re.finditer(xml):
+    for m in group_id_re.finditer(xml):
+        f = fill_re.search(m.group(0))
+        if not f:
+            raise ValueError(
+                'Error: The object %s missing the fill attribute' % m.group(1))
+
         # Append 'ff' because the themes require the alpha to be set
-        replacements[m.group(1)] = m.group(2)+'ff'
+        replacements[m.group(1)] = f.group(1) + 'ff'
 
     replacements['name'] = input('Enter theme name for "{}": '.format(name))
     replacements['price'] = input('Enter theme price: ')