BiztProtoBois/server
3
0
Fork 0
Code Pull Requests Releases Activity

finish netwrapper of server and executor improvements
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Torma Kristóf
2021-04-25 00:42:36 +02:00
parent 90396c2826
commit a5b77d0306
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/executor.py
View File

@@ -29,7 +29,8 @@ class Executor:
def removeDirectory(self, dirName: str) -> str:
dirName = self.sanitizeDirectory(dirName)
actualDirName = os.path.join(self.currentDirectory, dirName)
os.rmdir(actualDirName)
if actualDirName:
os.rmdir(actualDirName)
return actualDirName
def getCurrentDirectory(self) -> str:
@@ -40,16 +41,19 @@ class Executor:
if self.currentDirectory == self.baseDir:
return self.currentDirectory
else:
directories = self.currentDirectory.split("/")
directories = self.currentDirectory.split(os.path.sep)
strdirectory = ""
for dir in directories:
strdirectory += dir + "/"
strdirectory += dir + os.path.sep
strdirectory = strdirectory[:-3]
self.currentDirectory = strdirectory
if os.path.exists(strdirectory):
self.currentDirectory = strdirectory
return self.currentDirectory
else:
dirName = self.sanitizeDirectory(dirName)
self.currentDirectory = os.path.join(self.currentDirectory, dirName)
joinedDir = os.path.join(self.currentDirectory, dirName)
if os.path.exists(joinedDir):
self.currentDirectory = joinedDir
return self.currentDirectory
def listCurrentDirectoryContent(self) -> str:
@@ -71,10 +75,14 @@ class Executor:
def getFileInCurrentDirectory(self, file: str):
file = self.sanitizeFile(file)
currentfile = os.path.join(self.currentDirectory, file)
return open(currentfile, "r")
if os.path.exists(currentfile):
return open(currentfile, "r")
else:
raise Exception('File not found')
def removeFileInCurrentDirectory(self, file: str) -> str:
file = self.sanitizeFile(file)
currentfile = os.path.join(self.currentDirectory, file)
os.remove(currentfile)
if os.path.exists(currentfile):
os.remove(currentfile)
return currentfile