Enhance theme validation #1500
Merged
Enhance theme validation #1500
+54
−12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Makes the validation dynamic based on the existing theme css file names and applies a regexp sanity check just to be sure. Signed-off-by: Adam Dawidowski <drake@oomkill.net>
ADawidowski
force-pushed
the
enhance_webtheme_validation
branch
from
f5d408d
to
5dc25ed
Compare
PromoFaux
approved these changes
Dec 23, 2023
There was a problem hiding this comment.
Thanks for the submission, and thanks for adding comprehensive tests!
I'll accept this as-is for the time being, but there are no major plans to do another release of the v5-based code any time soon.
In the v6 (see branch development-v6 all repos) container, all settings are handled internally by pihole-FTL, and as such are to be configured with an env var like FTLCONF_webserver_interface_theme: 'default-dark' etc.
5 tasks
truecharts-admin
added a commit
to truecharts/charts
that referenced
this pull request
Mar 4, 2024
…56 by renovate (#18853) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [pihole/pihole](https://togithub.com/pi-hole/docker-pi-hole) | patch | `2024.02.0` -> `2024.02.2` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>pi-hole/docker-pi-hole (pihole/pihole)</summary> ### [`v2024.02.2`](https://togithub.com/pi-hole/docker-pi-hole/releases/tag/2024.02.2) [Compare Source](https://togithub.com/pi-hole/docker-pi-hole/compare/2024.02.1...2024.02.2) Jumped the gun a little with the last tag - didn't realise there were changes ready to go! Should fix: [pi-hole/docker-pi-hole#1543 <!-- Release notes generated using configuration in .github/release.yml at master --> #### What's Changed - Enhance theme validation by [@​ADawidowski](https://togithub.com/ADawidowski) in [pi-hole/docker-pi-hole#1500 #### New Contributors - [@​ADawidowski](https://togithub.com/ADawidowski) made their first contribution in [pi-hole/docker-pi-hole#1500 **Full Changelog**: pi-hole/docker-pi-hole@2024.02.0...2024.02.2 ### [`v2024.02.1`](https://togithub.com/pi-hole/docker-pi-hole/releases/tag/2024.02.1) [Compare Source](https://togithub.com/pi-hole/docker-pi-hole/compare/2024.02.0...2024.02.1) Nothing Docker-specific this time around, tagging to include FTL v5.25.1 <!-- Release notes generated using configuration in .github/release.yml at master --> #### What's Changed (FTL) - Fix spurious "resource limit exceeded" messages (v5 backport) by [@​DL6ER](https://togithub.com/DL6ER) in [pi-hole/FTL#1893 **Full Changelog**: pi-hole/FTL@v5.25...v5.25.1 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 10pm on monday" in timezone Europe/Amsterdam, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yMjUuMCIsInVwZGF0ZWRJblZlciI6IjM3LjIyNS4wIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Makes the web theme name validation dynamic based on the existing theme css file names and applies a regexp sanity check just to be sure.
Description
Modified bash_funcitons.sh:setup_web_theme.sh to replace static web theme name validation with dynamic one in order to make the validation future proof.
Motivation and Context
Adding new themes requires modification of the validation function. This change modifies the validation code so that it accepts every theme that exists in the file system location.
Example: currently the recently-added lcars-picard theme is not accepted by the validation function because it has not been explicitly added to the validation code. This code change fixes that.
How Has This Been Tested?
Ran standalone unit tests on the extracted setup_web_theme function. Added tests to the test suite. Added test fixture that temporarily creates empty theme files during the tests for the purpose of testing new known names.
Types of changes
Checklist: