Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3336 from telans/specific-fixes

Browse Source 
Fix trivial SA1005, SA1111, SA1508, SA1510 warnings
This commit is contained in:
Anthony Lavado 2020-06-14 22:51:29 -04:00 committed by GitHub
commit 100e9d586d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
201 changed files with 281 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1139,7 +1139,6 @@ namespace Emby.Dlna.Didl
width = null; width = null;
height = null; height = null;
} }
else if (width == -1 || height == -1) else if (width == -1 || height == -1)
{ {
width = null; width = null;

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

@ -12,7 +12,6 @@ namespace Emby.Dlna.Didl
public Filter() public Filter()
: this("*") : this("*")
{ {
} }
public Filter(string filter) public Filter(string filter)

1
Emby.Dlna/DlnaManager.cs
View File

@ -88,7 +88,6 @@ namespace Emby.Dlna
.Select(i => i.Item2) .Select(i => i.Item2)
.ToList(); .ToList();
} }
} }
public DeviceProfile GetDefaultProfile() public DeviceProfile GetDefaultProfile()

1
Emby.Dlna/Eventing/EventManager.cs
View File

@ -169,7 +169,6 @@ namespace Emby.Dlna.Eventing
{ {
using (await _httpClient.SendAsync(options, new HttpMethod("NOTIFY")).ConfigureAwait(false)) using (await _httpClient.SendAsync(options, new HttpMethod("NOTIFY")).ConfigureAwait(false))
{ {
} }
} }
catch (OperationCanceledException) catch (OperationCanceledException)

3
Emby.Dlna/PlayTo/Device.cs
View File

@ -794,7 +794,6 @@ namespace Emby.Dlna.PlayTo
} }
catch (XmlException) catch (XmlException)
{ {
} }
// first try to add a root node with a dlna namesapce // first try to add a root node with a dlna namesapce
@ -806,7 +805,6 @@ namespace Emby.Dlna.PlayTo
} }
catch (XmlException) catch (XmlException)
{ {
} }
// some devices send back invalid xml // some devices send back invalid xml
@ -816,7 +814,6 @@ namespace Emby.Dlna.PlayTo
} }
catch (XmlException) catch (XmlException)
{ {
} }
return null; return null;

2
Emby.Dlna/PlayTo/PlayToManager.cs
View File

@ -112,7 +112,6 @@ namespace Emby.Dlna.PlayTo
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -243,7 +242,6 @@ namespace Emby.Dlna.PlayTo
} }
catch catch
{ {
} }
_sessionLock.Dispose(); _sessionLock.Dispose();

1
Emby.Dlna/PlayTo/SsdpHttpClient.cs
View File

@ -91,7 +91,6 @@ namespace Emby.Dlna.PlayTo
using (await _httpClient.SendAsync(options, new HttpMethod("SUBSCRIBE")).ConfigureAwait(false)) using (await _httpClient.SendAsync(options, new HttpMethod("SUBSCRIBE")).ConfigureAwait(false))
{ {
} }
} }

1
Emby.Server.Implementations/Data/BaseSqliteRepository.cs
View File

@ -162,7 +162,6 @@ namespace Emby.Server.Implementations.Data
} }
return false; return false;
}, ReadTransactionMode); }, ReadTransactionMode);
} }

1
Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
View File

@ -51,7 +51,6 @@ namespace Emby.Server.Implementations.Data
_libraryManager.DeleteItem(item, new DeleteOptions _libraryManager.DeleteItem(item, new DeleteOptions
{ {
DeleteFileLocation = false DeleteFileLocation = false
}); });
} }

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

@ -321,7 +321,6 @@ namespace Emby.Server.Implementations.Data
AddColumn(db, "MediaStreams", "ColorPrimaries", "TEXT", existingColumnNames); AddColumn(db, "MediaStreams", "ColorPrimaries", "TEXT", existingColumnNames);
AddColumn(db, "MediaStreams", "ColorSpace", "TEXT", existingColumnNames); AddColumn(db, "MediaStreams", "ColorSpace", "TEXT", existingColumnNames);
AddColumn(db, "MediaStreams", "ColorTransfer", "TEXT", existingColumnNames); AddColumn(db, "MediaStreams", "ColorTransfer", "TEXT", existingColumnNames);
}, TransactionMode); }, TransactionMode);
connection.RunQueries(postQueries); connection.RunQueries(postQueries);
@ -2044,7 +2043,6 @@ namespace Emby.Server.Implementations.Data
db.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", idBlob); db.Execute("delete from " + ChaptersTableName + " where ItemId=@ItemId", idBlob);
InsertChapters(idBlob, chapters, db); InsertChapters(idBlob, chapters, db);
}, TransactionMode); }, TransactionMode);
} }
} }
@ -4789,7 +4787,6 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
connection.RunInTransaction(db => connection.RunInTransaction(db =>
{ {
connection.ExecuteAll(sql); connection.ExecuteAll(sql);
}, TransactionMode); }, TransactionMode);
} }
} }
@ -5180,7 +5177,6 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
} }
} }
} }
} }
LogQueryTime("GetItemValueNames", commandText, now); LogQueryTime("GetItemValueNames", commandText, now);
@ -5631,7 +5627,6 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
db.Execute("delete from People where ItemId=@ItemId", itemIdBlob); db.Execute("delete from People where ItemId=@ItemId", itemIdBlob);
InsertPeople(itemIdBlob, people, db); InsertPeople(itemIdBlob, people, db);
}, TransactionMode); }, TransactionMode);
} }
} }
@ -5788,7 +5783,6 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
db.Execute("delete from mediastreams where ItemId=@ItemId", itemIdBlob); db.Execute("delete from mediastreams where ItemId=@ItemId", itemIdBlob);
InsertMediaStreams(itemIdBlob, streams, db); InsertMediaStreams(itemIdBlob, streams, db);
}, TransactionMode); }, TransactionMode);
} }
} }
@ -6134,7 +6128,6 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
db.Execute("delete from mediaattachments where ItemId=@ItemId", itemIdBlob); db.Execute("delete from mediaattachments where ItemId=@ItemId", itemIdBlob);
InsertMediaAttachments(itemIdBlob, attachments, db, cancellationToken); InsertMediaAttachments(itemIdBlob, attachments, db, cancellationToken);
}, TransactionMode); }, TransactionMode);
} }
} }

4
Emby.Server.Implementations/Dto/DtoService.cs
View File

