Merge pull request #3341 from telans/brace-spacing

Add newlines after closing braces (SA1513/SA1516)
This commit is contained in:
Bond-009 2020-06-16 11:49:42 +02:00 committed by GitHub
commit 4d91060c25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
282 changed files with 1808 additions and 0 deletions

View File

@ -7,6 +7,7 @@ namespace DvdLib.Ifo
public class Cell public class Cell
{ {
public CellPlaybackInfo PlaybackInfo { get; private set; } public CellPlaybackInfo PlaybackInfo { get; private set; }
public CellPositionInfo PositionInfo { get; private set; } public CellPositionInfo PositionInfo { get; private set; }
internal void ParsePlayback(BinaryReader br) internal void ParsePlayback(BinaryReader br)

View File

@ -5,7 +5,9 @@ namespace DvdLib.Ifo
public class Chapter public class Chapter
{ {
public ushort ProgramChainNumber { get; private set; } public ushort ProgramChainNumber { get; private set; }
public ushort ProgramNumber { get; private set; } public ushort ProgramNumber { get; private set; }
public uint ChapterNumber { get; private set; } public uint ChapterNumber { get; private set; }
public Chapter(ushort pgcNum, ushort programNum, uint chapterNum) public Chapter(ushort pgcNum, ushort programNum, uint chapterNum)

View File

@ -22,7 +22,9 @@ namespace DvdLib.Ifo
public readonly List<Cell> Cells; public readonly List<Cell> Cells;
public DvdTime PlaybackTime { get; private set; } public DvdTime PlaybackTime { get; private set; }
public UserOperation ProhibitedUserOperations { get; private set; } public UserOperation ProhibitedUserOperations { get; private set; }
public byte[] AudioStreamControl { get; private set; } // 8*2 entries public byte[] AudioStreamControl { get; private set; } // 8*2 entries
public byte[] SubpictureStreamControl { get; private set; } // 32*4 entries public byte[] SubpictureStreamControl { get; private set; } // 32*4 entries
@ -33,9 +35,11 @@ namespace DvdLib.Ifo
private ushort _goupProgramNumber; private ushort _goupProgramNumber;
public ProgramPlaybackMode PlaybackMode { get; private set; } public ProgramPlaybackMode PlaybackMode { get; private set; }
public uint ProgramCount { get; private set; } public uint ProgramCount { get; private set; }
public byte StillTime { get; private set; } public byte StillTime { get; private set; }
public byte[] Palette { get; private set; } // 16*4 entries public byte[] Palette { get; private set; } // 16*4 entries
private ushort _commandTableOffset; private ushort _commandTableOffset;

View File

@ -8,8 +8,11 @@ namespace DvdLib.Ifo
public class Title public class Title
{ {
public uint TitleNumber { get; private set; } public uint TitleNumber { get; private set; }
public uint AngleCount { get; private set; } public uint AngleCount { get; private set; }
public ushort ChapterCount { get; private set; } public ushort ChapterCount { get; private set; }
public byte VideoTitleSetNumber { get; private set; } public byte VideoTitleSetNumber { get; private set; }
private ushort _parentalManagementMask; private ushort _parentalManagementMask;
@ -17,6 +20,7 @@ namespace DvdLib.Ifo
private uint _vtsStartSector; // relative to start of entire disk private uint _vtsStartSector; // relative to start of entire disk
public ProgramChain EntryProgramChain { get; private set; } public ProgramChain EntryProgramChain { get; private set; }
public readonly List<ProgramChain> ProgramChains; public readonly List<ProgramChain> ProgramChains;
public readonly List<Chapter> Chapters; public readonly List<Chapter> Chapters;

View File

@ -1357,6 +1357,7 @@ namespace Emby.Dlna.ContentDirectory
internal class ServerItem internal class ServerItem
{ {
public BaseItem Item { get; set; } public BaseItem Item { get; set; }
public StubType? StubType { get; set; } public StubType? StubType { get; set; }
public ServerItem(BaseItem item) public ServerItem(BaseItem item)

View File

@ -765,6 +765,7 @@ namespace Emby.Dlna.Didl
{ {
AddValue(writer, "dc", "rating", item.OfficialRating, NS_DC); AddValue(writer, "dc", "rating", item.OfficialRating, NS_DC);
} }
if (filter.Contains("upnp:rating")) if (filter.Contains("upnp:rating"))
{ {
AddValue(writer, "upnp", "rating", item.OfficialRating, NS_UPNP); AddValue(writer, "upnp", "rating", item.OfficialRating, NS_UPNP);
@ -1052,10 +1053,12 @@ namespace Emby.Dlna.Didl
{ {
return GetImageInfo(item, ImageType.Primary); return GetImageInfo(item, ImageType.Primary);
} }
if (item.HasImage(ImageType.Thumb)) if (item.HasImage(ImageType.Thumb))
{ {
return GetImageInfo(item, ImageType.Thumb); return GetImageInfo(item, ImageType.Thumb);
} }
if (item.HasImage(ImageType.Backdrop)) if (item.HasImage(ImageType.Backdrop))
{ {
if (item is Channel) if (item is Channel)

View File

@ -438,6 +438,7 @@ namespace Emby.Dlna
{ {
throw new ArgumentException("Profile is missing Id"); throw new ArgumentException("Profile is missing Id");
} }
if (string.IsNullOrEmpty(profile.Name)) if (string.IsNullOrEmpty(profile.Name))
{ {
throw new ArgumentException("Profile is missing Name"); throw new ArgumentException("Profile is missing Name");
@ -463,6 +464,7 @@ namespace Emby.Dlna
{ {
_profiles[path] = new Tuple<InternalProfileInfo, DeviceProfile>(GetInternalProfileInfo(_fileSystem.GetFileInfo(path), type), profile); _profiles[path] = new Tuple<InternalProfileInfo, DeviceProfile>(GetInternalProfileInfo(_fileSystem.GetFileInfo(path), type), profile);
} }
SerializeToXml(profile, path); SerializeToXml(profile, path);
} }
@ -492,6 +494,7 @@ namespace Emby.Dlna
class InternalProfileInfo class InternalProfileInfo
{ {
internal DeviceProfileInfo Info { get; set; } internal DeviceProfileInfo Info { get; set; }
internal string Path { get; set; } internal string Path { get; set; }
} }

View File

@ -150,6 +150,7 @@ namespace Emby.Dlna.Eventing
builder.Append("</" + key + ">"); builder.Append("</" + key + ">");
builder.Append("</e:property>"); builder.Append("</e:property>");
} }
builder.Append("</e:propertyset>"); builder.Append("</e:propertyset>");
var options = new HttpRequestOptions var options = new HttpRequestOptions

View File

@ -7,10 +7,13 @@ namespace Emby.Dlna.Eventing
public class EventSubscription public class EventSubscription
{ {
public string Id { get; set; } public string Id { get; set; }
public string CallbackUrl { get; set; } public string CallbackUrl { get; set; }
public string NotificationType { get; set; } public string NotificationType { get; set; }
public DateTime SubscriptionTime { get; set; } public DateTime SubscriptionTime { get; set; }
public int TimeoutSeconds { get; set; } public int TimeoutSeconds { get; set; }
public long TriggerCount { get; set; } public long TriggerCount { get; set; }

View File

@ -320,6 +320,7 @@ namespace Emby.Dlna.Main
{ {
guid = text.GetMD5(); guid = text.GetMD5();
} }
return guid.ToString("N", CultureInfo.InvariantCulture); return guid.ToString("N", CultureInfo.InvariantCulture);
} }
@ -388,6 +389,7 @@ namespace Emby.Dlna.Main
{ {
_logger.LogError(ex, "Error disposing PlayTo manager"); _logger.LogError(ex, "Error disposing PlayTo manager");
} }
_manager = null; _manager = null;
} }
} }

View File

@ -37,6 +37,7 @@ namespace Emby.Dlna.PlayTo
RefreshVolumeIfNeeded().GetAwaiter().GetResult(); RefreshVolumeIfNeeded().GetAwaiter().GetResult();
return _volume; return _volume;
} }
set => _volume = value; set => _volume = value;
} }
@ -494,6 +495,7 @@ namespace Emby.Dlna.PlayTo
return; return;
} }
} }
RestartTimerInactive(); RestartTimerInactive();
} }
} }

View File

@ -425,6 +425,7 @@ namespace Emby.Dlna.PlayTo
await _device.SetAvTransport(newItem.StreamUrl, GetDlnaHeaders(newItem), newItem.Didl, CancellationToken.None).ConfigureAwait(false); await _device.SetAvTransport(newItem.StreamUrl, GetDlnaHeaders(newItem), newItem.Didl, CancellationToken.None).ConfigureAwait(false);
return; return;
} }
await SeekAfterTransportChange(newPosition, CancellationToken.None).ConfigureAwait(false); await SeekAfterTransportChange(newPosition, CancellationToken.None).ConfigureAwait(false);
} }
} }
@ -713,6 +714,7 @@ namespace Emby.Dlna.PlayTo
throw new ArgumentException("Volume argument cannot be null"); throw new ArgumentException("Volume argument cannot be null");
} }
default: default:
return Task.CompletedTask; return Task.CompletedTask;
} }
@ -798,12 +800,15 @@ namespace Emby.Dlna.PlayTo
public int? SubtitleStreamIndex { get; set; } public int? SubtitleStreamIndex { get; set; }
public string DeviceProfileId { get; set; } public string DeviceProfileId { get; set; }
public string DeviceId { get; set; } public string DeviceId { get; set; }
public string MediaSourceId { get; set; } public string MediaSourceId { get; set; }
public string LiveStreamId { get; set; } public string LiveStreamId { get; set; }
public BaseItem Item { get; set; } public BaseItem Item { get; set; }
private MediaSourceInfo MediaSource; private MediaSourceInfo MediaSource;
private IMediaSourceManager _mediaSourceManager; private IMediaSourceManager _mediaSourceManager;

View File

@ -132,6 +132,7 @@ namespace Emby.Dlna.PlayTo
usn = usn.Substring(index); usn = usn.Substring(index);
found = true; found = true;
} }
index = usn.IndexOf("::", StringComparison.OrdinalIgnoreCase); index = usn.IndexOf("::", StringComparison.OrdinalIgnoreCase);
if (index != -1) if (index != -1)
{ {

View File

@ -12,6 +12,7 @@ namespace Emby.Dlna.PlayTo
public class MediaChangedEventArgs : EventArgs public class MediaChangedEventArgs : EventArgs
{ {
public uBaseObject OldMediaInfo { get; set; } public uBaseObject OldMediaInfo { get; set; }
public uBaseObject NewMediaInfo { get; set; } public uBaseObject NewMediaInfo { get; set; }
} }
} }

View File

@ -44,10 +44,12 @@ namespace Emby.Dlna.PlayTo
{ {
return MediaBrowser.Model.Entities.MediaType.Audio; return MediaBrowser.Model.Entities.MediaType.Audio;
} }
if (classType.IndexOf(MediaBrowser.Model.Entities.MediaType.Video, StringComparison.Ordinal) != -1) if (classType.IndexOf(MediaBrowser.Model.Entities.MediaType.Video, StringComparison.Ordinal) != -1)
{ {
return MediaBrowser.Model.Entities.MediaType.Video; return MediaBrowser.Model.Entities.MediaType.Video;
} }
if (classType.IndexOf("image", StringComparison.Ordinal) != -1) if (classType.IndexOf("image", StringComparison.Ordinal) != -1)
{ {
return MediaBrowser.Model.Entities.MediaType.Photo; return MediaBrowser.Model.Entities.MediaType.Photo;

View File

@ -134,6 +134,7 @@ namespace Emby.Dlna.Server
return result; return result;
} }
} }
return c.ToString(CultureInfo.InvariantCulture); return c.ToString(CultureInfo.InvariantCulture);
} }
@ -157,18 +158,22 @@ namespace Emby.Dlna.Server
{ {
break; break;
} }
if (stringBuilder == null) if (stringBuilder == null)
{ {
stringBuilder = new StringBuilder(); stringBuilder = new StringBuilder();
} }
stringBuilder.Append(str, num, num2 - num); stringBuilder.Append(str, num, num2 - num);
stringBuilder.Append(GetEscapeSequence(str[num2])); stringBuilder.Append(GetEscapeSequence(str[num2]));
num = num2 + 1; num = num2 + 1;
} }
if (stringBuilder == null) if (stringBuilder == null)
{ {
return str; return str;
} }
stringBuilder.Append(str, num, length - num); stringBuilder.Append(str, num, length - num);
return stringBuilder.ToString(); return stringBuilder.ToString();
} }

View File

