Systemd changes | root script | URL support for gif effects (#1319)

* Systemd changes and URL option for Gif Effects
* Add grayscale to gif effect
* WebUI adjustments
* Rename version to .version
* Copy runHyperionAsRoot.sh to rpi packages
* Pack script into all unix packages
* Start hyperion only after network is available
* Snap builds removed due to poor server connection
* Flexible updateHyperionUser.sh
* updateHyperionUser script entered in the package
* Print help on none sudo execute
* Corrected embedded Python location
* Replacement for the QWindowsScreen grabWindow function
* Updated to latest 2.x mbedtls version 2.27

Co-authored-by: LordGrey <lordgrey.emmel@gmail.com>

Author: Paulchen-Panther

.github/workflows/apt.yml

@@ -35,15 +35,15 @@ jobs:
       - name: Build package
         shell: bash
         run: |
-          tr -d '\n' < version > temp && mv temp version
+          tr -d '\n' < .version > temp && mv temp .version
           mkdir -p "${GITHUB_WORKSPACE}/deploy"
           docker run --rm \
             -v "${GITHUB_WORKSPACE}/deploy:/deploy" \
             -v "${GITHUB_WORKSPACE}:/source:rw" \
             ghcr.io/hyperion-project/${{ matrix.architecture }}:$(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]') \
             /bin/bash -c "cd /source && \
             mkdir -p debian/source && echo '3.0 (quilt)' > debian/source/format && \
-            dch --create --distribution $(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]') --package 'hyperion' -v '$(cat version)~$(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]')' '${{ github.event.commits[0].message }}' && \
+            dch --create --distribution $(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]') --package 'hyperion' -v '$(cat .version)~$(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]')' '${{ github.event.commits[0].message }}' && \
             cp -fr LICENSE debian/copyright && \
             sed 's/@BUILD_DEPENDS@/${{ matrix.build-depends }}/g; s/@DEPENDS@/${{ matrix.package-depends }}/g; s/@ARCHITECTURE@/${{ matrix.architecture }}/g' debian/control.in > debian/control && \
             tar cf ../hyperion_2.0.0.orig.tar . && \

.github/workflows/pull-request.yml

@@ -36,12 +36,12 @@ jobs:
         with:
           submodules: true
 
-      # Append PR number to version
+      # Append PR number to .version
       - name: Append PR number to version
         shell: bash
         run: |
-          tr -d '\n' < version > temp && mv temp version
-          echo -n "+PR${{ github.event.pull_request.number }}" >> version
+          tr -d '\n' < .version > temp && mv temp .version
+          echo -n "+PR${{ github.event.pull_request.number }}" >> .version
 
       # Build packages
       - name: Build packages
@@ -82,12 +82,12 @@ jobs:
         with:
           submodules: true
 
-      # Append PR number to version
+      # Append PR number to .version
       - name: Append PR number to version
         shell: bash
         run: |
-          tr -d '\n' < version > temp && mv temp version
-          echo -n "+PR${{ github.event.pull_request.number }}" >> version
+          tr -d '\n' < .version > temp && mv temp .version
+          echo -n "+PR${{ github.event.pull_request.number }}" >> .version
 
       # Install dependencies
       - name: Install dependencies
@@ -131,12 +131,12 @@ jobs:
         with:
           submodules: true
 
-      # Append PR number to version
+      # Append PR number to .version
       - name: Append PR number to version
         shell: bash
         run: |
-          tr -d '\n' < version > temp && mv temp version
-          echo -n "+PR${{ github.event.pull_request.number }}" >> version
+          tr -d '\n' < .version > temp && mv temp .version
+          echo -n "+PR${{ github.event.pull_request.number }}" >> .version
 
       - name: Cache Qt
         uses: actions/cache@v2
@@ -199,27 +199,3 @@ jobs:
         with:
           name: windows
           path: windows
-
-##########################
-#### Snap (x86_64) #######
-##########################
-
-  snap:
-    name: Snap (x86_64)
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      # Build snap package
-      - name: Build snap
-        id: build
-        uses: snapcore/action-build@v1
-
-      # Upload snap artifact (only on tagged commit)
-      - name: Upload snap artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: snap
-          path: ${{ steps.build.outputs.snap }}

.github/workflows/push-master.yml

@@ -156,31 +156,6 @@ jobs:
         with:
           path: build/Hyperion-*
 
-##########################
-#### Snap (x86_64) #######
-##########################
-
-  snap:
-    name: Snap (x86_64)
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      # Build snap package
-      - name: Build snap
-        id: build
-        uses: snapcore/action-build@v1
-
-      # Upload snap artifact (only on tagged commit)
-      - name: Upload snap artifact
-        if: startsWith(github.event.ref, 'refs/tags')
-        uses: actions/upload-artifact@v2
-        with:
-          name: snap
-          path: ${{ steps.build.outputs.snap }}
-
 #######################################
 ###### Publish GitHub Releases ########
 #######################################
