github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-13 08:33:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: OS specific paths for import artist tip

Browse source
This commit is contained in:
Qstick 2018-11-11 00:14:39 -05:00
parent 4712f7f947
commit eedaa2a7b8
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/AddArtist/ImportArtist/SelectFolder/ImportArtistSelectFolder.js
View file

@ -68,6 +68,7 @@ class ImportArtistSelectFolder extends Component {
render() { render() {
const { const {
isWindows,
isFetching, isFetching,
isPopulated, isPopulated,
error, error,
@ -98,7 +99,7 @@ class ImportArtistSelectFolder extends Component {
Some tips to ensure the import goes smoothly: Some tips to ensure the import goes smoothly:
<ul> <ul>
<li className={styles.tip}> <li className={styles.tip}>
Point Lidarr to the folder containing all of your music not a specific artist. eg. <span className={styles.code}>"\music\"</span> and not <span className={styles.code}>"\music\alien ant farm\"</span> Point Lidarr to the folder containing all of your music not a specific one. eg. <span className={styles.code}>"{isWindows ? 'C:\\music' : '/music'}"</span> and not <span className={styles.code}>"{isWindows ? 'C:\\music\\sublime' : '/music/sublime'}"</span>
</li> </li>
</ul> </ul>
</div> </div>
@ -172,6 +173,7 @@ class ImportArtistSelectFolder extends Component {
} }
ImportArtistSelectFolder.propTypes = { ImportArtistSelectFolder.propTypes = {
isWindows: PropTypes.bool.isRequired,
isFetching: PropTypes.bool.isRequired, isFetching: PropTypes.bool.isRequired,
isPopulated: PropTypes.bool.isRequired, isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object, error: PropTypes.object,

9
frontend/src/AddArtist/ImportArtist/SelectFolder/ImportArtistSelectFolderConnector.js
View file

@ -4,14 +4,19 @@ import React, { Component } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { push } from 'react-router-redux'; import { push } from 'react-router-redux';
import createSystemStatusSelector from 'Store/Selectors/createSystemStatusSelector';
import { fetchRootFolders, addRootFolder, deleteRootFolder } from 'Store/Actions/rootFolderActions'; import { fetchRootFolders, addRootFolder, deleteRootFolder } from 'Store/Actions/rootFolderActions';
import ImportArtistSelectFolder from './ImportArtistSelectFolder'; import ImportArtistSelectFolder from './ImportArtistSelectFolder';
function createMapStateToProps() { function createMapStateToProps() {
return createSelector( return createSelector(
(state) => state.rootFolders, (state) => state.rootFolders,
(rootFolders) => { createSystemStatusSelector(),
return rootFolders; (rootFolders, systemStatus) => {
return {
...rootFolders,
isWindows: systemStatus.isWindows
};
} }
); );
} }