Skip to content

Refactor backupCase to remove multithreading and implement cleanup fo… #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
legend-crypt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor backupCase to remove multithreading and implement cleanup fo… #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 13 additions & 39 deletions API/Routes/Upload/UploadRoute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,38 +180,15 @@ def updateTimeslices_OnlyTs(casename):
RYCTsPath = Path(Config.DATA_STORAGE, casename, 'RYCTs.json')
RYCTsPath.write_text(RYCTsPath.read_text().replace('Timeslice', 'TsId'))
##############################################################Multithreading example#########################3
class Download(Thread):
def __init__(self, request, zippedFile):
Thread.__init__(self)
self.request = request
self.zippedFile = zippedFile

def run(self):
print("wait few seconds for download to finish")
time.sleep(20)
#print(self.request)
#remove zipped file
os.remove(self.zippedFile)
print("Deletion of zip archive done!")


@upload_api.route('/myfunc', methods=["GET", "POST"])
def myfunc():
thread_a = Download(request.__copy__())
thread_a.start()
return "Processing in background", 200

@upload_api.route("/backupCase", methods=['GET'])
def backupCase():
try:
#case = request.form['case']
#case = request.json['casename']
try:
case = request.args.get('case')

casePath = Path('WebAPP', 'DataStorage',case)
zippedFile = Path('WebAPP', 'DataStorage', case+'.zip')

'''File system data storage'''
"""File system data storage"""
with ZipFile(zippedFile, 'w') as zipObj:
# Iterate over all the files in directory
for folderName, subfolders, filenames in os.walk(str(casePath)):
Expand All @@ -221,20 +198,17 @@ def backupCase():
#create complete filepath of file in directory
filePath = os.path.join(folderName, filename)
# Add file to zip
zipObj.write(filePath)

#osemosys 2.1 backup only input files
# for filename in os.listdir(str(casePath)):
# folderName = os.path.join(str(casePath))
# if os.path.isfile(os.path.join(folderName, filename)):
# if filename != 'data.txt':
# #create complete filepath of file in directory
# filePath = os.path.join(folderName, filename)
# # Add file to zip
# zipObj.write(filePath)

thread_a = Download(request.__copy__(), zippedFile)
thread_a.start()
zipObj.write(filePath)

# Register cleanup to run after response is sent to client
@after_this_request
def cleanup(response):
try:
if os.path.exists(zippedFile):
os.remove(zippedFile)
except OSError:
pass
return response

return send_file(zippedFile.resolve(), as_attachment=True)

Expand Down