@@ -195,10 +170,10 @@ jobs:
         uses: actions/checkout@v2
 
       # generate environment variables
-      - name: Generate environment variables from version and tag
+      - name: Generate environment variables from .version and tag
         run: |
           echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-          echo "VERSION=$(tr -d '\n' < version)" >> $GITHUB_ENV
+          echo "VERSION=$(tr -d '\n' < .version)" >> $GITHUB_ENV
           echo "preRelease=false" >> $GITHUB_ENV
 
       # If version contains alpha or beta, mark draft release as pre-release
@@ -223,35 +198,3 @@ jobs:
           prerelease: ${{ env.preRelease }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-############################
-###### Snap Release ########
-############################
-
-  snap_publish:
-    name: Publish Snap Release
-    if: startsWith(github.event.ref, 'refs/tags')
-    needs: [snap]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      # Download snap from snap job
-      - name: Download snap from snap build
-        id: download-artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: snap
-
-      # Get file name of the snap
-      - name: Get file name of the snap
-        run: echo "snap=$(ls ${{ steps.download-artifact.outputs.download-path }}/hyperion-ng_*.snap)" >> $GITHUB_ENV
-
-      # Publish snap build to edge channel
-      - name: Publish snap build to edge channel
-        uses: snapcore/action-publish@v1
-        with:
-          store_login: ${{ secrets.SNAP_STORE_LOGIN }}
-          snap: ${{ env.snap }}
-          release: edge

version .versionversion renamed to .version

@@ -6,7 +6,7 @@ PROJECT(hyperion)
 
 # Parse semantic version of version file and write version to config
 include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cmake)
-file (STRINGS "version" HYPERION_VERSION)
+file (STRINGS ".version" HYPERION_VERSION)
 SetVersionNumber(HYPERION ${HYPERION_VERSION})
 set(DEFAULT_JSON_CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/config/hyperion.config.json.default)
 file(READ ${DEFAULT_JSON_CONFIG_FILE} DEFAULT_JSON_CONFIG_VAR)

CMakeLists.txt

@@ -299,6 +299,10 @@ select.form-control {
     color: #DDDDDD;
 }
 