@ -406,7 +406,6 @@ namespace Emby.Server.Implementations.Dto
dto.DateLastMediaAdded = folder.DateLastMediaAdded; dto.DateLastMediaAdded = folder.DateLastMediaAdded;
} }
} }
else else
{ {
if (options.EnableUserData) if (options.EnableUserData)
@ -594,7 +593,6 @@ namespace Emby.Server.Implementations.Dto
_logger.LogError(ex, "Error getting person {Name}", c); _logger.LogError(ex, "Error getting person {Name}", c);
return null; return null;
} }
}).Where(i => i != null) }).Where(i => i != null)
.GroupBy(i => i.Name, StringComparer.OrdinalIgnoreCase) .GroupBy(i => i.Name, StringComparer.OrdinalIgnoreCase)
.Select(x => x.First()) .Select(x => x.First())
@ -1001,7 +999,6 @@ namespace Emby.Server.Implementations.Dto
} }
return null; return null;
}).Where(i => i != null).ToArray(); }).Where(i => i != null).ToArray();
} }
@ -1052,7 +1049,6 @@ namespace Emby.Server.Implementations.Dto
} }
return null; return null;
}).Where(i => i != null).ToArray(); }).Where(i => i != null).ToArray();
} }

1
Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
View File

@ -132,7 +132,6 @@ namespace Emby.Server.Implementations.EntryPoints
} }
catch catch
{ {
} }
} }
} }

2
Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
View File

@ -159,7 +159,6 @@ namespace Emby.Server.Implementations.EntryPoints
} }
catch (Exception) catch (Exception)
{ {
} }
} }
@ -175,7 +174,6 @@ namespace Emby.Server.Implementations.EntryPoints
} }
catch (Exception) catch (Exception)
{ {
} }
} }

1
Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
View File

@ -43,7 +43,6 @@ namespace Emby.Server.Implementations.EntryPoints
_logger = logger; _logger = logger;
_appHost = appHost; _appHost = appHost;
_config = configuration; _config = configuration;
} }
/// <inheritdoc /> /// <inheritdoc />

1
Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
View File

@ -580,7 +580,6 @@ namespace Emby.Server.Implementations.HttpServer
} }
catch (NotSupportedException) catch (NotSupportedException)
{ {
} }
} }

1
Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
View File

@ -116,7 +116,6 @@ namespace Emby.Server.Implementations.HttpServer.Security
{ {
info.Device = tokenInfo.DeviceName; info.Device = tokenInfo.DeviceName;
} }
else if (!string.Equals(info.Device, tokenInfo.DeviceName, StringComparison.OrdinalIgnoreCase)) else if (!string.Equals(info.Device, tokenInfo.DeviceName, StringComparison.OrdinalIgnoreCase))
{ {
if (allowTokenInfoUpdate) if (allowTokenInfoUpdate)

2
Emby.Server.Implementations/IO/LibraryMonitor.cs
View File

@ -266,7 +266,6 @@ namespace Emby.Server.Implementations.IO
{ {
DisposeWatcher(newWatcher, false); DisposeWatcher(newWatcher, false);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -393,7 +392,6 @@ namespace Emby.Server.Implementations.IO
} }
return false; return false;
})) }))
{ {
monitorPath = false; monitorPath = false;

1
Emby.Server.Implementations/Images/CollectionFolderImageProvider.cs
View File

@ -71,7 +71,6 @@ namespace Emby.Server.Implementations.Images
new ValueTuple<string, SortOrder>(ItemSortBy.Random, SortOrder.Ascending) new ValueTuple<string, SortOrder>(ItemSortBy.Random, SortOrder.Ascending)
}, },
IncludeItemTypes = includeItemTypes IncludeItemTypes = includeItemTypes
}); });
} }

1
Emby.Server.Implementations/Images/DynamicImageProvider.cs
View File

@ -78,7 +78,6 @@ namespace Emby.Server.Implementations.Images
} }
return i; return i;
}).GroupBy(x => x.Id) }).GroupBy(x => x.Id)
.Select(x => x.First()); .Select(x => x.First());

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

@ -2861,7 +2861,6 @@ namespace Emby.Server.Implementations.Library
_logger.LogError(ex, "Error getting person"); _logger.LogError(ex, "Error getting person");
return null; return null;
} }
}).Where(i => i != null).ToList(); }).Where(i => i != null).ToList();
} }

3
Emby.Server.Implementations/Library/LiveStreamHelper.cs
View File

@ -148,17 +148,14 @@ namespace Emby.Server.Implementations.Library
{ {
videoStream.BitRate = 30000000; videoStream.BitRate = 30000000;
} }
else if (width >= 1900) else if (width >= 1900)
{ {
videoStream.BitRate = 20000000; videoStream.BitRate = 20000000;
} }
else if (width >= 1200) else if (width >= 1200)
{ {
videoStream.BitRate = 8000000; videoStream.BitRate = 8000000;
} }
else if (width >= 700) else if (width >= 700)
{ {
videoStream.BitRate = 2000000; videoStream.BitRate = 2000000;

5
Emby.Server.Implementations/Library/MediaSourceManager.cs
View File

@ -436,7 +436,6 @@ namespace Emby.Server.Implementations.Library
} }
return 1; return 1;
}).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0) }).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
.ThenByDescending(i => .ThenByDescending(i =>
{ {
@ -620,7 +619,6 @@ namespace Emby.Server.Implementations.Library
MediaSource = mediaSource, MediaSource = mediaSource,
ExtractChapters = false, ExtractChapters = false,
MediaType = DlnaProfileType.Video MediaType = DlnaProfileType.Video
}, cancellationToken).ConfigureAwait(false); }, cancellationToken).ConfigureAwait(false);
mediaSource.MediaStreams = info.MediaStreams; mediaSource.MediaStreams = info.MediaStreams;
@ -748,17 +746,14 @@ namespace Emby.Server.Implementations.Library
{ {
videoStream.BitRate = 30000000; videoStream.BitRate = 30000000;
} }
else if (width >= 1900) else if (width >= 1900)
{ {
videoStream.BitRate = 20000000; videoStream.BitRate = 20000000;
} }
else if (width >= 1200) else if (width >= 1200)
{ {
videoStream.BitRate = 8000000; videoStream.BitRate = 8000000;
} }
else if (width >= 700) else if (width >= 700)
{ {
videoStream.BitRate = 2000000; videoStream.BitRate = 2000000;

1
Emby.Server.Implementations/Library/Resolvers/SpecialFolderResolver.cs
View File

@ -73,7 +73,6 @@ namespace Emby.Server.Implementations.Library.Resolvers
{ {
return false; return false;
} }
}) })
.Select(i => _fileSystem.GetFileNameWithoutExtension(i)) .Select(i => _fileSystem.GetFileNameWithoutExtension(i))
.FirstOrDefault(); .FirstOrDefault();

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