@ -18,6 +18,7 @@ namespace Emby.Dlna.Service
private const string NS_SOAPENV = "http://schemas.xmlsoap.org/soap/envelope/"; private const string NS_SOAPENV = "http://schemas.xmlsoap.org/soap/envelope/";
protected IServerConfigurationManager Config { get; } protected IServerConfigurationManager Config { get; }
protected ILogger Logger { get; } protected ILogger Logger { get; }
protected BaseControlHandler(IServerConfigurationManager config, ILogger logger) protected BaseControlHandler(IServerConfigurationManager config, ILogger logger)
@ -135,6 +136,7 @@ namespace Emby.Dlna.Service
break; break;
} }
default: default:
{ {
await reader.SkipAsync().ConfigureAwait(false); await reader.SkipAsync().ConfigureAwait(false);
@ -211,7 +213,9 @@ namespace Emby.Dlna.Service
private class ControlRequestInfo private class ControlRequestInfo
{ {
public string LocalName { get; set; } public string LocalName { get; set; }
public string NamespaceURI { get; set; } public string NamespaceURI { get; set; }
public Dictionary<string, string> Headers { get; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); public Dictionary<string, string> Headers { get; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
} }

View File

@ -80,6 +80,7 @@ namespace Emby.Dlna.Service
{ {
builder.Append("<allowedValue>" + DescriptionXmlBuilder.Escape(allowedValue) + "</allowedValue>"); builder.Append("<allowedValue>" + DescriptionXmlBuilder.Escape(allowedValue) + "</allowedValue>");
} }
builder.Append("</allowedValueList>"); builder.Append("</allowedValueList>");
} }

View File

@ -64,6 +64,7 @@ namespace Emby.Naming.AudioBook
{ {
result.ChapterNumber = int.Parse(matches[0].Groups[0].Value); result.ChapterNumber = int.Parse(matches[0].Groups[0].Value);
} }
if (matches.Count > 1) if (matches.Count > 1)
{ {
result.PartNumber = int.Parse(matches[matches.Count - 1].Groups[0].Value); result.PartNumber = int.Parse(matches[matches.Count - 1].Groups[0].Value);

View File

@ -793,6 +793,7 @@ namespace Emby.Server.Implementations.Data
{ {
saveItemStatement.TryBindNull("@Width"); saveItemStatement.TryBindNull("@Width");
} }
if (item.Height > 0) if (item.Height > 0)
{ {
saveItemStatement.TryBind("@Height", item.Height); saveItemStatement.TryBind("@Height", item.Height);
@ -932,6 +933,7 @@ namespace Emby.Server.Implementations.Data
{ {
saveItemStatement.TryBindNull("@SeriesName"); saveItemStatement.TryBindNull("@SeriesName");
} }
if (string.IsNullOrWhiteSpace(userDataKey)) if (string.IsNullOrWhiteSpace(userDataKey))
{ {
saveItemStatement.TryBindNull("@UserDataKey"); saveItemStatement.TryBindNull("@UserDataKey");
@ -1007,6 +1009,7 @@ namespace Emby.Server.Implementations.Data
{ {
artists = string.Join("|", hasArtists.Artists); artists = string.Join("|", hasArtists.Artists);
} }
saveItemStatement.TryBind("@Artists", artists); saveItemStatement.TryBind("@Artists", artists);
string albumArtists = null; string albumArtists = null;
@ -1106,6 +1109,7 @@ namespace Emby.Server.Implementations.Data
{ {
continue; continue;
} }
str.Append(ToValueString(i) + "|"); str.Append(ToValueString(i) + "|");
} }
@ -1366,6 +1370,7 @@ namespace Emby.Server.Implementations.Data
hasStartDate.StartDate = reader[index].ReadDateTime(); hasStartDate.StartDate = reader[index].ReadDateTime();
} }
} }
index++; index++;
} }
@ -1373,12 +1378,14 @@ namespace Emby.Server.Implementations.Data
{ {
item.EndDate = reader[index].TryReadDateTime(); item.EndDate = reader[index].TryReadDateTime();
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.ChannelId = new Guid(reader.GetString(index)); item.ChannelId = new Guid(reader.GetString(index));
} }
index++; index++;
if (enableProgramAttributes) if (enableProgramAttributes)
@ -1389,24 +1396,28 @@ namespace Emby.Server.Implementations.Data
{ {
hasProgramAttributes.IsMovie = reader.GetBoolean(index); hasProgramAttributes.IsMovie = reader.GetBoolean(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
hasProgramAttributes.IsSeries = reader.GetBoolean(index); hasProgramAttributes.IsSeries = reader.GetBoolean(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
hasProgramAttributes.EpisodeTitle = reader.GetString(index); hasProgramAttributes.EpisodeTitle = reader.GetString(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
hasProgramAttributes.IsRepeat = reader.GetBoolean(index); hasProgramAttributes.IsRepeat = reader.GetBoolean(index);
} }
index++; index++;
} }
else else
@ -1419,6 +1430,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.CommunityRating = reader.GetFloat(index); item.CommunityRating = reader.GetFloat(index);
} }
index++; index++;
if (HasField(query, ItemFields.CustomRating)) if (HasField(query, ItemFields.CustomRating))
@ -1427,6 +1439,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.CustomRating = reader.GetString(index); item.CustomRating = reader.GetString(index);
} }
index++; index++;
} }
@ -1434,6 +1447,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.IndexNumber = reader.GetInt32(index); item.IndexNumber = reader.GetInt32(index);
} }
index++; index++;
if (HasField(query, ItemFields.Settings)) if (HasField(query, ItemFields.Settings))
@ -1442,18 +1456,21 @@ namespace Emby.Server.Implementations.Data
{ {
item.IsLocked = reader.GetBoolean(index); item.IsLocked = reader.GetBoolean(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.PreferredMetadataLanguage = reader.GetString(index); item.PreferredMetadataLanguage = reader.GetString(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.PreferredMetadataCountryCode = reader.GetString(index); item.PreferredMetadataCountryCode = reader.GetString(index);
} }
index++; index++;
} }
@ -1463,6 +1480,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.Width = reader.GetInt32(index); item.Width = reader.GetInt32(index);
} }
index++; index++;
} }
@ -1472,6 +1490,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.Height = reader.GetInt32(index); item.Height = reader.GetInt32(index);
} }
index++; index++;
} }
@ -1481,6 +1500,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.DateLastRefreshed = reader[index].ReadDateTime(); item.DateLastRefreshed = reader[index].ReadDateTime();
} }
index++; index++;
} }
@ -1488,18 +1508,21 @@ namespace Emby.Server.Implementations.Data
{ {
item.Name = reader.GetString(index); item.Name = reader.GetString(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.Path = RestorePath(reader.GetString(index)); item.Path = RestorePath(reader.GetString(index));
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.PremiereDate = reader[index].TryReadDateTime(); item.PremiereDate = reader[index].TryReadDateTime();
} }
index++; index++;
if (HasField(query, ItemFields.Overview)) if (HasField(query, ItemFields.Overview))
@ -1508,6 +1531,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.Overview = reader.GetString(index); item.Overview = reader.GetString(index);
} }
index++; index++;
} }
@ -1515,18 +1539,21 @@ namespace Emby.Server.Implementations.Data
{ {
item.ParentIndexNumber = reader.GetInt32(index); item.ParentIndexNumber = reader.GetInt32(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.ProductionYear = reader.GetInt32(index); item.ProductionYear = reader.GetInt32(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.OfficialRating = reader.GetString(index); item.OfficialRating = reader.GetString(index);
} }
index++; index++;
if (HasField(query, ItemFields.SortName)) if (HasField(query, ItemFields.SortName))
@ -1535,6 +1562,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.ForcedSortName = reader.GetString(index); item.ForcedSortName = reader.GetString(index);
} }
index++; index++;
} }
@ -1542,12 +1570,14 @@ namespace Emby.Server.Implementations.Data
{ {
item.RunTimeTicks = reader.GetInt64(index); item.RunTimeTicks = reader.GetInt64(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.Size = reader.GetInt64(index); item.Size = reader.GetInt64(index);
} }
index++; index++;
if (HasField(query, ItemFields.DateCreated)) if (HasField(query, ItemFields.DateCreated))
@ -1556,6 +1586,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.DateCreated = reader[index].ReadDateTime(); item.DateCreated = reader[index].ReadDateTime();
} }
index++; index++;
} }
@ -1563,6 +1594,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.DateModified = reader[index].ReadDateTime(); item.DateModified = reader[index].ReadDateTime();
} }
index++; index++;
item.Id = reader.GetGuid(index); item.Id = reader.GetGuid(index);
@ -1574,6 +1606,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.Genres = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); item.Genres = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
} }
index++; index++;
} }
@ -1581,6 +1614,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.ParentId = reader.GetGuid(index); item.ParentId = reader.GetGuid(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
@ -1590,6 +1624,7 @@ namespace Emby.Server.Implementations.Data
item.Audio = audio; item.Audio = audio;
} }
} }
index++; index++;
// TODO: Even if not needed by apps, the server needs it internally // TODO: Even if not needed by apps, the server needs it internally
@ -1603,6 +1638,7 @@ namespace Emby.Server.Implementations.Data
liveTvChannel.ServiceName = reader.GetString(index); liveTvChannel.ServiceName = reader.GetString(index);
} }
} }
index++; index++;
} }
@ -1610,6 +1646,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.IsInMixedFolder = reader.GetBoolean(index); item.IsInMixedFolder = reader.GetBoolean(index);
} }
index++; index++;
if (HasField(query, ItemFields.DateLastSaved)) if (HasField(query, ItemFields.DateLastSaved))
@ -1618,6 +1655,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.DateLastSaved = reader[index].ReadDateTime(); item.DateLastSaved = reader[index].ReadDateTime();
} }
index++; index++;
} }
@ -1635,8 +1673,10 @@ namespace Emby.Server.Implementations.Data
} }
} }
} }
item.LockedFields = GetLockedFields(reader.GetString(index)).ToArray(); item.LockedFields = GetLockedFields(reader.GetString(index)).ToArray();
} }
index++; index++;
} }
@ -1646,6 +1686,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.Studios = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); item.Studios = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
} }
index++; index++;
} }
@ -1655,6 +1696,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.Tags = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); item.Tags = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
} }
index++; index++;
} }
@ -1674,9 +1716,11 @@ namespace Emby.Server.Implementations.Data
} }
} }
} }
trailer.TrailerTypes = GetTrailerTypes(reader.GetString(index)).ToArray(); trailer.TrailerTypes = GetTrailerTypes(reader.GetString(index)).ToArray();
} }
} }
index++; index++;
} }
@ -1686,6 +1730,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.OriginalTitle = reader.GetString(index); item.OriginalTitle = reader.GetString(index);
} }
index++; index++;
} }
@ -1696,6 +1741,7 @@ namespace Emby.Server.Implementations.Data
video.PrimaryVersionId = reader.GetString(index); video.PrimaryVersionId = reader.GetString(index);
} }
} }
index++; index++;
if (HasField(query, ItemFields.DateLastMediaAdded)) if (HasField(query, ItemFields.DateLastMediaAdded))
@ -1704,6 +1750,7 @@ namespace Emby.Server.Implementations.Data
{ {
folder.DateLastMediaAdded = reader[index].TryReadDateTime(); folder.DateLastMediaAdded = reader[index].TryReadDateTime();
} }
index++; index++;
} }
@ -1711,18 +1758,21 @@ namespace Emby.Server.Implementations.Data
{ {
item.Album = reader.GetString(index); item.Album = reader.GetString(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.CriticRating = reader.GetFloat(index); item.CriticRating = reader.GetFloat(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
item.IsVirtualItem = reader.GetBoolean(index); item.IsVirtualItem = reader.GetBoolean(index);
} }
index++; index++;
if (item is IHasSeries hasSeriesName) if (item is IHasSeries hasSeriesName)
@ -1732,6 +1782,7 @@ namespace Emby.Server.Implementations.Data
hasSeriesName.SeriesName = reader.GetString(index); hasSeriesName.SeriesName = reader.GetString(index);
} }
} }
index++; index++;
if (hasEpisodeAttributes) if (hasEpisodeAttributes)
@ -1742,6 +1793,7 @@ namespace Emby.Server.Implementations.Data
{ {
episode.SeasonName = reader.GetString(index); episode.SeasonName = reader.GetString(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
{ {
@ -1752,6 +1804,7 @@ namespace Emby.Server.Implementations.Data
{ {
index++; index++;
} }
index++; index++;
} }
@ -1765,6 +1818,7 @@ namespace Emby.Server.Implementations.Data
hasSeries.SeriesId = reader.GetGuid(index); hasSeries.SeriesId = reader.GetGuid(index);
} }
} }
index++; index++;
} }
@ -1774,6 +1828,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.PresentationUniqueKey = reader.GetString(index); item.PresentationUniqueKey = reader.GetString(index);
} }
index++; index++;
} }
@ -1783,6 +1838,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.InheritedParentalRatingValue = reader.GetInt32(index); item.InheritedParentalRatingValue = reader.GetInt32(index);
} }
index++; index++;
} }
@ -1792,6 +1848,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.ExternalSeriesId = reader.GetString(index); item.ExternalSeriesId = reader.GetString(index);
} }
index++; index++;
} }
@ -1801,6 +1858,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.Tagline = reader.GetString(index); item.Tagline = reader.GetString(index);
} }
index++; index++;
} }
@ -1808,6 +1866,7 @@ namespace Emby.Server.Implementations.Data
{ {
DeserializeProviderIds(reader.GetString(index), item); DeserializeProviderIds(reader.GetString(index), item);
} }
index++; index++;
if (query.DtoOptions.EnableImages) if (query.DtoOptions.EnableImages)
@ -1816,6 +1875,7 @@ namespace Emby.Server.Implementations.Data
{ {
DeserializeImages(reader.GetString(index), item); DeserializeImages(reader.GetString(index), item);
} }
index++; index++;
} }
@ -1825,6 +1885,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.ProductionLocations = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries).ToArray(); item.ProductionLocations = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries).ToArray();
} }
index++; index++;
} }
@ -1834,6 +1895,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.ExtraIds = SplitToGuids(reader.GetString(index)); item.ExtraIds = SplitToGuids(reader.GetString(index));
} }
index++; index++;
} }
@ -1841,6 +1903,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.TotalBitrate = reader.GetInt32(index); item.TotalBitrate = reader.GetInt32(index);
} }
index++; index++;
if (!reader.IsDBNull(index)) if (!reader.IsDBNull(index))
@ -1850,6 +1913,7 @@ namespace Emby.Server.Implementations.Data
item.ExtraType = extraType; item.ExtraType = extraType;
} }
} }
index++; index++;
if (hasArtistFields) if (hasArtistFields)
@ -1858,12 +1922,14 @@ namespace Emby.Server.Implementations.Data
{ {
hasArtists.Artists = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); hasArtists.Artists = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
} }
index++; index++;
if (item is IHasAlbumArtist hasAlbumArtists && !reader.IsDBNull(index)) if (item is IHasAlbumArtist hasAlbumArtists && !reader.IsDBNull(index))
{ {
hasAlbumArtists.AlbumArtists = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); hasAlbumArtists.AlbumArtists = reader.GetString(index).Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
} }
index++; index++;
} }
@ -1871,6 +1937,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.ExternalId = reader.GetString(index); item.ExternalId = reader.GetString(index);
} }
index++; index++;
if (HasField(query, ItemFields.SeriesPresentationUniqueKey)) if (HasField(query, ItemFields.SeriesPresentationUniqueKey))
@ -1882,6 +1949,7 @@ namespace Emby.Server.Implementations.Data
hasSeries.SeriesPresentationUniqueKey = reader.GetString(index); hasSeries.SeriesPresentationUniqueKey = reader.GetString(index);
} }
} }
index++; index++;
} }
@ -1891,6 +1959,7 @@ namespace Emby.Server.Implementations.Data
{ {
program.ShowId = reader.GetString(index); program.ShowId = reader.GetString(index);
} }
index++; index++;
} }
@ -1898,6 +1967,7 @@ namespace Emby.Server.Implementations.Data
{ {
item.OwnerId = reader.GetGuid(index); item.OwnerId = reader.GetGuid(index);
} }
index++; index++;
return item; return item;
@ -2473,6 +2543,7 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind("@SearchTermStartsWith", searchTerm + "%"); statement.TryBind("@SearchTermStartsWith", searchTerm + "%");
} }
if (commandText.IndexOf("@SearchTermContains", StringComparison.OrdinalIgnoreCase) != -1) if (commandText.IndexOf("@SearchTermContains", StringComparison.OrdinalIgnoreCase) != -1)
{ {
statement.TryBind("@SearchTermContains", "%" + searchTerm + "%"); statement.TryBind("@SearchTermContains", "%" + searchTerm + "%");
@ -2743,6 +2814,7 @@ namespace Emby.Server.Implementations.Data
{ {
items[i] = newItem; items[i] = newItem;
} }
return; return;
} }
} }
@ -2835,6 +2907,7 @@ namespace Emby.Server.Implementations.Data
{ {
statementTexts.Add(commandText); statementTexts.Add(commandText);
} }
if (query.EnableTotalRecordCount) if (query.EnableTotalRecordCount)
{ {
commandText = string.Empty; commandText = string.Empty;
@ -3239,6 +3312,7 @@ namespace Emby.Server.Implementations.Data
{ {
statementTexts.Add(commandText); statementTexts.Add(commandText);
} }
if (query.EnableTotalRecordCount) if (query.EnableTotalRecordCount)
{ {
commandText = string.Empty; commandText = string.Empty;
@ -3592,11 +3666,13 @@ namespace Emby.Server.Implementations.Data
whereClauses.Add("IndexNumber=@IndexNumber"); whereClauses.Add("IndexNumber=@IndexNumber");
statement?.TryBind("@IndexNumber", query.IndexNumber.Value); statement?.TryBind("@IndexNumber", query.IndexNumber.Value);
} }
if (query.ParentIndexNumber.HasValue) if (query.ParentIndexNumber.HasValue)
{ {
whereClauses.Add("ParentIndexNumber=@ParentIndexNumber"); whereClauses.Add("ParentIndexNumber=@ParentIndexNumber");
statement?.TryBind("@ParentIndexNumber", query.ParentIndexNumber.Value); statement?.TryBind("@ParentIndexNumber", query.ParentIndexNumber.Value);
} }
if (query.ParentIndexNumberNotEquals.HasValue) if (query.ParentIndexNumberNotEquals.HasValue)
{ {
whereClauses.Add("(ParentIndexNumber<>@ParentIndexNumberNotEquals or ParentIndexNumber is null)"); whereClauses.Add("(ParentIndexNumber<>@ParentIndexNumberNotEquals or ParentIndexNumber is null)");
@ -3882,6 +3958,7 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind(paramName, artistId.ToByteArray()); statement.TryBind(paramName, artistId.ToByteArray());
} }
index++; index++;
} }
@ -3902,6 +3979,7 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind(paramName, artistId.ToByteArray()); statement.TryBind(paramName, artistId.ToByteArray());
} }
index++; index++;
} }
@ -3922,8 +4000,10 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind(paramName, artistId.ToByteArray()); statement.TryBind(paramName, artistId.ToByteArray());
} }
index++; index++;
} }
var clause = "(" + string.Join(" OR ", clauses) + ")"; var clause = "(" + string.Join(" OR ", clauses) + ")";
whereClauses.Add(clause); whereClauses.Add(clause);
} }
@ -3941,8 +4021,10 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind(paramName, albumId.ToByteArray()); statement.TryBind(paramName, albumId.ToByteArray());
} }
index++; index++;
} }
var clause = "(" + string.Join(" OR ", clauses) + ")"; var clause = "(" + string.Join(" OR ", clauses) + ")";
whereClauses.Add(clause); whereClauses.Add(clause);
} }
@ -3960,8 +4042,10 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind(paramName, artistId.ToByteArray()); statement.TryBind(paramName, artistId.ToByteArray());
} }
index++; index++;
} }
var clause = "(" + string.Join(" OR ", clauses) + ")"; var clause = "(" + string.Join(" OR ", clauses) + ")";
whereClauses.Add(clause); whereClauses.Add(clause);
} }
@ -3979,8 +4063,10 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind(paramName, genreId.ToByteArray()); statement.TryBind(paramName, genreId.ToByteArray());
} }
index++; index++;
} }
var clause = "(" + string.Join(" OR ", clauses) + ")"; var clause = "(" + string.Join(" OR ", clauses) + ")";
whereClauses.Add(clause); whereClauses.Add(clause);
} }
@ -3996,8 +4082,10 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind("@Genre" + index, GetCleanValue(item)); statement.TryBind("@Genre" + index, GetCleanValue(item));
} }
index++; index++;
} }
var clause = "(" + string.Join(" OR ", clauses) + ")"; var clause = "(" + string.Join(" OR ", clauses) + ")";
whereClauses.Add(clause); whereClauses.Add(clause);
} }
@ -4013,8 +4101,10 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind("@Tag" + index, GetCleanValue(item)); statement.TryBind("@Tag" + index, GetCleanValue(item));
} }
index++; index++;
} }
var clause = "(" + string.Join(" OR ", clauses) + ")"; var clause = "(" + string.Join(" OR ", clauses) + ")";
whereClauses.Add(clause); whereClauses.Add(clause);
} }
@ -4030,8 +4120,10 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind("@ExcludeTag" + index, GetCleanValue(item)); statement.TryBind("@ExcludeTag" + index, GetCleanValue(item));
} }
index++; index++;
} }
var clause = "(" + string.Join(" OR ", clauses) + ")"; var clause = "(" + string.Join(" OR ", clauses) + ")";
whereClauses.Add(clause); whereClauses.Add(clause);
} }
@ -4050,8 +4142,10 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind(paramName, studioId.ToByteArray()); statement.TryBind(paramName, studioId.ToByteArray());
} }
index++; index++;
} }
var clause = "(" + string.Join(" OR ", clauses) + ")"; var clause = "(" + string.Join(" OR ", clauses) + ")";
whereClauses.Add(clause); whereClauses.Add(clause);
} }
@ -4067,8 +4161,10 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind("@OfficialRating" + index, item); statement.TryBind("@OfficialRating" + index, item);
} }
index++; index++;
} }
var clause = "(" + string.Join(" OR ", clauses) + ")"; var clause = "(" + string.Join(" OR ", clauses) + ")";
whereClauses.Add(clause); whereClauses.Add(clause);
} }
@ -4243,6 +4339,7 @@ namespace Emby.Server.Implementations.Data
statement.TryBind("@IsVirtualItem", isVirtualItem.Value); statement.TryBind("@IsVirtualItem", isVirtualItem.Value);
} }
} }
if (query.IsSpecialSeason.HasValue) if (query.IsSpecialSeason.HasValue)
{ {
if (query.IsSpecialSeason.Value) if (query.IsSpecialSeason.Value)
@ -4254,6 +4351,7 @@ namespace Emby.Server.Implementations.Data
whereClauses.Add("IndexNumber <> 0"); whereClauses.Add("IndexNumber <> 0");
} }
} }
if (query.IsUnaired.HasValue) if (query.IsUnaired.HasValue)
{ {
if (query.IsUnaired.Value) if (query.IsUnaired.Value)
@ -4265,6 +4363,7 @@ namespace Emby.Server.Implementations.Data
whereClauses.Add("PremiereDate < DATETIME('now')"); whereClauses.Add("PremiereDate < DATETIME('now')");
} }
} }
var queryMediaTypes = query.MediaTypes.Where(IsValidMediaType).ToArray(); var queryMediaTypes = query.MediaTypes.Where(IsValidMediaType).ToArray();
if (queryMediaTypes.Length == 1) if (queryMediaTypes.Length == 1)
{ {
@ -4280,6 +4379,7 @@ namespace Emby.Server.Implementations.Data
whereClauses.Add("MediaType in (" + val + ")"); whereClauses.Add("MediaType in (" + val + ")");
} }
if (query.ItemIds.Length > 0) if (query.ItemIds.Length > 0)
{ {
var includeIds = new List<string>(); var includeIds = new List<string>();
@ -4292,11 +4392,13 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind("@IncludeId" + index, id); statement.TryBind("@IncludeId" + index, id);
} }
index++; index++;
} }
whereClauses.Add("(" + string.Join(" OR ", includeIds) + ")"); whereClauses.Add("(" + string.Join(" OR ", includeIds) + ")");
} }
if (query.ExcludeItemIds.Length > 0) if (query.ExcludeItemIds.Length > 0)
{ {
var excludeIds = new List<string>(); var excludeIds = new List<string>();
@ -4309,6 +4411,7 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind("@ExcludeId" + index, id); statement.TryBind("@ExcludeId" + index, id);
} }
index++; index++;
} }
@ -4333,6 +4436,7 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind(paramName, "%" + pair.Key + "=" + pair.Value + "%"); statement.TryBind(paramName, "%" + pair.Key + "=" + pair.Value + "%");
} }
index++; index++;
break; break;
@ -4375,6 +4479,7 @@ namespace Emby.Server.Implementations.Data
{ {
statement.TryBind(paramName, "%" + pair.Key + "=" + pair.Value + "%"); statement.TryBind(paramName, "%" + pair.Key + "=" + pair.Value + "%");
} }
index++; index++;
break; break;
@ -4425,6 +4530,7 @@ namespace Emby.Server.Implementations.Data
{ {
whereClauses.Add("(TopParentId=@TopParentId)"); whereClauses.Add("(TopParentId=@TopParentId)");
} }
if (statement != null) if (statement != null)
{ {
statement.TryBind("@TopParentId", queryTopParentIds[0].ToString("N", CultureInfo.InvariantCulture)); statement.TryBind("@TopParentId", queryTopParentIds[0].ToString("N", CultureInfo.InvariantCulture));
@ -4462,11 +4568,13 @@ namespace Emby.Server.Implementations.Data
statement.TryBind("@AncestorId", query.AncestorIds[0]); statement.TryBind("@AncestorId", query.AncestorIds[0]);
} }
} }
if (query.AncestorIds.Length > 1) if (query.AncestorIds.Length > 1)
{ {
var inClause = string.Join(",", query.AncestorIds.Select(i => "'" + i.ToString("N", CultureInfo.InvariantCulture) + "'")); var inClause = string.Join(",", query.AncestorIds.Select(i => "'" + i.ToString("N", CultureInfo.InvariantCulture) + "'"));
whereClauses.Add(string.Format("Guid in (select itemId from AncestorIds where AncestorIdText in ({0}))", inClause)); whereClauses.Add(string.Format("Guid in (select itemId from AncestorIds where AncestorIdText in ({0}))", inClause));
} }
if (!string.IsNullOrWhiteSpace(query.AncestorWithPresentationUniqueKey)) if (!string.IsNullOrWhiteSpace(query.AncestorWithPresentationUniqueKey))
{ {
var inClause = "select guid from TypedBaseItems where PresentationUniqueKey=@AncestorWithPresentationUniqueKey"; var inClause = "select guid from TypedBaseItems where PresentationUniqueKey=@AncestorWithPresentationUniqueKey";
@ -4495,6 +4603,7 @@ namespace Emby.Server.Implementations.Data
statement.TryBind("@UnratedType", query.BlockUnratedItems[0].ToString()); statement.TryBind("@UnratedType", query.BlockUnratedItems[0].ToString());
} }
} }
if (query.BlockUnratedItems.Length > 1) if (query.BlockUnratedItems.Length > 1)
{ {
var inClause = string.Join(",", query.BlockUnratedItems.Select(i => "'" + i.ToString() + "'")); var inClause = string.Join(",", query.BlockUnratedItems.Select(i => "'" + i.ToString() + "'"));
@ -4969,6 +5078,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
statement.TryBind("@ItemId", query.ItemId.ToByteArray()); statement.TryBind("@ItemId", query.ItemId.ToByteArray());
} }
} }
if (!query.AppearsInItemId.Equals(Guid.Empty)) if (!query.AppearsInItemId.Equals(Guid.Empty))
{ {
whereClauses.Add("Name in (Select Name from People where ItemId=@AppearsInItemId)"); whereClauses.Add("Name in (Select Name from People where ItemId=@AppearsInItemId)");
@ -4977,6 +5087,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
statement.TryBind("@AppearsInItemId", query.AppearsInItemId.ToByteArray()); statement.TryBind("@AppearsInItemId", query.AppearsInItemId.ToByteArray());
} }
} }
var queryPersonTypes = query.PersonTypes.Where(IsValidPersonType).ToList(); var queryPersonTypes = query.PersonTypes.Where(IsValidPersonType).ToList();
if (queryPersonTypes.Count == 1) if (queryPersonTypes.Count == 1)
@ -4993,6 +5104,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
whereClauses.Add("PersonType in (" + val + ")"); whereClauses.Add("PersonType in (" + val + ")");
} }
var queryExcludePersonTypes = query.ExcludePersonTypes.Where(IsValidPersonType).ToList(); var queryExcludePersonTypes = query.ExcludePersonTypes.Where(IsValidPersonType).ToList();
if (queryExcludePersonTypes.Count == 1) if (queryExcludePersonTypes.Count == 1)
@ -5009,6 +5121,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
whereClauses.Add("PersonType not in (" + val + ")"); whereClauses.Add("PersonType not in (" + val + ")");
} }
if (query.MaxListOrder.HasValue) if (query.MaxListOrder.HasValue)
{ {
whereClauses.Add("ListOrder<=@MaxListOrder"); whereClauses.Add("ListOrder<=@MaxListOrder");
@ -5017,6 +5130,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
statement.TryBind("@MaxListOrder", query.MaxListOrder.Value); statement.TryBind("@MaxListOrder", query.MaxListOrder.Value);
} }
} }
if (!string.IsNullOrWhiteSpace(query.NameContains)) if (!string.IsNullOrWhiteSpace(query.NameContains))
{ {
whereClauses.Add("Name like @NameContains"); whereClauses.Add("Name like @NameContains");
@ -5156,6 +5270,7 @@ where AncestorIdText not null and ItemValues.Value not null and ItemValues.Type
var typeString = string.Join(",", withItemTypes.Select(i => "'" + i + "'")); var typeString = string.Join(",", withItemTypes.Select(i => "'" + i + "'"));
commandText += " AND ItemId In (select guid from typedbaseitems where type in (" + typeString + "))"; commandText += " AND ItemId In (select guid from typedbaseitems where type in (" + typeString + "))";
} }
if (excludeItemTypes.Count > 0) if (excludeItemTypes.Count > 0)
{ {
var typeString = string.Join(",", excludeItemTypes.Select(i => "'" + i + "'")); var typeString = string.Join(",", excludeItemTypes.Select(i => "'" + i + "'"));

View File

@ -135,10 +135,12 @@ namespace Emby.Server.Implementations.Data
{ {
throw new ArgumentNullException(nameof(userData)); throw new ArgumentNullException(nameof(userData));
} }
if (internalUserId <= 0) if (internalUserId <= 0)
{ {
throw new ArgumentNullException(nameof(internalUserId)); throw new ArgumentNullException(nameof(internalUserId));
} }
if (string.IsNullOrEmpty(key)) if (string.IsNullOrEmpty(key))
{ {
throw new ArgumentNullException(nameof(key)); throw new ArgumentNullException(nameof(key));
@ -153,6 +155,7 @@ namespace Emby.Server.Implementations.Data
{ {
throw new ArgumentNullException(nameof(userData)); throw new ArgumentNullException(nameof(userData));
} }
if (internalUserId <= 0) if (internalUserId <= 0)
{ {
throw new ArgumentNullException(nameof(internalUserId)); throw new ArgumentNullException(nameof(internalUserId));

View File

@ -169,6 +169,7 @@ namespace Emby.Server.Implementations.Devices
{ {
throw new ArgumentException("user not found"); throw new ArgumentException("user not found");
} }
if (string.IsNullOrEmpty(deviceId)) if (string.IsNullOrEmpty(deviceId))
{ {
throw new ArgumentNullException(nameof(deviceId)); throw new ArgumentNullException(nameof(deviceId));

View File

@ -277,6 +277,7 @@ namespace Emby.Server.Implementations.Dto
dto.EpisodeTitle = dto.Name; dto.EpisodeTitle = dto.Name;
dto.Name = dto.SeriesName; dto.Name = dto.SeriesName;
} }
liveTvManager.AddInfoToRecordingDto(item, dto, activeRecording, user); liveTvManager.AddInfoToRecordingDto(item, dto, activeRecording, user);
} }
@ -292,6 +293,7 @@ namespace Emby.Server.Implementations.Dto
{ {
continue; continue;
} }
var containers = container.Split(new[] { ',' }); var containers = container.Split(new[] { ',' });
if (containers.Length < 2) if (containers.Length < 2)
{ {
@ -456,6 +458,7 @@ namespace Emby.Server.Implementations.Dto
{ {
dto.SeriesName = item.SeriesName; dto.SeriesName = item.SeriesName;
} }
private static void SetPhotoProperties(BaseItemDto dto, Photo item) private static void SetPhotoProperties(BaseItemDto dto, Photo item)
{ {
dto.CameraMake = item.CameraMake; dto.CameraMake = item.CameraMake;
@ -554,22 +557,27 @@ namespace Emby.Server.Implementations.Dto
{ {
return 0; return 0;
} }
if (i.IsType(PersonType.GuestStar)) if (i.IsType(PersonType.GuestStar))
{ {
return 1; return 1;
} }
if (i.IsType(PersonType.Director)) if (i.IsType(PersonType.Director))
{ {
return 2; return 2;
} }
if (i.IsType(PersonType.Writer)) if (i.IsType(PersonType.Writer))
{ {
return 3; return 3;
} }
if (i.IsType(PersonType.Producer)) if (i.IsType(PersonType.Producer))
{ {
return 4; return 4;
} }
if (i.IsType(PersonType.Composer)) if (i.IsType(PersonType.Composer))
{ {
return 4; return 4;
@ -1346,6 +1354,7 @@ namespace Emby.Server.Implementations.Dto
dto.ParentLogoImageTag = GetTagAndFillBlurhash(dto, parent, image); dto.ParentLogoImageTag = GetTagAndFillBlurhash(dto, parent, image);
} }
} }
if (artLimit > 0 && !(imageTags != null && imageTags.ContainsKey(ImageType.Art)) && dto.ParentArtItemId == null) if (artLimit > 0 && !(imageTags != null && imageTags.ContainsKey(ImageType.Art)) && dto.ParentArtItemId == null)
{ {
var image = allImages.FirstOrDefault(i => i.Type == ImageType.Art); var image = allImages.FirstOrDefault(i => i.Type == ImageType.Art);
@ -1356,6 +1365,7 @@ namespace Emby.Server.Implementations.Dto
dto.ParentArtImageTag = GetTagAndFillBlurhash(dto, parent, image); dto.ParentArtImageTag = GetTagAndFillBlurhash(dto, parent, image);
} }
} }
if (thumbLimit > 0 && !(imageTags != null && imageTags.ContainsKey(ImageType.Thumb)) && (dto.ParentThumbItemId == null || parent is Series) && !(parent is ICollectionFolder) && !(parent is UserView)) if (thumbLimit > 0 && !(imageTags != null && imageTags.ContainsKey(ImageType.Thumb)) && (dto.ParentThumbItemId == null || parent is Series) && !(parent is ICollectionFolder) && !(parent is UserView))
{ {
var image = allImages.FirstOrDefault(i => i.Type == ImageType.Thumb); var image = allImages.FirstOrDefault(i => i.Type == ImageType.Thumb);
@ -1366,6 +1376,7 @@ namespace Emby.Server.Implementations.Dto
dto.ParentThumbImageTag = GetTagAndFillBlurhash(dto, parent, image); dto.ParentThumbImageTag = GetTagAndFillBlurhash(dto, parent, image);
} }
} }
if (backdropLimit > 0 && !((dto.BackdropImageTags != null && dto.BackdropImageTags.Length > 0) || (dto.ParentBackdropImageTags != null && dto.ParentBackdropImageTags.Length > 0))) if (backdropLimit > 0 && !((dto.BackdropImageTags != null && dto.BackdropImageTags.Length > 0) || (dto.ParentBackdropImageTags != null && dto.ParentBackdropImageTags.Length > 0)))
{ {
var images = allImages.Where(i => i.Type == ImageType.Backdrop).Take(backdropLimit).ToList(); var images = allImages.Where(i => i.Type == ImageType.Backdrop).Take(backdropLimit).ToList();

View File

@ -453,6 +453,7 @@ namespace Emby.Server.Implementations.HttpServer
{ {
httpRes.Headers.Add(key, value); httpRes.Headers.Add(key, value);
} }
httpRes.ContentType = "text/plain"; httpRes.ContentType = "text/plain";
await httpRes.WriteAsync(string.Empty, cancellationToken).ConfigureAwait(false); await httpRes.WriteAsync(string.Empty, cancellationToken).ConfigureAwait(false);
return; return;

View File

@ -20,15 +20,21 @@ namespace Emby.Server.Implementations.HttpServer
/// </summary> /// </summary>
/// <value>The source stream.</value> /// <value>The source stream.</value>
private Stream SourceStream { get; set; } private Stream SourceStream { get; set; }
private string RangeHeader { get; set; } private string RangeHeader { get; set; }
private bool IsHeadRequest { get; set; } private bool IsHeadRequest { get; set; }
private long RangeStart { get; set; } private long RangeStart { get; set; }
private long RangeEnd { get; set; } private long RangeEnd { get; set; }
private long RangeLength { get; set; } private long RangeLength { get; set; }
private long TotalContentLength { get; set; } private long TotalContentLength { get; set; }
public Action OnComplete { get; set; } public Action OnComplete { get; set; }
private readonly ILogger _logger; private readonly ILogger _logger;
private const int BufferSize = 81920; private const int BufferSize = 81920;
@ -139,6 +145,7 @@ namespace Emby.Server.Implementations.HttpServer
{ {
start = long.Parse(vals[0], UsCulture); start = long.Parse(vals[0], UsCulture);
} }
if (!string.IsNullOrEmpty(vals[1])) if (!string.IsNullOrEmpty(vals[1]))
{ {
end = long.Parse(vals[1], UsCulture); end = long.Parse(vals[1], UsCulture);

View File

@ -140,6 +140,7 @@ namespace Emby.Server.Implementations.HttpServer.Security
{ {
return true; return true;
} }
if (authAttribtues.AllowLocalOnly && request.IsLocal) if (authAttribtues.AllowLocalOnly && request.IsLocal)
{ {
return true; return true;

View File

@ -71,6 +71,7 @@ namespace Emby.Server.Implementations.HttpServer.Security
{ {
token = httpReq.Headers["X-MediaBrowser-Token"]; token = httpReq.Headers["X-MediaBrowser-Token"];
} }
if (string.IsNullOrEmpty(token)) if (string.IsNullOrEmpty(token))
{ {
token = httpReq.QueryString["api_key"]; token = httpReq.QueryString["api_key"];
@ -160,6 +161,7 @@ namespace Emby.Server.Implementations.HttpServer.Security
_authRepo.Update(tokenInfo); _authRepo.Update(tokenInfo);
} }
} }
httpReq.Items["OriginalAuthenticationInfo"] = tokenInfo; httpReq.Items["OriginalAuthenticationInfo"] = tokenInfo;
} }

View File

@ -628,6 +628,7 @@ namespace Emby.Server.Implementations.IO
{ {
return false; return false;
} }
return extensions.Contains(ext, StringComparer.OrdinalIgnoreCase); return extensions.Contains(ext, StringComparer.OrdinalIgnoreCase);
}); });
} }
@ -682,6 +683,7 @@ namespace Emby.Server.Implementations.IO
{ {
return false; return false;
} }
return extensions.Contains(ext, StringComparer.OrdinalIgnoreCase); return extensions.Contains(ext, StringComparer.OrdinalIgnoreCase);
}); });
} }

