isolated clickonce dependancies

7 files changed, 431 insertions, 8 deletions

diff --git a/MediaBrowser.Api/EnvironmentService.cs b/MediaBrowser.Api/EnvironmentService.cs
index e552c7f1d..db768d0e8 100644
--- a/MediaBrowser.Api/EnvironmentService.cs
+++ b/MediaBrowser.Api/EnvironmentService.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 using ServiceStack.ServiceHost;
 using System;
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 546cf4492..220101de5 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -66,14 +66,11 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApiService.cs" />
@@ -87,6 +84,8 @@
     <Compile Include="LocalizationService.cs" />
     <Compile Include="PackageService.cs" />
     <Compile Include="PluginService.cs" />
+    <Compile Include="ScheduledTasks\ScheduledTaskService.cs" />
+    <Compile Include="ScheduledTasks\ScheduledTasksWebSocketListener.cs" />
     <Compile Include="SystemService.cs" />
     <Compile Include="Streaming\AudioHandler.cs" />
     <Compile Include="Streaming\BaseHlsPlaylistHandler.cs" />
@@ -108,6 +107,8 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WeatherService.cs" />
+    <Compile Include="WebSocket\LogFileWebSocketListener.cs" />
+    <Compile Include="WebSocket\SystemInfoWebSocketListener.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs
index 64c5d6cbc..924c33937 100644
--- a/MediaBrowser.Api/PackageService.cs
+++ b/MediaBrowser.Api/PackageService.cs
@@ -1,8 +1,7 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller;
-using MediaBrowser.Model.Tasks;
 using MediaBrowser.Model.Updates;
 using ServiceStack.ServiceHost;
 using System;
