Your ROOT_URL in app.ini is https://git.cloudchain.link/ but you are visiting https://dash.bss.nz/open-source-mirrors/jellyfin/commit/5a8e972952e45ff7361d8370e289eb44911b914c
You should set ROOT_URL correctly, otherwise the web may not work correctly.
51 changed files with
175 additions and
32 deletions
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Globalization ;
using System.IO ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.IO ;
using System.Linq ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.Audio
{
public class MultiPartResult
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Globalization ;
using System.IO ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.AudioBook
{
public class AudioBookFilePathParserResult
@ -7,6 +7,9 @@ namespace Emby.Naming.AudioBook
/// </summary>
public class AudioBookInfo
{
/// <summary>
/// Initializes a new instance of the <see cref="AudioBookInfo" /> class.
/// </summary>
public AudioBookInfo ( )
{
Files = new List < AudioBookFileInfo > ( ) ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System.Collections.Generic ;
using System.Linq ;
using Emby.Naming.Common ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.IO ;
using System.Linq ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Text.RegularExpressions ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.Common
{
public enum MediaType
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Linq ;
using System.Text.RegularExpressions ;
@ -6,6 +6,10 @@
<GenerateDocumentationFile > true</GenerateDocumentationFile>
</PropertyGroup>
<PropertyGroup Condition= " '$(Configuration)' == 'Release' " >
<TreatWarningsAsErrors > true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup >
<Compile Include= "..\SharedVersion.cs" />
</ItemGroup>
@ -21,13 +25,13 @@
<RepositoryUrl > https://github.com/jellyfin/jellyfin</RepositoryUrl>
</PropertyGroup>
<!-- Code analys ers-->
<ItemGroup Condition= " '$(Configuration)' == 'Debug' " >
<!-- Code Analyz ers-->
<!-- <ItemGroup Condition= " '$(Configuration)' == 'Debug' ">
<PackageReference Include= "Microsoft.CodeAnalysis.FxCopAnalyzers" Version= "2.9.7" PrivateAssets= "All" />
<PackageReference Include= "SerilogAnalyzer" Version= "0.15.0" PrivateAssets= "All" />
<PackageReference Include= "StyleCop.Analyzers" Version= "1.1.118" PrivateAssets= "All" />
<PackageReference Include= "SmartAnalyzers.MultithreadingAnalyzer" Version= "1.1.31" PrivateAssets= "All" />
</ItemGroup>
</ItemGroup> -->
<PropertyGroup Condition= " '$(Configuration)' == 'Debug' " >
<CodeAnalysisRuleSet > ../jellyfin.ruleset</CodeAnalysisRuleSet>
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.Subtitles
{
public class SubtitleInfo
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.IO ;
using System.Linq ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.TV
{
public class EpisodeInfo
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Collections.Generic ;
using System.Globalization ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.TV
{
public class EpisodePathParserResult
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.IO ;
using System.Linq ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Globalization ;
using System.IO ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.TV
{
public class SeasonPathParserResult
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Globalization ;
using System.IO ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.Video
{
public class CleanDateTimeResult
@ -7,11 +10,13 @@ namespace Emby.Naming.Video
/// </summary>
/// <value>The name.</value>
public string Name { get ; set ; }
/// <summary>
/// Gets or sets the year.
/// </summary>
/// <value>The year.</value>
public int? Year { get ; set ; }
/// <summary>
/// Gets or sets a value indicating whether this instance has changed.
/// </summary>
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System.Collections.Generic ;
using System.Text.RegularExpressions ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.Video
{
public class CleanStringResult
@ -7,6 +10,7 @@ namespace Emby.Naming.Video
/// </summary>
/// <value>The name.</value>
public string Name { get ; set ; }
/// <summary>
/// Gets or sets a value indicating whether this instance has changed.
/// </summary>
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.IO ;
using System.Linq ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.Video
{
public class ExtraResult
@ -7,6 +10,7 @@ namespace Emby.Naming.Video
/// </summary>
/// <value>The type of the extra.</value>
public string ExtraType { get ; set ; }
/// <summary>
/// Gets or sets the rule.
/// </summary>
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using Emby.Naming.Common ;
namespace Emby.Naming.Video
@ -9,16 +12,19 @@ namespace Emby.Naming.Video
/// </summary>
/// <value>The token.</value>
public string Token { get ; set ; }
/// <summary>
/// Gets or sets the type of the extra.
/// </summary>
/// <value>The type of the extra.</value>
public string ExtraType { get ; set ; }
/// <summary>
/// Gets or sets the type of the rule.
/// </summary>
/// <value>The type of the rule.</value>
public ExtraRuleType RuleType { get ; set ; }
/// <summary>
/// Gets or sets the type of the media.
/// </summary>
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.Video
{
public enum ExtraRuleType
@ -6,10 +9,12 @@ namespace Emby.Naming.Video
/// The suffix
/// </summary>
Suffix = 0 ,
/// <summary>
/// The filename
/// </summary>
Filename = 1 ,
/// <summary>
/// The regex
/// </summary>
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Collections.Generic ;
using System.Linq ;
@ -6,15 +9,17 @@ namespace Emby.Naming.Video
{
public class FileStack
{
public string Name { get ; set ; }
public List < string > Files { get ; set ; }
public bool IsDirectoryStack { get ; set ; }
public FileStack ( )
{
Files = new List < string > ( ) ;
}
public string Name { get ; set ; }
public List < string > Files { get ; set ; }
public bool IsDirectoryStack { get ; set ; }
public bool ContainsFile ( string file , bool isDirectory )
{
if ( IsDirectoryStack = = isDirectory )
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.IO ;
using Emby.Naming.Common ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Linq ;
using Emby.Naming.Common ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System.Collections.Generic ;
namespace Emby.Naming.Video
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.Video
{
public class Format3DRule
@ -7,6 +10,7 @@ namespace Emby.Naming.Video
/// </summary>
/// <value>The token.</value>
public string Token { get ; set ; }
/// <summary>
/// Gets or sets the preceeding token.
/// </summary>
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Collections.Generic ;
using System.IO ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System.Collections.Generic ;
namespace Emby.Naming.Video
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.IO ;
using System.Linq ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.Video
{
public struct StubResult
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
namespace Emby.Naming.Video
{
public class StubTypeRule
@ -77,6 +77,7 @@ namespace Emby.Naming.Video
/// <value>The file name without extension.</value>
public string FileNameWithoutExtension = > ! IsDirectory ? System . IO . Path . GetFileNameWithoutExtension ( Path ) : System . IO . Path . GetFileName ( Path ) ;
/// <inheritdoc />
public override string ToString ( )
{
// Makes debugging easier
@ -7,6 +7,16 @@ namespace Emby.Naming.Video
/// </summary>
public class VideoInfo
{
/// <summary>
/// Initializes a new instance of the <see cref="VideoInfo" /> class.
/// </summary>
public VideoInfo ( )
{
Files = new List < VideoFileInfo > ( ) ;
Extras = new List < VideoFileInfo > ( ) ;
AlternateVersions = new List < VideoFileInfo > ( ) ;
}
/// <summary>
/// Gets or sets the name.
/// </summary>
@ -36,12 +46,5 @@ namespace Emby.Naming.Video
/// </summary>
/// <value>The alternate versions.</value>
public List < VideoFileInfo > AlternateVersions { get ; set ; }
public VideoInfo ( )
{
Files = new List < VideoFileInfo > ( ) ;
Extras = new List < VideoFileInfo > ( ) ;
AlternateVersions = new List < VideoFileInfo > ( ) ;
}
}
}
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.Collections.Generic ;
using System.IO ;
@ -1,3 +1,6 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System ;
using System.IO ;
using System.Linq ;
@ -1,5 +1,9 @@
<Project Sdk= "Microsoft.NET.Sdk" >
<PropertyGroup Condition= " '$(Configuration)' == 'Release' " >
<TreatWarningsAsErrors > true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup >
<ProjectReference Include= "..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
<ProjectReference Include= "..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
@ -20,12 +24,12 @@
<TreatWarningsAsErrors > true</TreatWarningsAsErrors>
</PropertyGroup>
<!-- Code analys ers-->
<ItemGroup Condition= " '$(Configuration)' == 'Debug' " >
<!-- Code Analyz ers-->
<!-- <ItemGroup Condition= " '$(Configuration)' == 'Debug' ">
<PackageReference Include= "Microsoft.CodeAnalysis.FxCopAnalyzers" Version= "2.9.7" />
<PackageReference Include= "StyleCop.Analyzers" Version= "1.1.118" />
<PackageReference Include= "SerilogAnalyzer" Version= "0.15.0" />
</ItemGroup>
</ItemGroup> -->
<PropertyGroup Condition= " '$(Configuration)' == 'Debug' " >
<CodeAnalysisRuleSet > ../jellyfin.ruleset</CodeAnalysisRuleSet>
@ -50,13 +50,13 @@
<GenerateDocumentationFile > true</GenerateDocumentationFile>
</PropertyGroup>
<!-- Code analys ers-->
<ItemGroup Condition= " '$(Configuration)' == 'Debug' " >
<!-- Code Analyz ers-->
<!-- <ItemGroup Condition= " '$(Configuration)' == 'Debug' ">
<PackageReference Include= "Microsoft.CodeAnalysis.FxCopAnalyzers" Version= "2.9.7" />
<PackageReference Include= "SerilogAnalyzer" Version= "0.15.0" />
<PackageReference Include= "StyleCop.Analyzers" Version= "1.1.118" />
<PackageReference Include= "SmartAnalyzers.MultithreadingAnalyzer" Version= "1.1.31" />
</ItemGroup>
</ItemGroup> -->
<PropertyGroup Condition= " '$(Configuration)' == 'Debug' " >
<CodeAnalysisRuleSet > ../jellyfin.ruleset</CodeAnalysisRuleSet>
@ -392,7 +392,7 @@ namespace Emby.Server.Implementations.Library
if ( providers . Length = = 0 )
{
// Assign the user to the InvalidAuthProvider since no configured auth provider was valid/found
_logger . LogWarning ( "User {UserName} was found with invalid/missing Authentication Provider {AuthenticationProviderId}. Assigning user to InvalidAuthProvider until this is corrected" , user .Name , user . Policy . AuthenticationProviderId ) ;
_logger . LogWarning ( "User {UserName} was found with invalid/missing Authentication Provider {AuthenticationProviderId}. Assigning user to InvalidAuthProvider until this is corrected" , user ? .Name , user ? . Policy . AuthenticationProviderId ) ;
providers = new IAuthenticationProvider [ ] { _invalidAuthProvider } ;
}
@ -472,7 +472,7 @@ namespace Emby.Server.Implementations.Library
if ( ! success
& & _networkManager . IsInLocalNetwork ( remoteEndPoint )
& & user .Configuration . EnableLocalPassword
& & user ? .Configuration . EnableLocalPassword = = true
& & ! string . IsNullOrEmpty ( user . EasyPassword ) )
{
// Check easy password
@ -1,5 +1,6 @@
using System ;
using System.IO ;
using System.Net.Http ;
using System.Threading ;
using System.Threading.Tasks ;
using MediaBrowser.Common.Net ;
@ -74,7 +75,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
DecompressionMethod = CompressionMethod . None
} ;
using ( var response = await _httpClient . SendAsync ( httpRequestOptions , "GET" ) . ConfigureAwait ( false ) )
using ( var response = await _httpClient . SendAsync ( httpRequestOptions , HttpMethod . Get ) . ConfigureAwait ( false ) )
{
_logger . LogInformation ( "Opened recording stream from tuner provider" ) ;
@ -5,6 +5,7 @@ using System.Globalization;
using System.IO ;
using System.Linq ;
using System.Net ;
using System.Net.Http ;
using System.Threading ;
using System.Threading.Tasks ;
using MediaBrowser.Common ;
@ -12,7 +13,6 @@ using MediaBrowser.Common.Net;
using MediaBrowser.Controller.LiveTv ;
using MediaBrowser.Model.Dto ;
using MediaBrowser.Model.Entities ;
using MediaBrowser.Model.Extensions ;
using MediaBrowser.Model.LiveTv ;
using MediaBrowser.Model.Net ;
using MediaBrowser.Model.Serialization ;
@ -663,7 +663,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
try
{
return await _httpClient . SendAsync ( options , "GET" ) . ConfigureAwait ( false ) ;
return await _httpClient . SendAsync ( options , HttpMethod . Get ) . ConfigureAwait ( false ) ;
}
catch ( HttpException ex )
{
@ -738,7 +738,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
httpOptions . RequestHeaders [ "token" ] = token ;
using ( await _httpClient . SendAsync ( httpOptions , "PUT" ) . ConfigureAwait ( false ) )
using ( await _httpClient . SendAsync ( httpOptions , HttpMethod . Put ) . ConfigureAwait ( false ) )
{
}
}
@ -1,6 +1,7 @@
using System ;
using System.Collections.Generic ;
using System.IO ;
using System.Net.Http ;
using System.Threading ;
using System.Threading.Tasks ;
using MediaBrowser.Common.Configuration ;
@ -64,7 +65,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
httpRequestOptions . RequestHeaders [ header . Key ] = header . Value ;
}
var response = await _httpClient . SendAsync ( httpRequestOptions , "GET" ) . ConfigureAwait ( false ) ;
var response = await _httpClient . SendAsync ( httpRequestOptions , HttpMethod . Get ) . ConfigureAwait ( false ) ;
var extension = "ts" ;
var requiresRemux = false ;
@ -1,10 +1,10 @@
using System ;
using System.Collections.Concurrent ;
using System.Collections.Generic ;
using System.Globalization ;
using System.IO ;
using System.Linq ;
using System.Net.Http ;
using System.Runtime.CompilerServices ;
using System.Security.Cryptography ;
using System.Threading ;
using System.Threading.Tasks ;
@ -189,7 +189,7 @@ namespace Emby.Server.Implementations.Updates
}
/// <inheritdoc />
public async IAsyncEnumerable < PackageVersionInfo > GetAvailablePluginUpdates ( CancellationToken cancellationToken = default )
public async IAsyncEnumerable < PackageVersionInfo > GetAvailablePluginUpdates ( [ EnumeratorCancellation ] CancellationToken cancellationToken = default )
{
var catalog = await GetAvailablePackages ( cancellationToken ) . ConfigureAwait ( false ) ;
@ -17,7 +17,7 @@
<ProjectReference Include= "..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
</ItemGroup>
<!-- Code analys ers-->
<!-- Code Analyz ers-->
<ItemGroup Condition= " '$(Configuration)' == 'Debug' " >
<PackageReference Include= "Microsoft.CodeAnalysis.FxCopAnalyzers" Version= "2.9.7" PrivateAssets= "All" />
<PackageReference Include= "SerilogAnalyzer" Version= "0.15.0" PrivateAssets= "All" />
@ -24,8 +24,8 @@
<ItemGroup >
<FrameworkReference Include= "Microsoft.AspNetCore.App" />
</ItemGroup>
<!-- Code a nalyzers-->
<!-- Code A nalyzers-->
<ItemGroup Condition= " '$(Configuration)' == 'Debug' " >
<PackageReference Include= "Microsoft.CodeAnalysis.FxCopAnalyzers" Version= "2.9.7" />
<PackageReference Include= "SerilogAnalyzer" Version= "0.15.0" />