@ -94,7 +94,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
_localization.GetLocalizedString("NameSeasonNumber"), _localization.GetLocalizedString("NameSeasonNumber"),
seasonNumber, seasonNumber,
args.GetLibraryOptions().PreferredMetadataLanguage); args.GetLibraryOptions().PreferredMetadataLanguage);
} }
return season; return season;

1
Emby.Server.Implementations/Library/SearchEngine.cs
View File

@ -207,7 +207,6 @@ namespace Emby.Server.Implementations.Library
return mediaItems.Select(i => new SearchHintInfo return mediaItems.Select(i => new SearchHintInfo
{ {
Item = i Item = i
}).ToList(); }).ToList();
} }
} }

1
Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs
View File

@ -98,7 +98,6 @@ namespace Emby.Server.Implementations.Library.Validators
_libraryManager.DeleteItem(item, new DeleteOptions _libraryManager.DeleteItem(item, new DeleteOptions
{ {
DeleteFileLocation = false DeleteFileLocation = false
}, false); }, false);
} }

1
Emby.Server.Implementations/Library/Validators/StudiosValidator.cs
View File

@ -92,7 +92,6 @@ namespace Emby.Server.Implementations.Library.Validators
_libraryManager.DeleteItem(item, new DeleteOptions _libraryManager.DeleteItem(item, new DeleteOptions
{ {
DeleteFileLocation = false DeleteFileLocation = false
}, false); }, false);
} }

1
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -1547,7 +1547,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
IsFolder = false, IsFolder = false,
Recursive = true, Recursive = true,
DtoOptions = new DtoOptions(true) DtoOptions = new DtoOptions(true)
}) })
.Where(i => i.IsFileProtocol && File.Exists(i.Path)) .Where(i => i.IsFileProtocol && File.Exists(i.Path))
.Skip(seriesTimer.KeepUpTo - 1) .Skip(seriesTimer.KeepUpTo - 1)

1
Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
View File

@ -56,7 +56,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
name += " " + info.EpisodeTitle; name += " " + info.EpisodeTitle;
} }
} }
else if (info.IsMovie && info.ProductionYear != null) else if (info.IsMovie && info.ProductionYear != null)
{ {
name += " (" + info.ProductionYear + ")"; name += " (" + info.ProductionYear + ")";

1
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
View File

@ -1218,7 +1218,6 @@ namespace Emby.Server.Implementations.LiveTv.Listings
public string programID { get; set; } public string programID { get; set; }
public List<ImageData> data { get; set; } public List<ImageData> data { get; set; }
} }
} }
} }
} }

6
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -1168,7 +1168,6 @@ namespace Emby.Server.Implementations.LiveTv
IncludeItemTypes = new string[] { typeof(LiveTvProgram).Name }, IncludeItemTypes = new string[] { typeof(LiveTvProgram).Name },
ChannelIds = new Guid[] { currentChannel.Id }, ChannelIds = new Guid[] { currentChannel.Id },
DtoOptions = new DtoOptions(true) DtoOptions = new DtoOptions(true)
}).Cast<LiveTvProgram>().ToDictionary(i => i.Id); }).Cast<LiveTvProgram>().ToDictionary(i => i.Id);
var newPrograms = new List<LiveTvProgram>(); var newPrograms = new List<LiveTvProgram>();
@ -1738,7 +1737,6 @@ namespace Emby.Server.Implementations.LiveTv
var results = await GetTimers(new TimerQuery var results = await GetTimers(new TimerQuery
{ {
Id = id Id = id
}, cancellationToken).ConfigureAwait(false); }, cancellationToken).ConfigureAwait(false);
return results.Items.FirstOrDefault(i => string.Equals(i.Id, id, StringComparison.OrdinalIgnoreCase)); return results.Items.FirstOrDefault(i => string.Equals(i.Id, id, StringComparison.OrdinalIgnoreCase));
@ -1790,7 +1788,6 @@ namespace Emby.Server.Implementations.LiveTv
.Select(i => .Select(i =>
{ {
return i.Item1; return i.Item1;
}) })
.ToArray(); .ToArray();
@ -1845,7 +1842,6 @@ namespace Emby.Server.Implementations.LiveTv
} }
return _tvDtoService.GetSeriesTimerInfoDto(i.Item1, i.Item2, channelName); return _tvDtoService.GetSeriesTimerInfoDto(i.Item1, i.Item2, channelName);
}) })
.ToArray(); .ToArray();
@ -1878,7 +1874,6 @@ namespace Emby.Server.Implementations.LiveTv
OrderBy = new[] { (ItemSortBy.StartDate, SortOrder.Ascending) }, OrderBy = new[] { (ItemSortBy.StartDate, SortOrder.Ascending) },
TopParentIds = new[] { GetInternalLiveTvFolder(CancellationToken.None).Id }, TopParentIds = new[] { GetInternalLiveTvFolder(CancellationToken.None).Id },
DtoOptions = options DtoOptions = options
}) : new List<BaseItem>(); }) : new List<BaseItem>();
RemoveFields(options); RemoveFields(options);
@ -2456,7 +2451,6 @@ namespace Emby.Server.Implementations.LiveTv
UserId = user.Id, UserId = user.Id,
IsRecordingsFolder = true, IsRecordingsFolder = true,
RefreshLatestChannelItems = refreshChannels RefreshLatestChannelItems = refreshChannels
}).Items); }).Items);
return folders.Cast<BaseItem>().ToList(); return folders.Cast<BaseItem>().ToList();

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

@ -99,7 +99,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
} }
catch (IOException) catch (IOException)
{ {
} }
} }
} }
@ -116,7 +115,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
} }
catch (IOException) catch (IOException)
{ {
} }
} }
} }

3
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
View File

@ -111,7 +111,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
ChannelType = ChannelType.TV, ChannelType = ChannelType.TV,
IsLegacyTuner = (i.URL ?? string.Empty).StartsWith("hdhomerun", StringComparison.OrdinalIgnoreCase), IsLegacyTuner = (i.URL ?? string.Empty).StartsWith("hdhomerun", StringComparison.OrdinalIgnoreCase),
Path = i.URL Path = i.URL
}).Cast<ChannelInfo>().ToList(); }).Cast<ChannelInfo>().ToList();
} }
@ -481,7 +480,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
Height = height, Height = height,
BitRate = videoBitrate, BitRate = videoBitrate,
NalLengthSize = nal NalLengthSize = nal
}, },
new MediaStream new MediaStream
{ {
@ -722,7 +720,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
} }
} }
} }
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {

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

@ -220,11 +220,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
} }
catch (IOException) catch (IOException)
{ {
} }
catch (ArgumentException) catch (ArgumentException)
{ {
} }
catch (Exception ex) catch (Exception ex)
{ {

1
Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
View File

@ -127,7 +127,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
{ {
using (var stream = await new M3uParser(Logger, _httpClient, _appHost).GetListingsStream(info.Url, CancellationToken.None).ConfigureAwait(false)) using (var stream = await new M3uParser(Logger, _httpClient, _appHost).GetListingsStream(info.Url, CancellationToken.None).ConfigureAwait(false))
{ {
} }
} }

1
Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
View File

@ -210,7 +210,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
} }
} }
} }
} }
if (!IsValidChannelNumber(numberString)) if (!IsValidChannelNumber(numberString))

