Promote develop to master: CI hardening, release flow, and parser fixes

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,11 +6,6 @@ A few sentences describing the overall goals of the pull request's commits.
 
 #### Screenshot (if UI related)
 
-#### Todos
-- [ ] Tests
-- [ ] Translation Keys (./src/NzbDrone.Core/Localization/Core/en.json)
-- [ ] [Wiki Updates](https://wiki.servarr.com)
-
 #### Issues Fixed or Closed by this PR
 
-* Fixes #XXXX
+* Fixes #XXXX

.github/workflows/ci.yml

@@ -39,6 +39,7 @@ jobs:
       build_number: ${{ steps.build-meta.outputs.build_number }}
       radarr_version: ${{ steps.build-meta.outputs.radarr_version }}
       branch_name: ${{ steps.build-meta.outputs.branch_name }}
+      branch_name_safe: ${{ steps.build-meta.outputs.branch_name_safe }}
       backend_changed: ${{ steps.changes.outputs.backend_changed }}
     steps:
       - name: Checkout
@@ -53,44 +54,23 @@ jobs:
           HEAD_REF: ${{ github.head_ref }}
           REF_NAME: ${{ github.ref_name }}
           EVENT_NAME: ${{ github.event_name }}
-          BASE_REF: ${{ github.base_ref }}
+          RUN_NUMBER: ${{ github.run_number }}
         run: |
-          git fetch --tags --force
-
-          LAST=$(git tag -l 'build-counter-*' | sed 's/build-counter-//' | sort -n | tail -1)
-          BUILD_NUMBER=$(( ${LAST:-2999} + 1 ))
-
-          if [ "$EVENT_NAME" != "pull_request" ]; then
-            tag_pushed=false
-            for attempt in 1 2 3; do
-              if git tag "build-counter-${BUILD_NUMBER}" && git push origin "build-counter-${BUILD_NUMBER}"; then
-                echo "Tag pushed successfully on attempt $attempt"
-                tag_pushed=true
-                break
-              fi
-              echo "Tag push failed on attempt $attempt, retrying..."
-              git tag -d "build-counter-${BUILD_NUMBER}" 2>/dev/null || true
-              git fetch --tags --force
-              LAST=$(git tag -l 'build-counter-*' | sed 's/build-counter-//' | sort -n | tail -1)
-              BUILD_NUMBER=$(( LAST + 1 ))
-            done
-
-            if [ "$tag_pushed" != "true" ]; then
-              echo "::error::Failed to reserve a build counter tag after 3 attempts"
-              exit 1
-            fi
-          fi
+          # Keep fork build numbers in the existing 30xx range without mutating repo state.
+          BUILD_NUMBER=$(( 3000 + RUN_NUMBER ))
 
           if [ "$EVENT_NAME" = "pull_request" ]; then
             BRANCH_NAME="$HEAD_REF"
           else
             BRANCH_NAME="$REF_NAME"
           fi
 
+          BRANCH_NAME_SAFE=$(printf '%s' "$BRANCH_NAME" | sed 's#[^A-Za-z0-9._-]#-#g')
           {
             echo "build_number=$BUILD_NUMBER"
             echo "radarr_version=${MAJOR_VERSION}.${BUILD_NUMBER}"
             echo "branch_name=$BRANCH_NAME"
+            echo "branch_name_safe=$BRANCH_NAME_SAFE"
           } >> "$GITHUB_OUTPUT"
 
       - name: Detect backend changes
@@ -225,7 +205,7 @@ jobs:
     env:
       RADARRVERSION: ${{ needs.setup.outputs.radarr_version }}
       BUILD_SOURCEBRANCHNAME: ${{ needs.setup.outputs.branch_name }}
-      BUILDNAME: ${{ needs.setup.outputs.branch_name }}.${{ needs.setup.outputs.radarr_version }}
+      BUILDNAME: ${{ needs.setup.outputs.branch_name_safe }}.${{ needs.setup.outputs.radarr_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -389,7 +369,7 @@ jobs:
       packages: write
     env:
       RADARR_VERSION: ${{ needs.setup.outputs.radarr_version }}
-      BUILDNAME: ${{ needs.setup.outputs.branch_name }}.${{ needs.setup.outputs.radarr_version }}
+      BUILDNAME: ${{ needs.setup.outputs.branch_name_safe }}.${{ needs.setup.outputs.radarr_version }}
       REGISTRY: ghcr.io
       IMAGE_NAME: staros-labs/radarr
     strategy:
@@ -583,30 +563,43 @@ jobs:
     runs-on: ubuntu-24.04
     needs: [build-backend, setup]
     if: needs.setup.outputs.backend_changed == 'true'
-    container:
-      image: ghcr.io/servarr/testimages:alpine
+    env:
+      MUSL_TEST_IMAGE: ghcr.io/servarr/testimages:alpine
     timeout-minutes: 10
     steps:
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
-
       - name: Download test artifact
         uses: actions/download-artifact@v4
         with:
           name: linux-musl-x64-tests
           path: _tests/
 
-      - name: Set executable permissions
+      - name: Download dotnet installer
         run: |
-          chmod a+x _tests/ffprobe
-          find _tests -name "Radarr.Test.Dummy" -exec chmod a+x {} \;
+          mkdir -p _temp
+          curl -fsSL https://dot.net/v1/dotnet-install.sh -o _temp/dotnet-install.sh
+          chmod a+x _temp/dotnet-install.sh
 
-      - name: Run unit tests
+      - name: Run unit tests in Alpine container
         run: |
-          chmod a+x _tests/test.sh
-          _tests/test.sh Linux Unit Test
+          docker run --rm \
+            --user "$(id -u):$(id -g)" \
+            -e DOTNET_VERSION="${DOTNET_VERSION}" \
+            -e HOME=/tmp/home \
+            -e TEST_DIR=/work/_tests \
+            -v "${PWD}:/work" \
+            -w /work \
+            "${MUSL_TEST_IMAGE}" \
+            sh -lc '
+              set -e
+              mkdir -p "$HOME"
+              export DOTNET_ROOT=/tmp/dotnet
+              export PATH="$DOTNET_ROOT:$PATH"
+              bash /work/_temp/dotnet-install.sh --version "$DOTNET_VERSION" --install-dir "$DOTNET_ROOT" --architecture x64 --os linux-musl --no-path
+              chmod a+x _tests/ffprobe
+              find _tests -name "Radarr.Test.Dummy" -exec chmod a+x {} \;
+              chmod a+x _tests/test.sh
+              _tests/test.sh Linux Unit Test
+            '
 
       - name: Upload test results
         uses: actions/upload-artifact@v4
@@ -768,15 +761,10 @@ jobs:
     runs-on: ubuntu-24.04
     needs: [packages, build-backend, setup]
     if: needs.setup.outputs.backend_changed == 'true'
-    container:
-      image: ghcr.io/servarr/testimages:alpine
+    env:
+      MUSL_TEST_IMAGE: ghcr.io/servarr/testimages:alpine
     timeout-minutes: 15
     steps:
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: ${{ env.DOTNET_VERSION }}
-
       - name: Download test artifact
         uses: actions/download-artifact@v4
         with:
@@ -797,15 +785,33 @@ jobs:
           mkdir -p ./bin/
           cp -r _extracted/Radarr/. ./bin/ 2>/dev/null || cp -r _extracted/. ./bin/
 
-      - name: Set executable permissions
+      - name: Download dotnet installer
         run: |
-          chmod a+x _tests/ffprobe
-          find _tests -name "Radarr.Test.Dummy" -exec chmod a+x {} \;
+          mkdir -p _temp
+          curl -fsSL https://dot.net/v1/dotnet-install.sh -o _temp/dotnet-install.sh
+          chmod a+x _temp/dotnet-install.sh
 
-      - name: Run integration tests
+      - name: Run integration tests in Alpine container
         run: |
-          chmod a+x _tests/test.sh
-          _tests/test.sh Linux Integration Test
+          docker run --rm \
+            --user "$(id -u):$(id -g)" \
+            -e DOTNET_VERSION="${DOTNET_VERSION}" \
+            -e HOME=/tmp/home \
+            -e TEST_DIR=/work/_tests \
+            -v "${PWD}:/work" \
+            -w /work \
+            "${MUSL_TEST_IMAGE}" \
+            sh -lc '
+              set -e
+              mkdir -p "$HOME"
+              export DOTNET_ROOT=/tmp/dotnet
+              export PATH="$DOTNET_ROOT:$PATH"
+              bash /work/_temp/dotnet-install.sh --version "$DOTNET_VERSION" --install-dir "$DOTNET_ROOT" --architecture x64 --os linux-musl --no-path
+              chmod a+x _tests/ffprobe
+              find _tests -name "Radarr.Test.Dummy" -exec chmod a+x {} \;
+              chmod a+x _tests/test.sh
+              _tests/test.sh Linux Integration Test
+            '
 
       - name: Upload test results
         uses: actions/upload-artifact@v4
@@ -897,7 +903,7 @@ jobs:
       RADARRVERSION: ${{ needs.setup.outputs.radarr_version }}
       MAJORVERSION: '6.1.1'
       BUILD_SOURCEBRANCHNAME: ${{ needs.setup.outputs.branch_name }}
-      BUILDNAME: ${{ needs.setup.outputs.branch_name }}.${{ needs.setup.outputs.radarr_version }}
+      BUILDNAME: ${{ needs.setup.outputs.branch_name_safe }}.${{ needs.setup.outputs.radarr_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -1074,13 +1080,15 @@ jobs:
         shell: pwsh
 
       - name: Generate coverage report
-        uses: danielpalme/ReportGenerator-GitHub-Action@5
         if: always()
-        with:
-          reports: CoverageResults/**/coverage.cobertura.xml
-          targetdir: CoverageResults/combined
-          reporttypes: HtmlInline;Cobertura;Badges
-          sourcedirs: src
+        run: |
+          dotnet tool install --tool-path ./.tools dotnet-reportgenerator-globaltool --version 5.*
+          ./.tools/reportgenerator `
+            "-reports:CoverageResults/**/coverage.cobertura.xml" `
+            "-targetdir:CoverageResults/combined" `
+            "-reporttypes:HtmlInline;Cobertura;Badges" `
+            "-sourcedirs:src"
+        shell: pwsh
 
   # ---------------------------------------------------------------------------
   # API Docs: generate OpenAPI spec, create PR

AGENTS.md

@@ -0,0 +1,41 @@
+# Radarr Fork Agent Instructions
+
+These instructions apply to automated builders and reviewers working in this repository.
+
+## Session Startup
+
+- Work from a git worktree, not directly in the main checkout.
+- Read this file at the start of each session before making changes.
+- Check `git status --short --branch` before editing.
+- Assume the worktree may contain user changes. Do not revert or clean them up unless the user explicitly asks.
+
+## Communication
+
+- Keep updates concise and factual.
+- Act like an involved collaborator, not a passive executor.
+- Push back when a request is risky, underspecified, or likely to create avoidable maintenance problems.
+- Use role-based language such as `builder` or `reviewer` if you need to describe automation.
+- Do not use emojis in commits, pull requests, issues, comments, or docs.
+- Do not mention assistant product names in commits, pull requests, comments, or repo files.
+
+## Branch Workflow
+
+- This fork uses `develop` as the integration branch and `master` as the production branch.
+- Keep upstream-sync or vendor-tracking work separate from Staros-specific release work.
+- Do not assume upstream defaults are the same as this fork's release process.
+
+## Editing Standards
+
+- Match the existing .NET, frontend, and GitHub Actions patterns already in the repo.
+- Keep changes narrow and avoid unrelated cleanup in the same commit.
+- Use `rg` for search and `apply_patch` for manual edits.
+- Update docs or workflow guidance when branch behavior, release flow, or automation expectations change.
+
+## Validation
+
+- Run the smallest useful check for the files you changed.
+- For workflow-only changes, use focused review plus `git diff --check`.
+- If you cannot run a validation step, state that clearly and call out the remaining risk.
+## Git worktrees
+
+Worktree directory preference: create git worktrees under `~/worktrees/<repo>/<branch>`, never inside this clone or `~/Documents/Repos.nosync/`. Merged/clean worktrees are auto-pruned weekly by `infra/scripts/prune-worktrees.sh` (launchd `dev.staros.worktree-janitor`).

build.sh

@@ -15,13 +15,24 @@ ProgressEnd()
     echo "Finish '$1'"
 }
 
+EscapeSedReplacement()
+{
+    printf '%s' "$1" | sed -e 's/[&|\\]/\\&/g'
+}
+
 UpdateVersionNumber()
 {
     if [ "$RADARRVERSION" != "" ]; then
+        local escaped_version
+        local escaped_branch_name
+
+        escaped_version=$(EscapeSedReplacement "$RADARRVERSION")
+        escaped_branch_name=$(EscapeSedReplacement "$BUILD_SOURCEBRANCHNAME")
+
         echo "Updating Version Info"
-        sed -i'' -e "s/<AssemblyVersion>[0-9.*]\+<\/AssemblyVersion>/<AssemblyVersion>$RADARRVERSION<\/AssemblyVersion>/g" src/Directory.Build.props
-        sed -i'' -e "s/<AssemblyConfiguration>[\$()A-Za-z-]\+<\/AssemblyConfiguration>/<AssemblyConfiguration>${BUILD_SOURCEBRANCHNAME}<\/AssemblyConfiguration>/g" src/Directory.Build.props
-        sed -i'' -e "s/<string>10.0.0.0<\/string>/<string>$RADARRVERSION<\/string>/g" distribution/osx/Radarr.app/Contents/Info.plist
+        sed -i'' -e "s|<AssemblyVersion>[0-9.*]\+</AssemblyVersion>|<AssemblyVersion>${escaped_version}</AssemblyVersion>|g" src/Directory.Build.props
+        sed -i'' -e "s|<AssemblyConfiguration>[\$()A-Za-z/-]\+</AssemblyConfiguration>|<AssemblyConfiguration>${escaped_branch_name}</AssemblyConfiguration>|g" src/Directory.Build.props
+        sed -i'' -e "s|<string>10.0.0.0</string>|<string>${escaped_version}</string>|g" distribution/osx/Radarr.app/Contents/Info.plist
     fi
 }
 

frontend/src/Components/Page/Sidebar/PageSidebar.css

@@ -1,6 +1,7 @@
 .sidebarContainer {
   flex: 0 0 $sidebarWidth;
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: auto;
   width: $sidebarWidth;
   background-color: var(--sidebarBackgroundColor);
   transition: transform 300ms ease-in-out;
@@ -10,7 +11,8 @@
 .sidebar {
   display: flex;
   flex-direction: column;
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: auto;
   background-color: var(--sidebarBackgroundColor);
   color: var(--white);
 }
@@ -20,12 +22,15 @@
     position: fixed;
     top: 0;
     z-index: 2;
+    overflow-x: hidden;
+    overflow-y: auto;
     height: 100vh;
   }
 
   .sidebar {
     position: fixed;
     z-index: 2;
+    overflow-x: hidden;
     overflow-y: auto;
     width: 100%;
     height: 100%;

src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxySearchFixture.cs

@@ -18,9 +18,7 @@ public void Setup()
         }
 
         [TestCase("Prometheus", "Prometheus")]
-
-        // TODO: TMDB Doesn't like when we clean periods from this
-        // [TestCase("The Man from U.N.C.L.E.", "The Man from U.N.C.L.E.")]
+        [TestCase("The Man from U.N.C.L.E.", "The Man from U.N.C.L.E.")]
         [TestCase("imdb:tt2527336", "Star Wars: The Last Jedi")]
         [TestCase("imdb:tt2798920", "Annihilation")]
         [TestCase("https://www.imdb.com/title/tt0033467/", "Citizen Kane")]

src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyTitleNormalizationFixture.cs

@@ -0,0 +1,25 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.MetadataSource.SkyHook;
+
+namespace NzbDrone.Core.Test.MetadataSource.SkyHook
+{
+    [TestFixture]
+    public class SkyHookProxyTitleNormalizationFixture
+    {
+        [TestCase("The Man from U.N.C.L.E.", "the man from u.n.c.l.e.")]
+        [TestCase("R.I.P.D.", "r.i.p.d.")]
+        public void should_preserve_meaningful_periods_when_normalizing_titles(string title, string expected)
+        {
+            SkyHookProxy.NormalizeSearchTitle(title).Should().Be(expected);
+        }
+
+        [TestCase("the man from u.n.c.l.e.", "the+man+from+u.n.c.l.e.")]
+        [TestCase("r.i.p.d.", "r.i.p.d.")]
+        [TestCase("movie_title", "movie+title")]
+        public void should_only_replace_word_separators_when_building_search_terms(string title, string expected)
+        {
+            SkyHookProxy.BuildSearchTerm(title).Should().Be(expected);
+        }
+    }
+}

src/NzbDrone.Core.Test/ParserTests/EditionParserFixture.cs

@@ -24,6 +24,7 @@ public class EditionParserFixture : CoreTest
         [TestCase("Movie 2012 IMAX.mkv", "IMAX")]
         [TestCase("Movie 2012 Restored.mkv", "Restored")]
         [TestCase("Movie Title.Special.Edition.Fan Edit.2012..BRRip.x264.AAC-m2g", "Special Edition Fan Edit")]
+        [TestCase("Mission.Impossible.3.2011.Special.Edition.1080p.BluRay.x264-SPARKS", "Special Edition")]
         [TestCase("Movie Title (Despecialized) 1999.mkv", "Despecialized")]
         [TestCase("Movie Title.(Special.Edition.Remastered).2012.[Bluray-1080p].mkv", "Special Edition Remastered")]
         [TestCase("Movie Title Extended 2012", "Extended")]

src/NzbDrone.Core.Test/ParserTests/ExtendedQualityParserRegex.cs

@@ -22,11 +22,13 @@ public void Setup()
         [TestCase("Movie.Title.Super.Duper.Real.Proper.HDTV.x264-FTP", 0)]
         [TestCase("Movie.Title.PROPER.HDTV.x264-RiVER-RP", 0)]
         [TestCase("Movie.Title.PROPER.REAL.RERIP.1080p.BluRay.x264-TENEIGHTY", 1)]
+        [TestCase("Movie.Title.2013.REAL.PROPER.1080p.BluRay.x264-GRP", 1)]
         [TestCase("[MGS] - Movie.Title - Episode 02v2 - [D8B6C90D]", 0)]
         [TestCase("[Hatsuyuki] Movie Title - 07 [v2][848x480][23D8F455].avi", 0)]
         [TestCase("[DeadFish] Movie Title - 01v3 [720p][AAC]", 0)]
         [TestCase("[DeadFish] Movie Title Sword - 01v4 [720p][AAC]", 0)]
         [TestCase("The Real Movie.Titlewives of Some Place - S01E01 - Why are we doing this?", 0)]
+        [TestCase("The.Real.Movie.2013.1080p.BluRay.x264-GRP", 0)]
         public void should_parse_reality_from_title(string title, int reality)
         {
             QualityParser.ParseQuality(title).Revision.Real.Should().Be(reality);