aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.WebDashboard/Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.WebDashboard/Api')
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardInfo.cs39
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs62
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardService.cs72
3 files changed, 6 insertions, 167 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardInfo.cs b/MediaBrowser.WebDashboard/Api/DashboardInfo.cs
deleted file mode 100644
index 78cc5a758..000000000
--- a/MediaBrowser.WebDashboard/Api/DashboardInfo.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using MediaBrowser.Model.Session;
-using MediaBrowser.Model.System;
-using MediaBrowser.Model.Tasks;
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.WebDashboard.Api
-{
- /// <summary>
- /// Class DashboardInfo
- /// </summary>
- public class DashboardInfo
- {
- /// <summary>
- /// Gets or sets the system info.
- /// </summary>
- /// <value>The system info.</value>
- public SystemInfo SystemInfo { get; set; }
-
- /// <summary>
- /// Gets or sets the running tasks.
- /// </summary>
- /// <value>The running tasks.</value>
- public List<TaskInfo> RunningTasks { get; set; }
-
- /// <summary>
- /// Gets or sets the application update task id.
- /// </summary>
- /// <value>The application update task id.</value>
- public Guid ApplicationUpdateTaskId { get; set; }
-
- /// <summary>
- /// Gets or sets the active connections.
- /// </summary>
- /// <value>The active connections.</value>
- public List<SessionInfoDto> ActiveConnections { get; set; }
- }
-
-}
diff --git a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs
deleted file mode 100644
index af0f9e3a0..000000000
--- a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.ScheduledTasks;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Logging;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.WebDashboard.Api
-{
- /// <summary>
- /// Class DashboardInfoWebSocketListener
- /// </summary>
- class DashboardInfoWebSocketListener : BasePeriodicWebSocketListener<DashboardInfo, object>
- {
- /// <summary>
- /// Gets the name.
- /// </summary>
- /// <value>The name.</value>
- protected override string Name
- {
- get { return "DashboardInfo"; }
- }
-
- private readonly IServerApplicationHost _appHost;
-
- /// <summary>
- /// Gets or sets the task manager.
- /// </summary>
- /// <value>The task manager.</value>
- private readonly ITaskManager _taskManager;
-
- private readonly ISessionManager _sessionManager;
- private readonly IDtoService _dtoService;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="DashboardInfoWebSocketListener" /> class.
- /// </summary>
- /// <param name="appHost">The app host.</param>
- /// <param name="logger">The logger.</param>
- /// <param name="taskManager">The task manager.</param>
- /// <param name="sessionManager">The session manager.</param>
- public DashboardInfoWebSocketListener(IServerApplicationHost appHost, ILogger logger, ITaskManager taskManager, ISessionManager sessionManager, IDtoService dtoService)
- : base(logger)
- {
- _appHost = appHost;
- _taskManager = taskManager;
- _sessionManager = sessionManager;
- _dtoService = dtoService;
- }
-
- /// <summary>
- /// Gets the data to send.
- /// </summary>
- /// <param name="state">The state.</param>
- /// <returns>Task{IEnumerable{TaskInfo}}.</returns>
- protected override Task<DashboardInfo> GetDataToSend(object state)
- {
- return Task.FromResult(DashboardService.GetDashboardInfo(_appHost, _taskManager, _sessionManager, _dtoService));
- }
- }
-}
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 88f86632b..99afbbdd7 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -1,16 +1,13 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.Net;
-using MediaBrowser.Common.ScheduledTasks;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Tasks;
using ServiceStack;
+using ServiceStack.Web;
using System;
using System.Collections.Generic;
using System.IO;
@@ -18,7 +15,6 @@ using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
-using ServiceStack.Web;
namespace MediaBrowser.WebDashboard.Api
{
@@ -67,14 +63,6 @@ namespace MediaBrowser.WebDashboard.Api
}
/// <summary>
- /// Class GetDashboardInfo
- /// </summary>
- [Route("/dashboard/dashboardInfo", "GET")]
- public class GetDashboardInfo : IReturn<DashboardInfo>
- {
- }
-
- /// <summary>
/// Class DashboardService
/// </summary>
public class DashboardService : IRestfulService, IHasResultFactory
@@ -98,12 +86,6 @@ namespace MediaBrowser.WebDashboard.Api
public IRequest Request { get; set; }
/// <summary>
- /// Gets or sets the task manager.
- /// </summary>
- /// <value>The task manager.</value>
- private readonly ITaskManager _taskManager;
-
- /// <summary>
/// The _app host
/// </summary>
private readonly IServerApplicationHost _appHost;
@@ -113,24 +95,18 @@ namespace MediaBrowser.WebDashboard.Api
/// </summary>
private readonly IServerConfigurationManager _serverConfigurationManager;
- private readonly ISessionManager _sessionManager;
- private readonly IDtoService _dtoService;
private readonly IFileSystem _fileSystem;
/// <summary>
/// Initializes a new instance of the <see cref="DashboardService" /> class.
/// </summary>
- /// <param name="taskManager">The task manager.</param>
/// <param name="appHost">The app host.</param>
/// <param name="serverConfigurationManager">The server configuration manager.</param>
- /// <param name="sessionManager">The session manager.</param>
- public DashboardService(ITaskManager taskManager, IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, ISessionManager sessionManager, IDtoService dtoService, IFileSystem fileSystem)
+ /// <param name="fileSystem">The file system.</param>
+ public DashboardService(IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, IFileSystem fileSystem)
{
- _taskManager = taskManager;
_appHost = appHost;
_serverConfigurationManager = serverConfigurationManager;
- _sessionManager = sessionManager;
- _dtoService = dtoService;
_fileSystem = fileSystem;
}
@@ -168,45 +144,6 @@ namespace MediaBrowser.WebDashboard.Api
/// </summary>
/// <param name="request">The request.</param>
/// <returns>System.Object.</returns>
- public object Get(GetDashboardInfo request)
- {
- var result = GetDashboardInfo(_appHost, _taskManager, _sessionManager, _dtoService);
-
- return ResultFactory.GetOptimizedResult(Request, result);
- }
-
- /// <summary>
- /// Gets the dashboard info.
- /// </summary>
- /// <param name="appHost">The app host.</param>
- /// <param name="taskManager">The task manager.</param>
- /// <param name="connectionManager">The connection manager.</param>
- /// <returns>DashboardInfo.</returns>
- public static DashboardInfo GetDashboardInfo(IServerApplicationHost appHost,
- ITaskManager taskManager,
- ISessionManager connectionManager, IDtoService dtoService)
- {
- var connections = connectionManager.Sessions.Where(i => i.IsActive).ToList();
-
- return new DashboardInfo
- {
- SystemInfo = appHost.GetSystemInfo(),
-
- RunningTasks = taskManager.ScheduledTasks.Where(i => i.State == TaskState.Running || i.State == TaskState.Cancelling)
- .Select(ScheduledTaskHelpers.GetTaskInfo)
- .ToList(),
-
- ApplicationUpdateTaskId = taskManager.ScheduledTasks.First(t => t.ScheduledTask.GetType().Name.Equals("SystemUpdateTask", StringComparison.OrdinalIgnoreCase)).Id,
-
- ActiveConnections = connections.Select(dtoService.GetSessionInfoDto).ToList()
- };
- }
-
- /// <summary>
- /// Gets the specified request.
- /// </summary>
- /// <param name="request">The request.</param>
- /// <returns>System.Object.</returns>
public object Get(GetDashboardConfigurationPage request)
{
var page = ServerEntryPoint.Instance.PluginConfigurationPages.First(p => p.Name.Equals(request.Name, StringComparison.OrdinalIgnoreCase));
@@ -473,6 +410,7 @@ namespace MediaBrowser.WebDashboard.Api
"alphapicker.js",
"addpluginpage.js",
"advancedconfigurationpage.js",
+ "advancedpaths.js",
"advancedserversettings.js",
"metadataadvanced.js",
"appsplayback.js",
@@ -484,6 +422,8 @@ namespace MediaBrowser.WebDashboard.Api
"dashboardinfo.js",
"dashboardpage.js",
"directorybrowser.js",
+ "dlnaprofile.js",
+ "dlnaprofiles.js",
"dlnasettings.js",
"editcollectionitems.js",
"edititemmetadata.js",
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-06 07:52:32 +0000