2
Emby.Server.Implementations/Net/SocketFactory.cs
View File

@ -98,7 +98,6 @@ namespace Emby.Server.Implementations.Net
} }
catch (SocketException) catch (SocketException)
{ {
} }
try try
@ -109,7 +108,6 @@ namespace Emby.Server.Implementations.Net
} }
catch (SocketException) catch (SocketException)
{ {
} }
try try

4
Emby.Server.Implementations/Security/AuthenticationRepository.cs
View File

@ -61,7 +61,6 @@ namespace Emby.Server.Implementations.Security
AddColumn(db, "AccessTokens", "UserName", "TEXT", existingColumnNames); AddColumn(db, "AccessTokens", "UserName", "TEXT", existingColumnNames);
AddColumn(db, "AccessTokens", "DateLastActivity", "DATETIME", existingColumnNames); AddColumn(db, "AccessTokens", "DateLastActivity", "DATETIME", existingColumnNames);
AddColumn(db, "AccessTokens", "AppVersion", "TEXT", existingColumnNames); AddColumn(db, "AccessTokens", "AppVersion", "TEXT", existingColumnNames);
}, TransactionMode); }, TransactionMode);
connection.RunQueries(new[] connection.RunQueries(new[]
@ -107,7 +106,6 @@ namespace Emby.Server.Implementations.Security
statement.MoveNext(); statement.MoveNext();
} }
}, TransactionMode); }, TransactionMode);
} }
} }
@ -367,7 +365,6 @@ namespace Emby.Server.Implementations.Security
return result; return result;
} }
}, ReadTransactionMode); }, ReadTransactionMode);
} }
} }
@ -398,7 +395,6 @@ namespace Emby.Server.Implementations.Security
statement.MoveNext(); statement.MoveNext();
} }
}, TransactionMode); }, TransactionMode);
} }
} }

24
Emby.Server.Implementations/SyncPlay/SyncPlayController.cs
View File

@ -102,20 +102,15 @@ namespace Emby.Server.Implementations.SyncPlay
return new SessionInfo[] { from }; return new SessionInfo[] { from };
case BroadcastType.AllGroup: case BroadcastType.AllGroup:
return _group.Participants.Values.Select( return _group.Participants.Values.Select(
session => session.Session session => session.Session).ToArray();
).ToArray();
case BroadcastType.AllExceptCurrentSession: case BroadcastType.AllExceptCurrentSession:
return _group.Participants.Values.Select( return _group.Participants.Values.Select(
session => session.Session session => session.Session).Where(
).Where( session => !session.Id.Equals(from.Id)).ToArray();
session => !session.Id.Equals(from.Id)
).ToArray();
case BroadcastType.AllReady: case BroadcastType.AllReady:
return _group.Participants.Values.Where( return _group.Participants.Values.Where(
session => !session.IsBuffering session => !session.IsBuffering).Select(
).Select( session => session.Session).ToArray();
session => session.Session
).ToArray();
default: default:
return Array.Empty<SessionInfo>(); return Array.Empty<SessionInfo>();
} }
@ -314,8 +309,7 @@ namespace Emby.Server.Implementations.SyncPlay
// Playback synchronization will mainly happen client side // Playback synchronization will mainly happen client side
_group.IsPaused = false; _group.IsPaused = false;
_group.LastActivity = DateTime.UtcNow.AddMilliseconds( _group.LastActivity = DateTime.UtcNow.AddMilliseconds(
delay delay);
);
var command = NewSyncPlayCommand(SendCommandType.Play); var command = NewSyncPlayCommand(SendCommandType.Play);
SendCommand(session, BroadcastType.AllGroup, command, cancellationToken); SendCommand(session, BroadcastType.AllGroup, command, cancellationToken);
@ -449,8 +443,7 @@ namespace Emby.Server.Implementations.SyncPlay
{ {
// Client that was buffering is recovering, notifying others to resume // Client that was buffering is recovering, notifying others to resume
_group.LastActivity = currentTime.AddMilliseconds( _group.LastActivity = currentTime.AddMilliseconds(
delay delay);
);
var command = NewSyncPlayCommand(SendCommandType.Play); var command = NewSyncPlayCommand(SendCommandType.Play);
SendCommand(session, BroadcastType.AllExceptCurrentSession, command, cancellationToken); SendCommand(session, BroadcastType.AllExceptCurrentSession, command, cancellationToken);
} }
@ -461,8 +454,7 @@ namespace Emby.Server.Implementations.SyncPlay
delay = delay < _group.DefaulPing ? _group.DefaulPing : delay; delay = delay < _group.DefaulPing ? _group.DefaulPing : delay;
_group.LastActivity = currentTime.AddMilliseconds( _group.LastActivity = currentTime.AddMilliseconds(
delay delay);
);
var command = NewSyncPlayCommand(SendCommandType.Play); var command = NewSyncPlayCommand(SendCommandType.Play);
SendCommand(session, BroadcastType.AllGroup, command, cancellationToken); SendCommand(session, BroadcastType.AllGroup, command, cancellationToken);

12
Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
View File

@ -297,19 +297,15 @@ namespace Emby.Server.Implementations.SyncPlay
if (!filterItemId.Equals(Guid.Empty)) if (!filterItemId.Equals(Guid.Empty))
{ {
return _groups.Values.Where( return _groups.Values.Where(
group => group.GetPlayingItemId().Equals(filterItemId) && HasAccessToItem(user, group.GetPlayingItemId()) group => group.GetPlayingItemId().Equals(filterItemId) && HasAccessToItem(user, group.GetPlayingItemId())).Select(
).Select( group => group.GetInfo()).ToList();
group => group.GetInfo()
).ToList();
} }
// Otherwise show all available groups // Otherwise show all available groups
else else
{ {
return _groups.Values.Where( return _groups.Values.Where(
group => HasAccessToItem(user, group.GetPlayingItemId()) group => HasAccessToItem(user, group.GetPlayingItemId())).Select(
).Select( group => group.GetInfo()).ToList();
group => group.GetInfo()
).ToList();
} }
} }

1
Emby.Server.Implementations/TV/TVSeriesManager.cs
View File

