Revert "Release 2.7.1"

This reverts commit 57888b4.

Author: TheCaptain989

.assets/hotio-striptracks-synology.png

@@ -3,9 +3,7 @@
 .gitignore
 .github
 .gitattributes
-.vscode
 .assets
-hotio
 READMETEMPLATE.md
 README.md
 SECURITY.md

.dockerignore

@@ -22,7 +22,7 @@ jobs:
           echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT
           echo "MULTI_ARCH=${{ env.MULTI_ARCH }}" >> $GITHUB_OUTPUT
           # **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. ****
-          MOD_VERSION="2.7.1"
+          MOD_VERSION=${GITHUB_SHA:0:7}
           echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT
     outputs:
       GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }}

.github/workflows/BuildImage.yml

@@ -2,6 +2,7 @@
 
 ## Buildstage ##
 FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
+
 ARG MOD_VERSION
 
 # copy local files
@@ -16,14 +17,11 @@ RUN \
 
 ## Single layer deployed image ##
 FROM scratch
-ARG MOD_VERSION
 
-LABEL org.opencontainers.image.title=radarr-striptracks
+LABEL org.opencontainers.image.source=https://github.com/TheCaptain989/radarr-striptracks
 LABEL org.opencontainers.image.description="A Docker Mod to Radarr/Sonarr to automatically strip out unwanted audio and subtitle streams"
-LABEL org.opencontainers.image.version="${MOD_VERSION}"
-LABEL org.opencontainers.image.source="https://github.com/TheCaptain989/radarr-striptracks"
-LABEL org.opencontainers.image.authors="TheCaptain989 <thecaptain989@protonmail.com>"
 LABEL org.opencontainers.image.licenses=GPL-3.0-only
+LABEL org.opencontainers.image.authors="TheCaptain989 <thecaptain989@protonmail.com>"
 
 # Add files from buildstage
 COPY --from=buildstage /root-layer/ /

Dockerfile

