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

Merge branch 'master' into common

Browse Source
This commit is contained in:
Bond-009 2020-06-03 14:33:54 +02:00
commit af7edfc220
11 changed files with 12 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,6 +144,7 @@ namespace Emby.Server.Implementations.Library
/// <param name="userviewManagerFactory">The userview manager.</param>
/// <param name="mediaEncoder">The media encoder.</param>
/// <param name="itemRepository">The item repository.</param>
/// <param name="imageProcessor">The image processor.</param>
public LibraryManager(
IServerApplicationHost appHost,
ILogger<LibraryManager> logger,

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

@ -1,4 +1,3 @@
using System.IO;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Devices;
using MediaBrowser.Controller.Net;
@ -40,33 +39,6 @@ namespace MediaBrowser.Api.Devices
public string Id { get; set; }
}
[Route("/Devices/CameraUploads", "GET", Summary = "Gets camera upload history for a device")]
[Authenticated]
public class GetCameraUploads : IReturn<ContentUploadHistory>
{
[ApiMember(Name = "Id", Description = "Device Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
public string DeviceId { get; set; }
}
[Route("/Devices/CameraUploads", "POST", Summary = "Uploads content")]
[Authenticated]
public class PostCameraUpload : IRequiresRequestStream, IReturnVoid
{
[ApiMember(Name = "DeviceId", Description = "Device Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string DeviceId { get; set; }
[ApiMember(Name = "Album", Description = "Album", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string Album { get; set; }
[ApiMember(Name = "Name", Description = "Name", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string Name { get; set; }
[ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string Id { get; set; }
public Stream RequestStream { get; set; }
}
[Route("/Devices/Options", "POST", Summary = "Updates device options")]
[Authenticated(Roles = "Admin")]
public class PostDeviceOptions : DeviceOptions, IReturnVoid

10
MediaBrowser.Controller/Devices/CameraImageUploadInfo.cs
View File

@ -1,10 +0,0 @@
using MediaBrowser.Model.Devices;
namespace MediaBrowser.Controller.Devices
{
public class CameraImageUploadInfo
{
public LocalFileInfo FileInfo { get; set; }
public DeviceInfo Device { get; set; }
}
}

19
MediaBrowser.Model/Devices/ContentUploadHistory.cs
View File

@ -1,19 +0,0 @@
#nullable disable
#pragma warning disable CS1591
using System;
namespace MediaBrowser.Model.Devices
{
public class ContentUploadHistory
{
public string DeviceId { get; set; }
public LocalFileInfo[] FilesUploaded { get; set; }
public ContentUploadHistory()
{
FilesUploaded = Array.Empty<LocalFileInfo>();
}
}
}

2
MediaBrowser.Model/Devices/DeviceOptions.cs
View File

@ -4,6 +4,6 @@ namespace MediaBrowser.Model.Devices
{
public class DeviceOptions
{
public string CustomName { get; set; }
public string? CustomName { get; set; }
}
}

16
MediaBrowser.Model/Devices/LocalFileInfo.cs
View File

@ -1,16 +0,0 @@
#nullable disable
#pragma warning disable CS1591
namespace MediaBrowser.Model.Devices
{
public class LocalFileInfo
{
public string Name { get; set; }
public string Id { get; set; }
public string Album { get; set; }
public string MimeType { get; set; }
}
}

2
MediaBrowser.Model/SyncPlay/GroupInfoView.cs
View File

@ -1,3 +1,5 @@
#nullable disable
using System.Collections.Generic;
namespace MediaBrowser.Model.SyncPlay

2
MediaBrowser.Model/SyncPlay/GroupUpdate.cs
View File

@ -1,3 +1,5 @@
#nullable disable
namespace MediaBrowser.Model.SyncPlay
{
/// <summary>

2
MediaBrowser.Model/SyncPlay/SendCommand.cs
View File

@ -1,3 +1,5 @@
#nullable disable
namespace MediaBrowser.Model.SyncPlay
{
/// <summary>

2
MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs
View File

@ -1,3 +1,5 @@
#nullable disable
namespace MediaBrowser.Model.SyncPlay
{
/// <summary>

2
MediaBrowser.Model/Updates/VersionInfo.cs
View File

@ -1,3 +1,5 @@
#nullable disable
using System;
namespace MediaBrowser.Model.Updates