Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-03 19:17:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Re-Sharper inspection issues

Browse Source
This commit is contained in:
Stepan 2020-11-01 11:19:22 +01:00
parent 59619b6ea7
commit 60b49e67ea
17 changed files with 41 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Emby.Naming/AudioBook/AudioBookListResolver.cs
View File

@ -1,6 +1,5 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Emby.Naming.Common; using Emby.Naming.Common;

2
Emby.Naming/AudioBook/AudioBookResolver.cs
View File

@ -47,7 +47,7 @@ namespace Emby.Naming.AudioBook
container, container,
chapterNumber: parsingResult.ChapterNumber, chapterNumber: parsingResult.ChapterNumber,
partNumber: parsingResult.PartNumber, partNumber: parsingResult.PartNumber,
isDirectory: isDirectory ); isDirectory: isDirectory);
} }
} }
} }

12
Emby.Naming/Common/NamingOptions.cs
View File

@ -6,6 +6,8 @@ using System.Text.RegularExpressions;
using Emby.Naming.Video; using Emby.Naming.Video;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
// ReSharper disable StringLiteralTypo
namespace Emby.Naming.Common namespace Emby.Naming.Common
{ {
public class NamingOptions public class NamingOptions
@ -531,19 +533,19 @@ namespace Emby.Naming.Common
{ {
// Kodi rules: // Kodi rules:
new Format3DRule( new Format3DRule(
preceedingToken: "3d", precedingToken: "3d",
token: "hsbs"), token: "hsbs"),
new Format3DRule( new Format3DRule(
preceedingToken: "3d", precedingToken: "3d",
token: "sbs"), token: "sbs"),
new Format3DRule( new Format3DRule(
preceedingToken: "3d", precedingToken: "3d",
token: "htab"), token: "htab"),
new Format3DRule( new Format3DRule(
preceedingToken: "3d", precedingToken: "3d",
token: "tab"), token: "tab"),
// Media Browser rules: // Media Browser rules:
@ -608,7 +610,7 @@ namespace Emby.Naming.Common
".mxf" ".mxf"
}); });
MultipleEpisodeExpressions = new string[] MultipleEpisodeExpressions = new[]
{ {
@".*(\\|\/)[sS]?(?<seasonnumber>[0-9]{1,4})[xX](?<epnumber>[0-9]{1,3})((-| - )[0-9]{1,4}[eExX](?<endingepnumber>[0-9]{1,3}))+[^\\\/]*$", @".*(\\|\/)[sS]?(?<seasonnumber>[0-9]{1,4})[xX](?<epnumber>[0-9]{1,3})((-| - )[0-9]{1,4}[eExX](?<endingepnumber>[0-9]{1,3}))+[^\\\/]*$",
@".*(\\|\/)[sS]?(?<seasonnumber>[0-9]{1,4})[xX](?<epnumber>[0-9]{1,3})((-| - )[0-9]{1,4}[xX][eE](?<endingepnumber>[0-9]{1,3}))+[^\\\/]*$", @".*(\\|\/)[sS]?(?<seasonnumber>[0-9]{1,4})[xX](?<epnumber>[0-9]{1,3})((-| - )[0-9]{1,4}[xX][eE](?<endingepnumber>[0-9]{1,3}))+[^\\\/]*$",

2
Emby.Naming/Emby.Naming.csproj
View File

@ -39,7 +39,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<!-- Code Analyzers--> <!-- Code Analyzers-->

2
Emby.Naming/TV/EpisodeInfo.cs
View File

@ -55,7 +55,7 @@ namespace Emby.Naming.TV
public int? EpisodeNumber { get; set; } public int? EpisodeNumber { get; set; }
public int? EndingEpsiodeNumber { get; set; } public int? EndingEpisodeNumber { get; set; }
public int? Year { get; set; } public int? Year { get; set; }

8
Emby.Naming/TV/EpisodePathParser.cs
View File

@ -146,7 +146,7 @@ namespace Emby.Naming.TV
{ {
if (int.TryParse(endingNumberGroup.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out num)) if (int.TryParse(endingNumberGroup.Value, NumberStyles.Integer, CultureInfo.InvariantCulture, out num))
{ {
result.EndingEpsiodeNumber = num; result.EndingEpisodeNumber = num;
} }
} }
} }
@ -217,13 +217,13 @@ namespace Emby.Naming.TV
info.SeriesName = result.SeriesName; info.SeriesName = result.SeriesName;
} }
if (!info.EndingEpsiodeNumber.HasValue && info.EpisodeNumber.HasValue) if (!info.EndingEpisodeNumber.HasValue && info.EpisodeNumber.HasValue)
{ {
info.EndingEpsiodeNumber = result.EndingEpsiodeNumber; info.EndingEpisodeNumber = result.EndingEpisodeNumber;
} }
if (!string.IsNullOrEmpty(info.SeriesName) if (!string.IsNullOrEmpty(info.SeriesName)
&& (!info.EpisodeNumber.HasValue || info.EndingEpsiodeNumber.HasValue)) && (!info.EpisodeNumber.HasValue || info.EndingEpisodeNumber.HasValue))
{ {
break; break;
} }