View File

@ -12,11 +12,13 @@ namespace Emby.Server.Implementations.Library
public class ExclusiveLiveStream : ILiveStream public class ExclusiveLiveStream : ILiveStream
{ {
public int ConsumerCount { get; set; } public int ConsumerCount { get; set; }
public string OriginalStreamId { get; set; } public string OriginalStreamId { get; set; }
public string TunerHostId => null; public string TunerHostId => null;
public bool EnableStreamSharing { get; set; } public bool EnableStreamSharing { get; set; }
public MediaSourceInfo MediaSource { get; set; } public MediaSourceInfo MediaSource { get; set; }
public string UniqueId { get; private set; } public string UniqueId { get; private set; }

View File

@ -2784,10 +2784,12 @@ namespace Emby.Server.Implementations.Library
{ {
throw new ArgumentNullException(nameof(path)); throw new ArgumentNullException(nameof(path));
} }
if (string.IsNullOrWhiteSpace(from)) if (string.IsNullOrWhiteSpace(from))
{ {
throw new ArgumentNullException(nameof(from)); throw new ArgumentNullException(nameof(from));
} }
if (string.IsNullOrWhiteSpace(to)) if (string.IsNullOrWhiteSpace(to))
{ {
throw new ArgumentNullException(nameof(to)); throw new ArgumentNullException(nameof(to));

View File

@ -205,22 +205,27 @@ namespace Emby.Server.Implementations.Library
{ {
return MediaProtocol.Rtsp; return MediaProtocol.Rtsp;
} }
if (path.StartsWith("Rtmp", StringComparison.OrdinalIgnoreCase)) if (path.StartsWith("Rtmp", StringComparison.OrdinalIgnoreCase))
{ {
return MediaProtocol.Rtmp; return MediaProtocol.Rtmp;
} }
if (path.StartsWith("Http", StringComparison.OrdinalIgnoreCase)) if (path.StartsWith("Http", StringComparison.OrdinalIgnoreCase))
{ {
return MediaProtocol.Http; return MediaProtocol.Http;
} }
if (path.StartsWith("rtp", StringComparison.OrdinalIgnoreCase)) if (path.StartsWith("rtp", StringComparison.OrdinalIgnoreCase))
{ {
return MediaProtocol.Rtp; return MediaProtocol.Rtp;
} }
if (path.StartsWith("ftp", StringComparison.OrdinalIgnoreCase)) if (path.StartsWith("ftp", StringComparison.OrdinalIgnoreCase))
{ {
return MediaProtocol.Ftp; return MediaProtocol.Ftp;
} }
if (path.StartsWith("udp", StringComparison.OrdinalIgnoreCase)) if (path.StartsWith("udp", StringComparison.OrdinalIgnoreCase))
{ {
return MediaProtocol.Udp; return MediaProtocol.Udp;

View File

@ -41,10 +41,12 @@ namespace Emby.Server.Implementations.Library.Resolvers
{ {
return new AggregateFolder(); return new AggregateFolder();
} }
if (string.Equals(args.Path, _appPaths.DefaultUserViewsPath, StringComparison.OrdinalIgnoreCase)) if (string.Equals(args.Path, _appPaths.DefaultUserViewsPath, StringComparison.OrdinalIgnoreCase))
{ {
return new UserRootFolder(); // if we got here and still a root - must be user root return new UserRootFolder(); // if we got here and still a root - must be user root
} }
if (args.IsVf) if (args.IsVf)
{ {
return new CollectionFolder return new CollectionFolder

View File

@ -55,6 +55,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
episode.SeriesId = series.Id; episode.SeriesId = series.Id;
episode.SeriesName = series.Name; episode.SeriesName = series.Name;
} }
if (season != null) if (season != null)
{ {
episode.SeasonId = season.Id; episode.SeasonId = season.Id;

View File

@ -194,6 +194,7 @@ namespace Emby.Server.Implementations.Library
{ {
searchQuery.AncestorIds = new[] { searchQuery.ParentId }; searchQuery.AncestorIds = new[] { searchQuery.ParentId };
} }
searchQuery.ParentId = Guid.Empty; searchQuery.ParentId = Guid.Empty;
searchQuery.IncludeItemsByName = true; searchQuery.IncludeItemsByName = true;
searchQuery.IncludeItemTypes = Array.Empty<string>(); searchQuery.IncludeItemTypes = Array.Empty<string>();

View File

@ -212,6 +212,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
{ {
channelNumber = map.channel; channelNumber = map.channel;
} }
if (string.IsNullOrWhiteSpace(channelNumber)) if (string.IsNullOrWhiteSpace(channelNumber))
{ {
channelNumber = map.atscMajor + "." + map.atscMinor; channelNumber = map.atscMajor + "." + map.atscMinor;
@ -400,6 +401,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
{ {
date = DateTime.SpecifyKind(date, DateTimeKind.Utc); date = DateTime.SpecifyKind(date, DateTimeKind.Utc);
} }
return date; return date;
} }
@ -622,6 +624,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
_lastErrorResponse = DateTime.UtcNow; _lastErrorResponse = DateTime.UtcNow;
} }
} }
throw; throw;
} }
finally finally
@ -805,11 +808,13 @@ namespace Emby.Server.Implementations.LiveTv.Listings
{ {
throw new ArgumentException("Username is required"); throw new ArgumentException("Username is required");
} }
if (string.IsNullOrEmpty(info.Password)) if (string.IsNullOrEmpty(info.Password))
{ {
throw new ArgumentException("Password is required"); throw new ArgumentException("Password is required");
} }
} }
if (validateListings) if (validateListings)
{ {
if (string.IsNullOrEmpty(info.ListingsId)) if (string.IsNullOrEmpty(info.ListingsId))
@ -932,24 +937,35 @@ namespace Emby.Server.Implementations.LiveTv.Listings
public class Token public class Token
{ {
public int code { get; set; } public int code { get; set; }
public string message { get; set; } public string message { get; set; }
public string serverID { get; set; } public string serverID { get; set; }
public string token { get; set; } public string token { get; set; }
} }
public class Lineup public class Lineup
{ {
public string lineup { get; set; } public string lineup { get; set; }
public string name { get; set; } public string name { get; set; }
public string transport { get; set; } public string transport { get; set; }
public string location { get; set; } public string location { get; set; }
public string uri { get; set; } public string uri { get; set; }
} }
public class Lineups public class Lineups
{ {
public int code { get; set; } public int code { get; set; }
public string serverID { get; set; } public string serverID { get; set; }
public string datetime { get; set; } public string datetime { get; set; }
public List<Lineup> lineups { get; set; } public List<Lineup> lineups { get; set; }
} }
@ -957,8 +973,11 @@ namespace Emby.Server.Implementations.LiveTv.Listings
public class Headends public class Headends
{ {
public string headend { get; set; } public string headend { get; set; }
public string transport { get; set; } public string transport { get; set; }
public string location { get; set; } public string location { get; set; }
public List<Lineup> lineups { get; set; } public List<Lineup> lineups { get; set; }
} }
@ -967,59 +986,83 @@ namespace Emby.Server.Implementations.LiveTv.Listings
public class Map public class Map
{ {
public string stationID { get; set; } public string stationID { get; set; }
public string channel { get; set; } public string channel { get; set; }
public string logicalChannelNumber { get; set; } public string logicalChannelNumber { get; set; }
public int uhfVhf { get; set; } public int uhfVhf { get; set; }
public int atscMajor { get; set; } public int atscMajor { get; set; }
public int atscMinor { get; set; } public int atscMinor { get; set; }
} }
public class Broadcaster public class Broadcaster
{ {
public string city { get; set; } public string city { get; set; }
public string state { get; set; } public string state { get; set; }
public string postalcode { get; set; } public string postalcode { get; set; }
public string country { get; set; } public string country { get; set; }
} }
public class Logo public class Logo
{ {
public string URL { get; set; } public string URL { get; set; }
public int height { get; set; } public int height { get; set; }
public int width { get; set; } public int width { get; set; }
public string md5 { get; set; } public string md5 { get; set; }
} }
public class Station public class Station
{ {
public string stationID { get; set; } public string stationID { get; set; }
public string name { get; set; } public string name { get; set; }
public string callsign { get; set; } public string callsign { get; set; }
public List<string> broadcastLanguage { get; set; } public List<string> broadcastLanguage { get; set; }
public List<string> descriptionLanguage { get; set; } public List<string> descriptionLanguage { get; set; }
public Broadcaster broadcaster { get; set; } public Broadcaster broadcaster { get; set; }
public string affiliate { get; set; } public string affiliate { get; set; }
public Logo logo { get; set; } public Logo logo { get; set; }
public bool? isCommercialFree { get; set; } public bool? isCommercialFree { get; set; }
} }
public class Metadata public class Metadata
{ {
public string lineup { get; set; } public string lineup { get; set; }
public string modified { get; set; } public string modified { get; set; }
public string transport { get; set; } public string transport { get; set; }
} }
public class Channel public class Channel
{ {
public List<Map> map { get; set; } public List<Map> map { get; set; }
public List<Station> stations { get; set; } public List<Station> stations { get; set; }
public Metadata metadata { get; set; } public Metadata metadata { get; set; }
} }
public class RequestScheduleForChannel public class RequestScheduleForChannel
{ {
public string stationID { get; set; } public string stationID { get; set; }
public List<string> date { get; set; } public List<string> date { get; set; }
} }
@ -1029,29 +1072,43 @@ namespace Emby.Server.Implementations.LiveTv.Listings
public class Rating public class Rating
{ {
public string body { get; set; } public string body { get; set; }
public string code { get; set; } public string code { get; set; }
} }
public class Multipart public class Multipart
{ {
public int partNumber { get; set; } public int partNumber { get; set; }
public int totalParts { get; set; } public int totalParts { get; set; }
} }
public class Program public class Program
{ {
public string programID { get; set; } public string programID { get; set; }
public string airDateTime { get; set; } public string airDateTime { get; set; }
public int duration { get; set; } public int duration { get; set; }
public string md5 { get; set; } public string md5 { get; set; }
public List<string> audioProperties { get; set; } public List<string> audioProperties { get; set; }
public List<string> videoProperties { get; set; } public List<string> videoProperties { get; set; }
public List<Rating> ratings { get; set; } public List<Rating> ratings { get; set; }
public bool? @new { get; set; } public bool? @new { get; set; }
public Multipart multipart { get; set; } public Multipart multipart { get; set; }
public string liveTapeDelay { get; set; } public string liveTapeDelay { get; set; }
public bool premiere { get; set; } public bool premiere { get; set; }
public bool repeat { get; set; } public bool repeat { get; set; }
public string isPremiereOrFinale { get; set; } public string isPremiereOrFinale { get; set; }
} }
@ -1060,16 +1117,22 @@ namespace Emby.Server.Implementations.LiveTv.Listings
public class MetadataSchedule public class MetadataSchedule
{ {
public string modified { get; set; } public string modified { get; set; }
public string md5 { get; set; } public string md5 { get; set; }
public string startDate { get; set; } public string startDate { get; set; }
public string endDate { get; set; } public string endDate { get; set; }
public int days { get; set; } public int days { get; set; }
} }
public class Day public class Day
{ {
public string stationID { get; set; } public string stationID { get; set; }
public List<Program> programs { get; set; } public List<Program> programs { get; set; }
public MetadataSchedule metadata { get; set; } public MetadataSchedule metadata { get; set; }
public Day() public Day()
@ -1092,24 +1155,28 @@ namespace Emby.Server.Implementations.LiveTv.Listings
public class Description100 public class Description100
{ {
public string descriptionLanguage { get; set; } public string descriptionLanguage { get; set; }
public string description { get; set; } public string description { get; set; }
} }
public class Description1000 public class Description1000
{ {
public string descriptionLanguage { get; set; } public string descriptionLanguage { get; set; }
public string description { get; set; } public string description { get; set; }
} }
public class DescriptionsProgram public class DescriptionsProgram
{ {
public List<Description100> description100 { get; set; } public List<Description100> description100 { get; set; }
public List<Description1000> description1000 { get; set; } public List<Description1000> description1000 { get; set; }
} }
public class Gracenote public class Gracenote
{ {
public int season { get; set; } public int season { get; set; }
public int episode { get; set; } public int episode { get; set; }
} }
@ -1121,101 +1188,152 @@ namespace Emby.Server.Implementations.LiveTv.Listings
public class ContentRating public class ContentRating
{ {
public string body { get; set; } public string body { get; set; }
public string code { get; set; } public string code { get; set; }
} }
public class Cast public class Cast
{ {
public string billingOrder { get; set; } public string billingOrder { get; set; }
public string role { get; set; } public string role { get; set; }
public string nameId { get; set; } public string nameId { get; set; }
public string personId { get; set; } public string personId { get; set; }
public string name { get; set; } public string name { get; set; }
public string characterName { get; set; } public string characterName { get; set; }
} }
public class Crew public class Crew
{ {
public string billingOrder { get; set; } public string billingOrder { get; set; }
public string role { get; set; } public string role { get; set; }
public string nameId { get; set; } public string nameId { get; set; }
public string personId { get; set; } public string personId { get; set; }
public string name { get; set; } public string name { get; set; }
} }
public class QualityRating public class QualityRating
{ {
public string ratingsBody { get; set; } public string ratingsBody { get; set; }
public string rating { get; set; } public string rating { get; set; }
public string minRating { get; set; } public string minRating { get; set; }
public string maxRating { get; set; } public string maxRating { get; set; }
public string increment { get; set; } public string increment { get; set; }
} }
public class Movie public class Movie
{ {
public string year { get; set; } public string year { get; set; }
public int duration { get; set; } public int duration { get; set; }
public List<QualityRating> qualityRating { get; set; } public List<QualityRating> qualityRating { get; set; }
} }
public class Recommendation public class Recommendation
{ {
public string programID { get; set; } public string programID { get; set; }
public string title120 { get; set; } public string title120 { get; set; }
} }
public class ProgramDetails public class ProgramDetails
{ {
public string audience { get; set; } public string audience { get; set; }
public string programID { get; set; } public string programID { get; set; }
public List<Title> titles { get; set; } public List<Title> titles { get; set; }
public EventDetails eventDetails { get; set; } public EventDetails eventDetails { get; set; }
public DescriptionsProgram descriptions { get; set; } public DescriptionsProgram descriptions { get; set; }
public string originalAirDate { get; set; } public string originalAirDate { get; set; }
public List<string> genres { get; set; } public List<string> genres { get; set; }
public string episodeTitle150 { get; set; } public string episodeTitle150 { get; set; }
public List<MetadataPrograms> metadata { get; set; } public List<MetadataPrograms> metadata { get; set; }
public List<ContentRating> contentRating { get; set; } public List<ContentRating> contentRating { get; set; }
public List<Cast> cast { get; set; } public List<Cast> cast { get; set; }
public List<Crew> crew { get; set; } public List<Crew> crew { get; set; }
public string entityType { get; set; } public string entityType { get; set; }
public string showType { get; set; } public string showType { get; set; }
public bool hasImageArtwork { get; set; } public bool hasImageArtwork { get; set; }
public string primaryImage { get; set; } public string primaryImage { get; set; }
public string thumbImage { get; set; } public string thumbImage { get; set; }
public string backdropImage { get; set; } public string backdropImage { get; set; }
public string bannerImage { get; set; } public string bannerImage { get; set; }
public string imageID { get; set; } public string imageID { get; set; }
public string md5 { get; set; } public string md5 { get; set; }
public List<string> contentAdvisory { get; set; } public List<string> contentAdvisory { get; set; }
public Movie movie { get; set; } public Movie movie { get; set; }
public List<Recommendation> recommendations { get; set; } public List<Recommendation> recommendations { get; set; }
} }
public class Caption public class Caption
{ {
public string content { get; set; } public string content { get; set; }
public string lang { get; set; } public string lang { get; set; }
} }
public class ImageData public class ImageData
{ {
public string width { get; set; } public string width { get; set; }
public string height { get; set; } public string height { get; set; }
public string uri { get; set; } public string uri { get; set; }
public string size { get; set; } public string size { get; set; }
public string aspect { get; set; } public string aspect { get; set; }
public string category { get; set; } public string category { get; set; }
public string text { get; set; } public string text { get; set; }
public string primary { get; set; } public string primary { get; set; }
public string tier { get; set; } public string tier { get; set; }
public Caption caption { get; set; } public Caption caption { get; set; }
} }
public class ShowImages public class ShowImages
{ {
public string programID { get; set; } public string programID { get; set; }
public List<ImageData> data { get; set; } public List<ImageData> data { get; set; }
} }
} }

View File

@ -224,6 +224,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
{ {
uniqueString = "-" + programInfo.SeasonNumber.Value.ToString(CultureInfo.InvariantCulture); uniqueString = "-" + programInfo.SeasonNumber.Value.ToString(CultureInfo.InvariantCulture);
} }
if (programInfo.EpisodeNumber.HasValue) if (programInfo.EpisodeNumber.HasValue)
{ {
uniqueString = "-" + programInfo.EpisodeNumber.Value.ToString(CultureInfo.InvariantCulture); uniqueString = "-" + programInfo.EpisodeNumber.Value.ToString(CultureInfo.InvariantCulture);

View File

@ -556,6 +556,7 @@ namespace Emby.Server.Implementations.LiveTv
{ {
forceUpdate = true; forceUpdate = true;
} }
item.ParentId = channel.Id; item.ParentId = channel.Id;
// item.ChannelType = channelType; // item.ChannelType = channelType;
@ -575,6 +576,7 @@ namespace Emby.Server.Implementations.LiveTv
{ {
forceUpdate = true; forceUpdate = true;
} }
item.ExternalSeriesId = seriesId; item.ExternalSeriesId = seriesId;
var isSeries = info.IsSeries || !string.IsNullOrEmpty(info.EpisodeTitle); var isSeries = info.IsSeries || !string.IsNullOrEmpty(info.EpisodeTitle);
@ -589,30 +591,37 @@ namespace Emby.Server.Implementations.LiveTv
{ {
tags.Add("Live"); tags.Add("Live");
} }
if (info.IsPremiere) if (info.IsPremiere)
{ {
tags.Add("Premiere"); tags.Add("Premiere");
} }
if (info.IsNews) if (info.IsNews)
{ {
tags.Add("News"); tags.Add("News");
} }
if (info.IsSports) if (info.IsSports)
{ {
tags.Add("Sports"); tags.Add("Sports");
} }
if (info.IsKids) if (info.IsKids)
{ {
tags.Add("Kids"); tags.Add("Kids");
} }
if (info.IsRepeat) if (info.IsRepeat)
{ {
tags.Add("Repeat"); tags.Add("Repeat");
} }
if (info.IsMovie) if (info.IsMovie)
{ {
tags.Add("Movie"); tags.Add("Movie");
} }
if (isSeries) if (isSeries)
{ {
tags.Add("Series"); tags.Add("Series");
@ -635,6 +644,7 @@ namespace Emby.Server.Implementations.LiveTv
{ {
forceUpdate = true; forceUpdate = true;
} }
item.IsSeries = isSeries; item.IsSeries = isSeries;
item.Name = info.Name; item.Name = info.Name;
@ -652,12 +662,14 @@ namespace Emby.Server.Implementations.LiveTv
{ {
forceUpdate = true; forceUpdate = true;
} }
item.StartDate = info.StartDate; item.StartDate = info.StartDate;
if (item.EndDate != info.EndDate) if (item.EndDate != info.EndDate)
{ {
forceUpdate = true; forceUpdate = true;
} }
item.EndDate = info.EndDate; item.EndDate = info.EndDate;
item.ProductionYear = info.ProductionYear; item.ProductionYear = info.ProductionYear;

View File

@ -170,6 +170,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
_modelCache[cacheKey] = response; _modelCache[cacheKey] = response;
} }
} }
return response; return response;
} }
@ -201,6 +202,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
var name = line.Substring(0, index - 1); var name = line.Substring(0, index - 1);
var currentChannel = line.Substring(index + 7); var currentChannel = line.Substring(index + 7);
if (currentChannel != "none") { status = LiveTvTunerStatus.LiveTv; } else { status = LiveTvTunerStatus.Available; } if (currentChannel != "none") { status = LiveTvTunerStatus.LiveTv; } else { status = LiveTvTunerStatus.Available; }
tuners.Add(new LiveTvTunerInfo tuners.Add(new LiveTvTunerInfo
{ {
Name = name, Name = name,
@ -229,11 +231,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
inside = true; inside = true;
continue; continue;
} }
if (let == '>') if (let == '>')
{ {
inside = false; inside = false;
continue; continue;
} }
if (!inside) if (!inside)
{ {
buffer[bufferIndex] = let; buffer[bufferIndex] = let;
@ -331,12 +335,19 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
private class Channels private class Channels
{ {
public string GuideNumber { get; set; } public string GuideNumber { get; set; }
public string GuideName { get; set; } public string GuideName { get; set; }
public string VideoCodec { get; set; } public string VideoCodec { get; set; }
public string AudioCodec { get; set; } public string AudioCodec { get; set; }
public string URL { get; set; } public string URL { get; set; }
public bool Favorite { get; set; } public bool Favorite { get; set; }
public bool DRM { get; set; } public bool DRM { get; set; }
public int HD { get; set; } public int HD { get; set; }
} }
@ -657,13 +668,21 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
public class DiscoverResponse public class DiscoverResponse
{ {
public string FriendlyName { get; set; } public string FriendlyName { get; set; }
public string ModelNumber { get; set; } public string ModelNumber { get; set; }
public string FirmwareName { get; set; } public string FirmwareName { get; set; }
public string FirmwareVersion { get; set; } public string FirmwareVersion { get; set; }
public string DeviceID { get; set; } public string DeviceID { get; set; }
public string DeviceAuth { get; set; } public string DeviceAuth { get; set; }
public string BaseURL { get; set; } public string BaseURL { get; set; }
public string LineupURL { get; set; } public string LineupURL { get; set; }
public int TunerCount { get; set; } public int TunerCount { get; set; }
public bool SupportsTranscoding public bool SupportsTranscoding

View File

@ -58,12 +58,15 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
protected virtual int EmptyReadLimit => 1000; protected virtual int EmptyReadLimit => 1000;
public MediaSourceInfo OriginalMediaSource { get; set; } public MediaSourceInfo OriginalMediaSource { get; set; }
public MediaSourceInfo MediaSource { get; set; } public MediaSourceInfo MediaSource { get; set; }
public int ConsumerCount { get; set; } public int ConsumerCount { get; set; }
public string OriginalStreamId { get; set; } public string OriginalStreamId { get; set; }
public bool EnableStreamSharing { get; set; } public bool EnableStreamSharing { get; set; }
public string UniqueId { get; } public string UniqueId { get; }
public string TunerHostId { get; } public string TunerHostId { get; }

View File

@ -401,6 +401,7 @@ namespace Emby.Server.Implementations.Playlists
{ {
entry.Duration = TimeSpan.FromTicks(child.RunTimeTicks.Value); entry.Duration = TimeSpan.FromTicks(child.RunTimeTicks.Value);
} }
playlist.PlaylistEntries.Add(entry); playlist.PlaylistEntries.Add(entry);
} }

View File

@ -143,12 +143,14 @@ namespace Emby.Server.Implementations.ScheduledTasks
Logger.LogError(ex, "Error deserializing {File}", path); Logger.LogError(ex, "Error deserializing {File}", path);
} }
} }
_readFromFile = true; _readFromFile = true;
} }
} }
return _lastExecutionResult; return _lastExecutionResult;
} }
private set private set
{ {
_lastExecutionResult = value; _lastExecutionResult = value;
@ -261,6 +263,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
var triggers = InternalTriggers; var triggers = InternalTriggers;
return triggers.Select(i => i.Item1).ToArray(); return triggers.Select(i => i.Item1).ToArray();
} }
set set
{ {
if (value == null) if (value == null)
@ -640,6 +643,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
Logger.LogError(ex, "Error calling CancellationToken.Cancel();"); Logger.LogError(ex, "Error calling CancellationToken.Cancel();");
} }
} }
var task = _currentTask; var task = _currentTask;
if (task != null) if (task != null)
{ {
@ -675,6 +679,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
Logger.LogError(ex, "Error calling CancellationToken.Dispose();"); Logger.LogError(ex, "Error calling CancellationToken.Dispose();");
} }
} }
if (wassRunning) if (wassRunning)
{ {
OnTaskCompleted(startTime, DateTime.UtcNow, TaskCompletionStatus.Aborted, null); OnTaskCompleted(startTime, DateTime.UtcNow, TaskCompletionStatus.Aborted, null);

View File

@ -9,6 +9,7 @@ namespace Emby.Server.Implementations.Services
public string Id { get; set; } public string Id { get; set; }
public ActionInvokerFn ServiceAction { get; set; } public ActionInvokerFn ServiceAction { get; set; }
public MediaBrowser.Model.Services.IHasRequestFilter[] RequestFilters { get; set; } public MediaBrowser.Model.Services.IHasRequestFilter[] RequestFilters { get; set; }
public static string Key(Type serviceType, string method, string requestDtoName) public static string Key(Type serviceType, string method, string requestDtoName)

View File

@ -62,7 +62,9 @@ namespace Emby.Server.Implementations.Services
public string Path => this.restPath; public string Path => this.restPath;
public string Summary { get; private set; } public string Summary { get; private set; }
public string Description { get; private set; } public string Description { get; private set; }
public bool IsHidden { get; private set; } public bool IsHidden { get; private set; }
public static string[] GetPathPartsForMatching(string pathInfo) public static string[] GetPathPartsForMatching(string pathInfo)
@ -159,6 +161,7 @@ namespace Emby.Server.Implementations.Services
this.isWildcard[i] = true; this.isWildcard[i] = true;
variableName = variableName.Substring(0, variableName.Length - 1); variableName = variableName.Substring(0, variableName.Length - 1);
} }
this.variablesNames[i] = variableName; this.variablesNames[i] = variableName;
this.VariableArgsCount++; this.VariableArgsCount++;
} }

