From 249275c5973763914580ca0bb02576559b1af565 Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Sun, 10 Nov 2024 03:08:36 -0600 Subject: [PATCH] typo --- .github/workflows/generator-windows.yml | 4 ++-- rdgenerator/views.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index fc55233..9d98771 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -286,7 +286,7 @@ jobs: if: ${{ inputs.iconlink != 'false' }} continue-on-error: true run: | - Invoke-WebRequest -Uri ${{ fromJson(inputs.iconlink).url }}/get_png?filename=${{ fromJson(inputs.iconlink).file }}"&"uuid=${{ fromJson(inputs.iconlink).uuid }} -OutFile ./res/icon.png + Invoke-WebRequest -Uri ${{ fromJson(inputs.iconlink).url }}/get_png?filename=${{ fromJson(inputs.iconlink).file }}&uuid=${{ fromJson(inputs.iconlink).uuid }} -OutFile ./res/icon.png mv ./res/32x32.png ./res/32x32.png.bak mv ./res/64x64.png ./res/64x64.png.bak mv ./res/128x128.png ./res/128x128.png.bak @@ -387,7 +387,7 @@ jobs: if: ${{ inputs.logolink != 'false' }} continue-on-error: true run: | - Invoke-WebRequest -Uri ${{ fromJson(inputs.logolink).url }}/get_png?filename=${{ fromJson(inputs.logolink).file }}"&"uuid=${{ fromJson(inputs.logolink).uuid }} -OutFile ./rustdesk/data/flutter_assets/assets/logo.png + Invoke-WebRequest -Uri ${{ fromJson(inputs.logolink).url }}/get_png?filename=${{ fromJson(inputs.logolink).file }}&uuid=${{ fromJson(inputs.logolink).uuid }} -OutFile ./rustdesk/data/flutter_assets/assets/logo.png - name: find Runner.res diff --git a/rdgenerator/views.py b/rdgenerator/views.py index fb6c34a..abd570c 100644 --- a/rdgenerator/views.py +++ b/rdgenerator/views.py @@ -297,11 +297,11 @@ def resize_and_encode_icon(imagefile): return resized64 #the following is used when accessed from an external source, like the rustdesk api server -def startgh(request): +def startgh(request, platform): #print(request) data_ = json.loads(request.body) ####from here run the github action, we need user, repo, access token. - url = 'https://api.github.com/repos/'+_settings.GHUSER+'/rdgen/actions/workflows/generator-windows.yml/dispatches' + url = 'https://api.github.com/repos/'+_settings.GHUSER+'/rdgen/actions/workflows/generator-'+data_.get('platform')+'.yml/dispatches' data = { "ref":"master", "inputs":{ @@ -310,8 +310,8 @@ def startgh(request): "apiServer":data_.get('apiServer'), "custom":data_.get('custom'), "uuid":data_.get('uuid'), - "iconbase64":data_.get('iconbase64'), - "logobase64":data_.get('logobase64'), + "iconlink":data_.get('iconlink'), + "logolink":data_.get('logolink'), "appname":data_.get('appname'), "extras":data_.get('extras'), "filename":data_.get('filename')