alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 09:34:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

make library scan a bit more hands off

Browse Source
This commit is contained in:
Luke Pulverenti
2015-01-17 13:15:09 -05:00
parent 7a136349ee
commit 628c6cbc28
28 changed files with 254 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@@ -985,76 +985,6 @@ namespace MediaBrowser.Server.Implementations.Library
return new PeopleValidator(this, _logger, ConfigurationManager).ValidatePeople(cancellationToken, progress);
}
/// <summary>
/// Validates the artists.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
/// <param name="progress">The progress.</param>
/// <returns>Task.</returns>
public Task ValidateArtists(CancellationToken cancellationToken, IProgress<double> progress)
{
// Ensure the location is unavailable.
Directory.CreateDirectory(ArtistsPath);
return new ArtistsValidator(this, _userManager, _logger).Run(progress, cancellationToken);
}
/// <summary>
/// Validates the music genres.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
/// <param name="progress">The progress.</param>
/// <returns>Task.</returns>
public Task ValidateMusicGenres(CancellationToken cancellationToken, IProgress<double> progress)
{
// Ensure the location is unavailable.
Directory.CreateDirectory(ConfigurationManager.ApplicationPaths.MusicGenrePath);
return new MusicGenresValidator(this, _logger).Run(progress, cancellationToken);
}
/// <summary>
/// Validates the game genres.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
/// <param name="progress">The progress.</param>
/// <returns>Task.</returns>
public Task ValidateGameGenres(CancellationToken cancellationToken, IProgress<double> progress)
{
// Ensure the location is unavailable.
Directory.CreateDirectory(ConfigurationManager.ApplicationPaths.GameGenrePath);
return new GameGenresValidator(this, _userManager, _logger).Run(progress, cancellationToken);
}
/// <summary>
/// Validates the studios.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
/// <param name="progress">The progress.</param>
/// <returns>Task.</returns>
public Task ValidateStudios(CancellationToken cancellationToken, IProgress<double> progress)
{
// Ensure the location is unavailable.
Directory.CreateDirectory(ConfigurationManager.ApplicationPaths.StudioPath);
return new StudiosValidator(this, _userManager, _logger).Run(progress, cancellationToken);
}
/// <summary>
/// Validates the genres.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
/// <param name="progress">The progress.</param>
/// <returns>Task.</returns>
public Task ValidateGenres(CancellationToken cancellationToken, IProgress<double> progress)
{
// Ensure the location is unavailable.
Directory.CreateDirectory(ConfigurationManager.ApplicationPaths.GenrePath);
return new GenresValidator(this, _userManager, _logger).Run(progress, cancellationToken);
}
/// <summary>
/// Reloads the root media folder
/// </summary>

3
MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
View File

@@ -6,11 +6,10 @@ using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using MediaBrowser.Naming.Audio;
using MediaBrowser.Naming.Common;
using MediaBrowser.Server.Implementations.Logging;
using System;
using System.Collections.Generic;
using System.IO;
using MediaBrowser.Server.Implementations.Logging;
namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
{

7
MediaBrowser.Server.Implementations/Library/Validators/ArtistsPostScanTask.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Logging;
using System;
using System.Threading;
using System.Threading.Tasks;
@@ -14,14 +15,16 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// The _library manager
/// </summary>
private readonly ILibraryManager _libraryManager;
private readonly ILogger _logger;
/// <summary>
/// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
/// </summary>
/// <param name="libraryManager">The library manager.</param>
public ArtistsPostScanTask(ILibraryManager libraryManager)
public ArtistsPostScanTask(ILibraryManager libraryManager, ILogger logger)
{
_libraryManager = libraryManager;
_logger = logger;
}
/// <summary>
@@ -32,7 +35,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// <returns>Task.</returns>
public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
{
return ((LibraryManager)_libraryManager).ValidateArtists(cancellationToken, progress);
return new ArtistsValidator(_libraryManager, _logger).Run(progress, cancellationToken);
}
}
}

65
MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
View File