View File

@ -22,7 +22,9 @@ namespace Emby.Server.Implementations.Services
} }
public Action<object, object> PropertySetFn { get; private set; } public Action<object, object> PropertySetFn { get; private set; }
public Func<string, object> PropertyParseStringFn { get; private set; } public Func<string, object> PropertyParseStringFn { get; private set; }
public Type PropertyType { get; private set; } public Type PropertyType { get; private set; }
} }

View File

@ -18,13 +18,21 @@ namespace Emby.Server.Implementations.Services
public class SwaggerSpec public class SwaggerSpec
{ {
public string swagger { get; set; } public string swagger { get; set; }
public string[] schemes { get; set; } public string[] schemes { get; set; }
public SwaggerInfo info { get; set; } public SwaggerInfo info { get; set; }
public string host { get; set; } public string host { get; set; }
public string basePath { get; set; } public string basePath { get; set; }
public SwaggerTag[] tags { get; set; } public SwaggerTag[] tags { get; set; }
public IDictionary<string, Dictionary<string, SwaggerMethod>> paths { get; set; } public IDictionary<string, Dictionary<string, SwaggerMethod>> paths { get; set; }
public Dictionary<string, SwaggerDefinition> definitions { get; set; } public Dictionary<string, SwaggerDefinition> definitions { get; set; }
public SwaggerComponents components { get; set; } public SwaggerComponents components { get; set; }
} }
@ -36,15 +44,20 @@ namespace Emby.Server.Implementations.Services
public class SwaggerSecurityScheme public class SwaggerSecurityScheme
{ {
public string name { get; set; } public string name { get; set; }
public string type { get; set; } public string type { get; set; }
public string @in { get; set; } public string @in { get; set; }
} }
public class SwaggerInfo public class SwaggerInfo
{ {
public string description { get; set; } public string description { get; set; }
public string version { get; set; } public string version { get; set; }
public string title { get; set; } public string title { get; set; }
public string termsOfService { get; set; } public string termsOfService { get; set; }
public SwaggerConcactInfo contact { get; set; } public SwaggerConcactInfo contact { get; set; }
@ -53,36 +66,52 @@ namespace Emby.Server.Implementations.Services
public class SwaggerConcactInfo public class SwaggerConcactInfo
{ {
public string email { get; set; } public string email { get; set; }
public string name { get; set; } public string name { get; set; }
public string url { get; set; } public string url { get; set; }
} }
public class SwaggerTag public class SwaggerTag
{ {
public string description { get; set; } public string description { get; set; }
public string name { get; set; } public string name { get; set; }
} }
public class SwaggerMethod public class SwaggerMethod
{ {
public string summary { get; set; } public string summary { get; set; }
public string description { get; set; } public string description { get; set; }
public string[] tags { get; set; } public string[] tags { get; set; }
public string operationId { get; set; } public string operationId { get; set; }
public string[] consumes { get; set; } public string[] consumes { get; set; }
public string[] produces { get; set; } public string[] produces { get; set; }
public SwaggerParam[] parameters { get; set; } public SwaggerParam[] parameters { get; set; }
public Dictionary<string, SwaggerResponse> responses { get; set; } public Dictionary<string, SwaggerResponse> responses { get; set; }
public Dictionary<string, string[]>[] security { get; set; } public Dictionary<string, string[]>[] security { get; set; }
} }
public class SwaggerParam public class SwaggerParam
{ {
public string @in { get; set; } public string @in { get; set; }
public string name { get; set; } public string name { get; set; }
public string description { get; set; } public string description { get; set; }
public bool required { get; set; } public bool required { get; set; }
public string type { get; set; } public string type { get; set; }
public string collectionFormat { get; set; } public string collectionFormat { get; set; }
} }
@ -97,15 +126,20 @@ namespace Emby.Server.Implementations.Services
public class SwaggerDefinition public class SwaggerDefinition
{ {
public string type { get; set; } public string type { get; set; }
public Dictionary<string, SwaggerProperty> properties { get; set; } public Dictionary<string, SwaggerProperty> properties { get; set; }
} }
public class SwaggerProperty public class SwaggerProperty
{ {
public string type { get; set; } public string type { get; set; }
public string format { get; set; } public string format { get; set; }
public string description { get; set; } public string description { get; set; }
public string[] @enum { get; set; } public string[] @enum { get; set; }
public string @default { get; set; } public string @default { get; set; }
} }

View File

@ -167,6 +167,7 @@ namespace Emby.Server.Implementations.Session
_logger.LogWarning("Multiple attempts to keep alive single WebSocket {0}", webSocket); _logger.LogWarning("Multiple attempts to keep alive single WebSocket {0}", webSocket);
return; return;
} }
webSocket.Closed += OnWebSocketClosed; webSocket.Closed += OnWebSocketClosed;
webSocket.LastKeepAliveDate = DateTime.UtcNow; webSocket.LastKeepAliveDate = DateTime.UtcNow;

