mirror of
https://github.com/Readarr/Readarr.git
synced 2026-04-25 22:36:59 -04:00
Cleanup Conflicts in Sonarr/Lidarr Pulls
Co-Authored-By: Robin Dadswell <19610103+RobinDadswell@users.noreply.github.com>
This commit is contained in:
@@ -389,7 +389,7 @@ class MediaManagement extends Component {
|
||||
type={inputTypes.UMASK}
|
||||
name="chmodFolder"
|
||||
helpText="Octal, applied during import/rename to media folders and files (without execute bits)"
|
||||
helpTextWarning="This only works if the user running Lidarr is the owner of the file. It's better to ensure the download client sets the permissions properly."
|
||||
helpTextWarning="This only works if the user running Readarr is the owner of the file. It's better to ensure the download client sets the permissions properly."
|
||||
onChange={onInputChange}
|
||||
{...settings.chmodFolder}
|
||||
/>
|
||||
|
||||
@@ -9,7 +9,7 @@ function findMatchingItems(ids, items) {
|
||||
});
|
||||
}
|
||||
|
||||
function createMatchingAuthorSelector() {
|
||||
function createUnorderedMatchingAuthorSelector() {
|
||||
return createSelector(
|
||||
(state, { authorIds }) => authorIds,
|
||||
createAllAuthorSelector(),
|
||||
@@ -17,13 +17,13 @@ function createMatchingAuthorSelector() {
|
||||
);
|
||||
}
|
||||
|
||||
function createMatchingArtistSelector() {
|
||||
function createMatchingAuthorSelector() {
|
||||
return createSelector(
|
||||
createUnorderedMatchingArtistSelector(),
|
||||
(artists) => {
|
||||
return artists.sort((artistA, artistB) => {
|
||||
const sortNameA = artistA.sortName;
|
||||
const sortNameB = artistB.sortName;
|
||||
createUnorderedMatchingAuthorSelector(),
|
||||
(authors) => {
|
||||
return authors.sort((authorA, authorB) => {
|
||||
const sortNameA = authorA.sortName;
|
||||
const sortNameB = authorB.sortName;
|
||||
|
||||
if (sortNameA > sortNameB) {
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user