mirror of
https://github.com/Prowlarr/Prowlarr.git
synced 2025-09-17 17:14:18 +02:00
Fixed: Rejoin MovieFiles to Movies to fix Cutoff short term
This commit is contained in:
@@ -27,11 +27,14 @@ const selectMovieFiles = createSelector(
|
||||
|
||||
const hasMovieFiles = !!items.length;
|
||||
|
||||
const sizeOnDisk = items.map((item) => item.size).reduce((prev, curr) => prev + curr, 0);
|
||||
|
||||
return {
|
||||
isMovieFilesFetching: isFetching,
|
||||
isMovieFilesPopulated: isPopulated,
|
||||
movieFilesError: error,
|
||||
hasMovieFiles
|
||||
hasMovieFiles,
|
||||
sizeOnDisk
|
||||
};
|
||||
}
|
||||
);
|
||||
@@ -54,8 +57,9 @@ function createMapStateToProps() {
|
||||
const {
|
||||
isMovieFilesFetching,
|
||||
isMovieFilesPopulated,
|
||||
episodeFilesError,
|
||||
hasMovieFiles
|
||||
movieFilesError,
|
||||
hasMovieFiles,
|
||||
sizeOnDisk
|
||||
} = movieFiles;
|
||||
|
||||
const previousMovie = sortedMovies[movieIndex - 1] || _.last(sortedMovies);
|
||||
@@ -78,11 +82,7 @@ function createMapStateToProps() {
|
||||
const isFetching = isMovieFilesFetching;
|
||||
const isPopulated = isMovieFilesPopulated;
|
||||
const alternateTitles = _.reduce(movie.alternateTitles, (acc, alternateTitle) => {
|
||||
if ((alternateTitle.seasonNumber === -1 || alternateTitle.seasonNumber === undefined) &&
|
||||
(alternateTitle.sceneSeasonNumber === -1 || alternateTitle.sceneSeasonNumber === undefined)) {
|
||||
acc.push(alternateTitle.title);
|
||||
}
|
||||
|
||||
acc.push(alternateTitle.title);
|
||||
return acc;
|
||||
}, []);
|
||||
|
||||
@@ -97,8 +97,9 @@ function createMapStateToProps() {
|
||||
isRenamingMovie,
|
||||
isFetching,
|
||||
isPopulated,
|
||||
episodeFilesError,
|
||||
movieFilesError,
|
||||
hasMovieFiles,
|
||||
sizeOnDisk,
|
||||
previousMovie,
|
||||
nextMovie
|
||||
};
|
||||
|
@@ -18,11 +18,6 @@ class MovieIndexFooter extends PureComponent {
|
||||
let totalFileSize = 0;
|
||||
|
||||
movies.forEach((s) => {
|
||||
const { statistics = {} } = s;
|
||||
|
||||
const {
|
||||
sizeOnDisk = 0
|
||||
} = statistics;
|
||||
|
||||
if (s.hasFile) {
|
||||
movieFiles += 1;
|
||||
@@ -38,7 +33,7 @@ class MovieIndexFooter extends PureComponent {
|
||||
monitored++;
|
||||
}
|
||||
|
||||
totalFileSize += sizeOnDisk;
|
||||
totalFileSize += s.sizeOnDisk;
|
||||
});
|
||||
|
||||
return (
|
||||
|
@@ -12,13 +12,15 @@ function createUnoptimizedSelector() {
|
||||
const {
|
||||
monitored,
|
||||
status,
|
||||
statistics
|
||||
statistics,
|
||||
sizeOnDisk
|
||||
} = s;
|
||||
|
||||
return {
|
||||
monitored,
|
||||
status,
|
||||
statistics
|
||||
statistics,
|
||||
sizeOnDisk
|
||||
};
|
||||
});
|
||||
}
|
||||
|
@@ -1,5 +1,6 @@
|
||||
import PropTypes from 'prop-types';
|
||||
import React, { Component } from 'react';
|
||||
import formatBytes from 'Utilities/Number/formatBytes';
|
||||
import IconButton from 'Components/Link/IconButton';
|
||||
import { icons, kinds } from 'Helpers/Props';
|
||||
import TableRow from 'Components/Table/TableRow';
|
||||
@@ -70,6 +71,7 @@ class MovieFileEditorRow extends Component {
|
||||
const {
|
||||
id,
|
||||
relativePath,
|
||||
size,
|
||||
quality,
|
||||
qualityCutoffNotMet,
|
||||
languages
|
||||
@@ -105,6 +107,13 @@ class MovieFileEditorRow extends Component {
|
||||
/>
|
||||
</TableRowCell>
|
||||
|
||||
<TableRowCell
|
||||
className={styles.size}
|
||||
title={size}
|
||||
>
|
||||
{formatBytes(size)}
|
||||
</TableRowCell>
|
||||
|
||||
<TableRowCellButton
|
||||
className={styles.language}
|
||||
title="Click to change language"
|
||||
|
@@ -16,6 +16,11 @@ const columns = [
|
||||
label: 'Media Info',
|
||||
isVisible: true
|
||||
},
|
||||
{
|
||||
name: 'size',
|
||||
label: 'Size',
|
||||
isVisible: true
|
||||
},
|
||||
{
|
||||
name: 'languages',
|
||||
label: 'Languages',
|
||||
|
Reference in New Issue
Block a user