Read scripts from script path

All of our scripts are in the same directory, so it doesn’t make much sense to expand the script paths on every single call.
Autodesk · Mar 3, 2022 · 90c31bd · 90c31bd
1 parent cd7a393
commit 90c31bd
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 21 deletions.
diff --git a/updater/reports/Report.py b/updater/reports/Report.py
@@ -67,7 +67,7 @@ def executeScript(self, script, stdin = None):
 			if not stdin:
 				try:
 					# If the script is a file, then read its content as-is into stdin
-					with open(script) as f:
+					with open(self.scriptPath(script)) as f:
 						stdin = f.read()
 				except:
 					# If the script is a list of strings, then escape the content and set it to stdin

diff --git a/updater/reports/ReportAPIRequests.py b/updater/reports/ReportAPIRequests.py
@@ -6,8 +6,7 @@ def name(self):
 		return "api-requests"
 
 	def updateDailyData(self):
-		self.detailedHeader, newData = self.parseData(
-			self.executeScript(self.scriptPath("api-requests.sh")))
+		self.detailedHeader, newData = self.parseData(self.executeScript("api-requests.sh"))
 		self.header = ["date", "API requests"]
 		self.data.append(
 			[

diff --git a/updater/reports/ReportAPIRequestsByUser.py b/updater/reports/ReportAPIRequestsByUser.py
@@ -10,5 +10,4 @@ def readData(self):
 		pass
 
 	def updateData(self):
-		self.header, self.data = self.parseData(
-			self.executeScript(self.scriptPath("api-requests-by-user.sh")))
+		self.header, self.data = self.parseData(self.executeScript("api-requests-by-user.sh"))
diff --git a/updater/reports/ReportFailedWebhooks.py b/updater/reports/ReportFailedWebhooks.py
@@ -6,8 +6,7 @@ def name(self):
 		return "failed-webhooks"
 
 	def updateDailyData(self):
-		self.detailedHeader, newData = self.parseData(
-			self.executeScript(self.scriptPath("failed-webhooks.sh")))
+		self.detailedHeader, newData = self.parseData(self.executeScript("failed-webhooks.sh"))
 		self.header = ["date", "failed webhooks"]
 		self.data.append(
 			[

diff --git a/updater/reports/ReportGitDownload.py b/updater/reports/ReportGitDownload.py
@@ -6,10 +6,8 @@ def name(self):
 		return "git-download"
 
 	def updateDailyData(self):
-		self.detailedHeader, newData = self.parseData(
-			self.executeScript(self.scriptPath("git-download.sh")))
-		_, sumLFSTraffic = self.parseData(
-			self.executeScript(self.scriptPath("git-lfs-download.sh")))
+		self.detailedHeader, newData = self.parseData(self.executeScript("git-download.sh"))
+		_, sumLFSTraffic = self.parseData(self.executeScript("git-lfs-download.sh"))
 		self.header = \
 			[
 				"date",

diff --git a/updater/reports/ReportGitProtocol.py b/updater/reports/ReportGitProtocol.py
@@ -6,8 +6,7 @@ def name(self):
 		return "git-protocol"
 
 	def updateDailyData(self):
-		_, items = self.parseData(
-			self.executeScript(self.scriptPath("git-protocol.sh")))
+		_, items = self.parseData(self.executeScript("git-protocol.sh"))
 
 		protocols = {}
 		for item in items:

diff --git a/updater/reports/ReportGitRequests.py b/updater/reports/ReportGitRequests.py
@@ -6,8 +6,7 @@ def name(self):
 		return "git-requests"
 
 	def updateDailyData(self):
-		self.detailedHeader, newData = self.parseData(
-			self.executeScript(self.scriptPath("git-requests.sh")))
+		self.detailedHeader, newData = self.parseData(self.executeScript("git-requests.sh"))
 		self.header = ["date", "Git requests"]
 		self.data.append(
 			[

diff --git a/updater/reports/ReportGitVersions.py b/updater/reports/ReportGitVersions.py
@@ -10,5 +10,4 @@ def readData(self):
 		pass
 
 	def updateData(self):
-		self.header, self.data = self.parseData(
-			self.executeScript(self.scriptPath("git-versions.sh")))
+		self.header, self.data = self.parseData(self.executeScript("git-versions.sh"))
diff --git a/updater/reports/ReportGitVersionsNew.py b/updater/reports/ReportGitVersionsNew.py
@@ -6,8 +6,7 @@ def name(self):
 		return "git-versions-new"
 
 	def updateDailyData(self):
-		newHeader, newData = self.parseData(
-			self.executeScript(self.scriptPath("git-versions.sh")))
+		newHeader, newData = self.parseData(self.executeScript("git-versions.sh"))
 
 		self.header = ["date"] + newHeader
 

diff --git a/updater/reports/ReportTokenlessAuth.py b/updater/reports/ReportTokenlessAuth.py
@@ -6,8 +6,7 @@ def name(self):
 		return "tokenless-authentication"
 
 	def updateDailyData(self):
-		self.detailedHeader, newData = self.parseData(
-			self.executeScript(self.scriptPath("tokenless-auth.sh")))
+		self.detailedHeader, newData = self.parseData(self.executeScript("tokenless-auth.sh"))
 		self.header = ["date", "tokenless authentications"]
 		self.data.append(
 			[