diff --git a/django_code/stash_management/apps.py b/django_code/stash_management/apps.py index 5f251ba..215abbb 100644 --- a/django_code/stash_management/apps.py +++ b/django_code/stash_management/apps.py @@ -12,8 +12,9 @@ import random import mimetypes import ruamel.yaml import yaml -import urllib.request +from urllib import request as urlrequest +proxy_host = "gluetun-svc.gluetun.svc:8888" def hello(request): @@ -54,6 +55,7 @@ def fapello_form(request): # text_generated = "\n downloading for "+name+" "+url+increment_generated+url_suffix text_generated = "successfully sent to celery" return HttpResponse(text_generated, content_type="text/plain") + @shared_task() def increment_and_download(minimum_increment,maximum_increment,url,url_suffix,stash_folder,name): if minimum_increment == None: @@ -69,8 +71,9 @@ def increment_and_download(minimum_increment,maximum_increment,url,url_suffix,st elif len(str(increment)) == 1: increment_generated ='000' + str(increment) - - urllib.request.urlretrieve(url+increment_generated+url_suffix, stash_folder+"/"+increment_generated+url_suffix,proxyDict) + req = urlrequest.Request(url+increment_generated+url_suffix) + req.set_proxy(proxy_host, 'https') + urlrequest.urlretrieve(req, stash_folder+"/"+increment_generated+url_suffix) text_generated = "\n downloading for "+name+" "+url+increment_generated+url_suffix return text_generated def handle_survey_form(request):