simpler color data

colors.py

@@ -1,16 +1,14 @@
-from data import colors_c2, colors_c1
+from data import colors
 from models import Person, Series
 
 campaign2 = Series.select().where(Series.title == "Campaign 2").get()
 campaign1 = Series.select().where(Series.title == "Campaign 1").get()
 
 p: Person
-for p in Person.select():
+for p in Person.select().join(Series):
-    if p.name in colors_c1.keys() and p.series == campaign1:
+    if p.series.slug in colors:
-        print(p.name)
+        series_colors = colors[p.series.slug]
-        p.color = colors_c1[p.name]
+        if p.name in series_colors.keys():
-        p.save()
+            p.color=series_colors[p.name]
-    if p.name in colors_c2.keys() and p.series == campaign2:
+            p.save()
-        print(p.name)
+
-        p.color = colors_c2[p.name]
-        p.save()

data.py

@@ -1,27 +1,29 @@
 from dataclasses import dataclass
 from typing import Optional, List
 
-colors_c1 = {
+colors = {
-    "Travis": "#7592a4",
+    "campaign1": {
-    "Marisha": "#bd6b1e",
+        "Travis": "#7592a4",
-    "Taliesin": "#3c487d",
+        "Marisha": "#bd6b1e",
-    "Ashley": "#fdd9be",
+        "Taliesin": "#3c487d",
-    "Sam": "#781485",
+        "Ashley": "#fdd9be",
-    "Liam": "#3d7580",
+        "Sam": "#781485",
-    "Laura": "#28607d",
+        "Liam": "#3d7580",
-    "Orion": "#933326"
+        "Laura": "#28607d",
-}
+        "Orion": "#933326"
+    },
+    "campaign2":{
+        "Laura": "#59c3f9",
+        "Marisha": "#00146e",
+        "Liam": "#fe8413",
+        "Taliesin": "#be1c0d",
+        "Ashley": "#868984",
+        "Sam": "#dae1dd",
+        "Travis": "#076708",
+        "Matt": "#005d73",  # random color
+        "Khary": "#bcc9e3"
+    }
 
-colors_c2 = {
-    "Laura": "#59c3f9",
-    "Marisha": "#00146e",
-    "Liam": "#fe8413",
-    "Taliesin": "#be1c0d",
-    "Ashley": "#868984",
-    "Sam": "#dae1dd",
-    "Travis": "#076708",
-    "Matt": "#005d73",  # random color
-    "Khary": "#bcc9e3"
 }
 
 single_speaker = {

tests.sql

@@ -19,9 +19,12 @@ order by len desc;
 -- delete
 -- from phrase;
 
-delete from line;
+-- delete from line;
 
-update episode set text_imported=False;
+-- update episode
+-- set text_imported= False;
+
+update person set color=null;
 
 EXPLAIN analyse
 SELECT text, sum(count) as total_count
@@ -82,4 +85,7 @@ ORDER BY rank DESC
 LIMIT 20;
 
 
-SELECT * FROM ts_stat('SELECT search_text from line') order by nentry desc limit 500;
+SELECT *
+FROM ts_stat('SELECT search_text from line')
+order by nentry desc
+limit 500;