@@ -1,7 +1,5 @@
using MediaBrowser.Common.Progress;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using System;
using System.Collections.Generic;
@@ -22,11 +20,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// </summary>
private readonly ILibraryManager _libraryManager;
/// <summary>
/// The _user manager
/// </summary>
private readonly IUserManager _userManager;
/// <summary>
/// The _logger
/// </summary>
@@ -36,12 +29,10 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
/// </summary>
/// <param name="libraryManager">The library manager.</param>
/// <param name="userManager">The user manager.</param>
/// <param name="logger">The logger.</param>
public ArtistsValidator(ILibraryManager libraryManager, IUserManager userManager, ILogger logger)
public ArtistsValidator(ILibraryManager libraryManager, ILogger logger)
{
_libraryManager = libraryManager;
_userManager = userManager;
_logger = logger;
}
@@ -55,56 +46,8 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{
var allItems = _libraryManager.RootFolder.GetRecursiveChildren();
var allSongs = allItems.OfType<Audio>().ToList();
var allSongs = allItems.Where(i => !i.IsFolder).OfType<IHasArtist>().ToList();
var innerProgress = new ActionableProgress<double>();
innerProgress.RegisterAction(pct => progress.Report(pct * .8));
var allArtists = await GetAllArtists(allSongs, cancellationToken, innerProgress).ConfigureAwait(false);
progress.Report(80);
var numComplete = 0;
var numArtists = allArtists.Count;
foreach (var artist in allArtists)
{
cancellationToken.ThrowIfCancellationRequested();
// Only do this for artists accessed by name. Folder-based artists get it from the normal refresh
if (artist.IsAccessedByName && !artist.LockedFields.Contains(MetadataFields.Genres))
{
// Avoid implicitly captured closure
var artist1 = artist;
artist.Genres = allSongs.Where(i => i.HasArtist(artist1.Name))
.SelectMany(i => i.Genres)
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
}
numComplete++;
double percent = numComplete;
percent /= numArtists;
percent *= 20;
progress.Report(80 + percent);
}
progress.Report(100);
}
/// <summary>
/// Gets all artists.
/// </summary>
/// <param name="allSongs">All songs.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <param name="progress">The progress.</param>
/// <returns>Task{Artist[]}.</returns>
private async Task<List<MusicArtist>> GetAllArtists(IEnumerable<Audio> allSongs, CancellationToken cancellationToken, IProgress<double> progress)
{
var allArtists = allSongs.SelectMany(i => i.AllArtists)
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
@@ -138,8 +81,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
progress.Report(100 * percent);
}
return returnArtists;
}
}
}

8
MediaBrowser.Server.Implementations/Library/Validators/GameGenresPostScanTask.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Logging;
using System;
using System.Threading;
using System.Threading.Tasks;
@@ -14,14 +15,17 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// The _library manager
/// </summary>
private readonly ILibraryManager _libraryManager;
private readonly ILogger _logger;
/// <summary>
/// Initializes a new instance of the <see cref="GameGenresPostScanTask" /> class.
/// </summary>
/// <param name="libraryManager">The library manager.</param>
public GameGenresPostScanTask(ILibraryManager libraryManager)
/// <param name="logger">The logger.</param>
public GameGenresPostScanTask(ILibraryManager libraryManager, ILogger logger)
{
_libraryManager = libraryManager;
_logger = logger;
}
/// <summary>
@@ -32,7 +36,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// <returns>Task.</returns>
public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
{
return ((LibraryManager)_libraryManager).ValidateGameGenres(cancellationToken, progress);
return new GameGenresValidator(_libraryManager, _logger).Run(progress, cancellationToken);
}
}
}

15
MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
View File

