diff --git a/Contributing.md b/Contributing.md index 7fb1373..c3f2a5d 100644 --- a/Contributing.md +++ b/Contributing.md @@ -10,25 +10,34 @@ To contribute to the project, please follow the following instructions: ### When submitting your work for review and merge: -1. Prior to opening a pull request, - - Be certain to REBASE prior to opening the PR +1. Create an issue in the PlexDBRepair repo against the current release + - Describe the deficiency to be addressed in sufficient detail + +2. Complete your work in your branch + - Be certain to REBASE prior to starting work. + +3. Prior to opening a pull request, - Squash multiple commits into a single commit. - Clean up the commit message after squashing. - - Use force-push if needed to unify all changes. + - Use force-push if needed to unify all changes so there is one hash to reference. -2. Open the pull request against the 'contribute' branch. +4. Open the pull request against the master branch -3. In the pull request, provide a description of what change(s) where made +5. In the pull request, provide a description of what change(s) where made + - As last text added, on a blank line, - Add the text: `Fixes:` followed by the URL of the open Issue eg: Fixes: https://ChuckPa/PlexDBRepair/issues/12 (if we were fixing issue 12) - - Adding the above text+http tag has the following impact: - - The Issue which prompted the change is forever linked to the PR making documentation easy. + - Adding the above text & URL has the following impact: + -- The Issue which prompted the change is forever linked to the PR making documentation easy. + -- In the event of unforseen issues, reverting the changes will be trivial and allow easier rework. -5. Be certain to request review with your pull request. +6. Be certain to request review with your pull request. -6. Upon completion of review and testing, contributions will be merged into master. - When the PR is approved and merged, Github will automatically mark the issue as closed and solved. +7. Upon completion of review and testing, contributions will be merged into master. + When the PR is approved and merged, Github will automatically mark the issue as closed and fixed. + +8. The fix will be included in the next release or immediately in a new release if so warranted. ### Policy @@ -36,5 +45,5 @@ To contribute to the project, please follow the following instructions: While questions, suggestions, enhancement requests, and bug fixes are welcome and almost always implemented, it's not possible to accept PRs without an accompanying issue documention which justifies the change. - +Thanks, Chuck diff --git a/DBRepair.sh b/DBRepair.sh index bd1b1e3..627ad08 100755 --- a/DBRepair.sh +++ b/DBRepair.sh @@ -2,12 +2,12 @@ ######################################################################### # Plex Media Server database check and repair utility script. # # Maintainer: ChuckPa # -# Version: v1.04.00 # -# Date: 30-Jan-2024 # +# Version: v1.05.00 # +# Date: 09-Feb-2024 # ######################################################################### # Version for display purposes -Version="v1.04.00" +Version="v1.05.00" # Flag when temp files are to be retained Retain=0 @@ -593,8 +593,9 @@ HostConfig() { # - Docker cgroup v1 & v2 # - Podman (libpod) + # - Kubernetes (and TrueNAS platforms) elif [ "$(grep docker /proc/1/cgroup | wc -l)" -gt 0 ] || [ "$(grep 0::/ /proc/1/cgroup)" = "0::/" ] || - [ "$(grep libpod /proc/1/cgroup | wc -l)" -gt 0 ]; then + [ "$(grep libpod /proc/1/cgroup | wc -l)" -gt 0 ] || [ "$(grep kube /proc/1/cgroup | wc -l)" -gt 0 ]; then # HOTIO Plex image structure is non-standard (contains symlink which breaks detection) if [ -n "$(grep -irslm 1 hotio /etc/s6-overlay/s6-rc.d)" ]; then diff --git a/README.md b/README.md index 29132eb..2faa1e2 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,9 @@ If sufficient privleges exist (root), and supported by the environment, the opti 2. Database is malformed / damaged / corrupted 3. Database has bloated from media addition or changes 4. Damaged indexes damaged + 5. Importing data from other databases (watch history) + 6. Cleaning up operational temp files which PMS has forgotten to clean up + ## Functions provided @@ -114,6 +117,7 @@ Enter command # -or- command name (4 char min) : binhex | N/A | Container root (adjacent /config) Docker | N/A | Container root (adjacent /config) Hotio | N/A | Container root (adjacent /config) + Kubernetes | N/A | Container root (adjacent /config) Linux (wkstn/svr) | N/A | Anywhere Netgear (ReadyNAS) | "your_choice" | "/data/your_choice" QNAP (QTS/QuTS) | Public | /share/Public diff --git a/ReleaseNotes b/ReleaseNotes index 4d45f8c..4e96ec4 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -8,6 +8,10 @@ ![Maintenance](https://img.shields.io/badge/Maintained-Yes-green.svg) # Release Info: +v1.05.00 + + 1. Kubernetes support - Add support for Kubernetes (and also TrueNAS) containers. + v1.04.00 1. SNAP support - Add support for Plex Media Server SNAP package.