move usage reporter to server project

MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs

@@ -0,0 +1,73 @@
+using MediaBrowser.Common;
+using MediaBrowser.Common.Net;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.EntryPoints
+{
+    public class UsageReporter
+    {
+        private readonly IApplicationHost _applicationHost;
+        private readonly INetworkManager _networkManager;
+        private readonly IHttpClient _httpClient;
+
+        public UsageReporter(IApplicationHost applicationHost, INetworkManager networkManager, IHttpClient httpClient)
+        {
+            _applicationHost = applicationHost;
+            _networkManager = networkManager;
+            _httpClient = httpClient;
+        }
+
+        public Task ReportServerUsage(CancellationToken cancellationToken)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var mac = _networkManager.GetMacAddress();
+
+            var data = new Dictionary<string, string>
+            {
+                { "feature", _applicationHost.Name }, 
+                { "mac", mac }, 
+                { "serverid", _applicationHost.SystemId }, 
+                { "deviceid", _applicationHost.SystemId }, 
+                { "ver", _applicationHost.ApplicationVersion.ToString() }, 
+                { "platform", Environment.OSVersion.VersionString }, 
+                { "isservice", _applicationHost.IsRunningAsService.ToString().ToLower()}
+            };
+
+            return _httpClient.Post(Common.Constants.Constants.MbAdminUrl + "service/registration/ping", data, cancellationToken);
+        }
+
+        public Task ReportAppUsage(ClientInfo app, CancellationToken cancellationToken)
+        {
+            if (string.IsNullOrWhiteSpace(app.DeviceId))
+            {
+                throw new ArgumentException("Client info must have a device Id");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var data = new Dictionary<string, string>
+            {
+                { "feature", app.AppName ?? "Unknown App" }, 
+                { "serverid", _applicationHost.SystemId }, 
+                { "deviceid", app.DeviceId }, 
+                { "mac", app.DeviceId }, 
+                { "ver", app.AppVersion ?? "Unknown" }, 
+                { "platform", app.DeviceName }, 
+            };
+
+            return _httpClient.Post(Common.Constants.Constants.MbAdminUrl + "service/registration/ping", data, cancellationToken);
+        }
+    }
+
+    public class ClientInfo
+    {
+        public string AppName { get; set; }
+        public string AppVersion { get; set; }
+        public string DeviceName { get; set; }
+        public string DeviceId { get; set; }
+    }
+}

MediaBrowser.Server.Implementations/Library/LibraryManager.cs

@@ -1485,9 +1485,10 @@ namespace MediaBrowser.Server.Implementations.Library
 
             var item = GetItemById(id) as UserView;
 
-            if (item == null || !string.Equals(item.Path, path, StringComparison.OrdinalIgnoreCase))
+            if (item == null || 
+                !string.Equals(item.Path, path, StringComparison.OrdinalIgnoreCase))
             {
-                Directory.CreateDirectory(Path.GetDirectoryName(path));
+                Directory.CreateDirectory(path);
 
                 item = new UserView
                 {

MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj

@@ -135,6 +135,7 @@
     <Compile Include="EntryPoints\RefreshUsersMetadata.cs" />
     <Compile Include="EntryPoints\UsageEntryPoint.cs" />
     <Compile Include="Connect\ConnectEntryPoint.cs" />
+    <Compile Include="EntryPoints\UsageReporter.cs" />
     <Compile Include="FileOrganization\EpisodeFileOrganizer.cs" />
     <Compile Include="FileOrganization\Extensions.cs" />
     <Compile Include="FileOrganization\FileOrganizationService.cs" />
@@ -240,8 +241,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScheduledTasks\PeopleValidationTask.cs" />
     <Compile Include="ScheduledTasks\ChapterImagesTask.cs" />
+    <Compile Include="ScheduledTasks\PluginUpdateTask.cs" />
     <Compile Include="ScheduledTasks\RefreshIntrosTask.cs" />
     <Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" />
+    <Compile Include="ScheduledTasks\SystemUpdateTask.cs" />
     <Compile Include="Security\AuthenticationException.cs" />
     <Compile Include="Security\AuthenticationRepository.cs" />
     <Compile Include="Security\EncryptionManager.cs" />

MediaBrowser.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs

@@ -0,0 +1,135 @@
+using MediaBrowser.Common;
+using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Common.Updates;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Plugin Update Task
+    /// </summary>
+    public class PluginUpdateTask : IScheduledTask
+    {
+        /// <summary>
+        /// The _logger
+        /// </summary>
+        private readonly ILogger _logger;
+
+        private readonly IInstallationManager _installationManager;
+
+        private readonly IApplicationHost _appHost;
+
+        public PluginUpdateTask(ILogger logger, IInstallationManager installationManager, IApplicationHost appHost)
+        {
+            _logger = logger;
+            _installationManager = installationManager;
+            _appHost = appHost;
+        }
+
+        /// <summary>
+        /// Creates the triggers that define when the task will run
+        /// </summary>
+        /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
+        public IEnumerable<ITaskTrigger> GetDefaultTriggers()
+        {
+            return new ITaskTrigger[] { 
+            
+                // At startup
+                new StartupTrigger(),
+
+                // Every so often
+                new IntervalTrigger { Interval = TimeSpan.FromHours(24)}
+            };
+        }
+
+        /// <summary>
+        /// Update installed plugins
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns>Task.</returns>
+        public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            progress.Report(0);
+
+            var packagesToInstall = (await _installationManager.GetAvailablePluginUpdates(_appHost.ApplicationVersion, true, cancellationToken).ConfigureAwait(false)).ToList();
+
+            progress.Report(10);
+
+            var numComplete = 0;
+
+            // Create tasks for each one
+            var tasks = packagesToInstall.Select(i => Task.Run(async () =>
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                try
+                {
+                    await _installationManager.InstallPackage(i, new Progress<double>(), cancellationToken).ConfigureAwait(false);
+                }
+                catch (OperationCanceledException)
+                {
+                    // InstallPackage has it's own inner cancellation token, so only throw this if it's ours
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        throw;
+                    }
+                }
+                catch (HttpException ex)
+                {
+                    _logger.ErrorException("Error downloading {0}", ex, i.name);
+                }
+                catch (IOException ex)
+                {
+                    _logger.ErrorException("Error updating {0}", ex, i.name);
+                }
+
+                // Update progress
+                lock (progress)
+                {
+                    numComplete++;
+                    double percent = numComplete;
+                    percent /= packagesToInstall.Count;
+
+                    progress.Report((90 * percent) + 10);
+                }
+            }));
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            await Task.WhenAll(tasks).ConfigureAwait(false);
+
+            progress.Report(100);
+        }
+
+        /// <summary>
+        /// Gets the name of the task
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get { return "Check for plugin updates"; }
+        }
+
+        /// <summary>
+        /// Gets the description.
+        /// </summary>
+        /// <value>The description.</value>
+        public string Description
+        {
+            get { return "Downloads and installs updates for plugins that are configured to update automatically."; }
+        }
+
+        public string Category
+        {
+            get { return "Application"; }
+        }
+    }
+}