2
Emby.Naming/TV/EpisodePathParserResult.cs
View File

@ -8,7 +8,7 @@ namespace Emby.Naming.TV
public int? EpisodeNumber { get; set; } public int? EpisodeNumber { get; set; }
public int? EndingEpsiodeNumber { get; set; } public int? EndingEpisodeNumber { get; set; }
public string? SeriesName { get; set; } public string? SeriesName { get; set; }

2
Emby.Naming/TV/EpisodeResolver.cs
View File

@ -58,7 +58,7 @@ namespace Emby.Naming.TV
{ {
Container = container, Container = container,
IsStub = isStub, IsStub = isStub,
EndingEpsiodeNumber = parsingResult.EndingEpsiodeNumber, EndingEpisodeNumber = parsingResult.EndingEpisodeNumber,
EpisodeNumber = parsingResult.EpisodeNumber, EpisodeNumber = parsingResult.EpisodeNumber,
SeasonNumber = parsingResult.SeasonNumber, SeasonNumber = parsingResult.SeasonNumber,
SeriesName = parsingResult.SeriesName, SeriesName = parsingResult.SeriesName,

12
Emby.Naming/TV/SeasonPathParser.cs
View File

@ -101,9 +101,9 @@ namespace Emby.Naming.TV
} }
var parts = filename.Split(new[] { '.', '_', ' ', '-' }, StringSplitOptions.RemoveEmptyEntries); var parts = filename.Split(new[] { '.', '_', ' ', '-' }, StringSplitOptions.RemoveEmptyEntries);
for (int i = 0; i < parts.Length; i++) foreach (var part in parts)
{ {
if (TryGetSeasonNumberFromPart(parts[i], out int seasonNumber)) if (TryGetSeasonNumberFromPart(part, out int seasonNumber))
{ {
return (seasonNumber, true); return (seasonNumber, true);
} }
@ -139,7 +139,7 @@ namespace Emby.Naming.TV
var numericStart = -1; var numericStart = -1;
var length = 0; var length = 0;
var hasOpenParenth = false; var hasOpenParenthesis = false;
var isSeasonFolder = true; var isSeasonFolder = true;
// Find out where the numbers start, and then keep going until they end // Find out where the numbers start, and then keep going until they end
@ -147,7 +147,7 @@ namespace Emby.Naming.TV
{ {
if (char.IsNumber(path[i])) if (char.IsNumber(path[i]))
{ {
if (!hasOpenParenth) if (!hasOpenParenthesis)
{ {
if (numericStart == -1) if (numericStart == -1)
{ {
@ -167,11 +167,11 @@ namespace Emby.Naming.TV
var currentChar = path[i]; var currentChar = path[i];
if (currentChar == '(') if (currentChar == '(')
{ {
hasOpenParenth = true; hasOpenParenthesis = true;
} }
else if (currentChar == ')') else if (currentChar == ')')
{ {
hasOpenParenth = false; hasOpenParenthesis = false;
} }
} }

2
Emby.Naming/Video/ExtraRuleType.cs
View File

@ -22,6 +22,6 @@ namespace Emby.Naming.Video
/// <summary> /// <summary>
/// Match <see cref="ExtraRule.Token"/> against the name of the directory containing the file. /// Match <see cref="ExtraRule.Token"/> against the name of the directory containing the file.
/// </summary> /// </summary>
DirectoryName = 3, DirectoryName = 3
} }
} }

4
Emby.Naming/Video/FlagParser.cs
View File

@ -20,7 +20,7 @@ namespace Emby.Naming.Video
return GetFlags(path, _options.VideoFlagDelimiters); return GetFlags(path, _options.VideoFlagDelimiters);
} }
public string[] GetFlags(string path, char[] delimeters) public string[] GetFlags(string path, char[] delimiters)
{ {
if (string.IsNullOrEmpty(path)) if (string.IsNullOrEmpty(path))
{ {
@ -31,7 +31,7 @@ namespace Emby.Naming.Video
var file = Path.GetFileName(path); var file = Path.GetFileName(path);
return file.Split(delimeters, StringSplitOptions.RemoveEmptyEntries); return file.Split(delimiters, StringSplitOptions.RemoveEmptyEntries);
} }
} }
} }

14
Emby.Naming/Video/Format3DParser.cs
View File

