cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2660 from Bond-009/usings

Browse Source 
Minor style fixes
This commit is contained in:
Vasily 2020-04-01 23:56:00 +03:00 committed by GitHub
commit cc40f84f3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 108 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DvdLib/Ifo/Dvd.cs
View File

@ -33,7 +33,7 @@ namespace DvdLib.Ifo
continue; continue;
} }
var nums = ifo.Name.Split(new [] { '_' }, StringSplitOptions.RemoveEmptyEntries); var nums = ifo.Name.Split(new[] { '_' }, StringSplitOptions.RemoveEmptyEntries);
if (nums.Length >= 2 && ushort.TryParse(nums[1], out var ifoNumber)) if (nums.Length >= 2 && ushort.TryParse(nums[1], out var ifoNumber))
{ {
ReadVTS(ifoNumber, ifo.FullName); ReadVTS(ifoNumber, ifo.FullName);

32
Emby.Dlna/Didl/DidlBuilder.cs
View File

@ -392,24 +392,24 @@ namespace Emby.Dlna.Didl
{ {
switch (itemStubType.Value) switch (itemStubType.Value)
{ {
case StubType.Latest: return _localization.GetLocalizedString("Latest"); case StubType.Latest: return _localization.GetLocalizedString("Latest");
case StubType.Playlists: return _localization.GetLocalizedString("Playlists"); case StubType.Playlists: return _localization.GetLocalizedString("Playlists");
case StubType.AlbumArtists: return _localization.GetLocalizedString("HeaderAlbumArtists"); case StubType.AlbumArtists: return _localization.GetLocalizedString("HeaderAlbumArtists");
case StubType.Albums: return _localization.GetLocalizedString("Albums"); case StubType.Albums: return _localization.GetLocalizedString("Albums");
case StubType.Artists: return _localization.GetLocalizedString("Artists"); case StubType.Artists: return _localization.GetLocalizedString("Artists");
case StubType.Songs: return _localization.GetLocalizedString("Songs"); case StubType.Songs: return _localization.GetLocalizedString("Songs");
case StubType.Genres: return _localization.GetLocalizedString("Genres"); case StubType.Genres: return _localization.GetLocalizedString("Genres");
case StubType.FavoriteAlbums: return _localization.GetLocalizedString("HeaderFavoriteAlbums"); case StubType.FavoriteAlbums: return _localization.GetLocalizedString("HeaderFavoriteAlbums");
case StubType.FavoriteArtists: return _localization.GetLocalizedString("HeaderFavoriteArtists"); case StubType.FavoriteArtists: return _localization.GetLocalizedString("HeaderFavoriteArtists");
case StubType.FavoriteSongs: return _localization.GetLocalizedString("HeaderFavoriteSongs"); case StubType.FavoriteSongs: return _localization.GetLocalizedString("HeaderFavoriteSongs");
case StubType.ContinueWatching: return _localization.GetLocalizedString("HeaderContinueWatching"); case StubType.ContinueWatching: return _localization.GetLocalizedString("HeaderContinueWatching");
case StubType.Movies: return _localization.GetLocalizedString("Movies"); case StubType.Movies: return _localization.GetLocalizedString("Movies");
case StubType.Collections: return _localization.GetLocalizedString("Collections"); case StubType.Collections: return _localization.GetLocalizedString("Collections");
case StubType.Favorites: return _localization.GetLocalizedString("Favorites"); case StubType.Favorites: return _localization.GetLocalizedString("Favorites");
case StubType.NextUp: return _localization.GetLocalizedString("HeaderNextUp"); case StubType.NextUp: return _localization.GetLocalizedString("HeaderNextUp");
case StubType.FavoriteSeries: return _localization.GetLocalizedString("HeaderFavoriteShows"); case StubType.FavoriteSeries: return _localization.GetLocalizedString("HeaderFavoriteShows");
case StubType.FavoriteEpisodes: return _localization.GetLocalizedString("HeaderFavoriteEpisodes"); case StubType.FavoriteEpisodes: return _localization.GetLocalizedString("HeaderFavoriteEpisodes");
case StubType.Series: return _localization.GetLocalizedString("Shows"); case StubType.Series: return _localization.GetLocalizedString("Shows");
default: break; default: break;
} }
} }

1
Emby.Dlna/Didl/Filter.cs
View File

@ -1,7 +1,6 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
using System; using System;
using MediaBrowser.Model.Extensions;
namespace Emby.Dlna.Didl namespace Emby.Dlna.Didl
{ {

4
Emby.Dlna/Main/DlnaEntryPoint.cs
View File

@ -262,8 +262,8 @@ namespace Emby.Dlna.Main
{ {
if (address.AddressFamily == AddressFamily.InterNetworkV6) if (address.AddressFamily == AddressFamily.InterNetworkV6)
{ {
// Not support IPv6 right now // Not supporting IPv6 right now
continue; continue;
} }
var fullService = "urn:schemas-upnp-org:device:MediaServer:1"; var fullService = "urn:schemas-upnp-org:device:MediaServer:1";

1
Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
View File

@ -8,7 +8,6 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Common.Plugins; using MediaBrowser.Common.Plugins;
using MediaBrowser.Common.Updates; using MediaBrowser.Common.Updates;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Authentication; using MediaBrowser.Controller.Authentication;
using MediaBrowser.Controller.Devices; using MediaBrowser.Controller.Devices;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;

2
Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
View File

@ -132,7 +132,7 @@ namespace Emby.Server.Implementations.Configuration
var newPath = newConfig.MetadataPath; var newPath = newConfig.MetadataPath;
if (!string.IsNullOrWhiteSpace(newPath) if (!string.IsNullOrWhiteSpace(newPath)
&& !string.Equals(Configuration.MetadataPath, newPath, StringComparison.Ordinal)) && !string.Equals(Configuration.MetadataPath, newPath, StringComparison.Ordinal))
{ {
// Validate // Validate
if (!Directory.Exists(newPath)) if (!Directory.Exists(newPath))

25
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@ -454,7 +454,7 @@ namespace Emby.Server.Implementations.Data
private static string GetSaveItemCommandText() private static string GetSaveItemCommandText()
{ {
var saveColumns = new [] var saveColumns = new[]
{ {
"guid", "guid",
"type", "type",
@ -560,7 +560,7 @@ namespace Emby.Server.Implementations.Data
throw new ArgumentNullException(nameof(item)); throw new ArgumentNullException(nameof(item));
} }
SaveItems(new [] { item }, cancellationToken); SaveItems(new[] { item }, cancellationToken);
} }
public void SaveImages(BaseItem item) public void SaveImages(BaseItem item)
@ -1622,7 +1622,7 @@ namespace Emby.Server.Implementations.Data
{ {
IEnumerable<MetadataFields> GetLockedFields(string s) IEnumerable<MetadataFields> GetLockedFields(string s)
{ {
foreach (var i in s.Split(new [] { '|' }, StringSplitOptions.RemoveEmptyEntries)) foreach (var i in s.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries))
{ {
if (Enum.TryParse(i, true, out MetadataFields parsedValue)) if (Enum.TryParse(i, true, out MetadataFields parsedValue))
{ {
@ -1818,7 +1818,7 @@ namespace Emby.Server.Implementations.Data
{ {
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.ProductionLocations = reader.GetString(index).Split(new [] { '|' }, StringSplitOptions.RemoveEmptyEntries).ToArray(); item.ProductionLocations = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries).ToArray();
} }
index++; index++;
} }
@ -2900,8 +2900,8 @@ namespace Emby.Server.Implementations.Data
BindSimilarParams(query, statement); BindSimilarParams(query, statement);
BindSearchParams(query, statement); BindSearchParams(query, statement);
// Running this again will bind the params // Running this again will bind the params
GetWhereClauses(query, statement); GetWhereClauses(query, statement);
result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
} }
@ -2928,7 +2928,7 @@ namespace Emby.Server.Implementations.Data
prepend.Add(("SearchScore", SortOrder.Descending)); prepend.Add(("SearchScore", SortOrder.Descending));
prepend.Add((ItemSortBy.SortName, SortOrder.Ascending)); prepend.Add((ItemSortBy.SortName, SortOrder.Ascending));
} }
if (hasSimilar) if (hasSimilar)
{ {
prepend.Add(("SimilarityScore", SortOrder.Descending)); prepend.Add(("SimilarityScore", SortOrder.Descending));
@ -3269,8 +3269,8 @@ namespace Emby.Server.Implementations.Data
BindSimilarParams(query, statement); BindSimilarParams(query, statement);
BindSearchParams(query, statement); BindSearchParams(query, statement);
// Running this again will bind the params // Running this again will bind the params
GetWhereClauses(query, statement); GetWhereClauses(query, statement);
foreach (var row in statement.ExecuteQuery()) foreach (var row in statement.ExecuteQuery())
{ {
@ -3291,8 +3291,8 @@ namespace Emby.Server.Implementations.Data
BindSimilarParams(query, statement); BindSimilarParams(query, statement);
BindSearchParams(query, statement); BindSearchParams(query, statement);
// Running this again will bind the params // Running this again will bind the params
GetWhereClauses(query, statement); GetWhereClauses(query, statement);
result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First(); result.TotalRecordCount = statement.ExecuteQuery().SelectScalarInt().First();
} }
@ -6162,7 +6162,8 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
item.ColorTransfer = reader[34].ToString(); item.ColorTransfer = reader[34].ToString();
} }
if (item.Type == MediaStreamType.Subtitle){ if (item.Type == MediaStreamType.Subtitle)
{
item.localizedUndefined = _localization.GetLocalizedString("Undefined"); item.localizedUndefined = _localization.GetLocalizedString("Undefined");
item.localizedDefault = _localization.GetLocalizedString("Default"); item.localizedDefault = _localization.GetLocalizedString("Default");
item.localizedForced = _localization.GetLocalizedString("Forced"); item.localizedForced = _localization.GetLocalizedString("Forced");

2
Emby.Server.Implementations/Data/SqliteUserRepository.cs
View File

@ -25,7 +25,7 @@ namespace Emby.Server.Implementations.Data
IServerApplicationPaths appPaths) IServerApplicationPaths appPaths)
: base(logger) : base(logger)
{ {
_jsonOptions = JsonDefaults.GetOptions();; _jsonOptions = JsonDefaults.GetOptions();
DbFilePath = Path.Combine(appPaths.DataPath, "users.db"); DbFilePath = Path.Combine(appPaths.DataPath, "users.db");
} }

2
Emby.Server.Implementations/HttpServer/FileWriter.cs
View File

@ -11,8 +11,8 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using MediaBrowser.Model.Services; using MediaBrowser.Model.Services;
using Microsoft.Extensions.Logging;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Microsoft.Net.Http.Headers; using Microsoft.Net.Http.Headers;
namespace Emby.Server.Implementations.HttpServer namespace Emby.Server.Implementations.HttpServer

10
Emby.Server.Implementations/IO/ManagedFileSystem.cs
View File

@ -587,11 +587,11 @@ namespace Emby.Server.Implementations.IO
// some drives on linux have no actual size or are used for other purposes // some drives on linux have no actual size or are used for other purposes
return DriveInfo.GetDrives().Where(d => d.IsReady && d.TotalSize != 0 && d.DriveType != DriveType.Ram) return DriveInfo.GetDrives().Where(d => d.IsReady && d.TotalSize != 0 && d.DriveType != DriveType.Ram)
.Select(d => new FileSystemMetadata .Select(d => new FileSystemMetadata
{ {
Name = d.Name, Name = d.Name,
FullName = d.RootDirectory.FullName, FullName = d.RootDirectory.FullName,
IsDirectory = true IsDirectory = true
}).ToList(); }).ToList();
} }
public virtual IEnumerable<FileSystemMetadata> GetDirectories(string path, bool recursive = false) public virtual IEnumerable<FileSystemMetadata> GetDirectories(string path, bool recursive = false)

1
Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
View File

@ -8,7 +8,6 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Resolvers; using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;

18
Emby.Server.Implementations/Library/UserManager.cs
View File

@ -805,17 +805,17 @@ namespace Emby.Server.Implementations.Library
// Delete user config dir // Delete user config dir
lock (_configSyncLock) lock (_configSyncLock)
lock (_policySyncLock) lock (_policySyncLock)
{
try
{ {
Directory.Delete(user.ConfigurationDirectoryPath, true); try
{
Directory.Delete(user.ConfigurationDirectoryPath, true);
}
catch (IOException ex)
{
_logger.LogError(ex, "Error deleting user config dir: {Path}", user.ConfigurationDirectoryPath);
}
} }
catch (IOException ex)
{
_logger.LogError(ex, "Error deleting user config dir: {Path}", user.ConfigurationDirectoryPath);
}
}
_users.TryRemove(user.Id, out _); _users.TryRemove(user.Id, out _);

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
View File

@ -7,8 +7,8 @@ using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller; using MediaBrowser.Controller;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;

2
Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
View File

@ -7,8 +7,8 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Controller.Library;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using MediaBrowser.Model.LiveTv; using MediaBrowser.Model.LiveTv;

2
Emby.Server.Implementations/Networking/NetworkManager.cs
View File

@ -500,7 +500,7 @@ namespace Emby.Server.Implementations.Networking
{ {
if (ip.Address.Equals(address) && ip.IPv4Mask != null) if (ip.Address.Equals(address) && ip.IPv4Mask != null)
{ {
return ip.IPv4Mask; return ip.IPv4Mask;
} }
} }
} }

3
Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs
View File

@ -41,7 +41,8 @@ namespace Emby.Server.Implementations.ScheduledTasks
{ {
yield return new TaskTriggerInfo yield return new TaskTriggerInfo
{ {
Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(12).Ticks Type = TaskTriggerInfo.TriggerInterval,
IntervalTicks = TimeSpan.FromHours(12).Ticks
}; };
} }

4
Emby.Server.Implementations/Services/SwaggerService.cs
View File

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Emby.Server.Implementations.HttpServer;
using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Services; using MediaBrowser.Model.Services;
using Emby.Server.Implementations.HttpServer;
namespace Emby.Server.Implementations.Services namespace Emby.Server.Implementations.Services
{ {
@ -241,7 +241,7 @@ namespace Emby.Server.Implementations.Services
responses = responses, responses = responses,
security = new [] { apiKeySecurity } security = new[] { apiKeySecurity }
}; };
} }

1
Jellyfin.Server/CoreAppHost.cs
View File

@ -4,7 +4,6 @@ using Emby.Server.Implementations;
using MediaBrowser.Common.Net; using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Drawing;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Jellyfin.Server namespace Jellyfin.Server

2
Jellyfin.Server/Migrations/Routines/DisableTranscodingThrottling.cs
View File

@ -1,8 +1,6 @@
using System; using System;
using System.IO;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Configuration;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Jellyfin.Server.Migrations.Routines namespace Jellyfin.Server.Migrations.Routines

4
Jellyfin.Server/Program.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
@ -28,7 +27,6 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
using Serilog; using Serilog;
using Serilog.Events;
using Serilog.Extensions.Logging; using Serilog.Extensions.Logging;
using SQLitePCL; using SQLitePCL;
using ILogger = Microsoft.Extensions.Logging.ILogger; using ILogger = Microsoft.Extensions.Logging.ILogger;
@ -565,7 +563,7 @@ namespace Jellyfin.Server
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogWarning(ex, "Skia not available. Will fallback to NullIMageEncoder."); _logger.LogWarning(ex, $"Skia not available. Will fallback to {nameof(NullImageEncoder)}.");
} }
return new NullImageEncoder(); return new NullImageEncoder();