@ -225,7 +225,6 @@ namespace Emby.Server.Implementations.TV
ParentIndexNumberNotEquals = 0, ParentIndexNumberNotEquals = 0,
MinSortName = lastWatchedEpisode?.SortName, MinSortName = lastWatchedEpisode?.SortName,
DtoOptions = dtoOptions DtoOptions = dtoOptions
}).Cast<Episode>().FirstOrDefault(); }).Cast<Episode>().FirstOrDefault();
}; };

1
Jellyfin.Data/Entities/Artwork.cs
View File

@ -189,7 +189,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/Book.cs
View File

@ -63,7 +63,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("Release_Releases_Id")] [ForeignKey("Release_Releases_Id")]
public virtual ICollection<Release> Releases { get; protected set; } public virtual ICollection<Release> Releases { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/BookMetadata.cs
View File

@ -101,7 +101,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("Company_Publishers_Id")] [ForeignKey("Company_Publishers_Id")]
public virtual ICollection<Company> Publishers { get; protected set; } public virtual ICollection<Company> Publishers { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/Chapter.cs
View File

@ -257,7 +257,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/Collection.cs
View File

@ -114,7 +114,6 @@ namespace Jellyfin.Data.Entities
*************************************************************************/ *************************************************************************/
[ForeignKey("CollectionItem_CollectionItem_Id")] [ForeignKey("CollectionItem_CollectionItem_Id")]
public virtual ICollection<CollectionItem> CollectionItem { get; protected set; } public virtual ICollection<CollectionItem> CollectionItem { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/CollectionItem.cs
View File

@ -137,7 +137,6 @@ namespace Jellyfin.Data.Entities
/// </remarks> /// </remarks>
[ForeignKey("CollectionItem_Previous_Id")] [ForeignKey("CollectionItem_Previous_Id")]
public virtual CollectionItem Previous { get; set; } public virtual CollectionItem Previous { get; set; }
} }
} }

1
Jellyfin.Data/Entities/Company.cs
View File

@ -131,7 +131,6 @@ namespace Jellyfin.Data.Entities
public virtual ICollection<CompanyMetadata> CompanyMetadata { get; protected set; } public virtual ICollection<CompanyMetadata> CompanyMetadata { get; protected set; }
[ForeignKey("Company_Parent_Id")] [ForeignKey("Company_Parent_Id")]
public virtual Company Parent { get; set; } public virtual Company Parent { get; set; }
} }
} }

1
Jellyfin.Data/Entities/CompanyMetadata.cs
View File

@ -210,7 +210,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/CustomItem.cs
View File

@ -62,7 +62,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("Release_Releases_Id")] [ForeignKey("Release_Releases_Id")]
public virtual ICollection<Release> Releases { get; protected set; } public virtual ICollection<Release> Releases { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/CustomItemMetadata.cs
View File

@ -61,7 +61,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/Episode.cs
View File

@ -104,7 +104,6 @@ namespace Jellyfin.Data.Entities
public virtual ICollection<Release> Releases { get; protected set; } public virtual ICollection<Release> Releases { get; protected set; }
[ForeignKey("EpisodeMetadata_EpisodeMetadata_Id")] [ForeignKey("EpisodeMetadata_EpisodeMetadata_Id")]
public virtual ICollection<EpisodeMetadata> EpisodeMetadata { get; protected set; } public virtual ICollection<EpisodeMetadata> EpisodeMetadata { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/EpisodeMetadata.cs
View File

@ -173,7 +173,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/Genre.cs
View File

@ -146,7 +146,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/Library.cs
View File

@ -141,7 +141,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/LibraryItem.cs
View File

@ -164,7 +164,6 @@ namespace Jellyfin.Data.Entities
/// </summary> /// </summary>
[ForeignKey("LibraryRoot_Id")] [ForeignKey("LibraryRoot_Id")]
public virtual LibraryRoot LibraryRoot { get; set; } public virtual LibraryRoot LibraryRoot { get; set; }
} }
} }

1
Jellyfin.Data/Entities/LibraryRoot.cs
View File

@ -186,7 +186,6 @@ namespace Jellyfin.Data.Entities
/// </summary> /// </summary>
[ForeignKey("Library_Id")] [ForeignKey("Library_Id")]
public virtual Library Library { get; set; } public virtual Library Library { get; set; }
} }
} }

1
Jellyfin.Data/Entities/MediaFile.cs
View File

@ -194,7 +194,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("MediaFileStream_MediaFileStreams_Id")] [ForeignKey("MediaFileStream_MediaFileStreams_Id")]
public virtual ICollection<MediaFileStream> MediaFileStreams { get; protected set; } public virtual ICollection<MediaFileStream> MediaFileStreams { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/MediaFileStream.cs
View File

@ -143,7 +143,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/Metadata.cs
View File

@ -374,7 +374,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("PersonRole_PersonRoles_Id")] [ForeignKey("PersonRole_PersonRoles_Id")]
public virtual ICollection<MetadataProviderId> Sources { get; protected set; } public virtual ICollection<MetadataProviderId> Sources { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/MetadataProvider.cs
View File

@ -141,7 +141,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/MetadataProviderId.cs
View File

@ -173,7 +173,6 @@ namespace Jellyfin.Data.Entities
/// </summary> /// </summary>
[ForeignKey("MetadataProvider_Id")] [ForeignKey("MetadataProvider_Id")]
public virtual MetadataProvider MetadataProvider { get; set; } public virtual MetadataProvider MetadataProvider { get; set; }
} }
} }

1
Jellyfin.Data/Entities/Movie.cs
View File