MediaBrowser.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs

@@ -0,0 +1,149 @@
+using MediaBrowser.Common;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Model.Logging;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Plugin Update Task
+    /// </summary>
+    public class SystemUpdateTask : IScheduledTask, IHasKey
+    {
+        /// <summary>
+        /// The _app host
+        /// </summary>
+        private readonly IApplicationHost _appHost;
+
+        /// <summary>
+        /// Gets or sets the configuration manager.
+        /// </summary>
+        /// <value>The configuration manager.</value>
+        private IConfigurationManager ConfigurationManager { get; set; }
+        /// <summary>
+        /// Gets or sets the logger.
+        /// </summary>
+        /// <value>The logger.</value>
+        private ILogger Logger { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SystemUpdateTask" /> class.
+        /// </summary>
+        /// <param name="appHost">The app host.</param>
+        /// <param name="configurationManager">The configuration manager.</param>
+        /// <param name="logger">The logger.</param>
+        public SystemUpdateTask(IApplicationHost appHost, IConfigurationManager configurationManager, ILogger logger)
+        {
+            _appHost = appHost;
+            ConfigurationManager = configurationManager;
+            Logger = logger;
+        }
+
+        /// <summary>
+        /// Creates the triggers that define when the task will run
+        /// </summary>
+        /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
+        public IEnumerable<ITaskTrigger> GetDefaultTriggers()
+        {
+            // Until we can vary these default triggers per server and MBT, we need something that makes sense for both
+            return new ITaskTrigger[] { 
+            
+                // At startup
+                new StartupTrigger(),
+
+                // Every so often
+                new IntervalTrigger { Interval = TimeSpan.FromHours(24)}
+            };
+        }
+
+        /// <summary>
+        /// Returns the task to be executed
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="progress">The progress.</param>
+        /// <returns>Task.</returns>
+        public async Task Execute(CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            EventHandler<double> innerProgressHandler = (sender, e) => progress.Report(e * .1);
+
+            // Create a progress object for the update check
+            var innerProgress = new Progress<double>();
+            innerProgress.ProgressChanged += innerProgressHandler;
+
+            var updateInfo = await _appHost.CheckForApplicationUpdate(cancellationToken, innerProgress).ConfigureAwait(false);
+
+            // Release the event handler
+            innerProgress.ProgressChanged -= innerProgressHandler;
+
+            progress.Report(10);
+
+            if (!updateInfo.IsUpdateAvailable)
+            {
+                Logger.Debug("No application update available.");
+                progress.Report(100);
+                return;
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            if (!_appHost.CanSelfUpdate) return;
+
+            if (ConfigurationManager.CommonConfiguration.EnableAutoUpdate)
+            {
+                Logger.Info("Update Revision {0} available.  Updating...", updateInfo.AvailableVersion);
+
+                innerProgressHandler = (sender, e) => progress.Report((e * .9) + .1);
+
+                innerProgress = new Progress<double>();
+                innerProgress.ProgressChanged += innerProgressHandler;
+
+                await _appHost.UpdateApplication(updateInfo.Package, cancellationToken, innerProgress).ConfigureAwait(false);
+
+                // Release the event handler
+                innerProgress.ProgressChanged -= innerProgressHandler;
+            }
+            else
+            {
+                Logger.Info("A new version of Media Browser is available.");
+            }
+
+            progress.Report(100);
+        }
+
+        /// <summary>
+        /// Gets the name of the task
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name
+        {
+            get { return "Check for application updates"; }
+        }
+
+        /// <summary>
+        /// Gets the description.
+        /// </summary>
+        /// <value>The description.</value>
+        public string Description
+        {
+            get { return "Downloads and installs application updates."; }
+        }
+
+        /// <summary>
+        /// Gets the category.
+        /// </summary>
+        /// <value>The category.</value>
+        public string Category
+        {
+            get { return "Application"; }
+        }
+
+        public string Key
+        {
+            get { return "SystemUpdateTask"; }
+        }
+    }
+}