Fixed Utilities and Value Rescaling

This commit is contained in:
Alex Orid 2021-04-07 18:22:32 -04:00
parent 5ab2abc242
commit 84b36622b3
2 changed files with 35 additions and 5 deletions

View File

@ -3,6 +3,7 @@ import phue
from phue import Bridge
import random
import utilities_script as utilities
import credentials
import config
@ -106,6 +107,7 @@ class Lights_Module():
return [x, y]
def color_string_parser(self, message):
maxDigits = 4
print("trying to find color")
xy_color = [0, 0]
for text in message:
@ -120,6 +122,31 @@ class Lights_Module():
print("found: green")
xy_color = self.rgb_to_xy(0,1,0)
if "cyan" in text.lower():
print("found: cyan")
xy_color = self.rgb_to_xy(0,1,1)
if "aquamarine" in text.lower():
print("found: aquamarine")
xy_color = self.rgb_to_xy(
round(utilities.rescale_value(111,0,254),maxDigits),
round(utilities.rescale_value(218,0,254),maxDigits),
round(utilities.rescale_value(146,0,254),maxDigits))
if "turquoise" in text.lower():
print("found: turquoise")
xy_color = self.rgb_to_xy(
round(utilities.rescale_value(172,0,254),maxDigits),
round(utilities.rescale_value(233,0,254),maxDigits),
round(utilities.rescale_value(232,0,254),maxDigits))
if "orange" in text.lower():
print("found: orange")
xy_color = self.rgb_to_xy(
1,
round(utilities.rescale_value(126,0,254),maxDigits),
0)
return xy_color

View File

@ -13,14 +13,14 @@ clearScreen = lambda: os.system('cls' if os.name == 'nt' else 'clear')
urlMatcher = re.compile("(https?:(/{1,3}|[a-z0-9%])|[a-z0-9.-]+[.](com|net|org|edu|gov|mil|aero|asia|biz|cat|coop|info|int|jobs|mobi|museum|name|post|pro|tel|travel|xxx|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|dd|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|Ja|sk|sl|sm|sn|so|sr|ss|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw))")
def contains_url(self, input: str):
def contains_url(input: str):
containsURL = re.search(urlMatcher, input.lower()) is not None
return containsURL
def get_args(text: str) -> list:
return text.split(" ")
def does_contain_OnlyNumbers(self, text):
def does_contain_OnlyNumbers(text):
isJustNumbers = False
print("checking numbers")
try:
@ -34,10 +34,13 @@ def does_contain_OnlyNumbers(self, text):
return isJustNumbers
def rescale_value(self, value, min, max):
return (value - min) / (max - min)
def rescale_value(value, min, max):
print("trying Rescale")
returnValue = (value - min) / (max - min)
print("got ", returnValue)
return returnValue
def contains_slur(self, input: str):
def contains_slur(input: str):
containsSlur: bool = False
parsedMessage = input.split(" ")
for word in parsedMessage: