mirror of
https://github.com/Readarr/Readarr.git
synced 2026-04-24 22:35:39 -04:00
Whole album matching and fingerprinting (#592)
* Cache result of GetAllArtists
* Fixed: Manual import not respecting album import notifications
* Fixed: partial album imports stay in queue, prompting manual import
* Fixed: Allow release if tracks are missing
* Fixed: Be tolerant of missing/extra "The" at start of artist name
* Improve manual import UI
* Omit video tracks from DB entirely
* Revert "faster test packaging in build.sh"
This reverts commit 2723e2a7b8.
-u and -T are not supported on macOS
* Fix tests on linux and macOS
* Actually lint on linux
On linux yarn runs scripts with sh not bash so ** doesn't recursively glob
* Match whole albums
* Option to disable fingerprinting
* Rip out MediaInfo
* Don't split up things that have the same album selected in manual import
* Try to speed up IndentificationService
* More speedups
* Some fixes and increase power of recording id
* Fix NRE when no tags
* Fix NRE when some (but not all) files in a directory have missing tags
* Bump taglib, tidy up tag parsing
* Add a health check
* Remove media info setting
* Tags -> audioTags
* Add some tests where tags are null
* Rename history events
* Add missing method to interface
* Reinstate MediaInfo tags and update info with artist scan
Also adds migration to remove old format media info
* This file no longer exists
* Don't penalise year if missing from tags
* Formatting improvements
* Use correct system newline
* Switch to the netstandard2.0 library to support net 461
* TagLib.File is IDisposable so should be in a using
* Improve filename matching and add tests
* Neater logging of parsed tags
* Fix disk scan tests for new media info update
* Fix quality detection source
* Fix Inexact Artist/Album match
* Add button to clear track mapping
* Fix warning
* Pacify eslint
* Use \ not /
* Fix UI updates
* Fix media covers
Prevent localizing URL propaging back to the metadata object
* Reduce database overhead broadcasting UI updates
* Relax timings a bit to make test pass
* Remove irrelevant tests
* Test framework for identification service
* Fix PreferMissingToBadMatch test case
* Make fingerprinting more robust
* More logging
* Penalize unknown media format and country
* Prefer USA to UK
* Allow Data CD
* Fix exception if fingerprinting fails for all files
* Fix tests
* Fix NRE
* Allow apostrophes and remove accents in filename aggregation
* Address codacy issues
* Cope with old versions of fpcalc and suggest upgrade
* fpcalc health check passes if fingerprinting disabled
* Get the Artist meta with the artist
* Fix the mapper so that lazy loaded lists will be populated on Join
And therefore we can join TrackFiles on Tracks by default and avoid an
extra query
* Rename subtitle -> lyric
* Tidy up MediaInfoFormatter
This commit is contained in:
@@ -17,6 +17,8 @@ using NzbDrone.Core.RootFolders;
|
||||
using NzbDrone.Core.Music;
|
||||
using NzbDrone.Core.Music.Events;
|
||||
using NzbDrone.Core.MediaFiles.TrackImport;
|
||||
using NzbDrone.Core.Parser.Model;
|
||||
using NzbDrone.Common;
|
||||
|
||||
namespace NzbDrone.Core.MediaFiles
|
||||
{
|
||||
@@ -33,6 +35,7 @@ namespace NzbDrone.Core.MediaFiles
|
||||
IExecute<RescanArtistCommand>
|
||||
{
|
||||
private readonly IDiskProvider _diskProvider;
|
||||
private readonly IMediaFileService _mediaFileService;
|
||||
private readonly IMakeImportDecision _importDecisionMaker;
|
||||
private readonly IImportApprovedTracks _importApprovedTracks;
|
||||
private readonly IConfigService _configService;
|
||||
@@ -43,6 +46,7 @@ namespace NzbDrone.Core.MediaFiles
|
||||
private readonly Logger _logger;
|
||||
|
||||
public DiskScanService(IDiskProvider diskProvider,
|
||||
IMediaFileService mediaFileService,
|
||||
IMakeImportDecision importDecisionMaker,
|
||||
IImportApprovedTracks importApprovedTracks,
|
||||
IConfigService configService,
|
||||
@@ -53,6 +57,7 @@ namespace NzbDrone.Core.MediaFiles
|
||||
Logger logger)
|
||||
{
|
||||
_diskProvider = diskProvider;
|
||||
_mediaFileService = mediaFileService;
|
||||
_importDecisionMaker = importDecisionMaker;
|
||||
_importApprovedTracks = importApprovedTracks;
|
||||
_configService = configService;
|
||||
@@ -114,11 +119,36 @@ namespace NzbDrone.Core.MediaFiles
|
||||
var decisionsStopwatch = Stopwatch.StartNew();
|
||||
var decisions = _importDecisionMaker.GetImportDecisions(mediaFileList, artist);
|
||||
decisionsStopwatch.Stop();
|
||||
_logger.Trace("Import decisions complete for: {0} [{1}]", artist, decisionsStopwatch.Elapsed);
|
||||
_logger.Debug("Import decisions complete for: {0} [{1}]", artist, decisionsStopwatch.Elapsed);
|
||||
|
||||
var importStopwatch = Stopwatch.StartNew();
|
||||
_importApprovedTracks.Import(decisions, false);
|
||||
|
||||
RemoveEmptyArtistFolder(artist.Path);
|
||||
UpdateMediaInfo(artist, decisions.Select(x => x.Item).ToList());
|
||||
CompletedScanning(artist);
|
||||
importStopwatch.Stop();
|
||||
_logger.Debug("Track import complete for: {0} [{1}]", artist, importStopwatch.Elapsed);
|
||||
}
|
||||
|
||||
private void UpdateMediaInfo(Artist artist, List<LocalTrack> mediaFiles)
|
||||
{
|
||||
var existingFiles = _mediaFileService.GetFilesByArtist(artist.Id);
|
||||
var toUpdate = new List<TrackFile>(existingFiles.Count);
|
||||
|
||||
foreach (var file in existingFiles)
|
||||
{
|
||||
var path = Path.Combine(artist.Path, file.RelativePath);
|
||||
var scannedFile = mediaFiles.FirstOrDefault(x => PathEqualityComparer.Instance.Equals(path, x.Path));
|
||||
|
||||
if (scannedFile != null)
|
||||
{
|
||||
file.MediaInfo = scannedFile.FileTrackInfo.MediaInfo;
|
||||
toUpdate.Add(file);
|
||||
}
|
||||
}
|
||||
|
||||
_logger.Debug($"Updating Media Info for:\n{string.Join("\n", toUpdate)}");
|
||||
_mediaFileService.UpdateMediaInfo(toUpdate);
|
||||
}
|
||||
|
||||
private void CleanMediaFiles(Artist artist, List<string> mediaFileList)
|
||||
|
||||
Reference in New Issue
Block a user