View File

@ -44,6 +44,7 @@ namespace Emby.Server.Implementations.Sorting
// Don't blow up if the item has a bad ProductionYear, just return MinValue // Don't blow up if the item has a bad ProductionYear, just return MinValue
} }
} }
return DateTime.MinValue; return DateTime.MinValue;
} }

View File

@ -256,6 +256,7 @@ namespace Emby.Server.Implementations.TV
{ {
items = items.Skip(query.StartIndex.Value); items = items.Skip(query.StartIndex.Value);
} }
if (query.Limit.HasValue) if (query.Limit.HasValue)
{ {
items = items.Take(query.Limit.Value); items = items.Take(query.Limit.Value);

View File

@ -89,6 +89,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -127,6 +128,7 @@ namespace Jellyfin.Data.Entities
GetPath(ref value); GetPath(ref value);
return (_Path = value); return (_Path = value);
} }
set set
{ {
string oldValue = _Path; string oldValue = _Path;
@ -163,6 +165,7 @@ namespace Jellyfin.Data.Entities
GetKind(ref value); GetKind(ref value);
return (_Kind = value); return (_Kind = value);
} }
set set
{ {
Enums.ArtKind oldValue = _Kind; Enums.ArtKind oldValue = _Kind;

View File

@ -84,6 +84,7 @@ namespace Jellyfin.Data.Entities
GetISBN(ref value); GetISBN(ref value);
return (_ISBN = value); return (_ISBN = value);
} }
set set
{ {
long? oldValue = _ISBN; long? oldValue = _ISBN;

View File

@ -86,6 +86,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -123,6 +124,7 @@ namespace Jellyfin.Data.Entities
GetName(ref value); GetName(ref value);
return (_Name = value); return (_Name = value);
} }
set set
{ {
string oldValue = _Name; string oldValue = _Name;
@ -163,6 +165,7 @@ namespace Jellyfin.Data.Entities
GetLanguage(ref value); GetLanguage(ref value);
return (_Language = value); return (_Language = value);
} }
set set
{ {
string oldValue = _Language; string oldValue = _Language;
@ -199,6 +202,7 @@ namespace Jellyfin.Data.Entities
GetTimeStart(ref value); GetTimeStart(ref value);
return (_TimeStart = value); return (_TimeStart = value);
} }
set set
{ {
long oldValue = _TimeStart; long oldValue = _TimeStart;
@ -231,6 +235,7 @@ namespace Jellyfin.Data.Entities
GetTimeEnd(ref value); GetTimeEnd(ref value);
return (_TimeEnd = value); return (_TimeEnd = value);
} }
set set
{ {
long? oldValue = _TimeEnd; long? oldValue = _TimeEnd;

View File

@ -49,6 +49,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -86,6 +87,7 @@ namespace Jellyfin.Data.Entities
GetName(ref value); GetName(ref value);
return (_Name = value); return (_Name = value);
} }
set set
{ {
string oldValue = _Name; string oldValue = _Name;

View File

@ -93,6 +93,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;

View File

@ -101,6 +101,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;

View File

@ -85,6 +85,7 @@ namespace Jellyfin.Data.Entities
GetDescription(ref value); GetDescription(ref value);
return (_Description = value); return (_Description = value);
} }
set set
{ {
string oldValue = _Description; string oldValue = _Description;
@ -122,6 +123,7 @@ namespace Jellyfin.Data.Entities
GetHeadquarters(ref value); GetHeadquarters(ref value);
return (_Headquarters = value); return (_Headquarters = value);
} }
set set
{ {
string oldValue = _Headquarters; string oldValue = _Headquarters;
@ -159,6 +161,7 @@ namespace Jellyfin.Data.Entities
GetCountry(ref value); GetCountry(ref value);
return (_Country = value); return (_Country = value);
} }
set set
{ {
string oldValue = _Country; string oldValue = _Country;
@ -196,6 +199,7 @@ namespace Jellyfin.Data.Entities
GetHomepage(ref value); GetHomepage(ref value);
return (_Homepage = value); return (_Homepage = value);
} }
set set
{ {
string oldValue = _Homepage; string oldValue = _Homepage;

View File

@ -86,6 +86,7 @@ namespace Jellyfin.Data.Entities
GetEpisodeNumber(ref value); GetEpisodeNumber(ref value);
return (_EpisodeNumber = value); return (_EpisodeNumber = value);
} }
set set
{ {
int? oldValue = _EpisodeNumber; int? oldValue = _EpisodeNumber;

View File

@ -85,6 +85,7 @@ namespace Jellyfin.Data.Entities
GetOutline(ref value); GetOutline(ref value);
return (_Outline = value); return (_Outline = value);
} }
set set
{ {
string oldValue = _Outline; string oldValue = _Outline;
@ -122,6 +123,7 @@ namespace Jellyfin.Data.Entities
GetPlot(ref value); GetPlot(ref value);
return (_Plot = value); return (_Plot = value);
} }
set set
{ {
string oldValue = _Plot; string oldValue = _Plot;
@ -159,6 +161,7 @@ namespace Jellyfin.Data.Entities
GetTagline(ref value); GetTagline(ref value);
return (_Tagline = value); return (_Tagline = value);
} }
set set
{ {
string oldValue = _Tagline; string oldValue = _Tagline;

View File

@ -82,6 +82,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -120,6 +121,7 @@ namespace Jellyfin.Data.Entities
GetName(ref value); GetName(ref value);
return (_Name = value); return (_Name = value);
} }
set set
{ {
string oldValue = _Name; string oldValue = _Name;

View File

@ -77,6 +77,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -115,6 +116,7 @@ namespace Jellyfin.Data.Entities
GetName(ref value); GetName(ref value);
return (_Name = value); return (_Name = value);
} }
set set
{ {
string oldValue = _Name; string oldValue = _Name;

View File

@ -59,6 +59,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -96,6 +97,7 @@ namespace Jellyfin.Data.Entities
GetUrlId(ref value); GetUrlId(ref value);
return (_UrlId = value); return (_UrlId = value);
} }
set set
{ {
Guid oldValue = _UrlId; Guid oldValue = _UrlId;
@ -132,6 +134,7 @@ namespace Jellyfin.Data.Entities
GetDateAdded(ref value); GetDateAdded(ref value);
return (_DateAdded = value); return (_DateAdded = value);
} }
internal set internal set
{ {
DateTime oldValue = _DateAdded; DateTime oldValue = _DateAdded;

View File

@ -77,6 +77,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -116,6 +117,7 @@ namespace Jellyfin.Data.Entities
GetPath(ref value); GetPath(ref value);
return (_Path = value); return (_Path = value);
} }
set set
{ {
string oldValue = _Path; string oldValue = _Path;
@ -154,6 +156,7 @@ namespace Jellyfin.Data.Entities
GetNetworkPath(ref value); GetNetworkPath(ref value);
return (_NetworkPath = value); return (_NetworkPath = value);
} }
set set
{ {
string oldValue = _NetworkPath; string oldValue = _NetworkPath;

View File

@ -90,6 +90,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -129,6 +130,7 @@ namespace Jellyfin.Data.Entities
GetPath(ref value); GetPath(ref value);
return (_Path = value); return (_Path = value);
} }
set set
{ {
string oldValue = _Path; string oldValue = _Path;
@ -165,6 +167,7 @@ namespace Jellyfin.Data.Entities
GetKind(ref value); GetKind(ref value);
return (_Kind = value); return (_Kind = value);
} }
set set
{ {
Enums.MediaFileKind oldValue = _Kind; Enums.MediaFileKind oldValue = _Kind;

View File

@ -81,6 +81,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -117,6 +118,7 @@ namespace Jellyfin.Data.Entities
GetStreamNumber(ref value); GetStreamNumber(ref value);
return (_StreamNumber = value); return (_StreamNumber = value);
} }
set set
{ {
int oldValue = _StreamNumber; int oldValue = _StreamNumber;

View File

@ -76,6 +76,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -115,6 +116,7 @@ namespace Jellyfin.Data.Entities
GetTitle(ref value); GetTitle(ref value);
return (_Title = value); return (_Title = value);
} }
set set
{ {
string oldValue = _Title; string oldValue = _Title;
@ -152,6 +154,7 @@ namespace Jellyfin.Data.Entities
GetOriginalTitle(ref value); GetOriginalTitle(ref value);
return (_OriginalTitle = value); return (_OriginalTitle = value);
} }
set set
{ {
string oldValue = _OriginalTitle; string oldValue = _OriginalTitle;
@ -189,6 +192,7 @@ namespace Jellyfin.Data.Entities
GetSortTitle(ref value); GetSortTitle(ref value);
return (_SortTitle = value); return (_SortTitle = value);
} }
set set
{ {
string oldValue = _SortTitle; string oldValue = _SortTitle;
@ -229,6 +233,7 @@ namespace Jellyfin.Data.Entities
GetLanguage(ref value); GetLanguage(ref value);
return (_Language = value); return (_Language = value);
} }
set set
{ {
string oldValue = _Language; string oldValue = _Language;
@ -261,6 +266,7 @@ namespace Jellyfin.Data.Entities
GetReleaseDate(ref value); GetReleaseDate(ref value);
return (_ReleaseDate = value); return (_ReleaseDate = value);
} }
set set
{ {
DateTimeOffset? oldValue = _ReleaseDate; DateTimeOffset? oldValue = _ReleaseDate;
@ -297,6 +303,7 @@ namespace Jellyfin.Data.Entities
GetDateAdded(ref value); GetDateAdded(ref value);
return (_DateAdded = value); return (_DateAdded = value);
} }
internal set internal set
{ {
DateTime oldValue = _DateAdded; DateTime oldValue = _DateAdded;
@ -333,6 +340,7 @@ namespace Jellyfin.Data.Entities
GetDateModified(ref value); GetDateModified(ref value);
return (_DateModified = value); return (_DateModified = value);
} }
internal set internal set
{ {
DateTime oldValue = _DateModified; DateTime oldValue = _DateModified;

View File

@ -77,6 +77,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -115,6 +116,7 @@ namespace Jellyfin.Data.Entities
GetName(ref value); GetName(ref value);
return (_Name = value); return (_Name = value);
} }
set set
{ {
string oldValue = _Name; string oldValue = _Name;

View File

@ -103,6 +103,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -141,6 +142,7 @@ namespace Jellyfin.Data.Entities
GetProviderId(ref value); GetProviderId(ref value);
return (_ProviderId = value); return (_ProviderId = value);
} }
set set
{ {
string oldValue = _ProviderId; string oldValue = _ProviderId;

View File

@ -90,6 +90,7 @@ namespace Jellyfin.Data.Entities
GetOutline(ref value); GetOutline(ref value);
return (_Outline = value); return (_Outline = value);
} }
set set
{ {
string oldValue = _Outline; string oldValue = _Outline;
@ -127,6 +128,7 @@ namespace Jellyfin.Data.Entities
GetPlot(ref value); GetPlot(ref value);
return (_Plot = value); return (_Plot = value);
} }
set set
{ {
string oldValue = _Plot; string oldValue = _Plot;
@ -164,6 +166,7 @@ namespace Jellyfin.Data.Entities
GetTagline(ref value); GetTagline(ref value);
return (_Tagline = value); return (_Tagline = value);
} }
set set
{ {
string oldValue = _Tagline; string oldValue = _Tagline;
@ -201,6 +204,7 @@ namespace Jellyfin.Data.Entities
GetCountry(ref value); GetCountry(ref value);
return (_Country = value); return (_Country = value);
} }
set set
{ {
string oldValue = _Country; string oldValue = _Country;

View File

@ -90,6 +90,7 @@ namespace Jellyfin.Data.Entities
GetBarcode(ref value); GetBarcode(ref value);
return (_Barcode = value); return (_Barcode = value);
} }
set set
{ {
string oldValue = _Barcode; string oldValue = _Barcode;
@ -127,6 +128,7 @@ namespace Jellyfin.Data.Entities
GetLabelNumber(ref value); GetLabelNumber(ref value);
return (_LabelNumber = value); return (_LabelNumber = value);
} }
set set
{ {
string oldValue = _LabelNumber; string oldValue = _LabelNumber;
@ -164,6 +166,7 @@ namespace Jellyfin.Data.Entities
GetCountry(ref value); GetCountry(ref value);
return (_Country = value); return (_Country = value);
} }
set set
{ {
string oldValue = _Country; string oldValue = _Country;

View File

@ -85,6 +85,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -121,6 +122,7 @@ namespace Jellyfin.Data.Entities
GetUrlId(ref value); GetUrlId(ref value);
return (_UrlId = value); return (_UrlId = value);
} }
set set
{ {
Guid oldValue = _UrlId; Guid oldValue = _UrlId;
@ -159,6 +161,7 @@ namespace Jellyfin.Data.Entities
GetName(ref value); GetName(ref value);
return (_Name = value); return (_Name = value);
} }
set set
{ {
string oldValue = _Name; string oldValue = _Name;
@ -196,6 +199,7 @@ namespace Jellyfin.Data.Entities
GetSourceId(ref value); GetSourceId(ref value);
return (_SourceId = value); return (_SourceId = value);
} }
set set
{ {
string oldValue = _SourceId; string oldValue = _SourceId;
@ -232,6 +236,7 @@ namespace Jellyfin.Data.Entities
GetDateAdded(ref value); GetDateAdded(ref value);
return (_DateAdded = value); return (_DateAdded = value);
} }
internal set internal set
{ {
DateTime oldValue = _DateAdded; DateTime oldValue = _DateAdded;
@ -268,6 +273,7 @@ namespace Jellyfin.Data.Entities
GetDateModified(ref value); GetDateModified(ref value);
return (_DateModified = value); return (_DateModified = value);
} }
internal set internal set
{ {
DateTime oldValue = _DateModified; DateTime oldValue = _DateModified;

View File

@ -91,6 +91,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -128,6 +129,7 @@ namespace Jellyfin.Data.Entities
GetRole(ref value); GetRole(ref value);
return (_Role = value); return (_Role = value);
} }
set set
{ {
string oldValue = _Role; string oldValue = _Role;
@ -164,6 +166,7 @@ namespace Jellyfin.Data.Entities
GetType(ref value); GetType(ref value);
return (_Type = value); return (_Type = value);
} }
set set
{ {
Enums.PersonRoleType oldValue = _Type; Enums.PersonRoleType oldValue = _Type;

View File

@ -81,6 +81,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -117,6 +118,7 @@ namespace Jellyfin.Data.Entities
GetValue(ref value); GetValue(ref value);
return (_Value = value); return (_Value = value);
} }
set set
{ {
double oldValue = _Value; double oldValue = _Value;
@ -149,6 +151,7 @@ namespace Jellyfin.Data.Entities
GetVotes(ref value); GetVotes(ref value);
return (_Votes = value); return (_Votes = value);
} }
set set
{ {
int? oldValue = _Votes; int? oldValue = _Votes;

View File

@ -88,6 +88,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -125,6 +126,7 @@ namespace Jellyfin.Data.Entities
GetName(ref value); GetName(ref value);
return (_Name = value); return (_Name = value);
} }
set set
{ {
string oldValue = _Name; string oldValue = _Name;
@ -161,6 +163,7 @@ namespace Jellyfin.Data.Entities
GetMaximumValue(ref value); GetMaximumValue(ref value);
return (_MaximumValue = value); return (_MaximumValue = value);
} }
set set
{ {
double oldValue = _MaximumValue; double oldValue = _MaximumValue;
@ -197,6 +200,7 @@ namespace Jellyfin.Data.Entities
GetMinimumValue(ref value); GetMinimumValue(ref value);
return (_MinimumValue = value); return (_MinimumValue = value);
} }
set set
{ {
double oldValue = _MinimumValue; double oldValue = _MinimumValue;

View File

@ -113,6 +113,7 @@ namespace Jellyfin.Data.Entities
GetId(ref value); GetId(ref value);
return (_Id = value); return (_Id = value);
} }
protected set protected set
{ {
int oldValue = _Id; int oldValue = _Id;
@ -151,6 +152,7 @@ namespace Jellyfin.Data.Entities
GetName(ref value); GetName(ref value);
return (_Name = value); return (_Name = value);
} }
set set
{ {
string oldValue = _Name; string oldValue = _Name;

View File

@ -86,6 +86,7 @@ namespace Jellyfin.Data.Entities
GetSeasonNumber(ref value); GetSeasonNumber(ref value);
return (_SeasonNumber = value); return (_SeasonNumber = value);
} }
set set
{ {
int? oldValue = _SeasonNumber; int? oldValue = _SeasonNumber;

View File

@ -86,6 +86,7 @@ namespace Jellyfin.Data.Entities
GetOutline(ref value); GetOutline(ref value);
return (_Outline = value); return (_Outline = value);
} }
set set
{ {
string oldValue = _Outline; string oldValue = _Outline;

View File

@ -67,6 +67,7 @@ namespace Jellyfin.Data.Entities
GetAirsDayOfWeek(ref value); GetAirsDayOfWeek(ref value);
return (_AirsDayOfWeek = value); return (_AirsDayOfWeek = value);
} }
set set
{ {
DayOfWeek? oldValue = _AirsDayOfWeek; DayOfWeek? oldValue = _AirsDayOfWeek;
@ -102,6 +103,7 @@ namespace Jellyfin.Data.Entities
GetAirsTime(ref value); GetAirsTime(ref value);
return (_AirsTime = value); return (_AirsTime = value);
} }
set set
{ {
DateTimeOffset? oldValue = _AirsTime; DateTimeOffset? oldValue = _AirsTime;
@ -134,6 +136,7 @@ namespace Jellyfin.Data.Entities
GetFirstAired(ref value); GetFirstAired(ref value);
return (_FirstAired = value); return (_FirstAired = value);
} }
set set
{ {
DateTimeOffset? oldValue = _FirstAired; DateTimeOffset? oldValue = _FirstAired;

View File

@ -90,6 +90,7 @@ namespace Jellyfin.Data.Entities
GetOutline(ref value); GetOutline(ref value);
return (_Outline = value); return (_Outline = value);
} }
set set
{ {
string oldValue = _Outline; string oldValue = _Outline;
@ -127,6 +128,7 @@ namespace Jellyfin.Data.Entities
GetPlot(ref value); GetPlot(ref value);
return (_Plot = value); return (_Plot = value);
} }
set set
{ {
string oldValue = _Plot; string oldValue = _Plot;
@ -164,6 +166,7 @@ namespace Jellyfin.Data.Entities
GetTagline(ref value); GetTagline(ref value);
return (_Tagline = value); return (_Tagline = value);
} }
set set
{ {
string oldValue = _Tagline; string oldValue = _Tagline;
@ -201,6 +204,7 @@ namespace Jellyfin.Data.Entities
GetCountry(ref value); GetCountry(ref value);
return (_Country = value); return (_Country = value);
} }
set set
{ {
string oldValue = _Country; string oldValue = _Country;

View File

@ -86,6 +86,7 @@ namespace Jellyfin.Data.Entities
GetTrackNumber(ref value); GetTrackNumber(ref value);
return (_TrackNumber = value); return (_TrackNumber = value);
} }
set set
{ {
int? oldValue = _TrackNumber; int? oldValue = _TrackNumber;

View File

@ -34,37 +34,69 @@ namespace Jellyfin.Server.Implementations
public virtual DbSet<Preference> Preferences { get; set; } public virtual DbSet<Preference> Preferences { get; set; }
public virtual DbSet<User> Users { get; set; } public virtual DbSet<User> Users { get; set; }
/*public virtual DbSet<Artwork> Artwork { get; set; } /*public virtual DbSet<Artwork> Artwork { get; set; }
public virtual DbSet<Book> Books { get; set; } public virtual DbSet<Book> Books { get; set; }
public virtual DbSet<BookMetadata> BookMetadata { get; set; } public virtual DbSet<BookMetadata> BookMetadata { get; set; }
public virtual DbSet<Chapter> Chapters { get; set; } public virtual DbSet<Chapter> Chapters { get; set; }
public virtual DbSet<Collection> Collections { get; set; } public virtual DbSet<Collection> Collections { get; set; }
public virtual DbSet<CollectionItem> CollectionItems { get; set; } public virtual DbSet<CollectionItem> CollectionItems { get; set; }
public virtual DbSet<Company> Companies { get; set; } public virtual DbSet<Company> Companies { get; set; }
public virtual DbSet<CompanyMetadata> CompanyMetadata { get; set; } public virtual DbSet<CompanyMetadata> CompanyMetadata { get; set; }
public virtual DbSet<CustomItem> CustomItems { get; set; } public virtual DbSet<CustomItem> CustomItems { get; set; }
public virtual DbSet<CustomItemMetadata> CustomItemMetadata { get; set; } public virtual DbSet<CustomItemMetadata> CustomItemMetadata { get; set; }
public virtual DbSet<Episode> Episodes { get; set; } public virtual DbSet<Episode> Episodes { get; set; }
public virtual DbSet<EpisodeMetadata> EpisodeMetadata { get; set; } public virtual DbSet<EpisodeMetadata> EpisodeMetadata { get; set; }
public virtual DbSet<Genre> Genres { get; set; } public virtual DbSet<Genre> Genres { get; set; }
public virtual DbSet<Group> Groups { get; set; } public virtual DbSet<Group> Groups { get; set; }
public virtual DbSet<Library> Libraries { get; set; } public virtual DbSet<Library> Libraries { get; set; }
public virtual DbSet<LibraryItem> LibraryItems { get; set; } public virtual DbSet<LibraryItem> LibraryItems { get; set; }
public virtual DbSet<LibraryRoot> LibraryRoot { get; set; } public virtual DbSet<LibraryRoot> LibraryRoot { get; set; }
public virtual DbSet<MediaFile> MediaFiles { get; set; } public virtual DbSet<MediaFile> MediaFiles { get; set; }
public virtual DbSet<MediaFileStream> MediaFileStream { get; set; } public virtual DbSet<MediaFileStream> MediaFileStream { get; set; }
public virtual DbSet<Metadata> Metadata { get; set; } public virtual DbSet<Metadata> Metadata { get; set; }
public virtual DbSet<MetadataProvider> MetadataProviders { get; set; } public virtual DbSet<MetadataProvider> MetadataProviders { get; set; }
public virtual DbSet<MetadataProviderId> MetadataProviderIds { get; set; } public virtual DbSet<MetadataProviderId> MetadataProviderIds { get; set; }
public virtual DbSet<Movie> Movies { get; set; } public virtual DbSet<Movie> Movies { get; set; }
public virtual DbSet<MovieMetadata> MovieMetadata { get; set; } public virtual DbSet<MovieMetadata> MovieMetadata { get; set; }
public virtual DbSet<MusicAlbum> MusicAlbums { get; set; } public virtual DbSet<MusicAlbum> MusicAlbums { get; set; }
public virtual DbSet<MusicAlbumMetadata> MusicAlbumMetadata { get; set; } public virtual DbSet<MusicAlbumMetadata> MusicAlbumMetadata { get; set; }
public virtual DbSet<Person> People { get; set; } public virtual DbSet<Person> People { get; set; }
public virtual DbSet<PersonRole> PersonRoles { get; set; } public virtual DbSet<PersonRole> PersonRoles { get; set; }
public virtual DbSet<Photo> Photo { get; set; } public virtual DbSet<Photo> Photo { get; set; }
public virtual DbSet<PhotoMetadata> PhotoMetadata { get; set; } public virtual DbSet<PhotoMetadata> PhotoMetadata { get; set; }
public virtual DbSet<ProviderMapping> ProviderMappings { get; set; } public virtual DbSet<ProviderMapping> ProviderMappings { get; set; }
public virtual DbSet<Rating> Ratings { get; set; } public virtual DbSet<Rating> Ratings { get; set; }
/// <summary> /// <summary>
@ -72,12 +104,19 @@ namespace Jellyfin.Server.Implementations
/// store review ratings, not age ratings /// store review ratings, not age ratings
/// </summary> /// </summary>
public virtual DbSet<RatingSource> RatingSources { get; set; } public virtual DbSet<RatingSource> RatingSources { get; set; }
public virtual DbSet<Release> Releases { get; set; } public virtual DbSet<Release> Releases { get; set; }
public virtual DbSet<Season> Seasons { get; set; } public virtual DbSet<Season> Seasons { get; set; }
public virtual DbSet<SeasonMetadata> SeasonMetadata { get; set; } public virtual DbSet<SeasonMetadata> SeasonMetadata { get; set; }
public virtual DbSet<Series> Series { get; set; } public virtual DbSet<Series> Series { get; set; }
public virtual DbSet<SeriesMetadata> SeriesMetadata { get; set; } public virtual DbSet<SeriesMetadata> SeriesMetadata { get; set; }
public virtual DbSet<Track> Tracks { get; set; } public virtual DbSet<Track> Tracks { get; set; }
public virtual DbSet<TrackMetadata> TrackMetadata { get; set; }*/ public virtual DbSet<TrackMetadata> TrackMetadata { get; set; }*/
/// <inheritdoc/> /// <inheritdoc/>

View File

@ -50,6 +50,7 @@ namespace MediaBrowser.Api
public string Path { get; set; } public string Path { get; set; }
public bool ValidateWriteable { get; set; } public bool ValidateWriteable { get; set; }
public bool? IsFile { get; set; } public bool? IsFile { get; set; }
} }

