alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-31 23:42:09 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into keyframe_extraction_v1

Browse Source 
# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
This commit is contained in:
cvium
2022-01-07 10:23:22 +01:00
parent 2899b77cd5 6b4f5a8663
commit c658a883a2
736 changed files with 15159 additions and 11725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Jellyfin.Api/Models/ClientLogDtos/ClientLogDocumentResponseDto.cs Normal file
View File

@@ -0,0 +1,22 @@
namespace Jellyfin.Api.Models.ClientLogDtos
{
/// <summary>
/// Client log document response dto.
/// </summary>
public class ClientLogDocumentResponseDto
{
/// <summary>
/// Initializes a new instance of the <see cref="ClientLogDocumentResponseDto"/> class.
/// </summary>
/// <param name="fileName">The file name.</param>
public ClientLogDocumentResponseDto(string fileName)
{
FileName = fileName;
}
/// <summary>
/// Gets the resulting filename.
/// </summary>
public string FileName { get; }
}
}

106
Jellyfin.Api/Models/DisplayPreferencesDtos/DisplayPreferencesDto.cs
View File

@@ -1,106 +0,0 @@
using System.Collections.Generic;
using Jellyfin.Data.Enums;
namespace Jellyfin.Api.Models.DisplayPreferencesDtos
{
/// <summary>
/// Defines the display preferences for any item that supports them (usually Folders).
/// </summary>
public class DisplayPreferencesDto
{
/// <summary>
/// Initializes a new instance of the <see cref="DisplayPreferencesDto" /> class.
/// </summary>
public DisplayPreferencesDto()
{
RememberIndexing = false;
PrimaryImageHeight = 250;
PrimaryImageWidth = 250;
ShowBackdrop = true;
CustomPrefs = new Dictionary<string, string>();
}
/// <summary>
/// Gets or sets the user id.
/// </summary>
/// <value>The user id.</value>
public string? Id { get; set; }
/// <summary>
/// Gets or sets the type of the view.
/// </summary>
/// <value>The type of the view.</value>
public string? ViewType { get; set; }
/// <summary>
/// Gets or sets the sort by.
/// </summary>
/// <value>The sort by.</value>
public string? SortBy { get; set; }
/// <summary>
/// Gets or sets the index by.
/// </summary>
/// <value>The index by.</value>
public string? IndexBy { get; set; }
/// <summary>
/// Gets or sets a value indicating whether [remember indexing].
/// </summary>
/// <value><c>true</c> if [remember indexing]; otherwise, <c>false</c>.</value>
public bool RememberIndexing { get; set; }
/// <summary>
/// Gets or sets the height of the primary image.
/// </summary>
/// <value>The height of the primary image.</value>
public int PrimaryImageHeight { get; set; }
/// <summary>
/// Gets or sets the width of the primary image.
/// </summary>
/// <value>The width of the primary image.</value>
public int PrimaryImageWidth { get; set; }
/// <summary>
/// Gets the custom prefs.
/// </summary>
/// <value>The custom prefs.</value>
public Dictionary<string, string> CustomPrefs { get; }
/// <summary>
/// Gets or sets the scroll direction.
/// </summary>
/// <value>The scroll direction.</value>
public ScrollDirection ScrollDirection { get; set; }
/// <summary>
/// Gets or sets a value indicating whether to show backdrops on this item.
/// </summary>
/// <value><c>true</c> if showing backdrops; otherwise, <c>false</c>.</value>
public bool ShowBackdrop { get; set; }
/// <summary>
/// Gets or sets a value indicating whether [remember sorting].
/// </summary>
/// <value><c>true</c> if [remember sorting]; otherwise, <c>false</c>.</value>
public bool RememberSorting { get; set; }
/// <summary>
/// Gets or sets the sort order.
/// </summary>
/// <value>The sort order.</value>
public SortOrder SortOrder { get; set; }
/// <summary>
/// Gets or sets a value indicating whether [show sidebar].
/// </summary>
/// <value><c>true</c> if [show sidebar]; otherwise, <c>false</c>.</value>
public bool ShowSidebar { get; set; }
/// <summary>
/// Gets or sets the client.
/// </summary>
public string? Client { get; set; }
}
}

2
Jellyfin.Api/Models/LibraryStructureDto/MediaPathDto.cs
View File

@@ -24,4 +24,4 @@ namespace Jellyfin.Api.Models.LibraryStructureDto
/// </summary>
public MediaPathInfo? PathInfo { get; set; }
}
}
}

2
Jellyfin.Api/Models/LiveTvDtos/SetChannelMappingDto.cs
View File

@@ -25,4 +25,4 @@ namespace Jellyfin.Api.Models.LiveTvDtos
[Required]
public string ProviderChannelId { get; set; } = string.Empty;
}
}
}

2
Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs
View File

@@ -83,4 +83,4 @@ namespace Jellyfin.Api.Models.MediaInfoDtos
/// </summary>
public bool? AutoOpenLiveStream { get; set; }
}
}
}

7
Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs
View File

@@ -106,6 +106,11 @@ namespace Jellyfin.Api.Models.PlaybackDtos
/// </summary>
public bool HasExited { get; set; }
/// <summary>
/// Gets or sets exit code.
/// </summary>
public int ExitCode { get; set; }
/// <summary>
/// Gets or sets a value indicating whether is user paused.
/// </summary>
@@ -129,7 +134,7 @@ namespace Jellyfin.Api.Models.PlaybackDtos
/// <summary>
/// Gets or sets bytes downloaded.
/// </summary>
public long? BytesDownloaded { get; set; }
public long BytesDownloaded { get; set; }
/// <summary>
/// Gets or sets bytes transcoded.

4
Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs
View File

@@ -141,7 +141,7 @@ namespace Jellyfin.Api.Models.PlaybackDtos
private bool IsThrottleAllowed(TranscodingJobDto job, int thresholdSeconds)
{
var bytesDownloaded = job.BytesDownloaded ?? 0;
var bytesDownloaded = job.BytesDownloaded;
var transcodingPositionTicks = job.TranscodingPositionTicks ?? 0;
var downloadPositionTicks = job.DownloadPositionTicks ?? 0;
@@ -197,7 +197,7 @@ namespace Jellyfin.Api.Models.PlaybackDtos
}
}
_logger.LogDebug("No throttle data for " + path);
_logger.LogDebug("No throttle data for {Path}", path);
return false;
}

2
Jellyfin.Api/Models/StreamingDtos/StreamState.cs
View File

@@ -55,7 +55,7 @@ namespace Jellyfin.Api.Models.StreamingDtos
/// <summary>
/// Gets the video request.
/// </summary>
public VideoRequestDto? VideoRequest => Request! as VideoRequestDto;
public VideoRequestDto? VideoRequest => Request as VideoRequestDto;
/// <summary>
/// Gets or sets the direct stream provicer.

2
Jellyfin.Api/Models/SubtitleDtos/UploadSubtitleDto.cs
View File

@@ -31,4 +31,4 @@ namespace Jellyfin.Api.Models.SubtitleDtos
[Required]
public string Data { get; set; } = string.Empty;
}
}
}