mirror of
https://github.com/lidarr/lidarr.git
synced 2025-07-16 10:03:51 -07:00
Merge conflicts
This commit is contained in:
commit
dc0db08ca8
9 changed files with 49 additions and 43 deletions
|
@ -1,4 +1,4 @@
|
|||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using NLog;
|
||||
|
@ -31,8 +31,9 @@ namespace NzbDrone.Core.MediaFiles
|
|||
|
||||
public void Clean(Artist artist, List<string> filesOnDisk)
|
||||
{
|
||||
var artistFiles = _mediaFileService.GetFilesByArtist(artist.ForeignArtistId);
|
||||
var tracks = _trackService.GetTracksByArtist(artist.ForeignArtistId);
|
||||
var artistFiles = _mediaFileService.GetFilesByArtist(artist.Id);
|
||||
var tracks = _trackService.GetTracksByArtist(artist.Id);
|
||||
|
||||
|
||||
var filesOnDiskKeys = new HashSet<string>(filesOnDisk, PathEqualityComparer.Instance);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue