lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor improvements

Browse Source
This commit is contained in:
Bond_009 2021-05-05 14:39:50 +02:00
parent b6df851363
commit e432796f6f
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -29,7 +29,7 @@ namespace MediaBrowser.MediaEncoding.Probing
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly ILocalizationManager _localization; private readonly ILocalizationManager _localization;
private List<string> _splitWhiteList = null; private string[] _splitWhiteList;
public ProbeResultNormalizer(ILogger logger, ILocalizationManager localization) public ProbeResultNormalizer(ILogger logger, ILocalizationManager localization)
{ {
@ -37,6 +37,8 @@ namespace MediaBrowser.MediaEncoding.Probing
_localization = localization; _localization = localization;
} }
private IReadOnlyList<string> SplitWhitelist => _splitWhiteList ??= new string[] { "AC/DC" };
public MediaInfo GetMediaInfo(InternalMediaInfoResult data, VideoType? videoType, bool isAudio, string path, MediaProtocol protocol) public MediaInfo GetMediaInfo(InternalMediaInfoResult data, VideoType? videoType, bool isAudio, string path, MediaProtocol protocol)
{ {
var info = new MediaInfo var info = new MediaInfo
@ -1254,7 +1256,7 @@ namespace MediaBrowser.MediaEncoding.Probing
var artistsFound = new List<string>(); var artistsFound = new List<string>();
foreach (var whitelistArtist in GetSplitWhitelist()) foreach (var whitelistArtist in SplitWhitelist)
{ {
var originalVal = val; var originalVal = val;
val = val.Replace(whitelistArtist, "|", StringComparison.OrdinalIgnoreCase); val = val.Replace(whitelistArtist, "|", StringComparison.OrdinalIgnoreCase);
@ -1273,11 +1275,6 @@ namespace MediaBrowser.MediaEncoding.Probing
return artistsFound; return artistsFound;
} }
private IEnumerable<string> GetSplitWhitelist()
{
return _splitWhiteList ??= new List<string> { "AC/DC" };
}
/// <summary> /// <summary>
/// Gets the studios from the tags collection. /// Gets the studios from the tags collection.
/// </summary> /// </summary>

12
MediaBrowser.Providers/Subtitles/SubtitleManager.cs
View File

@ -207,7 +207,7 @@ namespace MediaBrowser.Providers.Subtitles
{ {
var mediaFolderPath = Path.GetFullPath(Path.Combine(video.ContainingFolderPath, saveFileName)); var mediaFolderPath = Path.GetFullPath(Path.Combine(video.ContainingFolderPath, saveFileName));
// TODO: Add some error handling to the API user: return BadRequest("Could not save subtitle, bad path."); // TODO: Add some error handling to the API user: return BadRequest("Could not save subtitle, bad path.");
if (mediaFolderPath.StartsWith(video.ContainingFolderPath)) if (mediaFolderPath.StartsWith(video.ContainingFolderPath, StringComparison.Ordinal))
{ {
savePaths.Add(mediaFolderPath); savePaths.Add(mediaFolderPath);
} }
@ -216,7 +216,7 @@ namespace MediaBrowser.Providers.Subtitles
var internalPath = Path.GetFullPath(Path.Combine(video.GetInternalMetadataPath(), saveFileName)); var internalPath = Path.GetFullPath(Path.Combine(video.GetInternalMetadataPath(), saveFileName));
// TODO: Add some error to the user: return BadRequest("Could not save subtitle, bad path."); // TODO: Add some error to the user: return BadRequest("Could not save subtitle, bad path.");
if (internalPath.StartsWith(video.GetInternalMetadataPath())) if (internalPath.StartsWith(video.GetInternalMetadataPath(), StringComparison.Ordinal))
{ {
savePaths.Add(internalPath); savePaths.Add(internalPath);
} }
@ -234,7 +234,7 @@ namespace MediaBrowser.Providers.Subtitles
private async Task TrySaveToFiles(Stream stream, List<string> savePaths) private async Task TrySaveToFiles(Stream stream, List<string> savePaths)
{ {
Exception exceptionToThrow = null; List<Exception> exs = null;
foreach (var savePath in savePaths) foreach (var savePath in savePaths)
{ {
@ -256,7 +256,7 @@ namespace MediaBrowser.Providers.Subtitles
} }
catch (Exception ex) catch (Exception ex)
{ {
exceptionToThrow ??= ex; (exs ??= new List<Exception>()).Add(ex);
} }
finally finally
{ {
@ -266,9 +266,9 @@ namespace MediaBrowser.Providers.Subtitles
stream.Position = 0; stream.Position = 0;
} }
if (exceptionToThrow != null) if (exs != null)
{ {
throw exceptionToThrow; throw new AggregateException(exs);
} }
} }