diff --git a/rdgenerator/forms.py b/rdgenerator/forms.py index aa55a2b..db5cb29 100644 --- a/rdgenerator/forms.py +++ b/rdgenerator/forms.py @@ -4,7 +4,7 @@ from PIL import Image class GenerateForm(forms.Form): #Platform platform = forms.ChoiceField(choices=[('windows','Windows 64Bit'),('windows-x86','Windows 32Bit'),('linux','Linux'),('android','Android'),('macos','macOS')], initial='windows') - version = forms.ChoiceField(choices=[('master','nightly'),('1.4.4','1.4.4'),('1.4.3','1.4.3'),('1.4.2','1.4.2'),('1.4.1','1.4.1'),('1.4.0','1.4.0'),('1.3.9','1.3.9'),('1.3.8','1.3.8'),('1.3.7','1.3.7'),('1.3.6','1.3.6'),('1.3.5','1.3.5'),('1.3.4','1.3.4'),('1.3.3','1.3.3')], initial='1.4.4') + version = forms.ChoiceField(choices=[('master','nightly'),('1.4.5','1.4.5'),('1.4.4','1.4.4'),('1.4.3','1.4.3'),('1.4.2','1.4.2'),('1.4.1','1.4.1'),('1.4.0','1.4.0'),('1.3.9','1.3.9'),('1.3.8','1.3.8'),('1.3.7','1.3.7'),('1.3.6','1.3.6'),('1.3.5','1.3.5'),('1.3.4','1.3.4'),('1.3.3','1.3.3')], initial='1.4.5') help_text="'master' is the development version (nightly build) with the latest features but may be less stable" delayFix = forms.BooleanField(initial=True, required=False) diff --git a/rdgenerator/views.py b/rdgenerator/views.py index 45517b3..75850dc 100644 --- a/rdgenerator/views.py +++ b/rdgenerator/views.py @@ -15,6 +15,8 @@ from .forms import GenerateForm from .models import GithubRun from PIL import Image from urllib.parse import quote +from cryptography.hazmat.primitives import hashes, serialization +from cryptography.hazmat.primitives.asymmetric import padding def generator_view(request): if request.method == 'POST': @@ -229,8 +231,6 @@ def generator_view(request): "apiServer":apiServer, "custom":encodedCustom, "uuid":myuuid, - #"iconbase64":iconbase64.decode("utf-8"), - #"logobase64":logobase64.decode("utf-8") if logobase64 else "", "iconlink":iconlink, "logolink":logolink, "appname":appname, @@ -248,7 +248,7 @@ def generator_view(request): create_github_run(myuuid) response = requests.post(url, json=data, headers=headers) print(response) - if response.status_code == 204: + if response.status_code == 204 or response.status_code == 200: return render(request, 'waiting.html', {'filename':filename, 'uuid':myuuid, 'status':"Starting generator...please wait", 'platform':platform}) else: return JsonResponse({"error": "Something went wrong"}) diff --git a/requirements.txt b/requirements.txt index cb29b5f..6a09b31 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ django requests pillow -gunicorn \ No newline at end of file +gunicorn +cryptography>=42.0.0 \ No newline at end of file