From be6f907698db193f09108978e93f601b6f09310d Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Sat, 23 Oct 2021 00:27:22 +0200 Subject: [PATCH] asd --- api/views.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/views.py b/api/views.py index 068105e..92d50b7 100644 --- a/api/views.py +++ b/api/views.py @@ -322,11 +322,11 @@ def NCAddFiles(request): # Dirs needed for the File for d in datadir_parent_dirnames: new_folder = d_prestring + "/" +d - r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_" + str(agency.pk)+ '/' + new_folder, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdadjangoapi_8fjz47epc6/Agenturdaten_" + str(agency.pk)+ '/' + new_folder, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) d_prestring += "/" + d # Uplod the file! - final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_"+ str(agency.pk) + "/" + d_prestring + "/" + file_to_load.name + final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdadjangoapi_8fjz47epc6/Agenturdaten_"+ str(agency.pk) + "/" + d_prestring + "/" + file_to_load.name with open(file_to_load.file.path, 'rb') as f: r = requests.put(final_file_path, data=f, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) if(len(r.text) == 0): @@ -346,7 +346,7 @@ def NCAddStandardFiles(request): file_to_load = DataFile.objects.get(pk=request.GET.get('fileid')) # Uplod the file! - final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_"+ str(agency.pk) + "/Standards Uploadbereich/" + file_to_load.name + final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdadjangoapi_8fjz47epc6/Agenturdaten_"+ str(agency.pk) + "/Standards Uploadbereich/" + file_to_load.name with open(file_to_load.file.path, 'rb') as f: r = requests.put(final_file_path, data=f, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) @@ -373,7 +373,7 @@ def NCAddDirs(request): sharestring += cd.agencygroupname + " (" + cd.nc_name + ")" # Dir has no parent, create if(len(dir_to_create.parent.name) == 0): - r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_" + str(agency.pk)+ '/' + dir_to_create.name, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdadjangoapi_8fjz47epc6/Agenturdaten_" + str(agency.pk)+ '/' + dir_to_create.name, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) return JsonResponse({'status' : True, 'message': 'Ordner ' + dir_to_create.name + ' angelegt. ' + sharestring + " RESP: " + r.text}) # Dir has parents, start thinking :) else: @@ -393,12 +393,12 @@ def NCAddDirs(request): d_prestring = "" for d in datadir_parent_dirnames: new_folder = d_prestring + "/" +d - r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_" + str(agency.pk)+ '/' + new_folder, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdadjangoapi_8fjz47epc6/Agenturdaten_" + str(agency.pk)+ '/' + new_folder, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) d_prestring += "/" + d - r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_" + str(agency.pk)+ d_prestring + "/" + dir_to_create.name, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdadjangoapi_8fjz47epc6/Agenturdaten_" + str(agency.pk)+ d_prestring + "/" + dir_to_create.name, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) - return JsonResponse({'status' : True, 'message': 'Ordner ' + dir_to_create.name + ' angelegt.' + sharestring + " RESP: " + r.text + " " + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_" + str(agency.pk) + d_prestring + "/" + dir_to_create.name}) + return JsonResponse({'status' : True, 'message': 'Ordner ' + dir_to_create.name + ' angelegt.' + sharestring + " RESP: " + r.text + " " + "remote.php/dav/files/vhdadjangoapi_8fjz47epc6/Agenturdaten_" + str(agency.pk) + d_prestring + "/" + dir_to_create.name}) return JsonResponse({'status' : False, 'message': 'AUTH ERROR'})