View File

@ -73,11 +73,17 @@ namespace MediaBrowser.Api
} }
public bool? IsAiring { get; set; } public bool? IsAiring { get; set; }
public bool? IsMovie { get; set; } public bool? IsMovie { get; set; }
public bool? IsSports { get; set; } public bool? IsSports { get; set; }
public bool? IsKids { get; set; } public bool? IsKids { get; set; }
public bool? IsNews { get; set; } public bool? IsNews { get; set; }
public bool? IsSeries { get; set; } public bool? IsSeries { get; set; }
public bool? Recursive { get; set; } public bool? Recursive { get; set; }
} }

View File

@ -3,6 +3,7 @@ namespace MediaBrowser.Api
public interface IHasDtoOptions : IHasItemFields public interface IHasDtoOptions : IHasItemFields
{ {
bool? EnableImages { get; set; } bool? EnableImages { get; set; }
bool? EnableUserData { get; set; } bool? EnableUserData { get; set; }
int? ImageTypeLimit { get; set; } int? ImageTypeLimit { get; set; }

View File

@ -285,29 +285,38 @@ namespace MediaBrowser.Api.Library
public class GetLibraryOptionsInfo : IReturn<LibraryOptionsResult> public class GetLibraryOptionsInfo : IReturn<LibraryOptionsResult>
{ {
public string LibraryContentType { get; set; } public string LibraryContentType { get; set; }
public bool IsNewLibrary { get; set; } public bool IsNewLibrary { get; set; }
} }
public class LibraryOptionInfo public class LibraryOptionInfo
{ {
public string Name { get; set; } public string Name { get; set; }
public bool DefaultEnabled { get; set; } public bool DefaultEnabled { get; set; }
} }
public class LibraryOptionsResult public class LibraryOptionsResult
{ {
public LibraryOptionInfo[] MetadataSavers { get; set; } public LibraryOptionInfo[] MetadataSavers { get; set; }
public LibraryOptionInfo[] MetadataReaders { get; set; } public LibraryOptionInfo[] MetadataReaders { get; set; }
public LibraryOptionInfo[] SubtitleFetchers { get; set; } public LibraryOptionInfo[] SubtitleFetchers { get; set; }
public LibraryTypeOptions[] TypeOptions { get; set; } public LibraryTypeOptions[] TypeOptions { get; set; }
} }
public class LibraryTypeOptions public class LibraryTypeOptions
{ {
public string Type { get; set; } public string Type { get; set; }
public LibraryOptionInfo[] MetadataFetchers { get; set; } public LibraryOptionInfo[] MetadataFetchers { get; set; }
public LibraryOptionInfo[] ImageFetchers { get; set; } public LibraryOptionInfo[] ImageFetchers { get; set; }
public ImageType[] SupportedImageTypes { get; set; } public ImageType[] SupportedImageTypes { get; set; }
public ImageOption[] DefaultImageOptions { get; set; } public ImageOption[] DefaultImageOptions { get; set; }
} }
@ -1036,6 +1045,7 @@ namespace MediaBrowser.Api.Library
{ {
break; break;
} }
item = parent; item = parent;
} }
@ -1093,6 +1103,7 @@ namespace MediaBrowser.Api.Library
{ {
break; break;
} }
item = parent; item = parent;
} }

