Release 3.3.5

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
   "name": "Whisparr",
   "image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0",
   "features": {
-    "ghcr.io/devcontainers/features/node:1": {
+    "ghcr.io/devcontainers/features/node:2": {
       "nodeGypDependencies": true,
       "version": "20",
       "nvmVersion": "latest"

.github/actions/build/action.yml

@@ -8,6 +8,9 @@ inputs:
   version:
     description: "Version number to build"
     required: true
+  assembly_version:
+    description: "Assembly version (major.minor.patch.build) to stamp"
+    required: true
   framework:
     description: ".net framework used for the build"
     required: true
@@ -38,7 +41,7 @@ runs:
         echo "SDK_PATH=${{ env.DOTNET_ROOT }}/sdk/${DOTNET_VERSION}" >> "$GITHUB_ENV"
         echo "WHISPARR_VERSION=${{ inputs.version }}" >> "$GITHUB_ENV"
         echo "BRANCH=${{ inputs.branch }}" >> "$GITHUB_ENV"
-        echo "WHISPARR_ASSEMBLY_VERSION=${{ env.WHISPARR_ASSEMBLY_VERSION }}" >> "$GITHUB_ENV"
+        echo "WHISPARR_ASSEMBLY_VERSION=${{ inputs.assembly_version }}" >> "$GITHUB_ENV"
 
         if [ "$RUNNER_OS" == "Windows" ]; then
           echo "NUGET_PACKAGES=D:\nuget\packages" >> "$GITHUB_ENV"

.github/workflows/build_v3.yml

@@ -24,8 +24,10 @@ env:
   FRAMEWORK: net10.0
   RAW_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   WHISPARR_MAJOR_VERSION: 3
-  VERSION: 3.3.4
-  WHISPARR_ASSEMBLY_VERSION: 3.3.4.${{ github.run_number }}
+  # Base version now comes from the newest base tag (vX.Y.Z) reachable from the
+  # building branch; this is only the fallback for the seed window before any
+  # base tag exists. See prepare job below.
+  VERSION_FALLBACK: 3.3.4
 
 jobs:
   prepare:
@@ -34,20 +36,45 @@ jobs:
       framework: ${{ steps.variables.outputs.framework }}
       major_version: ${{ steps.variables.outputs.major_version }}
       version: ${{ steps.variables.outputs.version }}
+      assembly_version: ${{ steps.variables.outputs.assembly_version }}
       branch: ${{ steps.variables.outputs.branch }}
     steps:
+      - name: Check out
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0 # fetches tags; needed to read the version marker
+
       - name: Setup Environment Variables
         id: variables
         shell: bash
         run: |
+          # Base version = highest base tag (strictly vX.Y.Z) reachable from THIS
+          # branch's history. --merged keeps it reachability-scoped so eros-develop
+          # and eros each resolve their own base; the strict regex rejects both the
+          # CI-minted -develop.N/-release.N tags and the legacy 4-part vX.Y.Z.B tags
+          # inherited from upstream (which glob-based matching cannot separate).
+          # `|| true` keeps the default bash `-eo pipefail` shell from aborting the
+          # step when no base tag matches yet (seed window) or when `head` closes the
+          # pipe early (SIGPIPE).
+          BASE_TAG=$(git tag --merged HEAD --sort=-v:refname 2>/dev/null \
+            | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | head -n1 || true)
+          if [ -n "$BASE_TAG" ]; then
+            BASE="${BASE_TAG#v}"
+            echo "Base version ${BASE} (from tag ${BASE_TAG})"
+          else
+            BASE="${{ env.VERSION_FALLBACK }}"
+            echo "Base version ${BASE} (from VERSION_FALLBACK; no vX.Y.Z tag reachable)"
+          fi
+
           if [[ "${{ github.ref_name }}" == "eros-develop" ]]; then
             SEMVER_LABEL="develop"
           else
             SEMVER_LABEL="release"
           fi
           echo "framework=${{ env.FRAMEWORK }}" >> "$GITHUB_OUTPUT"
           echo "major_version=${{ env.WHISPARR_MAJOR_VERSION }}" >> "$GITHUB_OUTPUT"
-          echo "version=${{ env.VERSION }}-${SEMVER_LABEL}.${{ github.run_number }}" >> "$GITHUB_OUTPUT"
+          echo "version=${BASE}-${SEMVER_LABEL}.${{ github.run_number }}" >> "$GITHUB_OUTPUT"
+          echo "assembly_version=${BASE}.${{ github.run_number }}" >> "$GITHUB_OUTPUT"
           echo "branch=${RAW_BRANCH_NAME//\//-}" >> "$GITHUB_OUTPUT"
 
   backend:
@@ -99,6 +126,7 @@ jobs:
         with:
           branch: ${{ needs.prepare.outputs.branch }}
           version: ${{ needs.prepare.outputs.version }}
+          assembly_version: ${{ needs.prepare.outputs.assembly_version }}
           framework: ${{ needs.prepare.outputs.framework }}
           runtime: ${{ matrix.runtime }}
           package_tests: ${{ matrix.package_tests }}

frontend/src/Store/Actions/addMovieActions.js

@@ -6,7 +6,6 @@ import createAjaxRequest from 'Utilities/createAjaxRequest';
 import getNewPerformer from 'Utilities/Performer/getNewPerformer';
 import getSectionState from 'Utilities/State/getSectionState';
 import updateSectionState from 'Utilities/State/updateSectionState';
-import getNewStudio from 'Utilities/Studio/getNewStudio';
 import { set, update, updateItem } from './baseActions';
 import createHandleActions from './Creators/createHandleActions';
 import createSetSettingValueReducer from './Creators/Reducers/createSetSettingValueReducer';
@@ -28,8 +27,6 @@ export const defaultState = {
   isAdded: false,
   addError: null,
   items: [],
-  studiosWithStatus: [],
-
   movieDefaults: {
     rootFolderPath: '',
     monitor: 'movieOnly',
@@ -65,31 +62,24 @@ export const persistState = [
 //
 // Actions Types
 
-export const LOOKUP_STUDIO = 'addMovie/lookupStudio';
 export const LOOKUP_PERFORMER = 'addMovie/lookupPerformer';
 export const ADD_PERFORMER = 'addMovie/addPerformer';
-export const ADD_STUDIO = 'addMovie/addStudio';
 export const SET_ADD_MOVIE_VALUE = 'addMovie/setAddMovieValue';
 export const SET_ADD_PERFORMER_VALUE = 'addMovie/setAddPerformerValue';
-export const SET_ADD_STUDIO_VALUE = 'addMovie/setAddStudioValue';
 export const CLEAR_ADD_MOVIE = 'addMovie/clearAddMovie';
 export const SET_ADD_MOVIE_DEFAULT = 'addMovie/setAddMovieDefault';
 export const SET_ADD_PERFORMER_DEFAULT = 'addMovie/setAddPerformerDefault';
 export const SET_ADD_STUDIO_DEFAULT = 'addMovie/setAddStudioDefault';
-export const SET_STUDIOS_WITH_STATUS = 'addMovie/setStudiosWithStatus';
 
 //
 // Action Creators
 
-export const lookupStudio = createThunk(LOOKUP_STUDIO);
 export const lookupPerformer = createThunk(LOOKUP_PERFORMER);
 export const addPerformer = createThunk(ADD_PERFORMER);
-export const addStudio = createThunk(ADD_STUDIO);
 export const clearAddMovie = createAction(CLEAR_ADD_MOVIE);
 export const setAddMovieDefault = createAction(SET_ADD_MOVIE_DEFAULT);
 export const setAddPerformerDefault = createAction(SET_ADD_PERFORMER_DEFAULT);
 export const setAddStudioDefault = createAction(SET_ADD_STUDIO_DEFAULT);
-export const setStudiosWithStatus = createAction(SET_STUDIOS_WITH_STATUS);
 
 export const setAddMovieValue = createAction(SET_ADD_MOVIE_VALUE, (payload) => {
   return {
@@ -106,67 +96,12 @@ export const setAddPerformerValue = createAction(
     };
   }
 );
-export const setAddStudioValue = createAction(
-  SET_ADD_STUDIO_VALUE,
-  (payload) => {
-    return {
-      section,
-      ...payload,
-    };
-  }
-);
+
 //
 // Action Handlers
 
 export const actionHandlers = handleThunks({
-  [LOOKUP_STUDIO]: function (getState, payload, dispatch) {
-    dispatch(set({ section, isFetching: true }));
-
-    if (abortCurrentRequest) {
-      abortCurrentRequest();
-    }
-
-    const { request, abortRequest } = createAjaxRequest({
-      url: '/lookup/studio',
-      data: {
-        term: payload.term,
-      },
-    });
-
-    abortCurrentRequest = abortRequest;
-
-    request.done((data) => {
-      data = data.map((movie) => ({
-        ...movie,
-        internalId: movie.id,
-        id: movie.foreignId,
-      }));
 
-      dispatch(
-        batchActions([
-          update({ section, data }),
-
-          set({
-            section,
-            isFetching: false,
-            isPopulated: true,
-            error: null,
-          }),
-        ])
-      );
-    });
-
-    request.fail((xhr) => {
-      dispatch(
-        set({
-          section,
-          isFetching: false,
-          isPopulated: false,
-          error: xhr.aborted ? null : xhr,
-        })
-      );
-    });
-  },
 
   [LOOKUP_PERFORMER]: function (getState, payload, dispatch) {
     dispatch(set({ section, isFetching: true }));
@@ -270,55 +205,7 @@ export const actionHandlers = handleThunks({
     });
   },
 
-  [ADD_STUDIO]: function (getState, payload, dispatch) {
-    dispatch(set({ section, isAdding: true }));
-
-    const foreignId = payload.foreignId;
-    const items = getState().addMovie.items;
-    const itemToAdd = _.find(items, { foreignId });
-    const newStudio = getNewStudio(_.cloneDeep(itemToAdd.studio), payload);
-    newStudio.id = 0;
-
-    const promise = createAjaxRequest({
-      url: '/studio',
-      method: 'POST',
-      dataType: 'json',
-      contentType: 'application/json',
-      data: JSON.stringify(newStudio),
-    }).request;
-
-    promise.done((data) => {
-      const updatedItem = _.cloneDeep(data);
-      updatedItem.internalId = updatedItem.id;
-      updatedItem.id = updatedItem.foreignId;
-      delete updatedItem.images;
-
-      const actions = [
-        updateItem({ section: 'studios', ...data }),
-        updateItem({ section: 'addMovie', ...updatedItem }),
-
-        set({
-          section,
-          isAdding: false,
-          isAdded: true,
-          addError: null,
-        }),
-      ];
 
-      dispatch(batchActions(actions));
-    });
-
-    promise.fail((xhr) => {
-      dispatch(
-        set({
-          section,
-          isAdding: false,
-          isAdded: false,
-          addError: xhr,
-        })
-      );
-    });
-  },
 });
 
 //
@@ -328,7 +215,6 @@ export const reducers = createHandleActions(
   {
     [SET_ADD_MOVIE_VALUE]: createSetSettingValueReducer(section),
     [SET_ADD_PERFORMER_VALUE]: createSetSettingValueReducer(section),
-    [SET_ADD_STUDIO_VALUE]: createSetSettingValueReducer(section),
 
     [SET_ADD_MOVIE_DEFAULT]: function (state, { payload }) {
       const newState = getSectionState(state, section);
@@ -361,12 +247,6 @@ export const reducers = createHandleActions(
       return updateSectionState(state, section, newState);
     },
 
-    [SET_STUDIOS_WITH_STATUS]: function (state, { payload }) {
-      const newState = getSectionState(state, section);
-      newState.studiosWithStatus = payload;
-      return updateSectionState(state, section, newState);
-    },
-
     [CLEAR_ADD_MOVIE]: function (state) {
       const {
         movieDefaults,

frontend/src/Studio/AddNewStudio/AddNewStudio.tsx

@@ -8,7 +8,6 @@ import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import PageContent from 'Components/Page/PageContent';
 import PageContentBody from 'Components/Page/PageContentBody';
 import { icons, kinds } from 'Helpers/Props';
-import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import translate from 'Utilities/String/translate';
 import AddNewStudioSearchResult from './AddNewStudioSearchResult';
 import useAddNewStudio from './useAddNewStudio';
@@ -84,7 +83,9 @@ function AddNewStudio(props: AddNewStudioProps) {
             <div className={styles.helpText}>
               {translate('FailedLoadingSearchResults')}
             </div>
-            <Alert kind={kinds.WARNING}>{getErrorMessage(error)}</Alert>
+            <Alert kind={kinds.WARNING}>
+              {error?.statusBody?.message ?? error?.message ?? ''}
+            </Alert>
             <div>
               <Link to="https://wiki.servarr.com/whisparr/troubleshooting#invalid-response-received-from-tmdb">
                 {translate('WhySearchesCouldBeFailing')}

frontend/src/Studio/AddNewStudio/AddNewStudioModal.tsx

@@ -1,11 +1,12 @@
 import React from 'react';
 import Modal from 'Components/Modal/Modal';
-import { Image } from 'Studio/Studio';
+import Studio, { Image } from 'Studio/Studio';
 import AddNewStudioModalContent from './AddNewStudioModalContent';
 
 interface AddNewStudioModalProps {
   isOpen: boolean;
   onModalClose: () => void;
+  studio: Studio;
   foreignId: string;
   title: string;
   images: Image[];

frontend/src/Studio/AddNewStudio/AddNewStudioModalContent.tsx

@@ -10,22 +10,23 @@ import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { inputTypes, kinds } from 'Helpers/Props';
-import { Image } from 'Studio/Studio';
+import Studio, { Image } from 'Studio/Studio';
 import StudioLogo from 'Studio/StudioLogo';
 import { EnhancedSelectInputChanged } from 'typings/inputs';
 import translate from 'Utilities/String/translate';
 import { useAddNewStudioModalContent } from './useAddNewStudio';
 import styles from './AddNewStudioModalContent.css';
 
 interface AddNewStudioModalContentProps {
+  studio: Studio;
   foreignId: string;
   title: string;
   images: Image[];
   onModalClose: () => void;
 }
 
 function AddNewStudioModalContent(props: AddNewStudioModalContentProps) {
-  const { foreignId, title, images, onModalClose } = props;
+  const { title, images, onModalClose, studio } = props;
 
   const {
     isAdding,
@@ -35,7 +36,7 @@ function AddNewStudioModalContent(props: AddNewStudioModalContentProps) {
     settings,
     onInputChange,
     onAddStudioPress,
-  } = useAddNewStudioModalContent(foreignId);
+  } = useAddNewStudioModalContent(studio);
 
   const onQualityProfileIdChange = React.useCallback(
     ({ value }: EnhancedSelectInputChanged<string | number>) => {

frontend/src/Studio/AddNewStudio/AddNewStudioSearchResult.tsx

@@ -134,6 +134,7 @@ function AddNewStudioSearchResult({
 
       <AddNewStudioModal
         isOpen={isNewAddStudioModalOpen && !isExistingStudio}
+        studio={studio}
         foreignId={foreignId}
         title={title}
         images={images}