0.13.1-12 Fix
This commit is contained in:
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster-backend",
|
"name": "ripster-backend",
|
||||||
"version": "0.13.1-11",
|
"version": "0.13.1-12",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ripster-backend",
|
"name": "ripster-backend",
|
||||||
"version": "0.13.1-11",
|
"version": "0.13.1-12",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"archiver": "^7.0.1",
|
"archiver": "^7.0.1",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster-backend",
|
"name": "ripster-backend",
|
||||||
"version": "0.13.1-11",
|
"version": "0.13.1-12",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "commonjs",
|
"type": "commonjs",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -7269,8 +7269,13 @@ class PipelineService extends EventEmitter {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const pluginResult = await plugin.review(job, pluginCtx);
|
const pluginResult = await plugin.review(job, pluginCtx);
|
||||||
|
const scanLines = Array.isArray(pluginResult?.scanLines) ? pluginResult.scanLines : [];
|
||||||
|
const scanAnalysisLines = Array.isArray(pluginResult?.scanAnalysisLines) && pluginResult.scanAnalysisLines.length > 0
|
||||||
|
? pluginResult.scanAnalysisLines
|
||||||
|
: scanLines;
|
||||||
return {
|
return {
|
||||||
scanLines: Array.isArray(pluginResult?.scanLines) ? pluginResult.scanLines : [],
|
scanLines,
|
||||||
|
scanAnalysisLines,
|
||||||
runInfo: pluginResult?.runInfo && typeof pluginResult.runInfo === 'object'
|
runInfo: pluginResult?.runInfo && typeof pluginResult.runInfo === 'object'
|
||||||
? pluginResult.runInfo
|
? pluginResult.runInfo
|
||||||
: null,
|
: null,
|
||||||
@@ -12153,9 +12158,9 @@ class PipelineService extends EventEmitter {
|
|||||||
});
|
});
|
||||||
pluginExecution = this.mergePluginExecutionState(pluginExecution, reviewResult?.pluginExecution || null);
|
pluginExecution = this.mergePluginExecutionState(pluginExecution, reviewResult?.pluginExecution || null);
|
||||||
|
|
||||||
const scanText = Array.isArray(reviewResult?.scanLines)
|
const scanText = Array.isArray(reviewResult?.scanAnalysisLines) && reviewResult.scanAnalysisLines.length > 0
|
||||||
? reviewResult.scanLines.join('\n')
|
? reviewResult.scanAnalysisLines.join('\n')
|
||||||
: '';
|
: (Array.isArray(reviewResult?.scanLines) ? reviewResult.scanLines.join('\n') : '');
|
||||||
if (scanText) {
|
if (scanText) {
|
||||||
const { DVDSeriesPlugin } = require('../plugins/DVDSeriesPlugin');
|
const { DVDSeriesPlugin } = require('../plugins/DVDSeriesPlugin');
|
||||||
const dvdSeriesPlugin = new DVDSeriesPlugin();
|
const dvdSeriesPlugin = new DVDSeriesPlugin();
|
||||||
@@ -12507,9 +12512,9 @@ class PipelineService extends EventEmitter {
|
|||||||
});
|
});
|
||||||
pluginExecution = this.mergePluginExecutionState(pluginExecution, reviewResult?.pluginExecution || null);
|
pluginExecution = this.mergePluginExecutionState(pluginExecution, reviewResult?.pluginExecution || null);
|
||||||
|
|
||||||
const scanText = Array.isArray(reviewResult?.scanLines)
|
const scanText = Array.isArray(reviewResult?.scanAnalysisLines) && reviewResult.scanAnalysisLines.length > 0
|
||||||
? reviewResult.scanLines.join('\n')
|
? reviewResult.scanAnalysisLines.join('\n')
|
||||||
: '';
|
: (Array.isArray(reviewResult?.scanLines) ? reviewResult.scanLines.join('\n') : '');
|
||||||
if (scanText) {
|
if (scanText) {
|
||||||
const { DVDSeriesPlugin } = require('../plugins/DVDSeriesPlugin');
|
const { DVDSeriesPlugin } = require('../plugins/DVDSeriesPlugin');
|
||||||
const dvdSeriesPlugin = new DVDSeriesPlugin();
|
const dvdSeriesPlugin = new DVDSeriesPlugin();
|
||||||
@@ -12885,7 +12890,10 @@ class PipelineService extends EventEmitter {
|
|||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
if (normalizeMediaProfile(mediaProfile) === 'dvd') {
|
if (normalizeMediaProfile(mediaProfile) === 'dvd') {
|
||||||
const seriesScanContextResult = enrichSeriesAnalyzeContextFromScan(effectiveAnalyzeContext, lines);
|
const seriesScanLines = Array.isArray(pluginScan?.scanAnalysisLines) && pluginScan.scanAnalysisLines.length > 0
|
||||||
|
? pluginScan.scanAnalysisLines
|
||||||
|
: lines;
|
||||||
|
const seriesScanContextResult = enrichSeriesAnalyzeContextFromScan(effectiveAnalyzeContext, seriesScanLines);
|
||||||
effectiveAnalyzeContext = seriesScanContextResult.analyzeContext;
|
effectiveAnalyzeContext = seriesScanContextResult.analyzeContext;
|
||||||
effectiveIsSeriesDvdReview = isSeriesDvdMetadataSelection(mediaProfile, selectedMetadata, effectiveAnalyzeContext);
|
effectiveIsSeriesDvdReview = isSeriesDvdMetadataSelection(mediaProfile, selectedMetadata, effectiveAnalyzeContext);
|
||||||
}
|
}
|
||||||
@@ -16766,7 +16774,10 @@ class PipelineService extends EventEmitter {
|
|||||||
if (dvdHandBrakeScanJson) {
|
if (dvdHandBrakeScanJson) {
|
||||||
const allDvdTitles = parseHandBrakeTitleList(dvdHandBrakeScanJson);
|
const allDvdTitles = parseHandBrakeTitleList(dvdHandBrakeScanJson);
|
||||||
dvdAllTitles = allDvdTitles;
|
dvdAllTitles = allDvdTitles;
|
||||||
const seriesScanContextResult = enrichSeriesAnalyzeContextFromScan(effectiveAnalyzeContext, dvdScanLines);
|
const seriesScanLines = Array.isArray(pluginScan?.scanAnalysisLines) && pluginScan.scanAnalysisLines.length > 0
|
||||||
|
? pluginScan.scanAnalysisLines
|
||||||
|
: dvdScanLines;
|
||||||
|
const seriesScanContextResult = enrichSeriesAnalyzeContextFromScan(effectiveAnalyzeContext, seriesScanLines);
|
||||||
effectiveAnalyzeContext = seriesScanContextResult.analyzeContext;
|
effectiveAnalyzeContext = seriesScanContextResult.analyzeContext;
|
||||||
const wasSeriesDvdReview = effectiveIsSeriesDvdReview;
|
const wasSeriesDvdReview = effectiveIsSeriesDvdReview;
|
||||||
effectiveIsSeriesDvdReview = isSeriesDvdMetadataSelection(
|
effectiveIsSeriesDvdReview = isSeriesDvdMetadataSelection(
|
||||||
@@ -17414,7 +17425,10 @@ class PipelineService extends EventEmitter {
|
|||||||
dvdTitleScanJson = parseMediainfoJsonOutput(dvdTitleScanLines.join('\n'));
|
dvdTitleScanJson = parseMediainfoJsonOutput(dvdTitleScanLines.join('\n'));
|
||||||
if (dvdTitleScanJson) {
|
if (dvdTitleScanJson) {
|
||||||
const allTitles = parseHandBrakeTitleList(dvdTitleScanJson);
|
const allTitles = parseHandBrakeTitleList(dvdTitleScanJson);
|
||||||
const seriesScanContextResult = enrichSeriesAnalyzeContextFromScan(effectiveAnalyzeContext, dvdTitleScanLines);
|
const seriesScanLines = Array.isArray(pluginScan?.scanAnalysisLines) && pluginScan.scanAnalysisLines.length > 0
|
||||||
|
? pluginScan.scanAnalysisLines
|
||||||
|
: dvdTitleScanLines;
|
||||||
|
const seriesScanContextResult = enrichSeriesAnalyzeContextFromScan(effectiveAnalyzeContext, seriesScanLines);
|
||||||
effectiveAnalyzeContext = seriesScanContextResult.analyzeContext;
|
effectiveAnalyzeContext = seriesScanContextResult.analyzeContext;
|
||||||
const wasSeriesDvdReview = effectiveIsSeriesDvdReview;
|
const wasSeriesDvdReview = effectiveIsSeriesDvdReview;
|
||||||
effectiveIsSeriesDvdReview = isSeriesDvdMetadataSelection(
|
effectiveIsSeriesDvdReview = isSeriesDvdMetadataSelection(
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster-frontend",
|
"name": "ripster-frontend",
|
||||||
"version": "0.13.1-11",
|
"version": "0.13.1-12",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ripster-frontend",
|
"name": "ripster-frontend",
|
||||||
"version": "0.13.1-11",
|
"version": "0.13.1-12",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"primeicons": "^7.0.0",
|
"primeicons": "^7.0.0",
|
||||||
"primereact": "^10.9.2",
|
"primereact": "^10.9.2",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster-frontend",
|
"name": "ripster-frontend",
|
||||||
"version": "0.13.1-11",
|
"version": "0.13.1-12",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -1391,6 +1391,7 @@ export default function MediaInfoReviewPanel({
|
|||||||
onEpisodeFillStartChange = null,
|
onEpisodeFillStartChange = null,
|
||||||
episodeAssignmentsByTitle = {},
|
episodeAssignmentsByTitle = {},
|
||||||
onEpisodeAssignmentChange = null,
|
onEpisodeAssignmentChange = null,
|
||||||
|
allowEpisodeAssignments = false,
|
||||||
availableScripts = [],
|
availableScripts = [],
|
||||||
availableChains = [],
|
availableChains = [],
|
||||||
preEncodeItems = [],
|
preEncodeItems = [],
|
||||||
@@ -2393,7 +2394,7 @@ export default function MediaInfoReviewPanel({
|
|||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
{titleChecked ? (
|
{allowEpisodeAssignments && titleChecked ? (
|
||||||
<div className="episode-title-input-row">
|
<div className="episode-title-input-row">
|
||||||
<label htmlFor={`episode-title-${title.id}`}>Episodentitel</label>
|
<label htmlFor={`episode-title-${title.id}`}>Episodentitel</label>
|
||||||
<input
|
<input
|
||||||
|
|||||||
@@ -3678,6 +3678,7 @@ export default function PipelineStatusCard({
|
|||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
episodeAssignmentsByTitle={episodeAssignmentsByTitle}
|
episodeAssignmentsByTitle={episodeAssignmentsByTitle}
|
||||||
|
allowEpisodeAssignments={isSeriesDvdReview}
|
||||||
onEpisodeAssignmentChange={(titleId, patch = {}) => {
|
onEpisodeAssignmentChange={(titleId, patch = {}) => {
|
||||||
const normalizedTitleId = normalizeTitleId(titleId);
|
const normalizedTitleId = normalizeTitleId(titleId);
|
||||||
if (!normalizedTitleId || !patch || typeof patch !== 'object') {
|
if (!normalizedTitleId || !patch || typeof patch !== 'object') {
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster",
|
"name": "ripster",
|
||||||
"version": "0.13.1-11",
|
"version": "0.13.1-12",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ripster",
|
"name": "ripster",
|
||||||
"version": "0.13.1-11",
|
"version": "0.13.1-12",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"concurrently": "^9.1.2"
|
"concurrently": "^9.1.2"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster",
|
"name": "ripster",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.13.1-11",
|
"version": "0.13.1-12",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "concurrently \"npm run dev --prefix backend\" \"npm run dev --prefix frontend\"",
|
"dev": "concurrently \"npm run dev --prefix backend\" \"npm run dev --prefix frontend\"",
|
||||||
"dev:backend": "npm run dev --prefix backend",
|
"dev:backend": "npm run dev --prefix backend",
|
||||||
|
|||||||
Reference in New Issue
Block a user