@@ -98,6 +97,12 @@ namespace MediaBrowser.Api
     public class PackageService : BaseRestService
     {
         /// <summary>
+        /// Gets or sets the application host.
+        /// </summary>
+        /// <value>The application host.</value>
+        public IApplicationHost ApplicationHost { get; set; }
+
+        /// <summary>
         /// Gets the specified request.
         /// </summary>
         /// <param name="request">The request.</param>
@@ -116,9 +121,9 @@ namespace MediaBrowser.Api
 
             else if (request.PackageType == PackageType.System || request.PackageType == PackageType.All)
             {
-                var updateCheckResult = new ApplicationUpdateCheck().CheckForApplicationUpdate(CancellationToken.None, new Progress<TaskProgress> { }).Result;
+                var updateCheckResult = ApplicationHost.CheckForApplicationUpdate(CancellationToken.None, new Progress<double> { }).Result;
 
-                if (updateCheckResult.UpdateAvailable)
+                if (updateCheckResult.IsUpdateAvailable)
                 {
                     result.Add(new PackageVersionInfo
                     {
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
new file mode 100644
index 000000000..bd12454a0
--- /dev/null
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
@@ -0,0 +1,176 @@
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Common.Serialization;
+using MediaBrowser.Model.Tasks;
+using ServiceStack.ServiceHost;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IO;
+using System.Linq;
+using ServiceStack.Text.Controller;
+
+namespace MediaBrowser.Api.ScheduledTasks
+{
+    /// <summary>
+    /// Class GetScheduledTask
+    /// </summary>
+    [Route("/ScheduledTasks/{Id}", "GET")]
+    public class GetScheduledTask : IReturn<TaskInfo>
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public Guid Id { get; set; }
+    }
+
+    /// <summary>
+    /// Class GetScheduledTasks
+    /// </summary>
+    [Route("/ScheduledTasks", "GET")]
+    public class GetScheduledTasks : IReturn<List<TaskInfo>>
+    {
+
+    }
+
+    /// <summary>
+    /// Class StartScheduledTask
+    /// </summary>
+    [Route("/ScheduledTasks/Running/{Id}", "POST")]
+    public class StartScheduledTask : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public Guid Id { get; set; }
+    }
+
+    /// <summary>
+    /// Class StopScheduledTask
+    /// </summary>
+    [Route("/ScheduledTasks/Running/{Id}", "DELETE")]
+    public class StopScheduledTask : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public Guid Id { get; set; }
+    }
+
+    /// <summary>
+    /// Class UpdateScheduledTaskTriggers
+    /// </summary>
+    [Route("/ScheduledTasks/{Id}/Triggers", "POST")]
+    public class UpdateScheduledTaskTriggers : IRequiresRequestStream
+    {
+        /// <summary>
+        /// Gets or sets the task id.
+        /// </summary>
+        /// <value>The task id.</value>
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// The raw Http Request Input Stream
+        /// </summary>
+        /// <value>The request stream.</value>
+        public Stream RequestStream { get; set; }
+    }
+
+    /// <summary>
+    /// Class ScheduledTasksService
+    /// </summary>
+    [Export(typeof(IRestfulService))]
+    public class ScheduledTaskService : BaseRestService
+    {
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>IEnumerable{TaskInfo}.</returns>
+        public object Get(GetScheduledTasks request)
+        {
+            var result = Kernel.ScheduledTasks.OrderBy(i => i.Name)
+                         .Select(ScheduledTaskHelpers.GetTaskInfo).ToList();
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>IEnumerable{TaskInfo}.</returns>
+        public object Get(GetScheduledTask request)
+        {
+            var task = Kernel.ScheduledTasks.FirstOrDefault(i => i.Id == request.Id);
+
+            if (task == null)
+            {
+                throw new ResourceNotFoundException("Task not found");
+            }
+
+            var result = ScheduledTaskHelpers.GetTaskInfo(task);
+
+            return ToOptimizedResult(result);
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(StartScheduledTask request)
+        {
+            var task = Kernel.ScheduledTasks.FirstOrDefault(i => i.Id == request.Id);
+
+            if (task == null)
+            {
+                throw new ResourceNotFoundException("Task not found");
+            }
+
+            task.Execute();
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Delete(StopScheduledTask request)
+        {
+            var task = Kernel.ScheduledTasks.FirstOrDefault(i => i.Id == request.Id);
+
+            if (task == null)
+            {
+                throw new ResourceNotFoundException("Task not found");
+            }
+
+            task.Cancel();
+        }
+
+        /// <summary>
+        /// Posts the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Post(UpdateScheduledTaskTriggers request)
+        {
+            // We need to parse this manually because we told service stack not to with IRequiresRequestStream
+            // https://code.google.com/p/servicestack/source/browse/trunk/Common/ServiceStack.Text/ServiceStack.Text/Controller/PathInfo.cs
+            var pathInfo = PathInfo.Parse(Request.PathInfo);
+            var id = new Guid(pathInfo.GetArgumentValue<string>(1));
+            
+            var task = Kernel.ScheduledTasks.FirstOrDefault(i => i.Id == id);
+
+            if (task == null)
+            {
+                throw new ResourceNotFoundException("Task not found");
+            }
+
+            var triggerInfos = JsonSerializer.DeserializeFromStream<TaskTriggerInfo[]>(request.RequestStream);
+
+            task.Triggers = triggerInfos.Select(t => ScheduledTaskHelpers.GetTrigger(t, Kernel));
+        }
+    }
+}
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
new file mode 100644
index 000000000..7fa47735e
--- /dev/null
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
@@ -0,0 +1,49 @@
+using MediaBrowser.Common.Kernel;
+using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Tasks;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.ScheduledTasks
+{
+    /// <summary>
+    /// Class ScheduledTasksWebSocketListener
+    /// </summary>
+    [Export(typeof(IWebSocketListener))]
+    public class ScheduledTasksWebSocketListener : BasePeriodicWebSocketListener<IKernel, IEnumerable<TaskInfo>, object>
+    {
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        protected override string Name
+        {
+            get { return "ScheduledTasksInfo"; }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ScheduledTasksWebSocketListener" /> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        [ImportingConstructor]
+        public ScheduledTasksWebSocketListener([Import("logger")] ILogger logger)
+            : base(logger)
+        {
+
+        }
+
+        /// <summary>
+        /// Gets the data to send.
+        /// </summary>
+        /// <param name="state">The state.</param>
+        /// <returns>Task{IEnumerable{TaskInfo}}.</returns>
+        protected override Task<IEnumerable<TaskInfo>> GetDataToSend(object state)
+        {
+            return Task.FromResult(Kernel.ScheduledTasks.OrderBy(i => i.Name)
+                         .Select(ScheduledTaskHelpers.GetTaskInfo));
+        }
+    }
+}
diff --git a/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs b/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
new file mode 100644
index 000000000..f725b0222
--- /dev/null
+++ b/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
@@ -0,0 +1,146 @@
+using MediaBrowser.Common.IO;
+using MediaBrowser.Common.Kernel;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Logging;
+
+namespace MediaBrowser.Api.WebSocket
+{
+    /// <summary>
+    /// Class ScheduledTasksWebSocketListener
+    /// </summary>
+    [Export(typeof(IWebSocketListener))]
+    public class LogFileWebSocketListener : BasePeriodicWebSocketListener<IKernel, IEnumerable<string>, LogFileWebSocketState>
+    {
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        protected override string Name
+        {
+            get { return "LogFile"; }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LogFileWebSocketListener" /> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        [ImportingConstructor]
+        public LogFileWebSocketListener([Import("logger")] ILogger logger)
+            : base(logger)
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes the specified kernel.
+        /// </summary>
+        /// <param name="kernel">The kernel.</param>
+        public override void Initialize(IKernel kernel)
+        {
+            base.Initialize(kernel);
+
+            kernel.LoggerLoaded += kernel_LoggerLoaded;
+        }
+
+        /// <summary>
+        /// Gets the data to send.
+        /// </summary>
+        /// <param name="state">The state.</param>
+        /// <returns>IEnumerable{System.String}.</returns>
+        protected override async Task<IEnumerable<string>> GetDataToSend(LogFileWebSocketState state)
+        {
+            if (!string.Equals(Kernel.LogFilePath, state.LastLogFilePath))
+            {
+                state.LastLogFilePath = Kernel.LogFilePath;
+                state.StartLine = 0;
+            }
+
+            var lines = await GetLogLines(state.LastLogFilePath, state.StartLine).ConfigureAwait(false);
+
+            state.StartLine += lines.Count;
+
+            return lines;
+        }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected override void Dispose(bool dispose)
+        {
+            if (dispose)
+            {
+                Kernel.LoggerLoaded -= kernel_LoggerLoaded;
+            }
+            base.Dispose(dispose);
+        }
+
+        /// <summary>
+        /// Handles the LoggerLoaded event of the kernel control.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">The <see cref="EventArgs" /> instance containing the event data.</param>
+        void kernel_LoggerLoaded(object sender, EventArgs e)
+        {
+            // Reset the startline for each connection whenever the logger reloads
+            lock (ActiveConnections)
+            {
+                foreach (var connection in ActiveConnections)
+                {
+                    connection.Item4.StartLine = 0;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the log lines.
+        /// </summary>
+        /// <param name="logFilePath">The log file path.</param>
+        /// <param name="startLine">The start line.</param>
+        /// <returns>Task{IEnumerable{System.String}}.</returns>
+        internal static async Task<List<string>> GetLogLines(string logFilePath, int startLine)
+        {
+            var lines = new List<string>();
+
+            using (var fs = new FileStream(logFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, StreamDefaults.DefaultFileStreamBufferSize, true))
+            {
+                using (var reader = new StreamReader(fs))
+                {
+                    while (!reader.EndOfStream)
+                    {
+                        lines.Add(await reader.ReadLineAsync().ConfigureAwait(false));
+                    }
+                }
+            }
+
+            if (startLine > 0)
+            {
+                lines = lines.Skip(startLine).ToList();
+            }
+
+            return lines;
+        }
+    }
+
+    /// <summary>
+    /// Class LogFileWebSocketState
+    /// </summary>
+    public class LogFileWebSocketState
+    {
+        /// <summary>
+        /// Gets or sets the last log file path.
+        /// </summary>
+        /// <value>The last log file path.</value>
+        public string LastLogFilePath { get; set; }
+        /// <summary>
+        /// Gets or sets the start line.
+        /// </summary>
+        /// <value>The start line.</value>
+        public int StartLine { get; set; }
+    }
+}
diff --git a/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs b/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs
new file mode 100644
index 000000000..51d9f2fcd
--- /dev/null
+++ b/MediaBrowser.Api/WebSocket/SystemInfoWebSocketListener.cs
@@ -0,0 +1,45 @@
+using MediaBrowser.Common.Kernel;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.System;
+using System.ComponentModel.Composition;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.WebSocket
+{
+    /// <summary>
+    /// Class SystemInfoWebSocketListener
+    /// </summary>
+    [Export(typeof(IWebSocketListener))]
+    public class SystemInfoWebSocketListener : BasePeriodicWebSocketListener<IKernel, SystemInfo, object>
+    {
+        /// <summary>
+        /// Gets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        protected override string Name
+        {
+            get { return "SystemInfo"; }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SystemInfoWebSocketListener" /> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        [ImportingConstructor]
+        public SystemInfoWebSocketListener([Import("logger")] ILogger logger)
+            : base(logger)
+        {
+            
+        }
+
+        /// <summary>
+        /// Gets the data to send.
+        /// </summary>
+        /// <param name="state">The state.</param>
+        /// <returns>Task{SystemInfo}.</returns>
+        protected override Task<SystemInfo> GetDataToSend(object state)
+        {
+            return Task.FromResult(Kernel.GetSystemInfo());
+        }
+    }
+}