View File

@ -200,10 +200,15 @@ namespace MediaBrowser.Api.LiveTv
public bool? EnableUserData { get; set; } public bool? EnableUserData { get; set; }
public bool? IsMovie { get; set; } public bool? IsMovie { get; set; }
public bool? IsSeries { get; set; } public bool? IsSeries { get; set; }
public bool? IsKids { get; set; } public bool? IsKids { get; set; }
public bool? IsSports { get; set; } public bool? IsSports { get; set; }
public bool? IsNews { get; set; } public bool? IsNews { get; set; }
public bool? IsLibraryItem { get; set; } public bool? IsLibraryItem { get; set; }
public GetRecordings() public GetRecordings()
@ -348,6 +353,7 @@ namespace MediaBrowser.Api.LiveTv
[ApiMember(Name = "HasAired", Description = "Optional. Filter by programs that have completed airing, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] [ApiMember(Name = "HasAired", Description = "Optional. Filter by programs that have completed airing, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool? HasAired { get; set; } public bool? HasAired { get; set; }
public bool? IsAiring { get; set; } public bool? IsAiring { get; set; }
[ApiMember(Name = "MaxStartDate", Description = "Optional. The maximum premiere date. Format = ISO", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")] [ApiMember(Name = "MaxStartDate", Description = "Optional. The maximum premiere date. Format = ISO", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET,POST")]
@ -407,6 +413,7 @@ namespace MediaBrowser.Api.LiveTv
public bool? EnableUserData { get; set; } public bool? EnableUserData { get; set; }
public string SeriesTimerId { get; set; } public string SeriesTimerId { get; set; }
public Guid LibrarySeriesId { get; set; } public Guid LibrarySeriesId { get; set; }
/// <summary> /// <summary>
@ -601,7 +608,9 @@ namespace MediaBrowser.Api.LiveTv
public class AddListingProvider : ListingsProviderInfo, IReturn<ListingsProviderInfo> public class AddListingProvider : ListingsProviderInfo, IReturn<ListingsProviderInfo>
{ {
public bool ValidateLogin { get; set; } public bool ValidateLogin { get; set; }
public bool ValidateListings { get; set; } public bool ValidateListings { get; set; }
public string Pw { get; set; } public string Pw { get; set; }
} }
@ -650,15 +659,20 @@ namespace MediaBrowser.Api.LiveTv
{ {
[ApiMember(Name = "Id", Description = "Provider id", IsRequired = true, DataType = "string", ParameterType = "query")] [ApiMember(Name = "Id", Description = "Provider id", IsRequired = true, DataType = "string", ParameterType = "query")]
public string ProviderId { get; set; } public string ProviderId { get; set; }
public string TunerChannelId { get; set; } public string TunerChannelId { get; set; }
public string ProviderChannelId { get; set; } public string ProviderChannelId { get; set; }
} }
public class ChannelMappingOptions public class ChannelMappingOptions
{ {
public List<TunerChannelMapping> TunerChannels { get; set; } public List<TunerChannelMapping> TunerChannels { get; set; }
public List<NameIdPair> ProviderChannels { get; set; } public List<NameIdPair> ProviderChannels { get; set; }
public NameValuePair[] Mappings { get; set; } public NameValuePair[] Mappings { get; set; }
public string ProviderName { get; set; } public string ProviderName { get; set; }
} }
@ -666,6 +680,7 @@ namespace MediaBrowser.Api.LiveTv
public class GetLiveStreamFile public class GetLiveStreamFile
{ {
public string Id { get; set; } public string Id { get; set; }
public string Container { get; set; } public string Container { get; set; }
} }

View File

@ -303,6 +303,7 @@ namespace MediaBrowser.Api.Playback
{ {
StartThrottler(state, transcodingJob); StartThrottler(state, transcodingJob);
} }
Logger.LogDebug("StartFfMpeg() finished successfully"); Logger.LogDebug("StartFfMpeg() finished successfully");
return transcodingJob; return transcodingJob;
@ -608,6 +609,7 @@ namespace MediaBrowser.Api.Playback
{ {
throw new ArgumentException("Invalid timeseek header"); throw new ArgumentException("Invalid timeseek header");
} }
int index = value.IndexOf('-'); int index = value.IndexOf('-');
value = index == -1 value = index == -1
? value.Substring(Npt.Length) ? value.Substring(Npt.Length)
@ -639,8 +641,10 @@ namespace MediaBrowser.Api.Playback
{ {
throw new ArgumentException("Invalid timeseek header"); throw new ArgumentException("Invalid timeseek header");
} }
timeFactor /= 60; timeFactor /= 60;
} }
return TimeSpan.FromSeconds(secondsSum).Ticks; return TimeSpan.FromSeconds(secondsSum).Ticks;
} }

