mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

New: Import List Tags (#505) 

* New: Import List Tags

* New: Show ImportLists where Tag is Used in Tag manager

* Fixed: SignalR Errors due to handleTag missing

* Fixed: Clarify Lidarr Tags, not to be confused with LastFmTags
This commit is contained in:
Qstick 2018-10-08 20:56:05 -04:00 committed by GitHub
parent b17cccd736
commit 27736649c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 101 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/Components/SignalRConnector.js
View File

@ -11,6 +11,7 @@ import { setAppValue, setVersion } from 'Store/Actions/appActions';
import { update, updateItem, removeItem } from 'Store/Actions/baseActions';
import { fetchHealth } from 'Store/Actions/systemActions';
import { fetchQueue, fetchQueueDetails } from 'Store/Actions/queueActions';
import { fetchTags, fetchTagDetails } from 'Store/Actions/tagActions';
function getState(status) {
switch (status) {
@ -68,7 +69,9 @@ const mapDispatchToProps = {
dispatchRemoveItem: removeItem,
dispatchFetchHealth: fetchHealth,
dispatchFetchQueue: fetchQueue,
dispatchFetchQueueDetails: fetchQueueDetails
dispatchFetchQueueDetails: fetchQueueDetails,
dispatchFetchTags: fetchTags,
dispatchFetchTagDetails: fetchTagDetails
};
class SignalRConnector extends Component {
@ -263,6 +266,14 @@ class SignalRConnector extends Component {
// No-op for now, we may want this later
}
handleTag = (body) => {
if (body.action === 'sync') {
this.props.dispatchFetchTags();
this.props.dispatchFetchTagDetails();
return;
}
}
//
// Listeners
@ -362,7 +373,9 @@ SignalRConnector.propTypes = {
dispatchRemoveItem: PropTypes.func.isRequired,
dispatchFetchHealth: PropTypes.func.isRequired,
dispatchFetchQueue: PropTypes.func.isRequired,
dispatchFetchQueueDetails: PropTypes.func.isRequired
dispatchFetchQueueDetails: PropTypes.func.isRequired,
dispatchFetchTags: PropTypes.func.isRequired,
dispatchFetchTagDetails: PropTypes.func.isRequired
};
export default connect(createMapStateToProps, mapDispatchToProps)(SignalRConnector);

13
frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js
View File

@ -44,6 +44,7 @@ function EditImportListModalContent(props) {
qualityProfileId,
languageProfileId,
metadataProfileId,
tags,
fields
} = item;
@ -152,6 +153,18 @@ function EditImportListModalContent(props) {
/>
</FormGroup>
<FormGroup>
<FormLabel>Lidarr Tags</FormLabel>
<FormInputGroup
type={inputTypes.TAG}
name="tags"
helpText="Add artists from this list with these tags"
{...tags}
onChange={onInputChange}
/>
</FormGroup>
{
!!fields && !!fields.length &&
<div>

17
frontend/src/Settings/Tags/Details/TagDetailsModalContent.js
View File

@ -17,6 +17,7 @@ function TagDetailsModalContent(props) {
isTagUsed,
artist,
delayProfiles,
importLists,
notifications,
restrictions,
onModalClose,
@ -80,6 +81,21 @@ function TagDetailsModalContent(props) {
</FieldSet>
}
{
!!importLists.length &&
<FieldSet legend="Import Lists">
{
importLists.map((item) => {
return (
<div key={item.id}>
{item.name}
</div>
);
})
}
</FieldSet>
}
{
!!restrictions.length &&
<FieldSet legend="Restrictions">
@ -154,6 +170,7 @@ TagDetailsModalContent.propTypes = {
isTagUsed: PropTypes.bool.isRequired,
artist: PropTypes.arrayOf(PropTypes.object).isRequired,
delayProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
importLists: PropTypes.arrayOf(PropTypes.object).isRequired,
notifications: PropTypes.arrayOf(PropTypes.object).isRequired,
restrictions: PropTypes.arrayOf(PropTypes.object).isRequired,
onModalClose: PropTypes.func.isRequired,

12
frontend/src/Settings/Tags/Details/TagDetailsModalContentConnector.js
View File

@ -25,6 +25,14 @@ function createMatchingDelayProfilesSelector() {
);
}
function createMatchingImportListsSelector() {
return createSelector(
(state, { importListIds }) => importListIds,
(state) => state.settings.importLists.items,
findMatchingItems
);
}
function createMatchingNotificationsSelector() {
return createSelector(
(state, { notificationIds }) => notificationIds,
@ -45,12 +53,14 @@ function createMapStateToProps() {
return createSelector(
createMatchingArtistSelector(),
createMatchingDelayProfilesSelector(),
createMatchingImportListsSelector(),
createMatchingNotificationsSelector(),
createMatchingRestrictionsSelector(),
(artist, delayProfiles, notifications, restrictions) => {
(artist, delayProfiles, importLists, notifications, restrictions) => {
return {
artist,
delayProfiles,
importLists,
notifications,
restrictions
};

12
frontend/src/Settings/Tags/Tag.js
View File

@ -53,6 +53,7 @@ class Tag extends Component {
const {
label,
delayProfileIds,
importListIds,
notificationIds,
restrictionIds,
artistIds
@ -65,6 +66,7 @@ class Tag extends Component {
const isTagUsed = !!(
delayProfileIds.length ||
importListIds.length ||
notificationIds.length ||
restrictionIds.length ||
artistIds.length
@ -97,6 +99,13 @@ class Tag extends Component {
</div>
}
{
!!importListIds.length &&
<div>
{importListIds.length} import list{importListIds.length > 1 && 's'}
</div>
}
{
!!notificationIds.length &&
<div>
@ -125,6 +134,7 @@ class Tag extends Component {
isTagUsed={isTagUsed}
artistIds={artistIds}
delayProfileIds={delayProfileIds}
importListIds={importListIds}
notificationIds={notificationIds}
restrictionIds={restrictionIds}
isOpen={isDetailsModalOpen}
@ -150,6 +160,7 @@ Tag.propTypes = {
id: PropTypes.number.isRequired,
label: PropTypes.string.isRequired,
delayProfileIds: PropTypes.arrayOf(PropTypes.number).isRequired,
importListIds: PropTypes.arrayOf(PropTypes.number).isRequired,
notificationIds: PropTypes.arrayOf(PropTypes.number).isRequired,
restrictionIds: PropTypes.arrayOf(PropTypes.number).isRequired,
artistIds: PropTypes.arrayOf(PropTypes.number).isRequired,
@ -158,6 +169,7 @@ Tag.propTypes = {
Tag.defaultProps = {
delayProfileIds: [],
importListIds: [],
notificationIds: [],
restrictionIds: [],
artistIds: []

6
frontend/src/Settings/Tags/TagsConnector.js
View File

@ -3,7 +3,7 @@ import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { fetchTagDetails } from 'Store/Actions/tagActions';
import { fetchDelayProfiles, fetchNotifications, fetchRestrictions } from 'Store/Actions/settingsActions';
import { fetchDelayProfiles, fetchNotifications, fetchRestrictions, fetchImportLists } from 'Store/Actions/settingsActions';
import Tags from './Tags';
function createMapStateToProps() {
@ -27,6 +27,7 @@ function createMapStateToProps() {
const mapDispatchToProps = {
dispatchFetchTagDetails: fetchTagDetails,
dispatchFetchDelayProfiles: fetchDelayProfiles,
dispatchFetchImportLists: fetchImportLists,
dispatchFetchNotifications: fetchNotifications,
dispatchFetchRestrictions: fetchRestrictions
};
@ -40,12 +41,14 @@ class MetadatasConnector extends Component {
const {
dispatchFetchTagDetails,
dispatchFetchDelayProfiles,
dispatchFetchImportLists,
dispatchFetchNotifications,
dispatchFetchRestrictions
} = this.props;
dispatchFetchTagDetails();
dispatchFetchDelayProfiles();
dispatchFetchImportLists();
dispatchFetchNotifications();
dispatchFetchRestrictions();
}
@ -65,6 +68,7 @@ class MetadatasConnector extends Component {
MetadatasConnector.propTypes = {
dispatchFetchTagDetails: PropTypes.func.isRequired,
dispatchFetchDelayProfiles: PropTypes.func.isRequired,
dispatchFetchImportLists: PropTypes.func.isRequired,
dispatchFetchNotifications: PropTypes.func.isRequired,
dispatchFetchRestrictions: PropTypes.func.isRequired
};

2
src/Lidarr.Api.V1/Tags/TagDetailsResource.cs
View File

@ -9,6 +9,7 @@ namespace Lidarr.Api.V1.Tags
{
public string Label { get; set; }
public List<int> DelayProfileIds { get; set; }
public List<int> ImportListIds { get; set; }
public List<int> NotificationIds { get; set; }
public List<int> RestrictionIds { get; set; }
public List<int> ArtistIds { get; set; }
@ -25,6 +26,7 @@ namespace Lidarr.Api.V1.Tags
Id = model.Id,
Label = model.Label,
DelayProfileIds = model.DelayProfileIds,
ImportListIds = model.ImportListIds,
NotificationIds = model.NotificationIds,
RestrictionIds = model.RestrictionIds,
ArtistIds = model.ArtistIds

14
src/NzbDrone.Core/Datastore/Migration/022_import_list_tags.cs Normal file
View File

@ -0,0 +1,14 @@
using FluentMigrator;
using NzbDrone.Core.Datastore.Migration.Framework;
namespace NzbDrone.Core.Datastore.Migration
{
[Migration(22)]
public class import_list_tags : NzbDroneMigrationBase
{
protected override void MainDbUpgrade()
{
Alter.Table("ImportLists").AddColumn("Tags").AsString().Nullable();
}
}
}

3
src/NzbDrone.Core/Datastore/TableMapping.cs
View File

@ -66,8 +66,7 @@ namespace NzbDrone.Core.Datastore
.Ignore(d => d.Tags);
Mapper.Entity<ImportListDefinition>().RegisterDefinition("ImportLists")
.Ignore(i => i.Enable)
.Ignore(d => d.Tags);
.Ignore(i => i.Enable);
Mapper.Entity<NotificationDefinition>().RegisterDefinition("Notifications")
.Ignore(i => i.SupportsOnGrab)

1
src/NzbDrone.Core/ImportLists/ImportListSyncService.cs
View File

@ -125,6 +125,7 @@ namespace NzbDrone.Core.ImportLists
ProfileId = importList.ProfileId,
LanguageProfileId = importList.LanguageProfileId,
MetadataProfileId = importList.MetadataProfileId,
Tags = importList.Tags,
AlbumFolder = true,
AddOptions = new AddArtistOptions { SearchForMissingAlbums = true, Monitored = importList.ShouldMonitor, SelectedOption = 0 }
});

1
src/NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -196,6 +196,7 @@
<Compile Include="Datastore\Migration\018_album_disambiguation.cs" />
<Compile Include="Datastore\Migration\019_add_ape_quality_in_profiles.cs" />
<Compile Include="Datastore\Migration\021_add_custom_filters.cs" />
<Compile Include="Datastore\Migration\022_import_list_tags.cs" />
<Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
<Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
<Compile Include="Datastore\Migration\Framework\MigrationDbFactory.cs" />

1
src/NzbDrone.Core/Tags/TagDetails.cs
View File

@ -10,5 +10,6 @@ namespace NzbDrone.Core.Tags
public List<int> NotificationIds { get; set; }
public List<int> RestrictionIds { get; set; }
public List<int> DelayProfileIds { get; set; }
public List<int> ImportListIds { get; set; }
}
}

8
src/NzbDrone.Core/Tags/TagService.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using NzbDrone.Core.ImportLists;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Notifications;
using NzbDrone.Core.Profiles.Delay;
@ -25,6 +26,7 @@ namespace NzbDrone.Core.Tags
private readonly ITagRepository _repo;
private readonly IEventAggregator _eventAggregator;
private readonly IDelayProfileService _delayProfileService;
private readonly IImportListFactory _importListFactory;
private readonly INotificationFactory _notificationFactory;
private readonly IRestrictionService _restrictionService;
private readonly IArtistService _artistService;
@ -32,6 +34,7 @@ namespace NzbDrone.Core.Tags
public TagService(ITagRepository repo,
IEventAggregator eventAggregator,
IDelayProfileService delayProfileService,
ImportListFactory importListFactory,
INotificationFactory notificationFactory,
IRestrictionService restrictionService,
IArtistService artistService)
@ -39,6 +42,7 @@ namespace NzbDrone.Core.Tags
_repo = repo;
_eventAggregator = eventAggregator;
_delayProfileService = delayProfileService;
_importListFactory = importListFactory;
_notificationFactory = notificationFactory;
_restrictionService = restrictionService;
_artistService = artistService;
@ -65,6 +69,7 @@ namespace NzbDrone.Core.Tags
{
var tag = GetTag(tagId);
var delayProfiles = _delayProfileService.AllForTag(tagId);
var importLists = _importListFactory.AllForTag(tagId);
var notifications = _notificationFactory.AllForTag(tagId);
var restrictions = _restrictionService.AllForTag(tagId);
var artist = _artistService.AllForTag(tagId);
@ -74,6 +79,7 @@ namespace NzbDrone.Core.Tags
Id = tagId,
Label = tag.Label,
DelayProfileIds = delayProfiles.Select(c => c.Id).ToList(),
ImportListIds = importLists.Select(c => c.Id).ToList(),
NotificationIds = notifications.Select(c => c.Id).ToList(),
RestrictionIds = restrictions.Select(c => c.Id).ToList(),
ArtistIds = artist.Select(c => c.Id).ToList()
@ -84,6 +90,7 @@ namespace NzbDrone.Core.Tags
{
var tags = All();
var delayProfiles = _delayProfileService.All();
var importLists = _importListFactory.All();
var notifications = _notificationFactory.All();
var restrictions = _restrictionService.All();
var artists = _artistService.GetAllArtists();
@ -97,6 +104,7 @@ namespace NzbDrone.Core.Tags
Id = tag.Id,
Label = tag.Label,
DelayProfileIds = delayProfiles.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList(),
ImportListIds = importLists.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList(),
NotificationIds = notifications.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList(),
RestrictionIds = restrictions.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList(),
ArtistIds = artists.Where(c => c.Tags.Contains(tag.Id)).Select(c => c.Id).ToList()