@ -63,7 +63,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("MovieMetadata_MovieMetadata_Id")] [ForeignKey("MovieMetadata_MovieMetadata_Id")]
public virtual ICollection<MovieMetadata> MovieMetadata { get; protected set; } public virtual ICollection<MovieMetadata> MovieMetadata { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/MovieMetadata.cs
View File

@ -217,7 +217,6 @@ namespace Jellyfin.Data.Entities
*************************************************************************/ *************************************************************************/
[ForeignKey("Company_Studios_Id")] [ForeignKey("Company_Studios_Id")]
public virtual ICollection<Company> Studios { get; protected set; } public virtual ICollection<Company> Studios { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/MusicAlbum.cs
View File

@ -62,7 +62,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("Track_Tracks_Id")] [ForeignKey("Track_Tracks_Id")]
public virtual ICollection<Track> Tracks { get; protected set; } public virtual ICollection<Track> Tracks { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/MusicAlbumMetadata.cs
View File

@ -181,7 +181,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("Company_Labels_Id")] [ForeignKey("Company_Labels_Id")]
public virtual ICollection<Company> Labels { get; protected set; } public virtual ICollection<Company> Labels { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/Person.cs
View File

@ -296,7 +296,6 @@ namespace Jellyfin.Data.Entities
*************************************************************************/ *************************************************************************/
[ForeignKey("MetadataProviderId_Sources_Id")] [ForeignKey("MetadataProviderId_Sources_Id")]
public virtual ICollection<MetadataProviderId> Sources { get; protected set; } public virtual ICollection<MetadataProviderId> Sources { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/PersonRole.cs
View File

@ -203,7 +203,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("MetadataProviderId_Sources_Id")] [ForeignKey("MetadataProviderId_Sources_Id")]
public virtual ICollection<MetadataProviderId> Sources { get; protected set; } public virtual ICollection<MetadataProviderId> Sources { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/Photo.cs
View File

@ -62,7 +62,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("Release_Releases_Id")] [ForeignKey("Release_Releases_Id")]
public virtual ICollection<Release> Releases { get; protected set; } public virtual ICollection<Release> Releases { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/PhotoMetadata.cs
View File

@ -62,7 +62,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/ProviderMapping.cs
View File

@ -111,7 +111,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/Rating.cs
View File

@ -181,7 +181,6 @@ namespace Jellyfin.Data.Entities
/// </summary> /// </summary>
[ForeignKey("RatingSource_RatingType_Id")] [ForeignKey("RatingSource_RatingType_Id")]
public virtual RatingSource RatingType { get; set; } public virtual RatingSource RatingType { get; set; }
} }
} }

1
Jellyfin.Data/Entities/RatingSource.cs
View File

@ -225,7 +225,6 @@ namespace Jellyfin.Data.Entities
*************************************************************************/ *************************************************************************/
[ForeignKey("MetadataProviderId_Source_Id")] [ForeignKey("MetadataProviderId_Source_Id")]
public virtual MetadataProviderId Source { get; set; } public virtual MetadataProviderId Source { get; set; }
} }
} }

1
Jellyfin.Data/Entities/Release.cs
View File

@ -182,7 +182,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("Chapter_Chapters_Id")] [ForeignKey("Chapter_Chapters_Id")]
public virtual ICollection<Chapter> Chapters { get; protected set; } public virtual ICollection<Chapter> Chapters { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/Season.cs
View File

@ -105,7 +105,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("Episode_Episodes_Id")] [ForeignKey("Episode_Episodes_Id")]
public virtual ICollection<Episode> Episodes { get; protected set; } public virtual ICollection<Episode> Episodes { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/SeasonMetadata.cs
View File

@ -100,7 +100,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

1
Jellyfin.Data/Entities/Series.cs
View File

@ -153,7 +153,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("Season_Seasons_Id")] [ForeignKey("Season_Seasons_Id")]
public virtual ICollection<Season> Seasons { get; protected set; } public virtual ICollection<Season> Seasons { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/SeriesMetadata.cs
View File

@ -217,7 +217,6 @@ namespace Jellyfin.Data.Entities
*************************************************************************/ *************************************************************************/
[ForeignKey("Company_Networks_Id")] [ForeignKey("Company_Networks_Id")]
public virtual ICollection<Company> Networks { get; protected set; } public virtual ICollection<Company> Networks { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/Track.cs
View File

@ -106,7 +106,6 @@ namespace Jellyfin.Data.Entities
[ForeignKey("TrackMetadata_TrackMetadata_Id")] [ForeignKey("TrackMetadata_TrackMetadata_Id")]
public virtual ICollection<TrackMetadata> TrackMetadata { get; protected set; } public virtual ICollection<TrackMetadata> TrackMetadata { get; protected set; }
} }
} }

1
Jellyfin.Data/Entities/TrackMetadata.cs
View File

@ -62,7 +62,6 @@ namespace Jellyfin.Data.Entities
/************************************************************************* /*************************************************************************
* Navigation properties * Navigation properties
*************************************************************************/ *************************************************************************/
} }
} }

3
MediaBrowser.Api/BaseApiService.cs
View File

@ -268,7 +268,6 @@ namespace MediaBrowser.Api
Name = name.Replace(BaseItem.SlugChar, '&'), Name = name.Replace(BaseItem.SlugChar, '&'),
IncludeItemTypes = new[] { typeof(T).Name }, IncludeItemTypes = new[] { typeof(T).Name },
DtoOptions = dtoOptions DtoOptions = dtoOptions
}).OfType<T>().FirstOrDefault(); }).OfType<T>().FirstOrDefault();
result ??= libraryManager.GetItemList(new InternalItemsQuery result ??= libraryManager.GetItemList(new InternalItemsQuery
@ -276,7 +275,6 @@ namespace MediaBrowser.Api
Name = name.Replace(BaseItem.SlugChar, '/'), Name = name.Replace(BaseItem.SlugChar, '/'),
IncludeItemTypes = new[] { typeof(T).Name }, IncludeItemTypes = new[] { typeof(T).Name },
DtoOptions = dtoOptions DtoOptions = dtoOptions
}).OfType<T>().FirstOrDefault(); }).OfType<T>().FirstOrDefault();
result ??= libraryManager.GetItemList(new InternalItemsQuery result ??= libraryManager.GetItemList(new InternalItemsQuery
@ -284,7 +282,6 @@ namespace MediaBrowser.Api
Name = name.Replace(BaseItem.SlugChar, '?'), Name = name.Replace(BaseItem.SlugChar, '?'),
IncludeItemTypes = new[] { typeof(T).Name }, IncludeItemTypes = new[] { typeof(T).Name },
DtoOptions = dtoOptions DtoOptions = dtoOptions
}).OfType<T>().FirstOrDefault(); }).OfType<T>().FirstOrDefault();
return result; return result;

1
MediaBrowser.Api/ChannelService.cs
View File

@ -240,7 +240,6 @@ namespace MediaBrowser.Api
{ {
Fields = request.GetItemFields() Fields = request.GetItemFields()
} }
}; };
foreach (var filter in request.GetFilters()) foreach (var filter in request.GetFilters())

2
MediaBrowser.Api/ConfigurationService.cs
View File

@ -17,7 +17,6 @@ namespace MediaBrowser.Api
[Authenticated] [Authenticated]
public class GetConfiguration : IReturn<ServerConfiguration> public class GetConfiguration : IReturn<ServerConfiguration>
{ {
} }
[Route("/System/Configuration/{Key}", "GET", Summary = "Gets a named configuration")] [Route("/System/Configuration/{Key}", "GET", Summary = "Gets a named configuration")]
@ -51,7 +50,6 @@ namespace MediaBrowser.Api
[Authenticated(Roles = "Admin")] [Authenticated(Roles = "Admin")]
public class GetDefaultMetadataOptions : IReturn<MetadataOptions> public class GetDefaultMetadataOptions : IReturn<MetadataOptions>
{ {
} }
[Route("/System/MediaEncoder/Path", "POST", Summary = "Updates the path to the media encoder")] [Route("/System/MediaEncoder/Path", "POST", Summary = "Updates the path to the media encoder")]

