From 4a744e900f4a70179d30208df003f8d14dfc93f1 Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Tue, 28 Jan 2025 17:22:50 -0600 Subject: [PATCH] add option to remove new version message --- .../remove_new_version_notification.patch | 22 +++++++++++++++++++ .github/workflows/generator-android.yml | 7 ++++++ .github/workflows/generator-linux.yml | 7 ++++++ .github/workflows/generator-macos.yml | 7 ++++++ .github/workflows/generator-windows.yml | 7 ++++++ .../workflows/pre137-generator-android.yml | 7 ++++++ .github/workflows/pre137-generator-linux.yml | 7 ++++++ .github/workflows/pre137-generator-macos.yml | 7 ++++++ .../workflows/pre137-generator-windows.yml | 7 ++++++ rdgenerator/forms.py | 3 ++- rdgenerator/templates/generator.html | 1 + rdgenerator/views.py | 2 ++ 12 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 .github/patches/remove_new_version_notification.patch diff --git a/.github/patches/remove_new_version_notification.patch b/.github/patches/remove_new_version_notification.patch new file mode 100644 index 0000000..92bc937 --- /dev/null +++ b/.github/patches/remove_new_version_notification.patch @@ -0,0 +1,22 @@ +diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart +index ba724eed5..cb66cdaed 100644 +--- a/flutter/lib/desktop/pages/desktop_home_page.dart ++++ b/flutter/lib/desktop/pages/desktop_home_page.dart +@@ -424,7 +424,7 @@ class _DesktopHomePageState extends State + } + + Widget buildHelpCards(String updateUrl) { +- if (!bind.isCustomClient() && ++ /*if (!bind.isCustomClient() && + updateUrl.isNotEmpty && + !isCardClosed && + bind.mainUriPrefixSync().contains('rustdesk')) { +@@ -435,7 +435,7 @@ class _DesktopHomePageState extends State + final Uri url = Uri.parse('https://rustdesk.com/download'); + await launchUrl(url); + }, closeButton: true); +- } ++ }*/ + if (systemError.isNotEmpty) { + return buildInstallCard("", systemError, "", () {}); + } \ No newline at end of file diff --git a/.github/workflows/generator-android.yml b/.github/workflows/generator-android.yml index 5ce94ca..cb29a33 100644 --- a/.github/workflows/generator-android.yml +++ b/.github/workflows/generator-android.yml @@ -408,6 +408,13 @@ jobs: wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff git apply statussort.diff + - name: removeNewVersionNotif + continue-on-error: true + if: fromJson(inputs.extras).removeNewVersionNotif == 'true' + run: | + wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff + git apply removeNewVersionNotif.diff + - name: Report Status uses: fjogeleit/http-request-action@v1 with: diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index 350b41a..71446d5 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -345,6 +345,13 @@ jobs: run: | wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff git apply statussort.diff + + - name: removeNewVersionNotif + continue-on-error: true + if: fromJson(inputs.extras).removeNewVersionNotif == 'true' + run: | + wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff + git apply removeNewVersionNotif.diff - name: Restore bridge files if: matrix.job.arch == 'x86_64' || env.UPLOAD_ARTIFACT == 'true' diff --git a/.github/workflows/generator-macos.yml b/.github/workflows/generator-macos.yml index edb03b1..5e555de 100644 --- a/.github/workflows/generator-macos.yml +++ b/.github/workflows/generator-macos.yml @@ -471,6 +471,13 @@ jobs: run: | wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff git apply statussort.diff + + - name: removeNewVersionNotif + continue-on-error: true + if: fromJson(inputs.extras).removeNewVersionNotif == 'true' + run: | + wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff + git apply removeNewVersionNotif.diff - name: Install Rust toolchain diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index 78ea8ca..3f242ac 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -383,6 +383,13 @@ jobs: Invoke-WebRequest -Uri https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff -OutFile statussort.diff git apply statussort.diff + - name: removeNewVersionNotif + continue-on-error: true + if: fromJson(inputs.extras).removeNewVersionNotif == 'true' + run: | + wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff + git apply removeNewVersionNotif.diff + - name: run as admin continue-on-error: true diff --git a/.github/workflows/pre137-generator-android.yml b/.github/workflows/pre137-generator-android.yml index 938dc81..c3eecc0 100644 --- a/.github/workflows/pre137-generator-android.yml +++ b/.github/workflows/pre137-generator-android.yml @@ -406,6 +406,13 @@ jobs: wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff git apply statussort.diff + - name: removeNewVersionNotif + continue-on-error: true + if: fromJson(inputs.extras).removeNewVersionNotif == 'true' + run: | + wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff + git apply removeNewVersionNotif.diff + - name: Report Status uses: fjogeleit/http-request-action@v1 with: diff --git a/.github/workflows/pre137-generator-linux.yml b/.github/workflows/pre137-generator-linux.yml index b3e477b..eed7b1b 100644 --- a/.github/workflows/pre137-generator-linux.yml +++ b/.github/workflows/pre137-generator-linux.yml @@ -344,6 +344,13 @@ jobs: wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff git apply statussort.diff + - name: removeNewVersionNotif + continue-on-error: true + if: fromJson(inputs.extras).removeNewVersionNotif == 'true' + run: | + wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff + git apply removeNewVersionNotif.diff + - name: Restore bridge files if: matrix.job.arch == 'x86_64' || env.UPLOAD_ARTIFACT == 'true' uses: actions/download-artifact@master diff --git a/.github/workflows/pre137-generator-macos.yml b/.github/workflows/pre137-generator-macos.yml index 85db444..7b6ec9a 100644 --- a/.github/workflows/pre137-generator-macos.yml +++ b/.github/workflows/pre137-generator-macos.yml @@ -464,6 +464,13 @@ jobs: run: | wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff git apply statussort.diff + + - name: removeNewVersionNotif + continue-on-error: true + if: fromJson(inputs.extras).removeNewVersionNotif == 'true' + run: | + wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff + git apply removeNewVersionNotif.diff - name: Install Rust toolchain diff --git a/.github/workflows/pre137-generator-windows.yml b/.github/workflows/pre137-generator-windows.yml index 27ae99e..0e2beea 100644 --- a/.github/workflows/pre137-generator-windows.yml +++ b/.github/workflows/pre137-generator-windows.yml @@ -381,6 +381,13 @@ jobs: Invoke-WebRequest -Uri https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff -OutFile statussort.diff git apply statussort.diff + - name: removeNewVersionNotif + continue-on-error: true + if: fromJson(inputs.extras).removeNewVersionNotif == 'true' + run: | + wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeNewVersionNotif.diff + git apply removeNewVersionNotif.diff + - name: run as admin continue-on-error: true diff --git a/rdgenerator/forms.py b/rdgenerator/forms.py index a554539..7429217 100644 --- a/rdgenerator/forms.py +++ b/rdgenerator/forms.py @@ -71,4 +71,5 @@ class GenerateForm(forms.Form): cycleMonitor = forms.BooleanField(initial=False, required=False) xOffline = forms.BooleanField(initial=False, required=False) hidecm = forms.BooleanField(initial=False, required=False) - statussort = forms.BooleanField(initial=False, required=False) \ No newline at end of file + statussort = forms.BooleanField(initial=False, required=False) + removeNewVersionNotif = forms.BooleanField(initial=False, required=False) \ No newline at end of file diff --git a/rdgenerator/templates/generator.html b/rdgenerator/templates/generator.html index b5b3c8b..de48496 100644 --- a/rdgenerator/templates/generator.html +++ b/rdgenerator/templates/generator.html @@ -212,6 +212,7 @@


+
diff --git a/rdgenerator/views.py b/rdgenerator/views.py index b38c26b..b0849d6 100644 --- a/rdgenerator/views.py +++ b/rdgenerator/views.py @@ -27,6 +27,7 @@ def generator_view(request): xOffline = form.cleaned_data['xOffline'] hidecm = form.cleaned_data['hidecm'] statussort = form.cleaned_data['statussort'] + removeNewVersionNotif = form.cleaned_data['removeNewVersionNotif'] server = form.cleaned_data['serverIP'] key = form.cleaned_data['key'] apiServer = form.cleaned_data['apiServer'] @@ -164,6 +165,7 @@ def generator_view(request): extras['xOffline'] = 'true' if xOffline else 'false' extras['hidecm'] = 'true' if hidecm else 'false' extras['statussort'] = 'true' if statussort else 'false' + extras['removeNewVersionNotif'] = 'true' if removeNewVersionNotif else 'false' extra_input = json.dumps(extras) ####from here run the github action, we need user, repo, access token.