2
MediaBrowser.Api/BaseApiService.cs
View File

@ -9,8 +9,8 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Session; using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Services;
using MediaBrowser.Model.Querying; using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Services;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace MediaBrowser.Api namespace MediaBrowser.Api

2
MediaBrowser.Api/ChannelService.cs
View File

@ -4,8 +4,8 @@ using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Api.UserLibrary; using MediaBrowser.Api.UserLibrary;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net;

2
MediaBrowser.Api/EnvironmentService.cs
View File

@ -177,7 +177,7 @@ namespace MediaBrowser.Api
} }
public object Get(GetDefaultDirectoryBrowser request) => public object Get(GetDefaultDirectoryBrowser request) =>
ToOptimizedResult(new DefaultDirectoryBrowserInfo {Path = null}); ToOptimizedResult(new DefaultDirectoryBrowserInfo { Path = null });
/// <summary> /// <summary>
/// Gets the specified request. /// Gets the specified request.

18
MediaBrowser.Api/Playback/MediaInfoService.cs
View File

@ -5,8 +5,8 @@
using System; using System;
using System.Buffers; using System.Buffers;
using System.Globalization; using System.Globalization;
using System.Text.Json;
using System.Linq; using System.Linq;
using System.Text.Json;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Common.Net; using MediaBrowser.Common.Net;
@ -470,7 +470,7 @@ namespace MediaBrowser.Api.Playback
else else
{ {
options.MaxBitrate = GetMaxBitrate(maxBitrate, user); options.MaxBitrate = GetMaxBitrate(maxBitrate, user);
if (item is Audio) if (item is Audio)
{ {
if (!user.Policy.EnableAudioPlaybackTranscoding) if (!user.Policy.EnableAudioPlaybackTranscoding)
@ -486,10 +486,10 @@ namespace MediaBrowser.Api.Playback
} }
} }
// The MediaSource supports direct stream, now test to see if the client supports it // The MediaSource supports direct stream, now test to see if the client supports it
var streamInfo = string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase) var streamInfo = string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase)
? streamBuilder.BuildAudioItem(options) ? streamBuilder.BuildAudioItem(options)
: streamBuilder.BuildVideoItem(options); : streamBuilder.BuildVideoItem(options);
if (streamInfo == null || !streamInfo.IsDirectStream) if (streamInfo == null || !streamInfo.IsDirectStream)
{ {
@ -516,7 +516,7 @@ namespace MediaBrowser.Api.Playback
{ {
if (streamInfo != null) if (streamInfo != null)
{ {
streamInfo.PlaySessionId = playSessionId; streamInfo.PlaySessionId = playSessionId;
streamInfo.StartPositionTicks = startTimeTicks; streamInfo.StartPositionTicks = startTimeTicks;
mediaSource.TranscodingUrl = streamInfo.ToUrl("-", auth.Token).TrimStart('-'); mediaSource.TranscodingUrl = streamInfo.ToUrl("-", auth.Token).TrimStart('-');
mediaSource.TranscodingUrl += "&allowVideoStreamCopy=false"; mediaSource.TranscodingUrl += "&allowVideoStreamCopy=false";
@ -526,10 +526,10 @@ namespace MediaBrowser.Api.Playback
} }
mediaSource.TranscodingContainer = streamInfo.Container; mediaSource.TranscodingContainer = streamInfo.Container;
mediaSource.TranscodingSubProtocol = streamInfo.SubProtocol; mediaSource.TranscodingSubProtocol = streamInfo.SubProtocol;
// Do this after the above so that StartPositionTicks is set // Do this after the above so that StartPositionTicks is set
SetDeviceSpecificSubtitleInfo(streamInfo, mediaSource, auth.Token); SetDeviceSpecificSubtitleInfo(streamInfo, mediaSource, auth.Token);
} }
} }
else else
{ {

2
MediaBrowser.Api/TvShowsService.cs
View File

@ -12,8 +12,8 @@ using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.TV; using MediaBrowser.Controller.TV;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Services;
using MediaBrowser.Model.Querying; using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Services;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace MediaBrowser.Api namespace MediaBrowser.Api

1
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -15,7 +15,6 @@ using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;

1
MediaBrowser.Controller/Entities/Person.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using MediaBrowser.Controller.Extensions; using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace MediaBrowser.Controller.Entities namespace MediaBrowser.Controller.Entities

1
MediaBrowser.Controller/Entities/PersonInfo.cs
View File

@ -1,5 +1,4 @@
using System; using System;
using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;

2
MediaBrowser.Controller/Library/NameExtensions.cs
View File

@ -1,6 +1,6 @@
using System; using System;
using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using MediaBrowser.Controller.Extensions; using MediaBrowser.Controller.Extensions;
namespace MediaBrowser.Controller.Library namespace MediaBrowser.Controller.Library

3
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -2013,6 +2013,7 @@ namespace MediaBrowser.Controller.MediaEncoding
} }
// If we're hardware VAAPI decoding and software encoding, download frames from the decoder first // If we're hardware VAAPI decoding and software encoding, download frames from the decoder first
else if (string.Equals(options.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase) && !options.EnableHardwareEncoding) else if (string.Equals(options.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase) && !options.EnableHardwareEncoding)
{ {
var codec = videoStream.Codec.ToLowerInvariant(); var codec = videoStream.Codec.ToLowerInvariant();
@ -2705,7 +2706,7 @@ namespace MediaBrowser.Controller.MediaEncoding
{ {
if (Environment.OSVersion.Platform == PlatformID.Win32NT) if (Environment.OSVersion.Platform == PlatformID.Win32NT)
{ {
if(Environment.OSVersion.Version.Major > 6 || (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor > 1)) if (Environment.OSVersion.Version.Major > 6 || (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor > 1))
return "-hwaccel d3d11va"; return "-hwaccel d3d11va";
else else
return "-hwaccel dxva2"; return "-hwaccel dxva2";

2
MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
View File

@ -9,8 +9,8 @@ using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo; using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Session;
using MediaBrowser.Model.Net; using MediaBrowser.Model.Net;
using MediaBrowser.Model.Session;
namespace MediaBrowser.Controller.MediaEncoding namespace MediaBrowser.Controller.MediaEncoding
{ {

1
MediaBrowser.Controller/Sorting/SortExtensions.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
namespace MediaBrowser.Controller.Sorting namespace MediaBrowser.Controller.Sorting
{ {

2
MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
View File

@ -1,6 +1,6 @@
using System; using System;
using System.Diagnostics;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;

2
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -20,8 +20,8 @@ using MediaBrowser.Model.Globalization;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo; using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.System; using MediaBrowser.Model.System;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
namespace MediaBrowser.MediaEncoding.Encoder namespace MediaBrowser.MediaEncoding.Encoder
{ {

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

@ -536,7 +536,7 @@ namespace MediaBrowser.MediaEncoding.Probing
if (!string.IsNullOrWhiteSpace(streamInfo.CodecTagString)) if (!string.IsNullOrWhiteSpace(streamInfo.CodecTagString))
{ {
attachment.CodecTag = streamInfo.CodecTagString; attachment.CodecTag = streamInfo.CodecTagString;
} }
if (streamInfo.Tags != null) if (streamInfo.Tags != null)

8
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@ -761,10 +761,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles
return _httpClient.Get(opts); return _httpClient.Get(opts);
case MediaProtocol.File: case MediaProtocol.File:
return Task.FromResult<Stream>(File.OpenRead(path)); return Task.FromResult<Stream>(File.OpenRead(path));
default: default:
throw new ArgumentOutOfRangeException(nameof(protocol)); throw new ArgumentOutOfRangeException(nameof(protocol));
} }
} }
} }

1
MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
View File

@ -1,7 +1,6 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
using System; using System;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.Dlna namespace MediaBrowser.Model.Dlna
{ {

1
MediaBrowser.Model/Dlna/SearchCriteria.cs
View File

@ -2,7 +2,6 @@
using System; using System;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using MediaBrowser.Model.Extensions;
namespace MediaBrowser.Model.Dlna namespace MediaBrowser.Model.Dlna
{ {

2
MediaBrowser.Model/Entities/DisplayPreferences.cs
View File

@ -101,7 +101,7 @@ namespace MediaBrowser.Model.Entities
/// </summary> /// </summary>
/// <value><c>true</c> if [show sidebar]; otherwise, <c>false</c>.</value> /// <value><c>true</c> if [show sidebar]; otherwise, <c>false</c>.</value>
public bool ShowSidebar { get; set; } public bool ShowSidebar { get; set; }
/// <summary> /// <summary>
/// Gets or sets the client /// Gets or sets the client
/// </summary> /// </summary>

6
MediaBrowser.Model/Entities/MediaStream.cs
View File

@ -69,9 +69,9 @@ namespace MediaBrowser.Model.Entities
} }
} }
public string localizedUndefined { get; set; } public string localizedUndefined { get; set; }
public string localizedDefault { get; set; } public string localizedDefault { get; set; }
public string localizedForced { get; set; } public string localizedForced { get; set; }
public string DisplayTitle public string DisplayTitle
{ {

2
MediaBrowser.Model/Entities/SeriesStatus.cs
View File

@ -9,7 +9,7 @@ namespace MediaBrowser.Model.Entities
/// The continuing. /// The continuing.
/// </summary> /// </summary>
Continuing, Continuing,
/// <summary> /// <summary>
/// The ended. /// The ended.
/// </summary> /// </summary>

2
MediaBrowser.Model/Entities/SortOrder.cs
View File

@ -9,7 +9,7 @@ namespace MediaBrowser.Model.Entities
/// The ascending. /// The ascending.
/// </summary> /// </summary>
Ascending, Ascending,
/// <summary> /// <summary>
/// The descending. /// The descending.
/// </summary> /// </summary>

8
MediaBrowser.Providers/Music/ArtistMetadataService.cs
View File

@ -31,10 +31,10 @@ namespace MediaBrowser.Providers.Music
{ {
return item.IsAccessedByName return item.IsAccessedByName
? item.GetTaggedItems(new InternalItemsQuery ? item.GetTaggedItems(new InternalItemsQuery
{ {
Recursive = true, Recursive = true,
IsFolder = false IsFolder = false
}) })
: item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder); : item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder);
} }

8
MediaBrowser.Providers/Plugins/TheTvdb/TvdbClientManager.cs
View File

@ -60,21 +60,21 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
var cacheKey = GenerateKey("series", name, language); var cacheKey = GenerateKey("series", name, language);
return TryGetValue(cacheKey, language,() => TvDbClient.Search.SearchSeriesByNameAsync(name, cancellationToken)); return TryGetValue(cacheKey, language, () => TvDbClient.Search.SearchSeriesByNameAsync(name, cancellationToken));
} }
public Task<TvDbResponse<Series>> GetSeriesByIdAsync(int tvdbId, string language, public Task<TvDbResponse<Series>> GetSeriesByIdAsync(int tvdbId, string language,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
var cacheKey = GenerateKey("series", tvdbId, language); var cacheKey = GenerateKey("series", tvdbId, language);
return TryGetValue(cacheKey, language,() => TvDbClient.Series.GetAsync(tvdbId, cancellationToken)); return TryGetValue(cacheKey, language, () => TvDbClient.Series.GetAsync(tvdbId, cancellationToken));
} }
public Task<TvDbResponse<EpisodeRecord>> GetEpisodesAsync(int episodeTvdbId, string language, public Task<TvDbResponse<EpisodeRecord>> GetEpisodesAsync(int episodeTvdbId, string language,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
var cacheKey = GenerateKey("episode", episodeTvdbId, language); var cacheKey = GenerateKey("episode", episodeTvdbId, language);
return TryGetValue(cacheKey, language,() => TvDbClient.Episodes.GetAsync(episodeTvdbId, cancellationToken)); return TryGetValue(cacheKey, language, () => TvDbClient.Episodes.GetAsync(episodeTvdbId, cancellationToken));
} }
public async Task<List<EpisodeRecord>> GetAllEpisodesAsync(int tvdbId, string language, public async Task<List<EpisodeRecord>> GetAllEpisodesAsync(int tvdbId, string language,
@ -109,7 +109,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
var cacheKey = GenerateKey("series", imdbId, language); var cacheKey = GenerateKey("series", imdbId, language);
return TryGetValue(cacheKey, language,() => TvDbClient.Search.SearchSeriesByImdbIdAsync(imdbId, cancellationToken)); return TryGetValue(cacheKey, language, () => TvDbClient.Search.SearchSeriesByImdbIdAsync(imdbId, cancellationToken));
} }
public Task<TvDbResponse<SeriesSearchResult[]>> GetSeriesByZap2ItIdAsync( public Task<TvDbResponse<SeriesSearchResult[]>> GetSeriesByZap2ItIdAsync(

2
MediaBrowser.Providers/Plugins/TheTvdb/TvdbEpisodeProvider.cs
View File

@ -201,7 +201,7 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
continue; continue;
} }
var roles = new List<string> {currentActor.Substring(roleStartIndex + 1)}; var roles = new List<string> { currentActor.Substring(roleStartIndex + 1) };
// Fetch all roles // Fetch all roles
for (var j = i + 1; j < episode.GuestStars.Length; ++j) for (var j = i + 1; j < episode.GuestStars.Length; ++j)

10
MediaBrowser.Providers/Tmdb/Models/General/Profile.cs
View File

@ -2,10 +2,10 @@ namespace MediaBrowser.Providers.Tmdb.Models.General
{ {
public class Profile public class Profile
{ {
public string File_Path { get; set; } public string File_Path { get; set; }
public int Width { get; set; } public int Width { get; set; }
public int Height { get; set; } public int Height { get; set; }
public object Iso_639_1 { get; set; } public object Iso_639_1 { get; set; }
public double Aspect_Ratio { get; set; } public double Aspect_Ratio { get; set; }
} }
} }

2
RSSDP/DisposableManagedObjectBase.cs
View File

@ -72,7 +72,7 @@ namespace Rssdp.Infrastructure
/// <para>Sets the <see cref="IsDisposed"/> property to true. Does not explicitly throw an exception if called multiple times, but makes no promises about behaviour of derived classes.</para> /// <para>Sets the <see cref="IsDisposed"/> property to true. Does not explicitly throw an exception if called multiple times, but makes no promises about behaviour of derived classes.</para>
/// </remarks> /// </remarks>
/// <seealso cref="IsDisposed"/> /// <seealso cref="IsDisposed"/>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Justification="We do exactly as asked, but CA doesn't seem to like us also setting the IsDisposed property. Too bad, it's a good idea and shouldn't cause an exception or anything likely to interfer with the dispose process.")] [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Justification = "We do exactly as asked, but CA doesn't seem to like us also setting the IsDisposed property. Too bad, it's a good idea and shouldn't cause an exception or anything likely to interfer with the dispose process.")]
public void Dispose() public void Dispose()
{ {
IsDisposed = true; IsDisposed = true;

4
RSSDP/SsdpCommunicationsServer.cs
View File

@ -8,9 +8,9 @@ using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Common.Net; using MediaBrowser.Common.Net;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
using MediaBrowser.Model.Net;
using Microsoft.Extensions.Logging;
namespace Rssdp.Infrastructure namespace Rssdp.Infrastructure
{ {

4
tests/Jellyfin.Api.Tests/Auth/FirstTimeSetupOrElevatedPolicy/FirstTimeSetupOrElevatedHandlerTests.cs
View File

@ -23,7 +23,7 @@ namespace Jellyfin.Api.Tests.Auth.FirstTimeSetupOrElevatedPolicy
{ {
var fixture = new Fixture().Customize(new AutoMoqCustomization()); var fixture = new Fixture().Customize(new AutoMoqCustomization());
_configurationManagerMock = fixture.Freeze<Mock<IConfigurationManager>>(); _configurationManagerMock = fixture.Freeze<Mock<IConfigurationManager>>();
_requirements = new List<IAuthorizationRequirement> {new FirstTimeSetupOrElevatedRequirement()}; _requirements = new List<IAuthorizationRequirement> { new FirstTimeSetupOrElevatedRequirement() };
_sut = fixture.Create<FirstTimeSetupOrElevatedHandler>(); _sut = fixture.Create<FirstTimeSetupOrElevatedHandler>();
} }
@ -58,7 +58,7 @@ namespace Jellyfin.Api.Tests.Auth.FirstTimeSetupOrElevatedPolicy
private static ClaimsPrincipal SetupUser(string role) private static ClaimsPrincipal SetupUser(string role)
{ {
var claims = new[] {new Claim(ClaimTypes.Role, role)}; var claims = new[] { new Claim(ClaimTypes.Role, role) };
var identity = new ClaimsIdentity(claims); var identity = new ClaimsIdentity(claims);
return new ClaimsPrincipal(identity); return new ClaimsPrincipal(identity);
} }

4
tests/Jellyfin.Api.Tests/Auth/RequiresElevationPolicy/RequiresElevationHandlerTests.cs
View File

@ -23,9 +23,9 @@ namespace Jellyfin.Api.Tests.Auth.RequiresElevationPolicy
[InlineData(UserRoles.Guest, false)] [InlineData(UserRoles.Guest, false)]
public async Task ShouldHandleRolesCorrectly(string role, bool shouldSucceed) public async Task ShouldHandleRolesCorrectly(string role, bool shouldSucceed)
{ {
var requirements = new List<IAuthorizationRequirement> {new RequiresElevationRequirement()}; var requirements = new List<IAuthorizationRequirement> { new RequiresElevationRequirement() };
var claims = new[] {new Claim(ClaimTypes.Role, role)}; var claims = new[] { new Claim(ClaimTypes.Role, role) };
var identity = new ClaimsIdentity(claims); var identity = new ClaimsIdentity(claims);
var user = new ClaimsPrincipal(identity); var user = new ClaimsPrincipal(identity);