1.4.5
This commit is contained in:
@@ -4,7 +4,7 @@ from PIL import Image
|
|||||||
class GenerateForm(forms.Form):
|
class GenerateForm(forms.Form):
|
||||||
#Platform
|
#Platform
|
||||||
platform = forms.ChoiceField(choices=[('windows','Windows 64Bit'),('windows-x86','Windows 32Bit'),('linux','Linux'),('android','Android'),('macos','macOS')], initial='windows')
|
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"
|
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)
|
delayFix = forms.BooleanField(initial=True, required=False)
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ from .forms import GenerateForm
|
|||||||
from .models import GithubRun
|
from .models import GithubRun
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
from urllib.parse import quote
|
from urllib.parse import quote
|
||||||
|
from cryptography.hazmat.primitives import hashes, serialization
|
||||||
|
from cryptography.hazmat.primitives.asymmetric import padding
|
||||||
|
|
||||||
def generator_view(request):
|
def generator_view(request):
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
@@ -229,8 +231,6 @@ def generator_view(request):
|
|||||||
"apiServer":apiServer,
|
"apiServer":apiServer,
|
||||||
"custom":encodedCustom,
|
"custom":encodedCustom,
|
||||||
"uuid":myuuid,
|
"uuid":myuuid,
|
||||||
#"iconbase64":iconbase64.decode("utf-8"),
|
|
||||||
#"logobase64":logobase64.decode("utf-8") if logobase64 else "",
|
|
||||||
"iconlink":iconlink,
|
"iconlink":iconlink,
|
||||||
"logolink":logolink,
|
"logolink":logolink,
|
||||||
"appname":appname,
|
"appname":appname,
|
||||||
@@ -248,7 +248,7 @@ def generator_view(request):
|
|||||||
create_github_run(myuuid)
|
create_github_run(myuuid)
|
||||||
response = requests.post(url, json=data, headers=headers)
|
response = requests.post(url, json=data, headers=headers)
|
||||||
print(response)
|
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})
|
return render(request, 'waiting.html', {'filename':filename, 'uuid':myuuid, 'status':"Starting generator...please wait", 'platform':platform})
|
||||||
else:
|
else:
|
||||||
return JsonResponse({"error": "Something went wrong"})
|
return JsonResponse({"error": "Something went wrong"})
|
||||||
|
|||||||
@@ -2,3 +2,4 @@ django
|
|||||||
requests
|
requests
|
||||||
pillow
|
pillow
|
||||||
gunicorn
|
gunicorn
|
||||||
|
cryptography>=42.0.0
|
||||||
Reference in New Issue
Block a user