1
MediaBrowser.Api/Devices/DeviceService.cs
View File

@ -92,7 +92,6 @@ namespace MediaBrowser.Api.Devices
var sessions = _authRepo.Get(new AuthenticationInfoQuery var sessions = _authRepo.Get(new AuthenticationInfoQuery
{ {
DeviceId = request.Id DeviceId = request.Id
}).Items; }).Items;
foreach (var session in sessions) foreach (var session in sessions)

1
MediaBrowser.Api/EnvironmentService.cs
View File

@ -100,7 +100,6 @@ namespace MediaBrowser.Api
[Route("/Environment/DefaultDirectoryBrowser", "GET", Summary = "Gets the parent path of a given path")] [Route("/Environment/DefaultDirectoryBrowser", "GET", Summary = "Gets the parent path of a given path")]
public class GetDefaultDirectoryBrowser : IReturn<DefaultDirectoryBrowserInfo> public class GetDefaultDirectoryBrowser : IReturn<DefaultDirectoryBrowserInfo>
{ {
} }
/// <summary> /// <summary>

2
MediaBrowser.Api/FilterService.cs
View File

@ -150,7 +150,6 @@ namespace MediaBrowser.Api
{ {
Name = i.Item1.Name, Name = i.Item1.Name,
Id = i.Item1.Id Id = i.Item1.Id
}).ToArray(); }).ToArray();
} }
else else
@ -159,7 +158,6 @@ namespace MediaBrowser.Api
{ {
Name = i.Item1.Name, Name = i.Item1.Name,
Id = i.Item1.Id Id = i.Item1.Id
}).ToArray(); }).ToArray();
} }

1
MediaBrowser.Api/IHasItemFields.cs
View File

@ -43,7 +43,6 @@ namespace MediaBrowser.Api
} }
return null; return null;
}).Where(i => i.HasValue).Select(i => i.Value).ToArray(); }).Where(i => i.HasValue).Select(i => i.Value).ToArray();
} }
} }

1
MediaBrowser.Api/Images/ImageService.cs
View File

@ -743,7 +743,6 @@ namespace MediaBrowser.Api.Images
Path = imageResult.Item1, Path = imageResult.Item1,
FileShare = FileShare.Read FileShare = FileShare.Read
}).ConfigureAwait(false); }).ConfigureAwait(false);
} }

1
MediaBrowser.Api/Images/RemoteImageService.cs
View File

@ -152,7 +152,6 @@ namespace MediaBrowser.Api.Images
IncludeAllLanguages = request.IncludeAllLanguages, IncludeAllLanguages = request.IncludeAllLanguages,
IncludeDisabledProviders = true, IncludeDisabledProviders = true,
ImageType = request.Type ImageType = request.Type
}, CancellationToken.None).ConfigureAwait(false); }, CancellationToken.None).ConfigureAwait(false);
var imagesList = images.ToArray(); var imagesList = images.ToArray();

3
MediaBrowser.Api/Library/LibraryService.cs
View File

@ -562,7 +562,6 @@ namespace MediaBrowser.Api.Library
_authContext) _authContext)
{ {
Request = Request, Request = Request,
}.GetSimilarItemsResult(request); }.GetSimilarItemsResult(request);
} }
@ -660,7 +659,6 @@ namespace MediaBrowser.Api.Library
{ {
EnableImages = false EnableImages = false
} }
}).Where(i => string.Equals(request.TvdbId, i.GetProviderId(MetadataProvider.Tvdb), StringComparison.OrdinalIgnoreCase)).ToArray(); }).Where(i => string.Equals(request.TvdbId, i.GetProviderId(MetadataProvider.Tvdb), StringComparison.OrdinalIgnoreCase)).ToArray();
foreach (var item in series) foreach (var item in series)
@ -689,7 +687,6 @@ namespace MediaBrowser.Api.Library
{ {
EnableImages = false EnableImages = false
} }
}); });
if (!string.IsNullOrWhiteSpace(request.ImdbId)) if (!string.IsNullOrWhiteSpace(request.ImdbId))

7
MediaBrowser.Api/LiveTv/LiveTvService.cs
View File

@ -679,7 +679,6 @@ namespace MediaBrowser.Api.LiveTv
[Authenticated] [Authenticated]
public class GetTunerHostTypes : IReturn<List<NameIdPair>> public class GetTunerHostTypes : IReturn<List<NameIdPair>>
{ {
} }
[Route("/LiveTv/Tuners/Discvover", "GET")] [Route("/LiveTv/Tuners/Discvover", "GET")]
@ -826,7 +825,6 @@ namespace MediaBrowser.Api.LiveTv
{ {
Name = i.Name, Name = i.Name,
Id = i.Id Id = i.Id
}).ToList(), }).ToList(),
Mappings = mappings, Mappings = mappings,
@ -845,7 +843,6 @@ namespace MediaBrowser.Api.LiveTv
{ {
Url = "https://json.schedulesdirect.org/20141201/available/countries", Url = "https://json.schedulesdirect.org/20141201/available/countries",
BufferContent = false BufferContent = false
}).ConfigureAwait(false); }).ConfigureAwait(false);
return ResultFactory.GetResult(Request, response, "application/json"); return ResultFactory.GetResult(Request, response, "application/json");
@ -958,7 +955,6 @@ namespace MediaBrowser.Api.LiveTv
SortBy = request.GetOrderBy(), SortBy = request.GetOrderBy(),
SortOrder = request.SortOrder ?? SortOrder.Ascending, SortOrder = request.SortOrder ?? SortOrder.Ascending,
AddCurrentProgram = request.AddCurrentProgram AddCurrentProgram = request.AddCurrentProgram
}, options, CancellationToken.None); }, options, CancellationToken.None);
var user = request.UserId.Equals(Guid.Empty) ? null : _userManager.GetUserById(request.UserId); var user = request.UserId.Equals(Guid.Empty) ? null : _userManager.GetUserById(request.UserId);
@ -1113,7 +1109,6 @@ namespace MediaBrowser.Api.LiveTv
Fields = request.GetItemFields(), Fields = request.GetItemFields(),
ImageTypeLimit = request.ImageTypeLimit, ImageTypeLimit = request.ImageTypeLimit,
EnableImages = request.EnableImages EnableImages = request.EnableImages
}, options); }, options);
return ToOptimizedResult(result); return ToOptimizedResult(result);
@ -1152,7 +1147,6 @@ namespace MediaBrowser.Api.LiveTv
SeriesTimerId = request.SeriesTimerId, SeriesTimerId = request.SeriesTimerId,
IsActive = request.IsActive, IsActive = request.IsActive,
IsScheduled = request.IsScheduled IsScheduled = request.IsScheduled
}, CancellationToken.None).ConfigureAwait(false); }, CancellationToken.None).ConfigureAwait(false);
return ToOptimizedResult(result); return ToOptimizedResult(result);
@ -1188,7 +1182,6 @@ namespace MediaBrowser.Api.LiveTv
{ {
SortOrder = request.SortOrder, SortOrder = request.SortOrder,
SortBy = request.SortBy SortBy = request.SortBy
}, CancellationToken.None).ConfigureAwait(false); }, CancellationToken.None).ConfigureAwait(false);
return ToOptimizedResult(result); return ToOptimizedResult(result);

