master updates #41

Manually merged
alex_orid merged 177 commits from master into github-master 2021-05-13 21:11:10 +00:00
2 changed files with 102 additions and 2 deletions
Showing only changes of commit 5be420a2d1 - Show all commits

View File

@ -24,8 +24,8 @@ class Command_chyron_v2(AbstractCommand, metaclass=ABCMeta):
def __init__(self):
super().__init__(Command_chyron_v2.command, n_args=1, command_type=AbstractCommand.CommandType.Ver2)
self.help = ["This command allows you to modify the lights via the Lights_Module.",
"\nExample:","lights \"SCENE\"","lights \"COLOR\"","lights \"R\" \"G\" \"B\"","lights \"1\" \"0.5\" \"0\""]
self.help = ["The chyron string can be generated and updated with this command.",
"\nExample:","chyron update \"RIGHTNOW\""]
self.isCommandEnabled = True
def do_command(self, source = AbstractCommand.CommandSource.default, user = "User", command = "", rest = "", bonusData = None):

View File

@ -0,0 +1,100 @@
from abc import ABCMeta
from commands.command_base import AbstractCommand
from json import loads
from urllib.parse import urlencode
import requests
import config
import tempText_Module
import os
import praxis_logging
praxis_logger_obj = praxis_logging.praxis_logger()
praxis_logger_obj.init(os.path.basename(__file__))
praxis_logger_obj.log("\n -Starting Logs: " + os.path.basename(__file__))
class Command_Text_v2(AbstractCommand, metaclass=ABCMeta):
"""
this is the text command.
"""
command = "!text"
def __init__(self):
super().__init__(Command_Text_v2.command, n_args=1, command_type=AbstractCommand.CommandType.Ver2)
self.help = ["The temptext string can be generated and updated with this command.",
"\nExample:","temptext update \"Name\" \"Title\" \"Content\""]
self.isCommandEnabled = True
def do_command(self, source = AbstractCommand.CommandSource.default, user = "User", command = "", rest = "", bonusData = None):
returnString = "trying to update text..."
praxis_logger_obj.log("\n Command>: " + command + " " + rest)
for name in config.adminUsers_List:
print(name)
tempName = user.lower()
if name == tempName:
#try:
# returnString = user + " has updated the text!"
# tempText_ = tempText_Module.tempText_Module()
# tempText_.main()
# testItem = tempText_Module.tempTextItem("testy","► ", rest)
# tempText_.makeItem(testItem)
# tempText_.update_tempTextFiles()
#except:
# returnString = user + " has attempted to update the text but an error may have occurred!"
#returnString = chyron_.chyron_computedString
bandaid_string:str = command + " " + rest
tempParsedMessage = bandaid_string.split(" ")
i = len(tempParsedMessage)
if i > 2:
if "update" in tempParsedMessage[1]:
tempTextModule:tempText_Module.tempText_Module = tempText_Module.tempText_Module()
tempText:tempText_Module.tempTextItem = tempText_Module.tempTextItem()
if i > 2:
newText = ""
counter = 0
for word in tempParsedMessage:
if counter > 2:
newText = newText + word + " "
counter = counter + 1
newText = newText[:-1] # Gets rid of last space
#print(tempParsedMessage[2], newText)
tempText.itemName = tempParsedMessage[2]
tempText.itemContent = newText
tempTextModule.makeItem(tempText)
else:
returnString = user + " has attempted to update the text but an error may have occurred!"
#tempTextModule.update_tempTextFiles()
returnMessage = user + " has updated the text!"
returnString = returnMessage
return returnString
def send_Lights_Command(self, username, light_group, command, rest):
# todo need to url-escape command and rest
params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest})
#standalone_lights
url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params
resp = requests.get(url)
if resp.status_code == 200:
print("Got the following message: %s" % resp.text)
data = loads(resp.text)
msg = data['message']
if msg is not None:
return msg
# todo send to logger and other relevent services
else:
# todo handle failed requests
return None
def get_help(self):
return self.help