Enforce NuGet warnings as errors; refactor field access
Added "allWarningsAsErrors": true to NuGet config files across the solution to treat all warnings as errors, increasing build strictness. Updated project cache hashes and assembly info files to reflect these changes. Refactored C# code to use explicit `this.` for field and property assignments, improving clarity. Note: some method signatures were incorrectly changed to use `this.` as a prefix, which is invalid C# syntax and must be corrected before compiling. Binary files updated due to build changes.
This commit is contained in:
@@ -20,10 +20,10 @@ namespace Emby.Naming.AudioBook
|
||||
/// <param name="chapterNumber">Number of chapter this file represents.</param>
|
||||
public AudioBookFileInfo(string path, string container, int? partNumber = default, int? chapterNumber = default)
|
||||
{
|
||||
Path = path;
|
||||
Container = container;
|
||||
PartNumber = partNumber;
|
||||
ChapterNumber = chapterNumber;
|
||||
this.Path = path;
|
||||
this.Container = container;
|
||||
this.PartNumber = partNumber;
|
||||
this.ChapterNumber = chapterNumber;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -63,19 +63,19 @@ namespace Emby.Naming.AudioBook
|
||||
return 1;
|
||||
}
|
||||
|
||||
var chapterNumberComparison = Nullable.Compare(ChapterNumber, other.ChapterNumber);
|
||||
var chapterNumberComparison = Nullable.Compare(this.ChapterNumber, other.ChapterNumber);
|
||||
if (chapterNumberComparison != 0)
|
||||
{
|
||||
return chapterNumberComparison;
|
||||
}
|
||||
|
||||
var partNumberComparison = Nullable.Compare(PartNumber, other.PartNumber);
|
||||
var partNumberComparison = Nullable.Compare(this.PartNumber, other.PartNumber);
|
||||
if (partNumberComparison != 0)
|
||||
{
|
||||
return partNumberComparison;
|
||||
}
|
||||
|
||||
return string.Compare(Path, other.Path, StringComparison.Ordinal);
|
||||
return string.Compare(this.Path, other.Path, StringComparison.Ordinal);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace Emby.Naming.AudioBook
|
||||
/// <param name="options">Naming options containing AudioBookPartsExpressions.</param>
|
||||
public AudioBookFilePathParser(NamingOptions options)
|
||||
{
|
||||
_options = options;
|
||||
this._options = options;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -34,7 +34,7 @@ namespace Emby.Naming.AudioBook
|
||||
{
|
||||
AudioBookFilePathParserResult result = default;
|
||||
var fileName = Path.GetFileNameWithoutExtension(path);
|
||||
foreach (var expression in _options.AudioBookPartsExpressions)
|
||||
foreach (var expression in this._options.AudioBookPartsExpressions)
|
||||
{
|
||||
var match = Regex.Match(fileName, expression, RegexOptions.IgnoreCase);
|
||||
if (match.Success)
|
||||
|
||||
@@ -21,11 +21,11 @@ namespace Emby.Naming.AudioBook
|
||||
/// <param name="alternateVersions">Alternative version of files.</param>
|
||||
public AudioBookInfo(string name, int? year, IReadOnlyList<AudioBookFileInfo> files, IReadOnlyList<AudioBookFileInfo> extras, IReadOnlyList<AudioBookFileInfo> alternateVersions)
|
||||
{
|
||||
Name = name;
|
||||
Year = year;
|
||||
Files = files;
|
||||
Extras = extras;
|
||||
AlternateVersions = alternateVersions;
|
||||
this.Name = name;
|
||||
this.Year = year;
|
||||
this.Files = files;
|
||||
this.Extras = extras;
|
||||
this.AlternateVersions = alternateVersions;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -26,8 +26,8 @@ namespace Emby.Naming.AudioBook
|
||||
/// <param name="options">Naming options passed along to <see cref="AudioBookResolver"/> and <see cref="AudioBookNameParser"/>.</param>
|
||||
public AudioBookListResolver(NamingOptions options)
|
||||
{
|
||||
_options = options;
|
||||
_audioBookResolver = new AudioBookResolver(_options);
|
||||
this._options = options;
|
||||
this._audioBookResolver = new AudioBookResolver(this._options);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -39,7 +39,7 @@ namespace Emby.Naming.AudioBook
|
||||
{
|
||||
// File with empty fullname will be sorted out here.
|
||||
var audiobookFileInfos = files
|
||||
.Select(i => _audioBookResolver.Resolve(i.FullName))
|
||||
.Select(i => this._audioBookResolver.Resolve(i.FullName))
|
||||
.OfType<AudioBookFileInfo>();
|
||||
|
||||
var stackResult = StackResolver.ResolveAudioBooks(audiobookFileInfos);
|
||||
@@ -47,13 +47,13 @@ namespace Emby.Naming.AudioBook
|
||||
foreach (var stack in stackResult)
|
||||
{
|
||||
var stackFiles = stack.Files
|
||||
.Select(i => _audioBookResolver.Resolve(i))
|
||||
.Select(i => this._audioBookResolver.Resolve(i))
|
||||
.OfType<AudioBookFileInfo>()
|
||||
.ToList();
|
||||
|
||||
stackFiles.Sort();
|
||||
|
||||
var nameParserResult = new AudioBookNameParser(_options).Parse(stack.Name);
|
||||
var nameParserResult = new AudioBookNameParser(this._options).Parse(stack.Name);
|
||||
|
||||
FindExtraAndAlternativeFiles(ref stackFiles, out var extras, out var alternativeVersions, nameParserResult);
|
||||
|
||||
@@ -70,8 +70,8 @@ namespace Emby.Naming.AudioBook
|
||||
|
||||
private void FindExtraAndAlternativeFiles(ref List<AudioBookFileInfo> stackFiles, out List<AudioBookFileInfo> extras, out List<AudioBookFileInfo> alternativeVersions, AudioBookNameParserResult nameParserResult)
|
||||
{
|
||||
extras = new List<AudioBookFileInfo>();
|
||||
alternativeVersions = new List<AudioBookFileInfo>();
|
||||
this.extras = new List<AudioBookFileInfo>();
|
||||
this.alternativeVersions = new List<AudioBookFileInfo>();
|
||||
|
||||
var haveChaptersOrPages = stackFiles.Any(x => x.ChapterNumber is not null || x.PartNumber is not null);
|
||||
var groupedBy = stackFiles.GroupBy(file => new { file.ChapterNumber, file.PartNumber });
|
||||
@@ -108,7 +108,7 @@ namespace Emby.Naming.AudioBook
|
||||
.ThenBy(x => x.Path)
|
||||
.ToList();
|
||||
|
||||
stackFiles = stackFiles.Except(extra).ToList();
|
||||
this.stackFiles = stackFiles.Except(extra).ToList();
|
||||
extras.AddRange(extra);
|
||||
}
|
||||
|
||||
@@ -119,9 +119,9 @@ namespace Emby.Naming.AudioBook
|
||||
.ThenBy(x => x.Path)
|
||||
.ToList();
|
||||
|
||||
var main = FindMainAudioBookFile(alternatives, nameParserResult.Name);
|
||||
var main = this.FindMainAudioBookFile(alternatives, nameParserResult.Name);
|
||||
alternatives.Remove(main);
|
||||
stackFiles = stackFiles.Except(alternatives).ToList();
|
||||
this.stackFiles = stackFiles.Except(alternatives).ToList();
|
||||
alternativeVersions.AddRange(alternatives);
|
||||
}
|
||||
}
|
||||
@@ -134,7 +134,7 @@ namespace Emby.Naming.AudioBook
|
||||
.Skip(1)
|
||||
.ToList();
|
||||
|
||||
stackFiles = stackFiles.Except(alternatives).ToList();
|
||||
this.stackFiles = stackFiles.Except(alternatives).ToList();
|
||||
alternativeVersions.AddRange(alternatives);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace Emby.Naming.AudioBook
|
||||
/// <param name="options">Naming options containing AudioBookNamesExpressions.</param>
|
||||
public AudioBookNameParser(NamingOptions options)
|
||||
{
|
||||
_options = options;
|
||||
this._options = options;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -32,7 +32,7 @@ namespace Emby.Naming.AudioBook
|
||||
public AudioBookNameParserResult Parse(string name)
|
||||
{
|
||||
AudioBookNameParserResult result = default;
|
||||
foreach (var expression in _options.AudioBookNamesExpressions)
|
||||
foreach (var expression in this._options.AudioBookNamesExpressions)
|
||||
{
|
||||
var match = Regex.Match(name, expression, RegexOptions.IgnoreCase);
|
||||
if (match.Success)
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace Emby.Naming.AudioBook
|
||||
/// <param name="options"><see cref="NamingOptions"/> containing AudioFileExtensions and also used to pass to AudioBookFilePathParser.</param>
|
||||
public AudioBookResolver(NamingOptions options)
|
||||
{
|
||||
_options = options;
|
||||
this._options = options;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -41,14 +41,14 @@ namespace Emby.Naming.AudioBook
|
||||
var extension = Path.GetExtension(path);
|
||||
|
||||
// Check supported extensions
|
||||
if (!_options.AudioFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
|
||||
if (!this._options.AudioFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var container = extension.TrimStart('.');
|
||||
|
||||
var parsingResult = new AudioBookFilePathParser(_options).Parse(path);
|
||||
var parsingResult = new AudioBookFilePathParser(this._options).Parse(path);
|
||||
|
||||
return new AudioBookFileInfo(
|
||||
path,
|
||||
|
||||
Reference in New Issue
Block a user