1
MediaBrowser.Api/Movies/CollectionService.cs
View File

@ -79,7 +79,6 @@ namespace MediaBrowser.Api.Movies
ParentId = parentId, ParentId = parentId,
ItemIdList = SplitValue(request.Ids, ','), ItemIdList = SplitValue(request.Ids, ','),
UserIds = new[] { userId } UserIds = new[] { userId }
}); });
var dtoOptions = GetDtoOptions(_authContext, request); var dtoOptions = GetDtoOptions(_authContext, request);

4
MediaBrowser.Api/Movies/MoviesService.cs
View File

@ -194,7 +194,6 @@ namespace MediaBrowser.Api.Movies
ParentId = parentIdGuid, ParentId = parentIdGuid,
Recursive = true, Recursive = true,
DtoOptions = dtoOptions DtoOptions = dtoOptions
}); });
var mostRecentMovies = recentlyPlayedMovies.Take(6).ToList(); var mostRecentMovies = recentlyPlayedMovies.Take(6).ToList();
@ -279,7 +278,6 @@ namespace MediaBrowser.Api.Movies
IsMovie = true, IsMovie = true,
EnableGroupByMetadataKey = true, EnableGroupByMetadataKey = true,
DtoOptions = dtoOptions DtoOptions = dtoOptions
}).GroupBy(i => i.GetProviderId(MetadataProvider.Imdb) ?? Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture)) }).GroupBy(i => i.GetProviderId(MetadataProvider.Imdb) ?? Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture))
.Select(x => x.First()) .Select(x => x.First())
.Take(itemLimit) .Take(itemLimit)
@ -320,7 +318,6 @@ namespace MediaBrowser.Api.Movies
IsMovie = true, IsMovie = true,
EnableGroupByMetadataKey = true, EnableGroupByMetadataKey = true,
DtoOptions = dtoOptions DtoOptions = dtoOptions
}).GroupBy(i => i.GetProviderId(MetadataProvider.Imdb) ?? Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture)) }).GroupBy(i => i.GetProviderId(MetadataProvider.Imdb) ?? Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture))
.Select(x => x.First()) .Select(x => x.First())
.Take(itemLimit) .Take(itemLimit)
@ -360,7 +357,6 @@ namespace MediaBrowser.Api.Movies
SimilarTo = item, SimilarTo = item,
EnableGroupByMetadataKey = true, EnableGroupByMetadataKey = true,
DtoOptions = dtoOptions DtoOptions = dtoOptions
}); });
if (similar.Count > 0) if (similar.Count > 0)

1
MediaBrowser.Api/Movies/TrailersService.cs
View File

@ -82,7 +82,6 @@ namespace MediaBrowser.Api.Movies
_authContext) _authContext)
{ {
Request = Request, Request = Request,
}.Get(getItems); }.Get(getItems);
} }
} }

1
MediaBrowser.Api/Music/InstantMixService.cs
View File

@ -192,6 +192,5 @@ namespace MediaBrowser.Api.Music
return result; return result;
} }
} }
} }

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

@ -646,7 +646,6 @@ namespace MediaBrowser.Api.Playback
} }
return 1; return 1;
}).ThenBy(i => }).ThenBy(i =>
{ {
// Let's assume direct streaming a file is just as desirable as direct playing a remote url // Let's assume direct streaming a file is just as desirable as direct playing a remote url
@ -656,7 +655,6 @@ namespace MediaBrowser.Api.Playback
} }
return 1; return 1;
}).ThenBy(i => }).ThenBy(i =>
{ {
return i.Protocol switch return i.Protocol switch
@ -672,7 +670,6 @@ namespace MediaBrowser.Api.Playback
} }
return 1; return 1;
}).ThenBy(originalList.IndexOf) }).ThenBy(originalList.IndexOf)
.ToArray(); .ToArray();
} }

1
MediaBrowser.Api/Playback/Progressive/VideoService.cs
View File

@ -59,7 +59,6 @@ namespace MediaBrowser.Api.Playback.Progressive
[Route("/Videos/{Id}/stream", "HEAD")] [Route("/Videos/{Id}/stream", "HEAD")]
public class GetVideoStream : VideoStreamRequest public class GetVideoStream : VideoStreamRequest
{ {
} }
/// <summary> /// <summary>

1
MediaBrowser.Api/Playback/UniversalAudioService.cs
View File

@ -259,7 +259,6 @@ namespace MediaBrowser.Api.Playback
UserId = request.UserId, UserId = request.UserId,
DeviceProfile = deviceProfile, DeviceProfile = deviceProfile,
MediaSourceId = request.MediaSourceId MediaSourceId = request.MediaSourceId
}).ConfigureAwait(false); }).ConfigureAwait(false);
var mediaSource = playbackInfoResult.MediaSources[0]; var mediaSource = playbackInfoResult.MediaSources[0];

1
MediaBrowser.Api/PlaylistService.cs
View File

@ -161,7 +161,6 @@ namespace MediaBrowser.Api
ItemIdList = GetGuids(request.Ids), ItemIdList = GetGuids(request.Ids),
UserId = request.UserId, UserId = request.UserId,
MediaType = request.MediaType MediaType = request.MediaType
}).ConfigureAwait(false); }).ConfigureAwait(false);
return ToOptimizedResult(result); return ToOptimizedResult(result);

1
MediaBrowser.Api/SearchService.cs
View File

@ -180,7 +180,6 @@ namespace MediaBrowser.Api
IsNews = request.IsNews, IsNews = request.IsNews,
IsSeries = request.IsSeries, IsSeries = request.IsSeries,
IsSports = request.IsSports IsSports = request.IsSports
}); });
return new SearchHintResult return new SearchHintResult

Some files were not shown because too many files have changed in this diff Show More