From 653a0864c3ac1851159943a4e68be07a7822a423 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 13 Aug 2012 17:05:01 -0700 Subject: [PATCH] Removed DM - Branched if required later. --- NzbDrone.Common/EnvironmentProvider.cs | 4 - NzbDrone.Core.Test/CentralDispatchFixture.cs | 10 +- NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 1 - .../AnalyticsProviderFixture.cs | 146 ------------------ NzbDrone.Core/CentralDispatch.cs | 11 -- .../Datastore/Migrations/Migration20110707.cs | 3 - NzbDrone.Core/Jobs/CheckpointJob.cs | 40 ----- NzbDrone.Core/NzbDrone.Core.csproj | 4 - NzbDrone.Core/Providers/AnalyticsProvider.cs | 71 --------- NzbDrone.Test.Common/TestBase.cs | 2 - 10 files changed, 1 insertion(+), 291 deletions(-) delete mode 100644 NzbDrone.Core.Test/ProviderTests/AnalyticsProviderTests/AnalyticsProviderFixture.cs delete mode 100644 NzbDrone.Core/Jobs/CheckpointJob.cs delete mode 100644 NzbDrone.Core/Providers/AnalyticsProvider.cs diff --git a/NzbDrone.Common/EnvironmentProvider.cs b/NzbDrone.Common/EnvironmentProvider.cs index 158ad968c..e5cc2e8db 100644 --- a/NzbDrone.Common/EnvironmentProvider.cs +++ b/NzbDrone.Common/EnvironmentProvider.cs @@ -49,9 +49,6 @@ namespace NzbDrone.Common public static Guid UGuid { get; set; } - - public static bool RegisterNewInstall { get; set; } - public virtual bool IsUserInteractive { get { return Environment.UserInteractive; } @@ -102,7 +99,6 @@ namespace NzbDrone.Common return dir.GetDirectories(ROOT_MARKER).Length != 0; } - public virtual string StartUpPath { get diff --git a/NzbDrone.Core.Test/CentralDispatchFixture.cs b/NzbDrone.Core.Test/CentralDispatchFixture.cs index c969df4e0..8ec3a2012 100644 --- a/NzbDrone.Core.Test/CentralDispatchFixture.cs +++ b/NzbDrone.Core.Test/CentralDispatchFixture.cs @@ -101,13 +101,5 @@ namespace NzbDrone.Core.Test first.Should().BeSameAs(second); } - - [Test] - public void app_should_be_marked_as_new_install_if_db_is_initilized_for_the_first_time() - { - WithRealDb(); - EnvironmentProvider.RegisterNewInstall.Should().Be(true); - } - } -} +} \ No newline at end of file diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index cfaef9e0f..63dd57d24 100644 --- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -111,7 +111,6 @@ - diff --git a/NzbDrone.Core.Test/ProviderTests/AnalyticsProviderTests/AnalyticsProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/AnalyticsProviderTests/AnalyticsProviderFixture.cs deleted file mode 100644 index 4758ba56c..000000000 --- a/NzbDrone.Core.Test/ProviderTests/AnalyticsProviderTests/AnalyticsProviderFixture.cs +++ /dev/null @@ -1,146 +0,0 @@ -using System; -using System.Linq; -using DeskMetrics; -using Moq; -using NUnit.Framework; -using NzbDrone.Common; -using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Test.Framework; - -namespace NzbDrone.Core.Test.ProviderTests.AnalyticsProviderTests -{ - // ReSharper disable InconsistentNaming - public class AnalyticsProviderFixture : CoreTest - { - - [SetUp] - public void Setup() - { - Mocker.GetMock().SetupGet(c => c.UpdateUrl).Returns(UpdateProvider.DEFAULT_UPDATE_URL); - } - - - private void WithStageClient() - { - Mocker.SetConstant(new DeskMetricsClient(Guid.NewGuid().ToString(), AnalyticsProvider.DESKMETRICS_TEST_ID, new Version(9, 9, 9))); - } - - [Test] - public void checkpoint_should_stop_existing_start_then_start_again() - { - Mocker.GetMock().SetupGet(c => c.Started).Returns(true); - var provider = Mocker.Resolve(); - - provider.Checkpoint(); - - Mocker.GetMock().Verify(c => c.Start(), Times.Once()); - Mocker.GetMock().Verify(c => c.Stop(), Times.Once()); - } - - [Test] - public void checkpoint_should_not_stop_existing_if_not_started() - { - Mocker.GetMock().SetupGet(c => c.Started).Returns(false); - var provider = Mocker.Resolve(); - - provider.Checkpoint(); - - Mocker.GetMock().Verify(c => c.Start(), Times.Once()); - Mocker.GetMock().Verify(c => c.Stop(), Times.Never()); - } - - [Test] - public void new_install_should_be_registered() - { - EnvironmentProvider.RegisterNewInstall = true; - - var provider = Mocker.Resolve(); - - provider.Checkpoint(); - - Mocker.GetMock().Verify(c => c.RegisterInstall(), Times.Once()); - } - - [Test] - public void new_install_should_only_be_registered_on_first_call() - { - EnvironmentProvider.RegisterNewInstall = true; - - var provider = Mocker.Resolve(); - - provider.Checkpoint(); - provider.Checkpoint(); - provider.Checkpoint(); - - Mocker.GetMock().Verify(c => c.RegisterInstall(), Times.Once()); - } - - [Test] - public void upgrade_should_not_register_install() - { - EnvironmentProvider.RegisterNewInstall = false; - - var provider = Mocker.Resolve(); - - provider.Checkpoint(); - - Mocker.GetMock().Verify(c => c.RegisterInstall(), Times.Never()); - } - - - [Test] - public void shouldnt_register_anything_if_not_on_master_branch() - { - EnvironmentProvider.RegisterNewInstall = false; - - Mocker.GetMock().SetupGet(c => c.UpdateUrl).Returns("http://update.nzbdrone.com/master_auto/"); - - Mocker.GetMock(MockBehavior.Strict); - - Mocker.Resolve().Checkpoint(); - } - - [Test] - public void new_install_shouldnt_register_anything_if_not_on_master_branch() - { - EnvironmentProvider.RegisterNewInstall = true; - - Mocker.GetMock().SetupGet(c => c.UpdateUrl).Returns("http://update.nzbdrone.com/master_auto/"); - - Mocker.GetMock(MockBehavior.Strict); - - Mocker.Resolve().Checkpoint(); - } - - [Test] - public void should_be_able_to_call_deskmetrics_using_test_appid() - { - EnvironmentProvider.RegisterNewInstall = true; - Mocker.Resolve().Checkpoint(); - } - - - - - - [TestCase("http://update.nzbdrone.com/master/")] - [TestCase("http://update.nzbdrone.com/master//")] - [TestCase("http://update.nzbdrone.com/master")] - [TestCase("http://update.nzbdrone.com/master ")] - [TestCase("http://update.nzbdrone.com/master/ ")] - [TestCase("http://UPDATE.nzbdrone.COM/master/ ")] - public void should_still_work_if_url_is_slightly_diffrent(string url) - { - Mocker.GetMock().SetupGet(c => c.UpdateUrl).Returns(url); - - var provider = Mocker.Resolve(); - - provider.Checkpoint(); - - Mocker.GetMock().Verify(c => c.Start(), Times.Once()); - } - - - } -} diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 875c58781..9f87dda45 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -74,16 +74,6 @@ namespace NzbDrone.Core EnvironmentProvider.UGuid = Kernel.Get().UGuid; ReportingService.RestProvider = Kernel.Get(); ReportingService.SetupExceptronDriver(); - - var appId = AnalyticsProvider.DESKMETRICS_TEST_ID; - - if (EnvironmentProvider.IsProduction) - appId = AnalyticsProvider.DESKMETRICS_PRODUCTION_ID; - - var deskMetricsClient = new DeskMetricsClient(Kernel.Get().UGuid.ToString(), appId, _environmentProvider.Version); - Kernel.Bind().ToConstant(deskMetricsClient); - - Kernel.Get().Checkpoint(); } private void InitQuality() @@ -142,7 +132,6 @@ namespace NzbDrone.Core Kernel.Bind().To().InSingletonScope(); Kernel.Bind().To().InSingletonScope(); Kernel.Bind().To().InSingletonScope(); - Kernel.Bind().To().InSingletonScope(); Kernel.Bind().To().InSingletonScope(); Kernel.Bind().To().InSingletonScope(); Kernel.Bind().To().InSingletonScope(); diff --git a/NzbDrone.Core/Datastore/Migrations/Migration20110707.cs b/NzbDrone.Core/Datastore/Migrations/Migration20110707.cs index af0adf72b..68dfc59c7 100644 --- a/NzbDrone.Core/Datastore/Migrations/Migration20110707.cs +++ b/NzbDrone.Core/Datastore/Migrations/Migration20110707.cs @@ -11,9 +11,6 @@ namespace NzbDrone.Core.Datastore.Migrations { protected override void MainDbUpgrade() { - //This should not run unless for a clean install - EnvironmentProvider.RegisterNewInstall = true; - Database.AddTable("Series", new[] { new Column("SeriesId", DbType.Int32, ColumnProperty.PrimaryKey), diff --git a/NzbDrone.Core/Jobs/CheckpointJob.cs b/NzbDrone.Core/Jobs/CheckpointJob.cs deleted file mode 100644 index af98a3e3d..000000000 --- a/NzbDrone.Core/Jobs/CheckpointJob.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Linq; -using Ninject; -using NzbDrone.Common; -using NzbDrone.Core.Model.Notification; -using NzbDrone.Core.Providers; - -namespace NzbDrone.Core.Jobs -{ - public class CheckpointJob : IJob - { - private readonly AnalyticsProvider _analyticsProvider; - - [Inject] - public CheckpointJob(AnalyticsProvider analyticsProvider) - { - _analyticsProvider = analyticsProvider; - } - - public CheckpointJob() - { - - } - - public string Name - { - get { return "Checkpoint Job"; } - } - - public TimeSpan DefaultInterval - { - get { return TimeSpan.FromDays(1); } - } - - public void Start(ProgressNotification notification, int targetId, int secondaryTargetId) - { - _analyticsProvider.Checkpoint(); - } - } -} \ No newline at end of file diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index edf77d7e4..14cb64c3c 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -252,7 +252,6 @@ - @@ -320,9 +319,6 @@ - - Code - diff --git a/NzbDrone.Core/Providers/AnalyticsProvider.cs b/NzbDrone.Core/Providers/AnalyticsProvider.cs deleted file mode 100644 index 6879d94ee..000000000 --- a/NzbDrone.Core/Providers/AnalyticsProvider.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Linq; -using DeskMetrics; -using NLog; -using Ninject; -using NzbDrone.Common; -using NzbDrone.Core.Providers.Core; - -namespace NzbDrone.Core.Providers -{ - public class AnalyticsProvider - { - private static readonly Logger logger = LogManager.GetCurrentClassLogger(); - - private readonly IDeskMetricsClient _deskMetricsClient; - private readonly ConfigProvider _configProvider; - public const string DESKMETRICS_TEST_ID = "4ea8d347a14ad71442000002"; - public const string DESKMETRICS_PRODUCTION_ID = "4f20b01ea14ad729b2000000"; - - [Inject] - public AnalyticsProvider(IDeskMetricsClient deskMetricsClient, ConfigProvider configProvider) - { - _deskMetricsClient = deskMetricsClient; - _configProvider = configProvider; - } - - public AnalyticsProvider() - { - - } - - public virtual void Checkpoint() - { - try - { - //Don't report anything unless working from master branch. - if (!IsOnMasterBranch()) - return; - - if (EnvironmentProvider.RegisterNewInstall) - { - _deskMetricsClient.RegisterInstall(); - EnvironmentProvider.RegisterNewInstall = false; - } - - if (_deskMetricsClient.Started) - { - _deskMetricsClient.Stop(); - } - - _deskMetricsClient.Start(); - } - catch (Exception e) - { - if (!EnvironmentProvider.IsProduction) - throw; - - logger.WarnException("Error while sending analytics data.", e); - } - } - - - private bool IsOnMasterBranch() - { - var defaultUpdateUrl = UpdateProvider.DEFAULT_UPDATE_URL.Trim().Trim('/'); - var currentUpdateUrl = _configProvider.UpdateUrl.Trim().Trim('/'); - - return String.Equals(defaultUpdateUrl, currentUpdateUrl, StringComparison.InvariantCultureIgnoreCase); - } - } -} diff --git a/NzbDrone.Test.Common/TestBase.cs b/NzbDrone.Test.Common/TestBase.cs index b67718ece..a5801995b 100644 --- a/NzbDrone.Test.Common/TestBase.cs +++ b/NzbDrone.Test.Common/TestBase.cs @@ -45,8 +45,6 @@ namespace NzbDrone.Test.Common [SetUp] public void TestBaseSetup() { - EnvironmentProvider.RegisterNewInstall = true; - MockedRestProvider = new Mock(); ReportingService.RestProvider = MockedRestProvider.Object; ReportingService.SetupExceptronDriver();