change usage reporting to a timer

3 files changed, 41 insertions, 128 deletions

diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
index dfe7d70ee..1688fac8b 100644
--- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
+++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
@@ -92,7 +92,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScheduledTasks\ScheduledTaskWorker.cs" />
     <Compile Include="ScheduledTasks\TaskManager.cs" />
-    <Compile Include="ScheduledTasks\Tasks\StatisticsTask.cs" />
     <Compile Include="ScheduledTasks\Tasks\DeleteCacheFileTask.cs" />
     <Compile Include="ScheduledTasks\Tasks\DeleteLogFileTask.cs" />
     <Compile Include="ScheduledTasks\Tasks\PluginUpdateTask.cs" />
@@ -105,6 +104,7 @@
     <Compile Include="Serialization\XmlSerializer.cs" />
     <Compile Include="Updates\ApplicationUpdater.cs" />
     <Compile Include="Updates\InstallationManager.cs" />
+    <Compile Include="Security\UsageReporter.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/StatisticsTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/StatisticsTask.cs
deleted file mode 100644
index 9c0fe165d..000000000
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/StatisticsTask.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.ScheduledTasks;
-using MediaBrowser.Model.Logging;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
-{
-    /// <summary>
-    /// Class ReloadLoggerFileTask
-    /// </summary>
-    public class StatisticsTask : IScheduledTask, IConfigurableScheduledTask
-    {
-        /// <summary>
-        /// Gets or sets the log manager.
-        /// </summary>
-        /// <value>The log manager.</value>
-        private ILogManager LogManager { get; set; }
-        /// <summary>
-        /// Gets or sets the app host
-        /// </summary>
-        /// <value>The application host.</value>
-        private IApplicationHost ApplicationHost { get; set; }
-
-        /// <summary>
-        /// The network manager
-        /// </summary>
-        private INetworkManager NetworkManager { get; set; }
-
-        /// <summary>
-        /// The http client
-        /// </summary>
-        private IHttpClient HttpClient { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReloadLoggerFileTask" /> class.
-        /// </summary>
-        /// <param name="logManager">The logManager.</param>
-        /// <param name="appHost"></param>
-        /// <param name="httpClient"></param>
-        public StatisticsTask(ILogManager logManager, IApplicationHost appHost, INetworkManager networkManager, IHttpClient httpClient)
-        {
-            LogManager = logManager;
-            ApplicationHost = appHost;
-            NetworkManager = networkManager;
-            HttpClient = httpClient;
-        }
-
-        /// <summary>
-        /// Gets the default triggers.
-        /// </summary>
-        /// <returns>IEnumerable{BaseTaskTrigger}.</returns>
-        public IEnumerable<ITaskTrigger> GetDefaultTriggers()
-        {
-            var trigger = new DailyTrigger { TimeOfDay = TimeSpan.FromHours(20) }; //8pm - when the system is most likely to be active
-            var trigger2 = new StartupTrigger(); //and also at system start
-
-            return new ITaskTrigger[] { trigger, trigger2 };
-        }
-
-        /// <summary>
-        /// Executes the internal.
-        /// </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)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-
-            progress.Report(0);
-            var mac = NetworkManager.GetMacAddress();
-
-            var data = new Dictionary<string, string>
-            {
-                { "feature", ApplicationHost.Name }, 
-                { "mac", mac }, 
-                { "ver", ApplicationHost.ApplicationVersion.ToString() }, 
-                { "platform", Environment.OSVersion.VersionString }, 
-                { "isservice", ApplicationHost.IsRunningAsService.ToString().ToLower()}
-            };
-
-            await HttpClient.Post(Constants.Constants.MbAdminUrl + "service/registration/ping", data, CancellationToken.None).ConfigureAwait(false);
-            progress.Report(100);
-
-        }
-
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string Name
-        {
-            get { return "Collect anonymous usage stats"; }
-        }
-
-        /// <summary>
-        /// Gets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        public string Description
-        {
-            get { return "Pings the admin site just so we know how many folks are out there and what version they are on."; }
-        }
-
-        /// <summary>
-        /// Gets the category.
-        /// </summary>
-        /// <value>The category.</value>
-        public string Category
-        {
-            get { return "Application"; }
-        }
-
-        public bool IsHidden
-        {
-            get { return true; }
-        }
-
-        public bool IsEnabled
-        {
-            get { return true; }
-        }
-    }
-}
diff --git a/MediaBrowser.Common.Implementations/Security/UsageReporter.cs b/MediaBrowser.Common.Implementations/Security/UsageReporter.cs
new file mode 100644
index 000000000..e32940be9
--- /dev/null
+++ b/MediaBrowser.Common.Implementations/Security/UsageReporter.cs
@@ -0,0 +1,40 @@
+using MediaBrowser.Common.Net;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Common.Implementations.Security
+{
+    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 ReportUsage(CancellationToken cancellationToken)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var mac = _networkManager.GetMacAddress();
+
+            var data = new Dictionary<string, string>
+            {
+                { "feature", _applicationHost.Name }, 
+                { "mac", mac }, 
+                { "ver", _applicationHost.ApplicationVersion.ToString() }, 
+                { "platform", Environment.OSVersion.VersionString }, 
+                { "isservice", _applicationHost.IsRunningAsService.ToString().ToLower()}
+            };
+
+            return _httpClient.Post(Constants.Constants.MbAdminUrl + "service/registration/ping", data, cancellationToken);
+        }
+    }
+}