View File

@ -146,6 +146,7 @@ namespace MediaBrowser.Api.Playback.Hls
{ {
ApiEntryPoint.Instance.OnTranscodeEndRequest(job); ApiEntryPoint.Instance.OnTranscodeEndRequest(job);
} }
return ResultFactory.GetResult(GetLivePlaylistText(playlist, state.SegmentLength), MimeTypes.GetMimeType("playlist.m3u8"), new Dictionary<string, string>()); return ResultFactory.GetResult(GetLivePlaylistText(playlist, state.SegmentLength), MimeTypes.GetMimeType("playlist.m3u8"), new Dictionary<string, string>());
} }

View File

@ -234,6 +234,7 @@ namespace MediaBrowser.Api.Playback.Hls
Logger.LogDebug("Starting transcoding because segmentGap is {0} and max allowed gap is {1}. requestedIndex={2}", requestedIndex - currentTranscodingIndex.Value, segmentGapRequiringTranscodingChange, requestedIndex); Logger.LogDebug("Starting transcoding because segmentGap is {0} and max allowed gap is {1}. requestedIndex={2}", requestedIndex - currentTranscodingIndex.Value, segmentGapRequiringTranscodingChange, requestedIndex);
startTranscoding = true; startTranscoding = true;
} }
if (startTranscoding) if (startTranscoding)
{ {
// If the playlist doesn't already exist, startup ffmpeg // If the playlist doesn't already exist, startup ffmpeg
@ -518,6 +519,7 @@ namespace MediaBrowser.Api.Playback.Hls
{ {
Logger.LogDebug("serving {0} as it's on disk and transcoding stopped", segmentPath); Logger.LogDebug("serving {0} as it's on disk and transcoding stopped", segmentPath);
} }
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
} }
else else

View File

@ -551,10 +551,12 @@ namespace MediaBrowser.Api.Playback
{ {
mediaSource.TranscodingUrl += "&allowVideoStreamCopy=false"; mediaSource.TranscodingUrl += "&allowVideoStreamCopy=false";
} }
if (!allowAudioStreamCopy) if (!allowAudioStreamCopy)
{ {
mediaSource.TranscodingUrl += "&allowAudioStreamCopy=false"; mediaSource.TranscodingUrl += "&allowAudioStreamCopy=false";
} }
mediaSource.TranscodingContainer = streamInfo.Container; mediaSource.TranscodingContainer = streamInfo.Container;
mediaSource.TranscodingSubProtocol = streamInfo.SubProtocol; mediaSource.TranscodingSubProtocol = streamInfo.SubProtocol;
} }

View File

@ -88,14 +88,17 @@ namespace MediaBrowser.Api.Playback.Progressive
{ {
return ".ts"; return ".ts";
} }
if (string.Equals(videoCodec, "theora", StringComparison.OrdinalIgnoreCase)) if (string.Equals(videoCodec, "theora", StringComparison.OrdinalIgnoreCase))
{ {
return ".ogv"; return ".ogv";
} }
if (string.Equals(videoCodec, "vpx", StringComparison.OrdinalIgnoreCase)) if (string.Equals(videoCodec, "vpx", StringComparison.OrdinalIgnoreCase))
{ {
return ".webm"; return ".webm";
} }
if (string.Equals(videoCodec, "wmv", StringComparison.OrdinalIgnoreCase)) if (string.Equals(videoCodec, "wmv", StringComparison.OrdinalIgnoreCase))
{ {
return ".asf"; return ".asf";
@ -111,14 +114,17 @@ namespace MediaBrowser.Api.Playback.Progressive
{ {
return ".aac"; return ".aac";
} }
if (string.Equals("mp3", audioCodec, StringComparison.OrdinalIgnoreCase)) if (string.Equals("mp3", audioCodec, StringComparison.OrdinalIgnoreCase))
{ {
return ".mp3"; return ".mp3";
} }
if (string.Equals("vorbis", audioCodec, StringComparison.OrdinalIgnoreCase)) if (string.Equals("vorbis", audioCodec, StringComparison.OrdinalIgnoreCase))
{ {
return ".ogg"; return ".ogg";
} }
if (string.Equals("wma", audioCodec, StringComparison.OrdinalIgnoreCase)) if (string.Equals("wma", audioCodec, StringComparison.OrdinalIgnoreCase))
{ {
return ".wma"; return ".wma";

View File

@ -23,6 +23,7 @@ namespace MediaBrowser.Api.Playback.Progressive
private long _bytesWritten = 0; private long _bytesWritten = 0;
public long StartPosition { get; set; } public long StartPosition { get; set; }
public bool AllowEndOfFile = true; public bool AllowEndOfFile = true;
private readonly IDirectStreamProvider _directStreamProvider; private readonly IDirectStreamProvider _directStreamProvider;
@ -105,6 +106,7 @@ namespace MediaBrowser.Api.Playback.Progressive
{ {
eofCount++; eofCount++;
} }
await Task.Delay(100, cancellationToken).ConfigureAwait(false); await Task.Delay(100, cancellationToken).ConfigureAwait(false);
} }
else else

View File

@ -12,11 +12,15 @@ namespace MediaBrowser.Api.Playback
public string DeviceProfileId { get; set; } public string DeviceProfileId { get; set; }
public string Params { get; set; } public string Params { get; set; }
public string PlaySessionId { get; set; } public string PlaySessionId { get; set; }
public string Tag { get; set; } public string Tag { get; set; }
public string SegmentContainer { get; set; } public string SegmentContainer { get; set; }
public int? SegmentLength { get; set; } public int? SegmentLength { get; set; }
public int? MinSegments { get; set; } public int? MinSegments { get; set; }
} }

View File

@ -37,10 +37,13 @@ namespace MediaBrowser.Api.Playback
public string DeviceId { get; set; } public string DeviceId { get; set; }
public Guid UserId { get; set; } public Guid UserId { get; set; }
public string AudioCodec { get; set; } public string AudioCodec { get; set; }
public string Container { get; set; } public string Container { get; set; }
public int? MaxAudioChannels { get; set; } public int? MaxAudioChannels { get; set; }
public int? TranscodingAudioChannels { get; set; } public int? TranscodingAudioChannels { get; set; }
public long? MaxStreamingBitrate { get; set; } public long? MaxStreamingBitrate { get; set; }
@ -49,12 +52,17 @@ namespace MediaBrowser.Api.Playback
public long? StartTimeTicks { get; set; } public long? StartTimeTicks { get; set; }
public string TranscodingContainer { get; set; } public string TranscodingContainer { get; set; }
public string TranscodingProtocol { get; set; } public string TranscodingProtocol { get; set; }
public int? MaxAudioSampleRate { get; set; } public int? MaxAudioSampleRate { get; set; }
public int? MaxAudioBitDepth { get; set; } public int? MaxAudioBitDepth { get; set; }
public bool EnableRedirection { get; set; } public bool EnableRedirection { get; set; }
public bool EnableRemoteMedia { get; set; } public bool EnableRemoteMedia { get; set; }
public bool BreakOnNonKeyFrames { get; set; } public bool BreakOnNonKeyFrames { get; set; }
public BaseUniversalRequest() public BaseUniversalRequest()
@ -114,16 +122,27 @@ namespace MediaBrowser.Api.Playback
} }
protected IHttpClient HttpClient { get; private set; } protected IHttpClient HttpClient { get; private set; }
protected IUserManager UserManager { get; private set; } protected IUserManager UserManager { get; private set; }
protected ILibraryManager LibraryManager { get; private set; } protected ILibraryManager LibraryManager { get; private set; }
protected IIsoManager IsoManager { get; private set; } protected IIsoManager IsoManager { get; private set; }
protected IMediaEncoder MediaEncoder { get; private set; } protected IMediaEncoder MediaEncoder { get; private set; }
protected IFileSystem FileSystem { get; private set; } protected IFileSystem FileSystem { get; private set; }
protected IDlnaManager DlnaManager { get; private set; } protected IDlnaManager DlnaManager { get; private set; }
protected IDeviceManager DeviceManager { get; private set; } protected IDeviceManager DeviceManager { get; private set; }
protected IMediaSourceManager MediaSourceManager { get; private set; } protected IMediaSourceManager MediaSourceManager { get; private set; }
protected IJsonSerializer JsonSerializer { get; private set; } protected IJsonSerializer JsonSerializer { get; private set; }
protected IAuthorizationContext AuthorizationContext { get; private set; } protected IAuthorizationContext AuthorizationContext { get; private set; }
protected INetworkManager NetworkManager { get; private set; } protected INetworkManager NetworkManager { get; private set; }
public Task<object> Get(GetUniversalAudioStream request) public Task<object> Get(GetUniversalAudioStream request)
@ -328,6 +347,7 @@ namespace MediaBrowser.Api.Playback
{ {
return await service.Head(newRequest).ConfigureAwait(false); return await service.Head(newRequest).ConfigureAwait(false);
} }
return await service.Get(newRequest).ConfigureAwait(false); return await service.Get(newRequest).ConfigureAwait(false);
} }
else else

View File

@ -115,24 +115,33 @@ namespace MediaBrowser.Api
public class RegistrationInfo public class RegistrationInfo
{ {
public string Name { get; set; } public string Name { get; set; }
public DateTime ExpirationDate { get; set; } public DateTime ExpirationDate { get; set; }
public bool IsTrial { get; set; } public bool IsTrial { get; set; }
public bool IsRegistered { get; set; } public bool IsRegistered { get; set; }
} }
public class MBRegistrationRecord public class MBRegistrationRecord
{ {
public DateTime ExpirationDate { get; set; } public DateTime ExpirationDate { get; set; }
public bool IsRegistered { get; set; } public bool IsRegistered { get; set; }
public bool RegChecked { get; set; } public bool RegChecked { get; set; }
public bool RegError { get; set; } public bool RegError { get; set; }
public bool TrialVersion { get; set; } public bool TrialVersion { get; set; }
public bool IsValid { get; set; } public bool IsValid { get; set; }
} }
public class PluginSecurityInfo public class PluginSecurityInfo
{ {
public string SupporterKey { get; set; } public string SupporterKey { get; set; }
public bool IsMBSupporter { get; set; } public bool IsMBSupporter { get; set; }
} }
/// <summary> /// <summary>

View File

@ -179,18 +179,22 @@ namespace MediaBrowser.Api
{ {
return 5; return 5;
} }
if (string.Equals(i.Type, PersonType.Actor, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.Actor, StringComparison.OrdinalIgnoreCase)) if (string.Equals(i.Type, PersonType.Actor, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.Actor, StringComparison.OrdinalIgnoreCase))
{ {
return 3; return 3;
} }
if (string.Equals(i.Type, PersonType.Composer, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.Composer, StringComparison.OrdinalIgnoreCase)) if (string.Equals(i.Type, PersonType.Composer, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.Composer, StringComparison.OrdinalIgnoreCase))
{ {
return 3; return 3;
} }
if (string.Equals(i.Type, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase)) if (string.Equals(i.Type, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.GuestStar, StringComparison.OrdinalIgnoreCase))
{ {
return 3; return 3;
} }
if (string.Equals(i.Type, PersonType.Writer, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.Writer, StringComparison.OrdinalIgnoreCase)) if (string.Equals(i.Type, PersonType.Writer, StringComparison.OrdinalIgnoreCase) || string.Equals(i.Role, PersonType.Writer, StringComparison.OrdinalIgnoreCase))
{ {
return 2; return 2;

View File

@ -97,6 +97,7 @@ namespace MediaBrowser.Api.Subtitles
[ApiMember(Name = "CopyTimestamps", Description = "CopyTimestamps", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] [ApiMember(Name = "CopyTimestamps", Description = "CopyTimestamps", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool CopyTimestamps { get; set; } public bool CopyTimestamps { get; set; }
public bool AddVttTimeMap { get; set; } public bool AddVttTimeMap { get; set; }
} }
@ -214,6 +215,7 @@ namespace MediaBrowser.Api.Subtitles
{ {
request.Format = "json"; request.Format = "json";
} }
if (string.IsNullOrEmpty(request.Format)) if (string.IsNullOrEmpty(request.Format))
{ {
var item = (Video)_libraryManager.GetItemById(request.Id); var item = (Video)_libraryManager.GetItemById(request.Id);

View File

@ -18,10 +18,15 @@ namespace MediaBrowser.Api
public class GetSuggestedItems : IReturn<QueryResult<BaseItemDto>> public class GetSuggestedItems : IReturn<QueryResult<BaseItemDto>>
{ {
public string MediaType { get; set; } public string MediaType { get; set; }
public string Type { get; set; } public string Type { get; set; }
public Guid UserId { get; set; } public Guid UserId { get; set; }
public bool EnableTotalRecordCount { get; set; } public bool EnableTotalRecordCount { get; set; }
public int? StartIndex { get; set; } public int? StartIndex { get; set; }
public int? Limit { get; set; } public int? Limit { get; set; }
public string[] GetMediaTypes() public string[] GetMediaTypes()

View File

@ -32,6 +32,7 @@ namespace MediaBrowser.Api
/// </summary> /// </summary>
/// <value>The path.</value> /// <value>The path.</value>
public MediaSourceInfo MediaSource { get; set; } public MediaSourceInfo MediaSource { get; set; }
public string Path { get; set; } public string Path { get; set; }
/// <summary> /// <summary>
/// Gets or sets the type. /// Gets or sets the type.
@ -43,6 +44,7 @@ namespace MediaBrowser.Api
/// </summary> /// </summary>
/// <value>The process.</value> /// <value>The process.</value>
public Process Process { get; set; } public Process Process { get; set; }
public ILogger Logger { get; private set; } public ILogger Logger { get; private set; }
/// <summary> /// <summary>
/// Gets or sets the active request count. /// Gets or sets the active request count.
@ -62,18 +64,23 @@ namespace MediaBrowser.Api
public object ProcessLock = new object(); public object ProcessLock = new object();
public bool HasExited { get; set; } public bool HasExited { get; set; }
public bool IsUserPaused { get; set; } public bool IsUserPaused { get; set; }
public string Id { get; set; } public string Id { get; set; }
public float? Framerate { get; set; } public float? Framerate { get; set; }
public double? CompletionPercentage { get; set; } public double? CompletionPercentage { get; set; }
public long? BytesDownloaded { get; set; } public long? BytesDownloaded { get; set; }
public long? BytesTranscoded { get; set; } public long? BytesTranscoded { get; set; }
public int? BitRate { get; set; } public int? BitRate { get; set; }
public long? TranscodingPositionTicks { get; set; } public long? TranscodingPositionTicks { get; set; }
public long? DownloadPositionTicks { get; set; } public long? DownloadPositionTicks { get; set; }
public TranscodingThrottler TranscodingThrottler { get; set; } public TranscodingThrottler TranscodingThrottler { get; set; }
@ -81,6 +88,7 @@ namespace MediaBrowser.Api
private readonly object _timerLock = new object(); private readonly object _timerLock = new object();
public DateTime LastPingDate { get; set; } public DateTime LastPingDate { get; set; }
public int PingTimeout { get; set; } public int PingTimeout { get; set; }
public TranscodingJob(ILogger logger) public TranscodingJob(ILogger logger)

View File

@ -73,6 +73,7 @@ namespace MediaBrowser.Api
[ApiMember(Name = "EnableUserData", Description = "Optional, include user data", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")] [ApiMember(Name = "EnableUserData", Description = "Optional, include user data", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
public bool? EnableUserData { get; set; } public bool? EnableUserData { get; set; }
public bool EnableTotalRecordCount { get; set; } public bool EnableTotalRecordCount { get; set; }
public GetNextUpEpisodes() public GetNextUpEpisodes()

View File

@ -210,6 +210,7 @@ namespace MediaBrowser.Api.UserLibrary
{ {
SetItemCounts(dto, i.Item2); SetItemCounts(dto, i.Item2);
} }
return dto; return dto;
}); });

View File

@ -322,8 +322,11 @@ namespace MediaBrowser.Api.UserLibrary
public bool? CollapseBoxSetItems { get; set; } public bool? CollapseBoxSetItems { get; set; }
public int? MinWidth { get; set; } public int? MinWidth { get; set; }
public int? MinHeight { get; set; } public int? MinHeight { get; set; }
public int? MaxWidth { get; set; } public int? MaxWidth { get; set; }
public int? MaxHeight { get; set; } public int? MaxHeight { get; set; }
/// <summary> /// <summary>

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