Skip to content
This repository was archived by the owner on Jan 9, 2023. It is now read-only.

Commit f303f6a

Browse files
muppet9010muppet9010
committed
change all object attributes to be lower case
1 parent 33ee914 commit f303f6a

File tree

10 files changed

+161
-161
lines changed

10 files changed

+161
-161
lines changed

‎Source/Config.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class Config():
66
def __init__(self, state):
7-
self.State = state
7+
self.state = state
88
self.fileName = "config.json"
99
self.settings = {}
1010
if Os.path.isfile(self.fileName):
@@ -34,7 +34,7 @@ def _PopulateMissingConfigDefaults(self):
3434

3535
def LogMissingSettings(self):
3636
for name in self.settingsMissing:
37-
self.State.Logging.Log(
37+
self.state.logging.Log(
3838
"Config key missing, using default: " + name)
3939

4040
def GetSetting(self, name):

‎Source/Currency.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66

77
class Currency():
88
def __init__(self, state):
9-
self.Logging = state.Logging
10-
self.State = state
9+
self.logging = state.logging
10+
self.state = state
1111
self.rates = {}
1212
self.cacheFileName = "currency data cache.json"
1313

1414
def GetRates(self):
1515
if len(self.rates) > 0:
1616
return True
1717
if Os.path.isfile(self.cacheFileName):
18-
self.Logging.DebugLog(
18+
self.logging.DebugLog(
1919
"Trying to get currancy rates from cache file")
2020
with open(self.cacheFileName, "r") as file:
2121
data = Json.load(file)
@@ -28,29 +28,29 @@ def GetRates(self):
2828
currency = name[3:]
2929
self.rates[currency] = rate
3030
if len(self.rates) > 0:
31-
self.Logging.DebugLog(
31+
self.logging.DebugLog(
3232
"Got currency rates from cache file")
3333
return True
3434

3535
self._SourceRateData()
3636
if len(self.rates) > 0:
37-
self.Logging.DebugLog("Got currency rates from website")
37+
self.logging.DebugLog("Got currency rates from website")
3838
return True
3939
else:
40-
self.Logging.DebugLog(
40+
self.logging.DebugLog(
4141
"Failed to get any currency rates from website")
4242
return False
4343

4444
def _SourceRateData(self):
45-
self.Logging.DebugLog("Sourcing currency rates from website")
45+
self.logging.DebugLog("Sourcing currency rates from website")
4646
url = "http://www.apilayer.net/api/live"
47-
params = {"access_key": self.State.Config.GetSetting(
47+
params = {"access_key": self.state.config.GetSetting(
4848
"Currency ApiLayerAccessKey")}
4949
request = Requests.get(url=url, params=params)
5050
response = request.json()
5151
if not response["success"]:
52-
self.State.RecordActivity(
53-
self.State.Translations.currentTexts["Currency WebsiteDownloadFailed"])
52+
self.state.RecordActivity(
53+
self.state.translations.currentTexts["Currency WebsiteDownloadFailed"])
5454
return False
5555
with open(self.cacheFileName, "w") as file:
5656
file.write(Json.dumps(response))

‎Source/Gui.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,72 +7,72 @@ def __init__(self, state):
77
root.minsize(500, 200)
88
root.geometry("1000x400")
99
root.protocol("WM_DELETE_WINDOW", state.OnQuitButtonHandler)
10-
self.State = state
11-
self.Gui = Gui(state, master=root)
10+
self.state = state
11+
self.gui = Gui(state, master=root)
1212

1313

1414
class Gui(TK.Frame):
1515
def __init__(self, state, master=None):
1616
super().__init__(master)
17-
self.master = master
17+
self.master=master
1818
self.pack()
19-
self.State = state
20-
self.Translations = state.Translations
19+
self.state=state
20+
self.translations=state.translations
2121

2222
def CreateWidgets(self):
2323
self._CreateRunningBar(self.master)
2424
self._CreateActivityLog(self.master)
2525
# self._CreateBottomBar(self.master) # Don't bother with for just a quit button
2626

2727
def _CreateRunningBar(self, parent):
28-
runningContainer = TK.Frame(parent)
28+
runningContainer=TK.Frame(parent)
2929
runningContainer.pack(fill=TK.X, side=TK.TOP)
3030

31-
self.statusText = TK.StringVar()
32-
self.State.UpdateStatus()
33-
statusLabel = TK.Label(
31+
self.statusText=TK.StringVar()
32+
self.state.UpdateStatus()
33+
statusLabel=TK.Label(
3434
runningContainer, textvariable=self.statusText, height=1, width=30)
3535
statusLabel.pack(side=TK.LEFT)
3636

37-
self.selectedProfileName = TK.StringVar()
38-
self.sortedProfileNames = sorted(list(
39-
self.State.Profiles.profiles.keys()))
40-
configProfileDefault = self.State.Config.GetSetting("Profile Default")
37+
self.selectedProfileName=TK.StringVar()
38+
self.sortedProfileNames=sorted(list(
39+
self.state.profiles.profiles.keys()))
40+
configProfileDefault=self.state.config.GetSetting("Profile Default")
4141
if configProfileDefault != "" and configProfileDefault in self.sortedProfileNames:
4242
self.selectedProfileName.set(configProfileDefault)
4343
else:
4444
self.selectedProfileName.set(
45-
self.Translations.currentTexts["Gui SelectProfile"])
46-
self.profileList = TK.OptionMenu(
45+
self.translations.currentTexts["Gui SelectProfile"])
46+
self.profileList=TK.OptionMenu(
4747
runningContainer, self.selectedProfileName, *self.sortedProfileNames)
4848
self.profileList.pack(side=TK.LEFT)
4949

50-
self.startButton = TK.Button(runningContainer,
51-
text=self.Translations.currentTexts["Gui StartButton"], command=self.State.OnStartButtonHandler)
50+
self.startButton=TK.Button(runningContainer,
51+
text=self.translations.currentTexts["Gui StartButton"], command=self.state.OnStartButtonHandler)
5252
self.startButton.pack(side=TK.LEFT)
5353

54-
self.stopButton = TK.Button(
55-
runningContainer, text=self.Translations.currentTexts["Gui StopButton"], command=self.State.OnStopButtonHandler)
54+
self.stopButton=TK.Button(
55+
runningContainer, text=self.translations.currentTexts["Gui StopButton"], command=self.state.OnStopButtonHandler)
5656
self.stopButton.pack(side=TK.LEFT)
5757

5858
self.OnStopped()
5959

6060
def _CreateActivityLog(self, parent):
61-
titleFrame = TK.LabelFrame(
62-
parent, text=self.Translations.currentTexts["Gui ActivityLogTitle"])
61+
titleFrame=TK.LabelFrame(
62+
parent, text=self.translations.currentTexts["Gui ActivityLogTitle"])
6363
titleFrame.pack(fill=TK.BOTH, expand=True, side=TK.TOP, padx=3, pady=3)
64-
yScroll = TK.Scrollbar(titleFrame, orient=TK.VERTICAL)
64+
yScroll=TK.Scrollbar(titleFrame, orient=TK.VERTICAL)
6565
yScroll.pack(fill=TK.Y, expand=False, side=TK.RIGHT)
66-
self.activityLogText = TK.Text(
66+
self.activityLogText=TK.Text(
6767
titleFrame, height=5, wrap=TK.WORD, yscrollcommand=yScroll.set, state=TK.DISABLED)
6868
self.activityLogText.pack(fill=TK.BOTH, expand=True, side=TK.LEFT)
6969

7070
def _CreateBottomBar(self, parent):
71-
self.bottomBarContainer = TK.Frame(parent)
71+
self.bottomBarContainer=TK.Frame(parent)
7272
self.bottomBarContainer.pack(fill=TK.X, side=TK.TOP)
7373

74-
quitButton = TK.Button(self.bottomBarContainer, text=self.Translations.currentTexts["Gui QuitButton"], fg="red",
75-
command=self.State.OnQuitButtonHandler)
74+
quitButton=TK.Button(self.bottomBarContainer, text=self.translations.currentTexts["Gui QuitButton"], fg="red",
75+
command=self.state.OnQuitButtonHandler)
7676
quitButton.pack(side=TK.LEFT)
7777

7878
def UpdateStatusText(self, text):
@@ -81,7 +81,7 @@ def UpdateStatusText(self, text):
8181
def AddToActivityLog(self, text):
8282
self.activityLogText.configure(state=TK.NORMAL)
8383
self.activityLogText.insert(
84-
1.0, self.State.Logging.TimestampText(text) + "\n")
84+
1.0, self.state.logging.TimestampText(text) + "\n")
8585
self.activityLogText.configure(state=TK.DISABLED)
8686

8787
def OnStarted(self):

‎Source/Logging.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55

66
class Logging():
77
def __init__(self, state):
8-
self.State = state
8+
self.state = state
99
dateFormat = "%Y_%m_%d %H_%M_%S"
1010
currentDT = Datetime.datetime.now()
1111
dtString = currentDT.strftime(dateFormat)
1212
logFolder = "Logs"
1313
if Os.path.isdir(logFolder):
1414
self._TidyUpOldLogFiles(
15-
logFolder, currentDT, state.Config.GetSetting("Logging DaysLogsToKeep"), dateFormat)
15+
logFolder, currentDT, state.config.GetSetting("Logging DaysLogsToKeep"), dateFormat)
1616
else:
1717
Os.mkdir(logFolder)
1818
logFileName = "Log " + dtString + ".log"
1919
self.logFilePath = logFolder + "/" + logFileName
2020
self.debugLogFilePath = logFolder + "/Debug" + logFileName
21-
self.debugLogging = state.Config.GetSetting("Logging DebugLogging")
21+
self.debugLogging = state.config.GetSetting("Logging DebugLogging")
2222

2323
def _TidyUpOldLogFiles(self, logFolder, currentDT, daysLogsToKeep, dateFormat):
2424
for name in Os.listdir(logFolder):
@@ -57,7 +57,7 @@ def RecordException(self, ex, description):
5757
text = description + " - See logs for full details"
5858
stackTrace = Traceback.format_exc()
5959
try:
60-
self.State.RecordActivity(text)
60+
self.state.RecordActivity(text)
6161
except:
6262
pass
6363
try:

‎Source/Profiles.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
class Profiles:
77
def __init__(self, state):
8-
self.State = state
8+
self.state = state
99
self.profileFolder = "Profiles"
1010
self.profiles = {}
1111
self.currentProfile = None
@@ -55,7 +55,7 @@ def GetActionTextForEvent(self, event):
5555

5656
class Reaction:
5757
def __init__(self, reactionData, profile):
58-
self.Logging = profile.profiles.State.Logging
58+
self.logging = profile.profiles.state.logging
5959
self.profile = profile
6060
self.platform = ""
6161
self.type = ""
@@ -67,12 +67,12 @@ def __init__(self, reactionData, profile):
6767
self.handlerName = StreamlabsEvent.MakeHandlerString(
6868
self.platform, self.type)
6969
if self.handlerName not in StreamlabsEvent.handledEventTypes.keys():
70-
self.Logging.LogQuit(
70+
self.logging.LogQuit(
7171
"invalid event handler type: " + self.handlerName)
7272
else:
7373
self.valueType = reactionData["valueType"]
7474
if self.valueType not in ["money", "follow", "viewer"]:
75-
self.Logging.LogQuit("invalid valueType: " + self.valueType)
75+
self.logging.LogQuit("invalid valueType: " + self.valueType)
7676
self.filterActionPriorities = {1: [], 2: []}
7777
for filteredActionData in reactionData["filteredActions"]:
7878
filteredAction = FilteredAction(filteredActionData, self)
@@ -100,31 +100,31 @@ def GetPrintHandlerType(self):
100100
class FilteredAction:
101101
def __init__(self, filteredActionData, reaction):
102102
self.reaction = reaction
103-
self.Logging = self.reaction.profile.profiles.State.Logging
103+
self.logging = self.reaction.profile.profiles.state.logging
104104

105105
self.condition = filteredActionData["condition"]
106106
if self.condition == "":
107-
self.Logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
107+
self.logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
108108
"' condition can not be blank")
109109
eventAttributeCheckResult = StreamlabsEvent.IsBadEventAttritubeUsed(
110110
self.reaction.handlerName, self.condition, False)
111111
if eventAttributeCheckResult != "":
112-
self.Logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
112+
self.logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
113113
"' condition error: " + eventAttributeCheckResult)
114114
scriptParseCheck = StreamlabsEvent.IsScriptValid(self.condition)
115115
if scriptParseCheck != "":
116-
self.Logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
116+
self.logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
117117
"' has an invalid condition script:\n" + scriptParseCheck)
118118

119119
self.manipulator = filteredActionData["manipulator"]
120120
eventAttributeCheckResult = StreamlabsEvent.IsBadEventAttritubeUsed(
121121
self.reaction.handlerName, self.manipulator, False)
122122
if eventAttributeCheckResult != "":
123-
self.Logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
123+
self.logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
124124
"' manipulator error: " + eventAttributeCheckResult)
125125
scriptParseCheck = StreamlabsEvent.IsScriptValid(self.manipulator)
126126
if scriptParseCheck != "":
127-
self.Logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
127+
self.logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
128128
"' has an invalid manipulator script:\n" + scriptParseCheck)
129129

130130
self.actionText = ""
@@ -137,20 +137,20 @@ def __init__(self, filteredActionData, reaction):
137137
eventAttributeCheckResult = StreamlabsEvent.IsBadEventAttritubeUsed(
138138
self.reaction.handlerName, self.action.effect, True)
139139
if eventAttributeCheckResult != "":
140-
self.Logging.LogQuit("'" + self.reaction.GetPrintHandlerType() + "' referenced action " +
140+
self.logging.LogQuit("'" + self.reaction.GetPrintHandlerType() + "' referenced action " +
141141
actionName + " which has action text error: " + eventAttributeCheckResult)
142142
else:
143-
self.Logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
143+
self.logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
144144
"' referenced non-existent action : " + actionName)
145145
else:
146146
self.actionText = action
147147
if self.actionText == "":
148-
self.Logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
148+
self.logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
149149
"' action can not be blank")
150150
eventAttributeCheckResult = StreamlabsEvent.IsBadEventAttritubeUsed(
151151
self.reaction.handlerName, self.actionText, True)
152152
if eventAttributeCheckResult != "":
153-
self.Logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
153+
self.logging.LogQuit("'" + self.reaction.GetPrintHandlerType() +
154154
"' action text error: " + eventAttributeCheckResult)
155155

156156
def DoesEventTriggerAction(self, event):

‎Source/Rcon.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33

44
class Rcon:
55
def __init__(self, state):
6-
self.State = state
7-
self.serverAddress = self.State.Config.GetSetting(
6+
self.state = state
7+
self.serverAddress = self.state.config.GetSetting(
88
"Rcon Server Address")
9-
self.serverPort = self.State.Config.GetSetting("Rcon Server Port")
10-
self.serverPassword = self.State.Config.GetSetting(
9+
self.serverPort = self.state.config.GetSetting("Rcon Server Port")
10+
self.serverPassword = self.state.config.GetSetting(
1111
"Rcon Server Password")
1212

1313
def TestConnection(self):
1414
try:
1515
self.SendCommand('/version')
1616
return True
1717
except Exception as ex:
18-
self.State.Logging.RecordException(ex, "Rcon server test failed")
19-
self.State.RecordActivity(str(ex))
18+
self.state.logging.RecordException(ex, "Rcon server test failed")
19+
self.state.RecordActivity(str(ex))
2020
return False
2121

2222
def SendCommand(self, commandString):

0 commit comments

Comments
 (0)