Merge pull request #2667 from crobibero/emby-naming-warnings
Fix warnings in Emby.Naming
This commit is contained in:
commit
bd4269cb59
|
@ -37,7 +37,7 @@ namespace Emby.Naming.AudioBook
|
|||
/// <value>The type.</value>
|
||||
public bool IsDirectory { get; set; }
|
||||
|
||||
/// <inheritdoc/>
|
||||
/// <inheritdoc />
|
||||
public int CompareTo(AudioBookFileInfo other)
|
||||
{
|
||||
if (ReferenceEquals(this, other))
|
||||
|
|
|
@ -29,11 +29,7 @@ namespace Emby.Naming.AudioBook
|
|||
// Filter out all extras, otherwise they could cause stacks to not be resolved
|
||||
// See the unit test TestStackedWithTrailer
|
||||
var metadata = audiobookFileInfos
|
||||
.Select(i => new FileSystemMetadata
|
||||
{
|
||||
FullName = i.Path,
|
||||
IsDirectory = i.IsDirectory
|
||||
});
|
||||
.Select(i => new FileSystemMetadata { FullName = i.Path, IsDirectory = i.IsDirectory });
|
||||
|
||||
var stackResult = new StackResolver(_options)
|
||||
.ResolveAudioBooks(metadata);
|
||||
|
@ -42,11 +38,7 @@ namespace Emby.Naming.AudioBook
|
|||
{
|
||||
var stackFiles = stack.Files.Select(i => audioBookResolver.Resolve(i, stack.IsDirectoryStack)).ToList();
|
||||
stackFiles.Sort();
|
||||
var info = new AudioBookInfo
|
||||
{
|
||||
Files = stackFiles,
|
||||
Name = stack.Name
|
||||
};
|
||||
var info = new AudioBookInfo { Files = stackFiles, Name = stack.Name };
|
||||
|
||||
yield return info;
|
||||
}
|
||||
|
|
|
@ -37,7 +37,8 @@ namespace Emby.Naming.Subtitles
|
|||
IsForced = _options.SubtitleForcedFlags.Any(i => flags.Contains(i, StringComparer.OrdinalIgnoreCase))
|
||||
};
|
||||
|
||||
var parts = flags.Where(i => !_options.SubtitleDefaultFlags.Contains(i, StringComparer.OrdinalIgnoreCase) && !_options.SubtitleForcedFlags.Contains(i, StringComparer.OrdinalIgnoreCase))
|
||||
var parts = flags.Where(i => !_options.SubtitleDefaultFlags.Contains(i, StringComparer.OrdinalIgnoreCase)
|
||||
&& !_options.SubtitleForcedFlags.Contains(i, StringComparer.OrdinalIgnoreCase))
|
||||
.ToList();
|
||||
|
||||
// Should have a name, language and file extension
|
||||
|
|
|
@ -18,7 +18,13 @@ namespace Emby.Naming.TV
|
|||
_options = options;
|
||||
}
|
||||
|
||||
public EpisodePathParserResult Parse(string path, bool isDirectory, bool? isNamed = null, bool? isOptimistic = null, bool? supportsAbsoluteNumbers = null, bool fillExtendedInfo = true)
|
||||
public EpisodePathParserResult Parse(
|
||||
string path,
|
||||
bool isDirectory,
|
||||
bool? isNamed = null,
|
||||
bool? isOptimistic = null,
|
||||
bool? supportsAbsoluteNumbers = null,
|
||||
bool fillExtendedInfo = true)
|
||||
{
|
||||
// Added to be able to use regex patterns which require a file extension.
|
||||
// There were no failed tests without this block, but to be safe, we can keep it until
|
||||
|
@ -64,7 +70,7 @@ namespace Emby.Naming.TV
|
|||
{
|
||||
result.SeriesName = result.SeriesName
|
||||
.Trim()
|
||||
.Trim(new[] { '_', '.', '-' })
|
||||
.Trim('_', '.', '-')
|
||||
.Trim();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ namespace Emby.Naming.TV
|
|||
public int? SeasonNumber { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether this <see cref="SeasonPathParserResult"/> is success.
|
||||
/// Gets or sets a value indicating whether this <see cref="SeasonPathParserResult" /> is success.
|
||||
/// </summary>
|
||||
/// <value><c>true</c> if success; otherwise, <c>false</c>.</value>
|
||||
public bool Success { get; set; }
|
||||
|
|
|
@ -21,31 +21,24 @@ namespace Emby.Naming.Video
|
|||
|
||||
public IEnumerable<FileStack> ResolveDirectories(IEnumerable<string> files)
|
||||
{
|
||||
return Resolve(files.Select(i => new FileSystemMetadata
|
||||
{
|
||||
FullName = i,
|
||||
IsDirectory = true
|
||||
}));
|
||||
return Resolve(files.Select(i => new FileSystemMetadata { FullName = i, IsDirectory = true }));
|
||||
}
|
||||
|
||||
public IEnumerable<FileStack> ResolveFiles(IEnumerable<string> files)
|
||||
{
|
||||
return Resolve(files.Select(i => new FileSystemMetadata
|
||||
{
|
||||
FullName = i,
|
||||
IsDirectory = false
|
||||
}));
|
||||
return Resolve(files.Select(i => new FileSystemMetadata { FullName = i, IsDirectory = false }));
|
||||
}
|
||||
|
||||
public IEnumerable<FileStack> ResolveAudioBooks(IEnumerable<FileSystemMetadata> files)
|
||||
{
|
||||
foreach (var directory in files.GroupBy(file => file.IsDirectory ? file.FullName : Path.GetDirectoryName(file.FullName)))
|
||||
var groupedDirectoryFiles = files.GroupBy(file =>
|
||||
file.IsDirectory
|
||||
? file.FullName
|
||||
: Path.GetDirectoryName(file.FullName));
|
||||
|
||||
foreach (var directory in groupedDirectoryFiles)
|
||||
{
|
||||
var stack = new FileStack()
|
||||
{
|
||||
Name = Path.GetFileName(directory.Key),
|
||||
IsDirectoryStack = false
|
||||
};
|
||||
var stack = new FileStack { Name = Path.GetFileName(directory.Key), IsDirectoryStack = false };
|
||||
foreach (var file in directory)
|
||||
{
|
||||
if (file.IsDirectory)
|
||||
|
|
|
@ -77,7 +77,9 @@ namespace Emby.Naming.Video
|
|||
/// Gets the file name without extension.
|
||||
/// </summary>
|
||||
/// <value>The file name without extension.</value>
|
||||
public string FileNameWithoutExtension => !IsDirectory ? System.IO.Path.GetFileNameWithoutExtension(Path) : System.IO.Path.GetFileName(Path);
|
||||
public string FileNameWithoutExtension => !IsDirectory
|
||||
? System.IO.Path.GetFileNameWithoutExtension(Path)
|
||||
: System.IO.Path.GetFileName(Path);
|
||||
|
||||
/// <inheritdoc />
|
||||
public override string ToString()
|
||||
|
|
|
@ -33,11 +33,7 @@ namespace Emby.Naming.Video
|
|||
// See the unit test TestStackedWithTrailer
|
||||
var nonExtras = videoInfos
|
||||
.Where(i => i.ExtraType == null)
|
||||
.Select(i => new FileSystemMetadata
|
||||
{
|
||||
FullName = i.Path,
|
||||
IsDirectory = i.IsDirectory
|
||||
});
|
||||
.Select(i => new FileSystemMetadata { FullName = i.Path, IsDirectory = i.IsDirectory });
|
||||
|
||||
var stackResult = new StackResolver(_options)
|
||||
.Resolve(nonExtras).ToList();
|
||||
|
@ -57,11 +53,7 @@ namespace Emby.Naming.Video
|
|||
|
||||
info.Year = info.Files[0].Year;
|
||||
|
||||
var extraBaseNames = new List<string>
|
||||
{
|
||||
stack.Name,
|
||||
Path.GetFileNameWithoutExtension(stack.Files[0])
|
||||
};
|
||||
var extraBaseNames = new List<string> { stack.Name, Path.GetFileNameWithoutExtension(stack.Files[0]) };
|
||||
|
||||
var extras = GetExtras(remainingFiles, extraBaseNames);
|
||||
|
||||
|
@ -83,10 +75,7 @@ namespace Emby.Naming.Video
|
|||
|
||||
foreach (var media in standaloneMedia)
|
||||
{
|
||||
var info = new VideoInfo(media.Name)
|
||||
{
|
||||
Files = new List<VideoFileInfo> { media }
|
||||
};
|
||||
var info = new VideoInfo(media.Name) { Files = new List<VideoFileInfo> { media } };
|
||||
|
||||
info.Year = info.Files[0].Year;
|
||||
|
||||
|
@ -222,8 +211,8 @@ namespace Emby.Naming.Video
|
|||
{
|
||||
testFilename = testFilename.Substring(folderName.Length).Trim();
|
||||
return string.IsNullOrEmpty(testFilename)
|
||||
|| testFilename[0] == '-'
|
||||
|| string.IsNullOrWhiteSpace(Regex.Replace(testFilename, @"\[([^]]*)\]", string.Empty));
|
||||
|| testFilename[0] == '-'
|
||||
|| string.IsNullOrWhiteSpace(Regex.Replace(testFilename, @"\[([^]]*)\]", string.Empty));
|
||||
}
|
||||
|
||||
return false;
|
||||
|
@ -239,7 +228,8 @@ namespace Emby.Naming.Video
|
|||
|
||||
return remainingFiles
|
||||
.Where(i => i.ExtraType == null)
|
||||
.Where(i => baseNames.Any(b => i.FileNameWithoutExtension.StartsWith(b, StringComparison.OrdinalIgnoreCase)))
|
||||
.Where(i => baseNames.Any(b =>
|
||||
i.FileNameWithoutExtension.StartsWith(b, StringComparison.OrdinalIgnoreCase)))
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,6 +26,7 @@ namespace MediaBrowser.Model.Entities
|
|||
/// </summary>
|
||||
/// <value>The image path.</value>
|
||||
public string ImagePath { get; set; }
|
||||
|
||||
public DateTime ImageDateModified { get; set; }
|
||||
|
||||
public string ImageTag { get; set; }
|
||||
|
|
Loading…
Reference in New Issue
Block a user