Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-07-17 16:50:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Bug Fix: Fixed stale references to old guideutils location. Also change dockerfile to get clear error messages during failure.

Browse source
This commit is contained in:
SergeantPanda 2026-03-24 13:19:48 -05:00
parent ec876716c5
commit 58f40ff276
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docker/Dockerfile
View file

@ -12,7 +12,7 @@ COPY ./frontend /app/frontend
# remove any node_modules that may have been copied from the host (x86)
RUN rm -rf node_modules || true; \
npm install --no-audit --progress=false;
RUN npm run build; \
RUN npm run build && \
rm -rf node_modules .cache
# --- Redeclare build arguments for the next stage ---
@ -32,9 +32,9 @@ COPY . /app
COPY ./docker/nginx.conf /etc/nginx/sites-enabled/default
# Fix line endings and make entrypoint scripts executable
RUN for f in /app/docker/entrypoint*.sh; do \
if [ -f "$f" ]; then \
sed -i 's/\r$//' "$f" && chmod +x "$f"; \
fi; \
if [ -f "$f" ]; then \
sed -i 's/\r$//' "$f" && chmod +x "$f"; \
fi; \
done
# Clean out existing frontend folder
RUN rm -rf /app/frontend

5
frontend/src/components/__tests__/ProgramDetailModal.test.jsx
View file

@ -21,9 +21,10 @@ vi.mock('../../utils/dateTimeUtils.js', () => ({
useDateTimeFormat: vi.fn(() => ({ timeFormat: 'h:mm A' })),
}));
vi.mock('../../pages/guideUtils', () => ({
vi.mock('../../utils/guideUtils', () => ({
formatSeasonEpisode: vi.fn((s, e) => {
if (s != null && e != null) return `S${String(s).padStart(2, '0')}E${String(e).padStart(2, '0')}`;
if (s != null && e != null)
return `S${String(s).padStart(2, '0')}E${String(e).padStart(2, '0')}`;
if (s != null) return `S${String(s).padStart(2, '0')}`;
if (e != null) return `E${String(e).padStart(2, '0')}`;
return null;

2
frontend/src/components/forms/ProgramRecordingModal.jsx
View file

@ -2,7 +2,7 @@ import React from 'react';
import { Modal, Flex, Button } from '@mantine/core';
import { deleteRecordingById } from '../../utils/cards/RecordingCardUtils.js';
import { deleteSeriesAndRule } from '../../utils/cards/RecordingCardUtils.js';
import { deleteSeriesRuleByTvgId } from '../../pages/guideUtils.js';
import { deleteSeriesRuleByTvgId } from '../../utils/guideUtils.js';
export default function ProgramRecordingModal({
opened,

2
frontend/src/components/forms/SeriesRecordingModal.jsx
View file

@ -5,7 +5,7 @@ import { deleteSeriesAndRule } from '../../utils/cards/RecordingCardUtils.js';
import {
evaluateSeriesRulesByTvgId,
fetchRules,
} from '../../pages/guideUtils.js';
} from '../../utils/guideUtils.js';
import { showNotification } from '../../utils/notificationUtils.js';
export default function SeriesRecordingModal({