+.radio__field:checked ~ .radio__icon::before {
+    background: #fff;
+  }
+
 .btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle) {
     border-bottom-right-radius: 4px;
     border-top-right-radius: 4px;

assets/webconfig/css/darkMode.css

@@ -764,6 +764,88 @@ li a:active:after {
     padding: 15px;
 }
 
+/*https://github.com/json-editor/json-editor/blob/2e005a2bd34c05803702d8bc1347efde7a4926ce/docs/radio.html#L37 radiobox for Json-Editor*/
+.radio {
+  position: relative;
+  display: inline-block;
+  min-width: 1.625rem;
+  min-height: 1.625rem;
+  max-width: 100%;
+}
+
+.radio:first-child {
+  margin-right: 20px;
+}
+
+.radio__field {
+  display: none;
+}
+
+.radio__icon {
+  position: absolute;
+  top: -0.125rem;
+  left: -0.125rem;
+  width: 1.875rem;
+  height: 1.875rem;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  border: 0.125rem solid #616161;
+  border-radius: 50%;
+  cursor: pointer;
+}
+
+.radio__icon::before {
+  position: absolute;
+  content: '';
+  top: 50%;
+  left: 50%;
+  width: 0.75rem;
+  height: 0.75rem;
+  -webkit-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+  border-radius: 50%;
+  visibility: hidden;
+}
+
+.radio__icon::after {
+  position: absolute;
+  content: '';
+  top: -0.4375rem;
+  right: -0.4375rem;
+  bottom: -0.4375rem;
+  left: -0.4375rem;
+}
+
+.radio__label {
+  line-height: 1.5rem;
+  display: block;
+  padding: 0.0625rem 0 0 2.375rem;
+  cursor: pointer;
+}
+
+.radio__field:checked ~ .radio__icon::before {
+  background: #616161;
+  visibility: visible;
+}
+
+/* disabled state css */
+.radio__field:disabled:checked ~ .radio__icon,
+.radio__field:disabled:not(:checked) ~ .radio__icon {
+  cursor: default;
+  border-color: #959899;
+}
+
+.radio__field:disabled:checked ~ .radio__label,
+.radio__field:disabled:not(:checked) ~ .radio__label {
+  cursor: default;
+  color: #959899;
+}
+
+.radio__field:disabled:checked ~ .radio__icon::before,
+.radio__field:disabled:not(:checked) ~ .radio__icon::before {
+  cursor: default;
+  background-color: #959899;
+}
 
 /*https://github.com/flatlogic/awesome-bootstrap-checkbox slighty edited for our purposes*/
 .checkbox {

assets/webconfig/css/hyperion.css

@@ -636,12 +636,17 @@
     "edt_eff_flag_header": "Flaggen",
     "edt_eff_flag_header_desc": "Verpasse deinen LEDs die Farben deines Landes. Du kannst mehr als eine Flagge auswählen, je nach Intervall werden diese dann abwechselnd angezeigt.",
     "edt_eff_fps": "Bilder pro Sekunde",
+    "edt_eff_grayscale": "Graustufen",
     "edt_eff_frequency": "Frequenz",
     "edt_eff_gif_header": "GIFs",
     "edt_eff_gif_header_desc": "Dieser Effekt spielt .gif Dateien ab. Bietet die Möglichkeit kleine GIF-Videos abzuspielen.",
     "edt_eff_height": "Höhe",
     "edt_eff_huechange": "Farbänderung",
+    "edt_eff_image_source": "Bildquelle",
+    "edt_eff_image_source_file": "Lokale Datei",
+    "edt_eff_image_source_url": "URL",
     "edt_eff_image": "Bilddatei",
+    "edt_eff_url": "Bildadresse",
     "edt_eff_initial_blink": "Blinken beim Start",
     "edt_eff_interval": "Intervall",
     "edt_eff_knightrider_header": "Knight Rider",
@@ -1018,4 +1023,4 @@
     "wiz_yeelight_intro1": "Dieser Assistent hilft dir bei der Konfiguration von Hyperion für Yeelight. Zu den Funktionen zählen ein automatisches Finden der Yeelights, die einzelnen Lampen unterschiedlichen Bereichen im Bild zuzuordnen und weitere Einstellungen von Hyperion automatisch anzupassen. Kurz gesagt: Komplette Einrichtung mit ein paar Klicks.",
     "wiz_yeelight_title": "Yeelight Einrichtungsassistent",
     "wiz_yeelight_unsupported": "Nicht unterstützt"
-}
+}

assets/webconfig/i18n/de.json

@@ -643,11 +643,16 @@
     "edt_eff_flag_header_desc": "Let your LEDs shine bright in the colours of your country. You can select more than one flag and they will change based on the interval time.",
     "edt_eff_fps": "Frames per seconds",
     "edt_eff_frequency": "Frequency",
+    "edt_eff_grayscale": "Grayscale",
     "edt_eff_gif_header": "GIF's",
     "edt_eff_gif_header_desc": "This effect plays .gif files, provide a simple video like loop as effect.",
     "edt_eff_height": "Height",
     "edt_eff_huechange": "Color change",
+    "edt_eff_image_source": "Image source",
+    "edt_eff_image_source_file": "Local file",
+    "edt_eff_image_source_url": "URL",
     "edt_eff_image": "Image file",
+    "edt_eff_url": "Image adress",
 	"edt_eff_initial_blink" : "Flash for attention",
     "edt_eff_interval": "Interval",
     "edt_eff_knightrider_header": "Knight Rider",

assets/webconfig/i18n/en.json

@@ -55,7 +55,11 @@ $(document).ready(function () {
     testrun = true;
 
     var args = effects_editor.getEditor('root.args');
-    requestTestEffect(effectName, effectPyScript, JSON.stringify(args.getValue()), imageData);
+    if ($('input[type=radio][value=url]').is(':checked')) {
+      requestTestEffect(effectName, effectPyScript, JSON.stringify(args.getValue()), "");
+    } else {
+      requestTestEffect(effectName, effectPyScript, JSON.stringify(args.getValue()), imageData);
+    }
   };
 
   // Specify upload handler for image files
@@ -133,7 +137,12 @@ $(document).ready(function () {
 
   // Save Effect
   $('#btn_write').off().on('click', function () {
-    requestWriteEffect(effectName, effectPyScript, JSON.stringify(effects_editor.getValue()), imageData);
+    if ($('input[type=radio][value=url]').is(':checked')) {
+      requestWriteEffect(effectName, effectPyScript, JSON.stringify(effects_editor.getValue()), "");
+    } else {
+      requestWriteEffect(effectName, effectPyScript, JSON.stringify(effects_editor.getValue()), imageData);
+    }
+
     $(window.hyperion).one("cmd-create-effect", function (event) {
       if (event.response.success)
         showInfoDialog('success', "", $.i18n('infoDialog_effconf_created_text', effectName));