@ -18,11 +18,11 @@ namespace Emby.Naming.Video
public Format3DResult Parse(string path) public Format3DResult Parse(string path)
{ {
int oldLen = _options.VideoFlagDelimiters.Length; int oldLen = _options.VideoFlagDelimiters.Length;
var delimeters = new char[oldLen + 1]; var delimiters = new char[oldLen + 1];
_options.VideoFlagDelimiters.CopyTo(delimeters, 0); _options.VideoFlagDelimiters.CopyTo(delimiters, 0);
delimeters[oldLen] = ' '; delimiters[oldLen] = ' ';
return Parse(new FlagParser(_options).GetFlags(path, delimeters)); return Parse(new FlagParser(_options).GetFlags(path, delimiters));
} }
internal Format3DResult Parse(string[] videoFlags) internal Format3DResult Parse(string[] videoFlags)
@ -44,7 +44,7 @@ namespace Emby.Naming.Video
{ {
var result = new Format3DResult(); var result = new Format3DResult();
if (string.IsNullOrEmpty(rule.PreceedingToken)) if (string.IsNullOrEmpty(rule.PrecedingToken))
{ {
result.Format3D = new[] { rule.Token }.FirstOrDefault(i => videoFlags.Contains(i, StringComparer.OrdinalIgnoreCase)); result.Format3D = new[] { rule.Token }.FirstOrDefault(i => videoFlags.Contains(i, StringComparer.OrdinalIgnoreCase));
result.Is3D = !string.IsNullOrEmpty(result.Format3D); result.Is3D = !string.IsNullOrEmpty(result.Format3D);
@ -63,7 +63,7 @@ namespace Emby.Naming.Video
{ {
if (foundPrefix) if (foundPrefix)
{ {
result.Tokens.Add(rule.PreceedingToken); result.Tokens.Add(rule.PrecedingToken);
if (string.Equals(rule.Token, flag, StringComparison.OrdinalIgnoreCase)) if (string.Equals(rule.Token, flag, StringComparison.OrdinalIgnoreCase))
{ {
@ -74,7 +74,7 @@ namespace Emby.Naming.Video
break; break;
} }
foundPrefix = string.Equals(flag, rule.PreceedingToken, StringComparison.OrdinalIgnoreCase); foundPrefix = string.Equals(flag, rule.PrecedingToken, StringComparison.OrdinalIgnoreCase);
} }
result.Is3D = foundPrefix && !string.IsNullOrEmpty(format); result.Is3D = foundPrefix && !string.IsNullOrEmpty(format);

10
Emby.Naming/Video/Format3DRule.cs
View File

@ -4,10 +4,10 @@ namespace Emby.Naming.Video
{ {
public class Format3DRule public class Format3DRule
{ {
public Format3DRule(string token, string? preceedingToken = null) public Format3DRule(string token, string? precedingToken = null)
{ {
Token = token; Token = token;
PreceedingToken = preceedingToken; PrecedingToken = precedingToken;
} }
/// <summary> /// <summary>
@ -17,9 +17,9 @@ namespace Emby.Naming.Video
public string Token { get; set; } public string Token { get; set; }
/// <summary> /// <summary>
/// Gets or sets the preceeding token. /// Gets or sets the preceding token.
/// </summary> /// </summary>
/// <value>The preceeding token.</value> /// <value>The preceding token.</value>
public string? PreceedingToken { get; set; } public string? PrecedingToken { get; set; }
} }
} }

19
Emby.Naming/Video/StubResult.cs
View File

@ -1,19 +0,0 @@
#pragma warning disable CS1591
namespace Emby.Naming.Video
{
public struct StubResult
{
/// <summary>
/// Gets or sets a value indicating whether this instance is stub.
/// </summary>
/// <value><c>true</c> if this instance is stub; otherwise, <c>false</c>.</value>
public bool IsStub { get; set; }
/// <summary>
/// Gets or sets the type of the stub.
/// </summary>
/// <value>The type of the stub.</value>
public string StubType { get; set; }
}
}

2
Emby.Naming/Video/VideoListResolver.cs
View File

@ -136,7 +136,7 @@ namespace Emby.Naming.Video
} }
// If there's only one video, accept all trailers // If there's only one video, accept all trailers
// Be lenient because people use all kinds of mish mash conventions with trailers // Be lenient because people use all kinds of mishmash conventions with trailers
if (list.Count == 1) if (list.Count == 1)
{ {
var trailers = remainingFiles var trailers = remainingFiles

4
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -2562,12 +2562,12 @@ namespace Emby.Server.Implementations.Library
if (!episode.IndexNumberEnd.HasValue || forceRefresh) if (!episode.IndexNumberEnd.HasValue || forceRefresh)
{ {
if (episode.IndexNumberEnd != episodeInfo.EndingEpsiodeNumber) if (episode.IndexNumberEnd != episodeInfo.EndingEpisodeNumber)
{ {
changed = true; changed = true;
} }
episode.IndexNumberEnd = episodeInfo.EndingEpsiodeNumber; episode.IndexNumberEnd = episodeInfo.EndingEpisodeNumber;
} }
if (!episode.ParentIndexNumber.HasValue || forceRefresh) if (!episode.ParentIndexNumber.HasValue || forceRefresh)

2
tests/Jellyfin.Naming.Tests/TV/MultiEpisodeTests.cs
View File

@ -74,7 +74,7 @@ namespace Jellyfin.Naming.Tests.TV
var result = new EpisodePathParser(options) var result = new EpisodePathParser(options)
.Parse(filename, false); .Parse(filename, false);
Assert.Equal(result.EndingEpsiodeNumber, endingEpisodeNumber); Assert.Equal(result.EndingEpisodeNumber, endingEpisodeNumber);
} }
} }
} }