@@ -1,18 +1,17 @@
 # About
 A [Docker Mod](https://github.com/linuxserver/docker-mods) for the LinuxServer.io Radarr/Sonarr v3 or higher Docker containers that adds a script to automatically strip out unwanted audio and subtitle tracks, keeping only the desired languages.
 
-**NEW!** There is a now an installer for **hotio** containers!  See the [HOTIO.md](./hotio/HOTIO.md) file for more details.  
+**Beginning with version 2.0 of this mod, it only supports v3 or later of Radarr/Sonarr.  For legacy Radarr/Sonarr v2 please use mod release 1.3 or earlier**
 
 **This unified script works in both Radarr and Sonarr.  Use this mod in either container!**
 >**NOTE:** This mod supports Linux OSes only.
-<!-- markdownlint-disable -->
+
 Production Container info: ![Docker Image Size](https://img.shields.io/docker/image-size/linuxserver/mods/radarr-striptracks "Container Size")
 [![linuxserver/docker-mods/mods/radarr-striptracks](https://img.shields.io/badge/dynamic/json?logo=github&url=https%3A%2F%2Fraw.githubusercontent.com%2Fthecaptain989%2Fghcr-pulls%2Fmaster%2Findex.json&query=%24%5B%3F(%40.owner%3D%3D%22linuxserver%22%20%26%26%20%40.repo%3D%3D%22docker-mods%22%20%26%26%20%40.image%3D%3D%22mods%22%20%26%26%20%40.tag%3D%3D%22radarr-striptracks%22)%5D.pulls&label=ghcr%20pulls&color=1572A4)](https://github.com/linuxserver/docker-mods/pkgs/container/mods)  
 Development Container info:
 ![Docker Image Size](https://img.shields.io/docker/image-size/thecaptain989/radarr-striptracks "Container Size")
 ![Docker Pulls](https://img.shields.io/docker/pulls/thecaptain989/radarr-striptracks?logo=docker "Container Pulls")
 [![GitHub Super-Linter](https://github.com/TheCaptain989/radarr-striptracks/actions/workflows/linter.yml/badge.svg)](https://github.com/TheCaptain989/radarr-striptracks/actions/workflows/linter.yml "Linter Job")  
-<!-- markdownlint-restore -->  
 
 # Installation
 1. Pull your selected container ([linuxserver/radarr](https://hub.docker.com/r/linuxserver/radarr "LinuxServer.io's Radarr container") or [linuxserver/sonarr](https://hub.docker.com/r/linuxserver/sonarr "LinuxServer.io's Sonarr container")) from GitHub Container Registry or Docker Hub:  
@@ -338,8 +337,5 @@ This would not be possible without the following:
 The AWK script parsing mkvmerge output is adapted from Endoro's post on [VideoHelp](https://forum.videohelp.com/threads/343271-BULK-remove-non-English-tracks-from-MKV-container#post2292889).  
 Icons made by [Freepik](https://www.freepik.com) from [Flaticon](https://www.flaticon.com/)
 
-## Legacy Change Notes
-Beginning with version 2.0 of this mod, it only supports v3 or later of Radarr/Sonarr.  For legacy Radarr/Sonarr v2 please use mod release 1.3 or earlier.
-
 [warning]: .assets/warning.png "Warning"
 [danger]: .assets/danger.png "Danger"

README.md

@@ -6,8 +6,8 @@ Only the latest major and minor version are supported.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 2.7.x   | :heavy_check_mark: |
-| < 2.7   | :x:                |
+| 2.6.x   | :heavy_check_mark: |
+| < 2.6   | :x:                |
 
 ## Reporting a Vulnerability
 

SECURITY.md

@@ -809,63 +809,6 @@ function check_compat {
   [ $striptracks_debug -ge 1 ] && echo "Debug|Feature $1 is $([ $striptracks_return -eq 1 ] && echo "not ")compatible with ${striptracks_type^} v${striptracks_arr_version}." | log
   return $striptracks_return
 }
-# Get media management configuration
-function get_media_config {
-  local url="$striptracks_api_url/config/mediamanagement"
-  [ $striptracks_debug -ge 1 ] && echo "Debug|Getting ${striptracks_type^} configuration. Calling ${striptracks_type^} API using GET and URL '$url'" | log
-  unset striptracks_result
-  striptracks_result=$(curl -s --fail-with-body -H "X-Api-Key: $striptracks_apikey" \
-    -H "Content-Type: application/json" \
-		-H "Accept: application/json" \
-    --get "$url")
-  local striptracks_curlret=$?; [ $striptracks_curlret -ne 0 ] && {
-    local striptracks_message=$(echo -e "[$striptracks_curlret] curl error when calling: \"$url\"\nWeb server returned: $(echo $striptracks_result | jq -jcrM .message?)" | awk '{print "Error|"$0}')
-    echo "$striptracks_message" | log
-    echo "$striptracks_message" >&2
-  }
-  [ $striptracks_debug -ge 2 ] && echo "API returned: $striptracks_result" | awk '{print "Debug|"$0}' | log
-  if [ "$(echo $striptracks_result | jq -crM '.id?')" != "null" ] && [ "$(echo $striptracks_result | jq -crM '.id?')" != "" ]; then
-    local striptracks_return=0
-  else
-    local striptracks_return=1
-  fi
-  return $striptracks_return
-}
-# Update file metadata in Radarr/Sonarr
-function set_video_info {
-  local url="$striptracks_api_url/$striptracks_video_api/$striptracks_video_id"
-  local data="$(echo $striptracks_videoinfo | jq -crM .monitored='true')"
-  local i=0
-  for ((i=1; i <= 5; i++)); do
-    [ $striptracks_debug -ge 1 ] && echo "Debug|Updating monitored to 'true'. Calling ${striptracks_type^} API using PUT and URL '$url' with data $data" | log
-    unset striptracks_result
-    striptracks_result=$(curl -s --fail-with-body -H "X-Api-Key: $striptracks_apikey" \
-      -H "Content-Type: application/json" \
-      -H "Accept: application/json" \
-      -d "$data" \
-      -X PUT "$url")
-    local striptracks_curlret=$?; [ $striptracks_curlret -ne 0 ] && {
-      local striptracks_message=$(echo -e "[$striptracks_curlret] curl error when calling: \"$url\" with data $data\nWeb server returned: $(echo $striptracks_result | jq -jcrM .message?)" | awk '{print "Error|"$0}')
-      echo "$striptracks_message" | log
-      echo "$striptracks_message" >&2
-    }
-    [ $striptracks_debug -ge 2 ] && echo "Debug|API returned ${#striptracks_result} bytes." | log
-    [ $striptracks_debug -ge 3 ] && echo "API returned: $striptracks_result" | awk '{print "Debug|"$0}' | log
-    # Exit loop if database is not locked, else wait 1 minute
-    if [[ ! "$(echo $striptracks_result | jq -jcrM .message?)" =~ database\ is\ locked ]]; then
-      break
-    else
-      echo "Warn|Database is locked; system is likely overloaded. Sleeping 1 minute." | log
-      sleep 60
-    fi
-  done
-  if [ $striptracks_curlret -eq 0 -a "${#striptracks_result}" != 0 ]; then
-    local striptracks_return=0
-  else
-    local striptracks_return=1
-  fi
-  return $striptracks_return
-}
 # Exit program
 function end_script {
   # Cool bash feature
@@ -1197,20 +1140,6 @@ elif [ -n "$striptracks_api_url" ]; then
     echo "$striptracks_message" >&2
     striptracks_exitstatus=17
   fi
-  # Check if Radarr/Sonarr are configured to unmonitor deleted videos
-  get_media_config
-  striptracks_return=$?; [ $striptracks_return -ne 0 ] && {
-    # No '.id' in returned JSON
-    striptracks_message="Warn|The Media Management Config API returned no id."
-    echo "$striptracks_message" | log
-    echo "$striptracks_message" >&2
-    striptracks_exitstatus=17
-  }
-  if [ "$(echo "$striptracks_result" | jq -crM ".autoUnmonitorPreviouslyDownloaded${striptracks_video_api^}s")" = "true" ]; then
-    striptracks_conf_unmonitor=1
-    striptracks_message="Warn|Will compensate for ${striptracks_type^} configuration to unmonitor deleted ${striptracks_video_api}s."
-    echo "$striptracks_message" | log
-  fi
 else
   # No URL means we can't call the API
   striptracks_message="Warn|Unable to determine ${striptracks_type^} API URL."
@@ -1589,18 +1518,8 @@ elif [ -n "$striptracks_api_url" ]; then
 
       # Get new video file id
       if get_video_info; then
-        striptracks_videoinfo="$striptracks_result"
-        striptracks_videofile_id="$(echo $striptracks_videoinfo | jq -crM .${striptracks_json_quality_root}.id)"
+        striptracks_videofile_id="$(echo $striptracks_result | jq -crM .${striptracks_json_quality_root}.id)"
         [ $striptracks_debug -ge 1 ] && echo "Debug|Using new video file id '$striptracks_videofile_id'" | log
-
-        # Check if video is unmonitored after the delete/import
-        if [ $striptracks_conf_unmonitor -eq 1 -a "$(echo "$striptracks_videoinfo" | jq -crM ".monitored")" = "false" ]; then
-          striptracks_message="Warn|'$striptracks_title' is unmonitored after deleting the original video.  Compensating for ${striptracks_type^} configuration."
-          echo "$striptracks_message" | log
-          # Set video to monitored again
-          set_video_info
-        fi
-
         # Get new video file info
         if get_videofile_info; then
           striptracks_videofile_info="$striptracks_result"