steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Refactor `random_colors` as a utility

This commit is contained in:
Christopher C. Wells 2022-05-25 21:03:12 -07:00 committed by Christopher Charbonneau Wells
parent 00d04f1464
commit 55a355f8af
2 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
core/models.py
View File

@ -1,5 +1,4 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import random
import re import re
from datetime import timedelta from datetime import timedelta
@ -14,7 +13,7 @@ from django.utils.translation import gettext_lazy as _
from taggit.managers import TaggableManager as TaggitTaggableManager from taggit.managers import TaggableManager as TaggitTaggableManager
from taggit.models import GenericTaggedItemBase, TagBase from taggit.models import GenericTaggedItemBase, TagBase
random.seed() from core.utils import random_color
def validate_date(date, field_name): def validate_date(date, field_name):
@ -77,34 +76,9 @@ def validate_time(time, field_name):
) )
def random_color():
TAG_COLORS = [
"#ff0000",
"#00ff00",
"#0000ff",
"#ff00ff",
"#ffff00",
"#00ffff",
"#ff7f7f",
"#7fff7f",
"#7f7fff",
"#ff7fff",
"#ffff7f",
"#7fffff",
"#7f0000",
"#007f00",
"#00007f",
"#7f007f",
"#7f7f00",
"#007f7f",
]
return TAG_COLORS[random.randrange(0, len(TAG_COLORS))]
class Tag(TagBase): class Tag(TagBase):
class Meta: DARK_COLOR = "#101010"
verbose_name = _("Tag") LIGHT_COLOR = "#EFEFEF"
verbose_name_plural = _("Tags")
color = models.CharField( color = models.CharField(
verbose_name=_("Color"), verbose_name=_("Color"),
@ -112,25 +86,27 @@ class Tag(TagBase):
default=random_color, default=random_color,
validators=[RegexValidator(r"^#[0-9a-fA-F]{6}$")], validators=[RegexValidator(r"^#[0-9a-fA-F]{6}$")],
) )
last_used = models.DateTimeField( last_used = models.DateTimeField(
verbose_name=_("Last used"), verbose_name=_("Last used"),
default=timezone.now, default=timezone.now,
blank=False, blank=False,
) )
class Meta:
verbose_name = _("Tag")
verbose_name_plural = _("Tags")
@property @property
def complementary_color(self): def complementary_color(self):
DARK, LIGHT = "#101010", "#EFEFEF"
if not self.color: if not self.color:
return DARK return self.DARK_COLOR
r, g, b = [int(x, 16) for x in re.match("#(..)(..)(..)", self.color).groups()] r, g, b = [int(x, 16) for x in re.match("#(..)(..)(..)", self.color).groups()]
yiq = ((r * 299) + (g * 587) + (b * 114)) // 1000 yiq = ((r * 299) + (g * 587) + (b * 114)) // 1000
if yiq >= 128: if yiq >= 128:
return DARK return self.DARK_COLOR
else: else:
return LIGHT return self.LIGHT_COLOR
class Tagged(GenericTaggedItemBase): class Tagged(GenericTaggedItemBase):

29
core/utils.py
View File

@ -1,7 +1,32 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import random
from django.utils import timezone from django.utils import timezone
from django.utils.translation import ngettext from django.utils.translation import ngettext
random.seed()
COLORS = [
"#ff0000",
"#00ff00",
"#0000ff",
"#ff00ff",
"#ffff00",
"#00ffff",
"#ff7f7f",
"#7fff7f",
"#7f7fff",
"#ff7fff",
"#ffff7f",
"#7fffff",
"#7f0000",
"#007f00",
"#00007f",
"#7f007f",
"#7f7f00",
"#007f7f",
]
def duration_string(duration, precision="s"): def duration_string(duration, precision="s"):
"""Format hours, minutes and seconds as a human-friendly string (e.g. "2 """Format hours, minutes and seconds as a human-friendly string (e.g. "2
@ -37,3 +62,7 @@ def duration_parts(duration):
h += duration.days * 24 h += duration.days * 24
m, s = divmod(remainder, 60) m, s = divmod(remainder, 60)
return h, m, s return h, m, s
def random_color():
return COLORS[random.randrange(0, len(COLORS))]