@@ -15,20 +15,14 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// </summary>
private readonly ILibraryManager _libraryManager;
/// <summary>
/// The _user manager
/// </summary>
private readonly IUserManager _userManager;
/// <summary>
/// The _logger
/// </summary>
private readonly ILogger _logger;
public GameGenresValidator(ILibraryManager libraryManager, IUserManager userManager, ILogger logger)
public GameGenresValidator(ILibraryManager libraryManager, ILogger logger)
{
_libraryManager = libraryManager;
_userManager = userManager;
_logger = logger;
}
@@ -45,14 +39,11 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
progress.Report(2);
var numComplete = 0;
var count = items.Count;
foreach (var name in items)
{
cancellationToken.ThrowIfCancellationRequested();
try
{
var itemByName = _libraryManager.GetGameGenre(name);
@@ -72,9 +63,9 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
numComplete++;
double percent = numComplete;
percent /= count;
percent *= 90;
percent *= 100;
progress.Report(percent + 10);
progress.Report(percent);
}
progress.Report(100);

8
MediaBrowser.Server.Implementations/Library/Validators/GenresPostScanTask.cs
View File

@@ -2,6 +2,7 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Server.Implementations.Library.Validators
{
@@ -11,14 +12,17 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// The _library manager
/// </summary>
private readonly ILibraryManager _libraryManager;
private readonly ILogger _logger;
/// <summary>
/// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
/// </summary>
/// <param name="libraryManager">The library manager.</param>
public GenresPostScanTask(ILibraryManager libraryManager)
/// <param name="logger">The logger.</param>
public GenresPostScanTask(ILibraryManager libraryManager, ILogger logger)
{
_libraryManager = libraryManager;
_logger = logger;
}
/// <summary>
@@ -29,7 +33,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// <returns>Task.</returns>
public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
{
return ((LibraryManager)_libraryManager).ValidateGenres(cancellationToken, progress);
return new GenresValidator(_libraryManager, _logger).Run(progress, cancellationToken);
}
}
}

15
MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
View File

@@ -16,20 +16,14 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// </summary>
private readonly ILibraryManager _libraryManager;
/// <summary>
/// The _user manager
/// </summary>
private readonly IUserManager _userManager;
/// <summary>
/// The _logger
/// </summary>
private readonly ILogger _logger;
public GenresValidator(ILibraryManager libraryManager, IUserManager userManager, ILogger logger)
public GenresValidator(ILibraryManager libraryManager, ILogger logger)
{
_libraryManager = libraryManager;
_userManager = userManager;
_logger = logger;
}
@@ -46,14 +40,11 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
progress.Report(2);
var numComplete = 0;
var count = items.Count;
foreach (var name in items)
{
cancellationToken.ThrowIfCancellationRequested();
try
{
var itemByName = _libraryManager.GetGenre(name);
@@ -73,9 +64,9 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
numComplete++;
double percent = numComplete;
percent /= count;
percent *= 90;
percent *= 100;
progress.Report(percent + 10);
progress.Report(percent);
}
progress.Report(100);

8
MediaBrowser.Server.Implementations/Library/Validators/MusicGenresPostScanTask.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Logging;
using System;
using System.Threading;
using System.Threading.Tasks;
@@ -14,14 +15,17 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// The _library manager
/// </summary>
private readonly ILibraryManager _libraryManager;
private readonly ILogger _logger;
/// <summary>
/// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
/// </summary>
/// <param name="libraryManager">The library manager.</param>
public MusicGenresPostScanTask(ILibraryManager libraryManager)
/// <param name="logger">The logger.</param>
public MusicGenresPostScanTask(ILibraryManager libraryManager, ILogger logger)
{
_libraryManager = libraryManager;
_logger = logger;
}
/// <summary>
@@ -32,7 +36,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// <returns>Task.</returns>
public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
{
return ((LibraryManager)_libraryManager).ValidateMusicGenres(cancellationToken, progress);
return new MusicGenresValidator(_libraryManager, _logger).Run(progress, cancellationToken);
}
}
}

7
MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
View File

@@ -39,14 +39,11 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
progress.Report(2);
var numComplete = 0;
var count = items.Count;
foreach (var name in items)
{
cancellationToken.ThrowIfCancellationRequested();
try
{
var itemByName = _libraryManager.GetMusicGenre(name);
@@ -66,9 +63,9 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
numComplete++;
double percent = numComplete;
percent /= count;
percent *= 90;
percent *= 100;
progress.Report(percent + 10);
progress.Report(percent);
}
progress.Report(100);

8
MediaBrowser.Server.Implementations/Library/Validators/StudiosPostScanTask.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Logging;
using System;
using System.Threading;
using System.Threading.Tasks;
@@ -15,13 +16,16 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// </summary>
private readonly ILibraryManager _libraryManager;
private readonly ILogger _logger;
/// <summary>
/// Initializes a new instance of the <see cref="ArtistsPostScanTask" /> class.
/// </summary>
/// <param name="libraryManager">The library manager.</param>
public StudiosPostScanTask(ILibraryManager libraryManager)
public StudiosPostScanTask(ILibraryManager libraryManager, ILogger logger)
{
_libraryManager = libraryManager;
_logger = logger;
}
/// <summary>
@@ -32,7 +36,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// <returns>Task.</returns>
public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
{
return ((LibraryManager)_libraryManager).ValidateStudios(cancellationToken, progress);
return new StudiosValidator(_libraryManager, _logger).Run(progress, cancellationToken);
}
}
}

15
MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
View File

@@ -14,20 +14,14 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// </summary>
private readonly ILibraryManager _libraryManager;
/// <summary>
/// The _user manager
/// </summary>
private readonly IUserManager _userManager;
/// <summary>
/// The _logger
/// </summary>
private readonly ILogger _logger;
public StudiosValidator(ILibraryManager libraryManager, IUserManager userManager, ILogger logger)
public StudiosValidator(ILibraryManager libraryManager, ILogger logger)
{
_libraryManager = libraryManager;
_userManager = userManager;
_logger = logger;
}
@@ -44,14 +38,11 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
progress.Report(2);
var numComplete = 0;
var count = items.Count;
foreach (var name in items)
{
cancellationToken.ThrowIfCancellationRequested();
try
{
var itemByName = _libraryManager.GetStudio(name);
@@ -71,9 +62,9 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
numComplete++;
double percent = numComplete;
percent /= count;
percent *= 90;
percent *= 100;
progress.Report(percent + 10);
progress.Report(percent);
}
progress.Report(100);

12
MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
View File

@@ -26,17 +26,15 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
.Distinct()
.ToList();
progress.Report(10);
var count = allYears.Count;
var numComplete = 0;
foreach (var yearNumber in allYears)
{
var year = _libraryManager.GetYear(yearNumber);
try
{
var year = _libraryManager.GetYear(yearNumber);
await year.RefreshMetadata(cancellationToken).ConfigureAwait(false);
}
catch (OperationCanceledException)
@@ -46,15 +44,15 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
}
catch (Exception ex)
{
_logger.ErrorException("Error refreshing year {0}", ex, year);
_logger.ErrorException("Error refreshing year {0}", ex, yearNumber);
}
numComplete++;
double percent = numComplete;
percent /= count;
percent *= 90;
percent *= 100;
progress.Report(percent + 10);
progress.Report(percent);
}
}
}

25
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@@ -436,40 +436,19 @@ namespace MediaBrowser.Server.Implementations.LiveTv
private async Task<LiveTvChannel> GetChannel(ChannelInfo channelInfo, string serviceName, CancellationToken cancellationToken)
{
var path = Path.Combine(_config.ApplicationPaths.ItemsByNamePath, "tvchannels", _fileSystem.GetValidFilename(channelInfo.Name));
var fileInfo = new DirectoryInfo(path);
var isNew = false;
if (!fileInfo.Exists)
{
_logger.Debug("Creating directory {0}", path);
Directory.CreateDirectory(path);
fileInfo = new DirectoryInfo(path);
if (!fileInfo.Exists)
{
throw new IOException("Path not created: " + path);
}
isNew = true;
}
var id = _tvDtoService.GetInternalChannelId(serviceName, channelInfo.Id);
var item = _itemRepo.RetrieveItem(id) as LiveTvChannel;
if (item == null || !string.Equals(item.Path, path, StringComparison.OrdinalIgnoreCase))
if (item == null)
{
item = new LiveTvChannel
{
Name = channelInfo.Name,
Id = id,
DateCreated = _fileSystem.GetCreationTimeUtc(fileInfo),
DateModified = _fileSystem.GetLastWriteTimeUtc(fileInfo),
Path = path
DateCreated = DateTime.UtcNow,
};
isNew = true;