fixing update for vnext.

NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs

@@ -7,11 +7,13 @@ using NzbDrone.Api.Indexers;
 using NzbDrone.Api.Mapping;
 using NzbDrone.Api.RootFolders;
 using NzbDrone.Api.Series;
+using NzbDrone.Api.Update;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RootFolders;
+using NzbDrone.Core.Update;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Api.Test.MappingTests
@@ -28,6 +30,7 @@ namespace NzbDrone.Api.Test.MappingTests
         [TestCase(typeof(ParsedEpisodeInfo), typeof(ReleaseResource))]
         [TestCase(typeof(DownloadDecision), typeof(ReleaseResource))]
         [TestCase(typeof(Core.History.History), typeof(HistoryResource))]
+        [TestCase(typeof(UpdatePackage), typeof(UpdateResource))]
         public void matching_fields(Type modelType, Type resourceType)
         {
             MappingValidation.ValidateMapping(modelType, resourceType);

NzbDrone.Api/AutomapperBootstraper.cs

@@ -4,8 +4,7 @@ using NzbDrone.Api.Calendar;
 using NzbDrone.Api.Episodes;
 using NzbDrone.Api.History;
 using NzbDrone.Api.Missing;
-using NzbDrone.Api.QualityProfiles;
+using NzbDrone.Api.Qualities;
-using NzbDrone.Api.QualityType;
 using NzbDrone.Api.Resolvers;
 using NzbDrone.Api.Series;
 using NzbDrone.Core.Datastore;
@@ -20,11 +19,11 @@ namespace NzbDrone.Api
         public static void InitializeAutomapper()
         {
             //QualityProfiles
-            Mapper.CreateMap<QualityProfile, QualityProfileModel>()
+            Mapper.CreateMap<QualityProfile, QualityProfileResource>()
                   .ForMember(dest => dest.Qualities,
                              opt => opt.ResolveUsing<AllowedToQualitiesResolver>().FromMember(src => src.Allowed));
 
-            Mapper.CreateMap<QualityProfileModel, QualityProfile>()
+            Mapper.CreateMap<QualityProfileResource, QualityProfile>()
                   .ForMember(dest => dest.Allowed,
                              opt => opt.ResolveUsing<QualitiesToAllowedResolver>().FromMember(src => src.Qualities));
 

NzbDrone.Api/NzbDrone.Api.csproj

@@ -135,10 +135,10 @@
     <Compile Include="Exceptions\InvalidApiKeyException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="NzbDroneApiModule.cs" />
-    <Compile Include="QualityProfiles\QualityProfileModel.cs" />
+    <Compile Include="Qualities\QualityProfileResource.cs" />
-    <Compile Include="QualityProfiles\QualityProfilesModule.cs" />
+    <Compile Include="Qualities\QualityProfilesModule.cs" />
-    <Compile Include="QualityType\QualitySizeResource.cs" />
+    <Compile Include="Qualities\QualitySizeResource.cs" />
-    <Compile Include="QualityType\QualitySizeModule.cs" />
+    <Compile Include="Qualities\QualitySizeModule.cs" />
     <Compile Include="Extensions\RequestExtensions.cs" />
     <Compile Include="Resolvers\AllowedToQualitiesResolver.cs" />
     <Compile Include="Resolvers\QualitiesToAllowedResolver.cs" />
@@ -149,6 +149,7 @@
     <Compile Include="SignalR\SignalrDependencyResolver.cs" />
     <Compile Include="SignalR\NzbDronePersistentConnection.cs" />
     <Compile Include="TinyIoCNancyBootstrapper.cs" />
+    <Compile Include="Update\UpdateModule.cs" />
     <Compile Include="Validation\IdValidationRule.cs" />
   </ItemGroup>
   <ItemGroup>

NzbDrone.Api/Qualities/QualityProfileResource.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
-namespace NzbDrone.Api.QualityProfiles
+namespace NzbDrone.Api.Qualities
 {
-    public class QualityProfileModel
+    public class QualityProfileResource
     {
         public Int32 Id { get; set; }
         public String Name { get; set; }

NzbDrone.Api/Qualities/QualityProfilesModule.cs

@@ -4,7 +4,7 @@ using Nancy;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Core.Qualities;
 
-namespace NzbDrone.Api.QualityProfiles
+namespace NzbDrone.Api.Qualities
 {
     public class QualityProfilesModule : NzbDroneApiModule
     {
@@ -23,19 +23,19 @@ namespace NzbDrone.Api.QualityProfiles
         private Response OnGet()
         {
             var profiles = _qualityProvider.All();
-            return Mapper.Map<List<QualityProfile>, List<QualityProfileModel>>(profiles).AsResponse();
+            return Mapper.Map<List<QualityProfile>, List<QualityProfileResource>>(profiles).AsResponse();
         }
 
         private Response OnGet(int id)
         {
             var profile = _qualityProvider.Get(id);
-            return Mapper.Map<QualityProfile, QualityProfileModel>(profile).AsResponse();
+            return Mapper.Map<QualityProfile, QualityProfileResource>(profile).AsResponse();
         }
 
         private Response OnPost()
         {
-            var request = Request.Body.FromJson<QualityProfileModel>();
+            var request = Request.Body.FromJson<QualityProfileResource>();
-            var profile = Mapper.Map<QualityProfileModel, QualityProfile>(request);
+            var profile = Mapper.Map<QualityProfileResource, QualityProfile>(request);
             request.Id = _qualityProvider.Add(profile).Id;
 
             return request.AsResponse();
@@ -44,8 +44,8 @@ namespace NzbDrone.Api.QualityProfiles
         //Update
         private Response OnPut()
         {
-            var request = Request.Body.FromJson<QualityProfileModel>();
+            var request = Request.Body.FromJson<QualityProfileResource>();
-            var profile = Mapper.Map<QualityProfileModel, QualityProfile>(request);
+            var profile = Mapper.Map<QualityProfileResource, QualityProfile>(request);
             _qualityProvider.Update(profile);
 
             return request.AsResponse();

NzbDrone.Api/Qualities/QualitySizeModule.cs

@@ -5,7 +5,7 @@ using Nancy;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Core.Qualities;
 
-namespace NzbDrone.Api.QualityType
+namespace NzbDrone.Api.Qualities
 {
     public class QualitySizeModule : NzbDroneApiModule
     {

NzbDrone.Api/Qualities/QualitySizeResource.cs

@@ -1,7 +1,7 @@
 using System;
 using NzbDrone.Api.REST;
 
-namespace NzbDrone.Api.QualityType
+namespace NzbDrone.Api.Qualities
 {
     public class QualitySizeResource : RestResource
     {

NzbDrone.Api/Resolvers/AllowedToQualitiesResolver.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using AutoMapper;
-using NzbDrone.Api.QualityProfiles;
+using NzbDrone.Api.Qualities;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Api.Resolvers

NzbDrone.Api/Resolvers/NullableDatetimeToString.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using AutoMapper;
-using NzbDrone.Api.QualityProfiles;
 
 namespace NzbDrone.Api.Resolvers
 {

NzbDrone.Api/Resolvers/QualitiesToAllowedResolver.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using AutoMapper;
-using NzbDrone.Api.QualityProfiles;
+using NzbDrone.Api.Qualities;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Api.Resolvers

NzbDrone.Api/Resolvers/QualityTypesToIntResolver.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using AutoMapper;
 using NzbDrone.Core.Qualities;
 

NzbDrone.Api/Update/UpdateModule.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using NzbDrone.Api.REST;
+using NzbDrone.Core.Update;
+using NzbDrone.Api.Mapping;
+
+namespace NzbDrone.Api.Update
+{
+    public class UpdateModule : NzbDroneRestModule<UpdateResource>
+    {
+        private readonly IUpdateService _updateService;
+
+        public UpdateModule(IUpdateService updateService)
+        {
+            _updateService = updateService;
+            GetResourceAll = GetAvailableUpdate;
+        }
+
+        private List<UpdateResource> GetAvailableUpdate()
+        {
+            var update = _updateService.AvailableUpdate();
+            var response = new List<UpdateResource>();
+
+            if (update != null)
+            {
+                response.Add(update.InjectTo<UpdateResource>());
+            }
+
+            return response;
+        }
+    }
+
+    public class UpdateResource : RestResource
+    {
+        public Version Version { get; set; }
+        public String FileName { get; set; }
+        public String Url { get; set; }
+    }
+}

NzbDrone.Common.Test/PathExtensionFixture.cs

@@ -107,12 +107,6 @@ namespace NzbDrone.Common.Test
             GetEnvironmentProvider().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\Nzbdrone_update\NzbDrone.Update.exe");
         }
 
-        [Test]
-        public void GetSandboxLogFolder()
-        {
-            GetEnvironmentProvider().GetSandboxLogFolder().Should().BeEquivalentTo(@"C:\Temp\Nzbdrone_update\UpdateLogs\");
-        }
-
         [Test]
         public void GetUpdateLogFolder()
         {

NzbDrone.Common/Instrumentation/ApplicationLogLayoutRenderer.cs

@@ -0,0 +1,26 @@
+using System.IO;
+using System.Text;
+using NLog;
+using NLog.Config;
+using NLog.LayoutRenderers;
+
+namespace NzbDrone.Common.Instrumentation
+{
+    [ThreadAgnostic]
+    [LayoutRenderer("appLog")]
+    public class ApplicationLogLayoutRenderer : LayoutRenderer
+    {
+        private readonly string _appData;
+
+        public ApplicationLogLayoutRenderer()
+        {
+            _appData = Path.Combine(new EnvironmentProvider().GetLogFolder(), "nzbdrone.txt");
+
+        }
+
+        protected override void Append(StringBuilder builder, LogEventInfo logEvent)
+        {
+            builder.Append(_appData);
+        }
+    }
+}

NzbDrone.Common/Instrumentation/DirSeparatorLayoutRenderer.cs

@@ -0,0 +1,19 @@
+using System.IO;
+using System.Text;
+using NLog;
+using NLog.Config;
+using NLog.LayoutRenderers;
+
+namespace NzbDrone.Common.Instrumentation
+{
+    [ThreadAgnostic]
+    [LayoutRenderer("dirSeparator")]
+    public class DirSeparatorLayoutRenderer : LayoutRenderer
+    {
+
+        protected override void Append(StringBuilder builder, LogEventInfo logEvent)
+        {
+            builder.Append(Path.DirectorySeparatorChar);
+        }
+    }
+}

NzbDrone.Common/Instrumentation/UpdateLogLayoutRenderer.cs

@@ -0,0 +1,27 @@
+using System;
+using System.IO;
+using System.Text;
+using NLog;
+using NLog.Config;
+using NLog.LayoutRenderers;
+
+namespace NzbDrone.Common.Instrumentation
+{
+    [ThreadAgnostic]
+    [LayoutRenderer("updateLog")]
+    public class UpdateLogLayoutRenderer : LayoutRenderer
+    {
+        private readonly string _appData;
+
+        public UpdateLogLayoutRenderer()
+        {
+            _appData = Path.Combine(new EnvironmentProvider().GetUpdateLogFolder(), DateTime.Now.ToString("yy.MM.d-HH.mm"));
+
+        }
+
+        protected override void Append(StringBuilder builder, LogEventInfo logEvent)
+        {
+            builder.Append(_appData);
+        }
+    }
+}

NzbDrone.Common/Instrumentation/VersionLayoutRenderer.cs

@@ -11,11 +11,11 @@ namespace NzbDrone.Common.Instrumentation
     [LayoutRenderer("version")]
     public class VersionLayoutRenderer : LayoutRenderer
     {
-        private static readonly string version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
+        private static readonly string Version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
 
         protected override void Append(StringBuilder builder, LogEventInfo logEvent)
         {
-            builder.Append(version);
+            builder.Append(Version);
         }
     }
 }

NzbDrone.Common/NzbDrone.Common.csproj

@@ -107,6 +107,9 @@
     <Compile Include="EnsureThat\Resources\ExceptionMessages.Designer.cs" />
     <Compile Include="EnsureThat\StringExtensions.cs" />
     <Compile Include="EnsureThat\TypeParam.cs" />
+    <Compile Include="Instrumentation\ApplicationLogLayoutRenderer.cs" />
+    <Compile Include="Instrumentation\DirSeparatorLayoutRenderer.cs" />
+    <Compile Include="Instrumentation\UpdateLogLayoutRenderer.cs" />
     <Compile Include="Serializer\Json.cs" />
     <Compile Include="Messaging\CommandCompletedEvent.cs" />
     <Compile Include="Messaging\CommandStartedEvent.cs" />

NzbDrone.Common/PathExtensions.cs

@@ -5,7 +5,6 @@ namespace NzbDrone.Common
 {
     public static class PathExtensions
     {
-        private static readonly string APP_DATA = "App_Data" + Path.DirectorySeparatorChar;
         private static readonly string APP_CONFIG_FILE = "config.xml";
         private static readonly string NZBDRONE_DB = "nzbdrone.db";
         private static readonly string BACKUP_ZIP_FILE = "NzbDrone_Backup.zip";
@@ -57,12 +56,17 @@ namespace NzbDrone.Common
 
         public static string GetAppDataPath(this IEnvironmentProvider environmentProvider)
         {
-            return Path.Combine(environmentProvider.WorkingDirectory, APP_DATA);
+            return environmentProvider.WorkingDirectory;
+        }
+
+        public static string GetLogFolder(this IEnvironmentProvider environmentProvider)
+        {
+            return Path.Combine(environmentProvider.GetAppDataPath(), "logs");
         }
 
         public static string GetConfigPath(this IEnvironmentProvider environmentProvider)
         {
-            return Path.Combine(environmentProvider.WorkingDirectory, APP_CONFIG_FILE);
+            return Path.Combine(environmentProvider.GetAppDataPath(), APP_CONFIG_FILE);
         }
 
         public static string GetMediaCoverPath(this IEnvironmentProvider environmentProvider)
@@ -72,7 +76,7 @@ namespace NzbDrone.Common
 
         public static string GetUpdateLogFolder(this IEnvironmentProvider environmentProvider)
         {
-            return Path.Combine(environmentProvider.WorkingDirectory, UPDATE_LOG_FOLDER_NAME);
+            return Path.Combine(environmentProvider.GetAppDataPath(), UPDATE_LOG_FOLDER_NAME);
         }
 
         public static string GetUpdateSandboxFolder(this IEnvironmentProvider environmentProvider)
@@ -100,11 +104,6 @@ namespace NzbDrone.Common
             return Path.Combine(environmentProvider.GetUpdateSandboxFolder(), UPDATE_CLIENT_EXE);
         }
 
-        public static string GetSandboxLogFolder(this IEnvironmentProvider environmentProvider)
-        {
-            return Path.Combine(environmentProvider.GetUpdateSandboxFolder(), UPDATE_LOG_FOLDER_NAME);
-        }
-
         public static string GetConfigBackupFile(this IEnvironmentProvider environmentProvider)
         {
             return Path.Combine(environmentProvider.GetAppDataPath(), BACKUP_ZIP_FILE);

NzbDrone.Common/Reflection/ReflectionExtensions.cs

@@ -32,6 +32,7 @@ namespace NzbDrone.Common.Reflection
                    || type.IsEnum
                    || type == typeof(string)
                    || type == typeof(DateTime)
+                   || type == typeof(Version)
                    || type == typeof(Decimal);
         }
 

NzbDrone.Core.Test/UpdateTests/GetUpdateLogFixture.cs

@@ -4,6 +4,7 @@ using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Update;
 
 namespace NzbDrone.Core.Test.UpdateTests
 {

NzbDrone.Core/Configuration/ConfigService.cs

@@ -167,7 +167,7 @@ namespace NzbDrone.Core.Configuration
 
         public string UpdateUrl
         {
-            get { return GetValue("UpdateUrl", "http://update.nzbdrone.com/_release/"); }
+            get { return GetValue("UpdateUrl", "http://update.nzbdrone.com/vnext/"); }
             set { SetValue("UpdateUrl", value); }
         }
 

NzbDrone.Core/Jobs/Scheduler.cs

@@ -45,10 +45,7 @@ namespace NzbDrone.Core.Jobs
                 {
                     try
                     {
-                        var commandType = Type.GetType(task.TypeName);
+                        _messageAggregator.PublishCommand(task.TypeName);
-                        var command = (ICommand)Activator.CreateInstance(commandType);
-
-                        _messageAggregator.PublishCommand(command);
                     }
                     catch (Exception e)
                     {

NzbDrone.Core/Jobs/TaskManager.cs

@@ -7,6 +7,7 @@ using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.MediaFiles.Commands;
 using NzbDrone.Core.Providers;
+using NzbDrone.Core.Update.Commands;
 
 namespace NzbDrone.Core.Jobs
 {
@@ -39,7 +40,8 @@ namespace NzbDrone.Core.Jobs
                     new ScheduledTask{ Interval = 25, TypeName = typeof(RssSyncCommand).FullName},
                     new ScheduledTask{ Interval = 12*60, TypeName = typeof(UpdateXemMappings).FullName},
                     new ScheduledTask{ Interval = 6*60, TypeName = typeof(DiskScanCommand).FullName},
-                    new ScheduledTask{ Interval = 1, TypeName = typeof(DownloadedEpisodesScanCommand).FullName}
+                    new ScheduledTask{ Interval = 1, TypeName = typeof(DownloadedEpisodesScanCommand).FullName},
+                    new ScheduledTask{ Interval = 15, TypeName = typeof(ApplicationUpdateCommand).FullName}
                 };
 
             var currentTasks = _scheduledTaskRepository.All();

NzbDrone.Core/Update/UpdateService.cs

@@ -7,106 +7,125 @@ using System.Linq;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.Messaging;
-using NzbDrone.Core.Update;
 using NzbDrone.Core.Update.Commands;
 
 namespace NzbDrone.Core.Update
 {
-    public interface IUpdateService
+    public interface IUpdateService : IExecute<ApplicationUpdateCommand>
     {
         Dictionary<DateTime, string> GetUpdateLogFiles();
+        UpdatePackage AvailableUpdate();
     }
-}
 
-public class UpdateService : IUpdateService, IExecute<ApplicationUpdateCommand>
+    public class UpdateService : IUpdateService
-{
-    private readonly IUpdatePackageProvider _updatePackageProvider;
-    private readonly IEnvironmentProvider _environmentProvider;
-
-    private readonly IDiskProvider _diskProvider;
-    private readonly IHttpProvider _httpProvider;
-    private readonly IConfigFileProvider _configFileProvider;
-    private readonly ArchiveProvider _archiveProvider;
-    private readonly IProcessProvider _processProvider;
-    private readonly Logger _logger;
-
-
-    public UpdateService(IUpdatePackageProvider updatePackageProvider, IEnvironmentProvider environmentProvider, IDiskProvider diskProvider,
-        IHttpProvider httpProvider, IConfigFileProvider configFileProvider, ArchiveProvider archiveProvider, IProcessProvider processProvider, Logger logger)
     {
-        _updatePackageProvider = updatePackageProvider;
+        private readonly IUpdatePackageProvider _updatePackageProvider;
-        _environmentProvider = environmentProvider;
+        private readonly IEnvironmentProvider _environmentProvider;
-        _diskProvider = diskProvider;
-        _httpProvider = httpProvider;
-        _configFileProvider = configFileProvider;
-        _archiveProvider = archiveProvider;
-        _processProvider = processProvider;
-        _logger = logger;
-    }
 
+        private readonly IDiskProvider _diskProvider;
+        private readonly IHttpProvider _httpProvider;
+        private readonly IConfigFileProvider _configFileProvider;
+        private readonly ArchiveProvider _archiveProvider;
+        private readonly IProcessProvider _processProvider;
+        private readonly Logger _logger;
 
-    private void InstallUpdate(UpdatePackage updatePackage)
-    {
-        var packageDestination = Path.Combine(_environmentProvider.GetUpdateSandboxFolder(), updatePackage.FileName);
 
-        if (_diskProvider.FolderExists(_environmentProvider.GetUpdateSandboxFolder()))
+        public UpdateService(IUpdatePackageProvider updatePackageProvider, IEnvironmentProvider environmentProvider,
+                             IDiskProvider diskProvider,
+                             IHttpProvider httpProvider, IConfigFileProvider configFileProvider,
+                             ArchiveProvider archiveProvider, IProcessProvider processProvider, Logger logger)
         {
-            _logger.Info("Deleting old update files");
+            _updatePackageProvider = updatePackageProvider;
-            _diskProvider.DeleteFolder(_environmentProvider.GetUpdateSandboxFolder(), true);
+            _environmentProvider = environmentProvider;
+            _diskProvider = diskProvider;
+            _httpProvider = httpProvider;
+            _configFileProvider = configFileProvider;
+            _archiveProvider = archiveProvider;
+            _processProvider = processProvider;
+            _logger = logger;
         }
 
-        _logger.Info("Downloading update package from [{0}] to [{1}]", updatePackage.Url, packageDestination);
-        _httpProvider.DownloadFile(updatePackage.Url, packageDestination);
-        _logger.Info("Download completed for update package from [{0}]", updatePackage.FileName);
 
-        _logger.Info("Extracting Update package");
+        private void InstallUpdate(UpdatePackage updatePackage)
-        _archiveProvider.ExtractArchive(packageDestination, _environmentProvider.GetUpdateSandboxFolder());
+        {
-        _logger.Info("Update package extracted successfully");
+            var updateSandboxFolder = _environmentProvider.GetUpdateSandboxFolder();
+
+            var packageDestination = Path.Combine(updateSandboxFolder, updatePackage.FileName);
 
-        _logger.Info("Preparing client");
+            if (_diskProvider.FolderExists(updateSandboxFolder))
-        _diskProvider.MoveDirectory(_environmentProvider.GetUpdateClientFolder(), _environmentProvider.GetUpdateSandboxFolder());
+            {
+                _logger.Info("Deleting old update files");
+                _diskProvider.DeleteFolder(updateSandboxFolder, true);
+            }
 
+            _logger.Info("Downloading update package from [{0}] to [{1}]", updatePackage.Url, packageDestination);
+            _httpProvider.DownloadFile(updatePackage.Url, packageDestination);
+            _logger.Info("Download completed for update package from [{0}]", updatePackage.FileName);
 
-        _logger.Info("Starting update client");
+            _logger.Info("Extracting Update package");
-        var startInfo = new ProcessStartInfo
+            _archiveProvider.ExtractArchive(packageDestination, updateSandboxFolder);
-        {
+            _logger.Info("Update package extracted successfully");
-            FileName = _environmentProvider.GetUpdateClientExePath(),
-            Arguments = string.Format("{0} {1}", _processProvider.GetCurrentProcess().Id, _configFileProvider.Guid)
-        };
 
-        var process = _processProvider.Start(startInfo);
+            _logger.Info("Preparing client");
+            _diskProvider.MoveDirectory(_environmentProvider.GetUpdateClientFolder(),
+                                        updateSandboxFolder);
 
-        _processProvider.WaitForExit(process);
-    }
 
-    public Dictionary<DateTime, string> GetUpdateLogFiles()
+            _logger.Info("Starting update client");
-    {
+            var startInfo = new ProcessStartInfo
-        var list = new Dictionary<DateTime, string>();
+                {
+                    FileName = _environmentProvider.GetUpdateClientExePath(),
+                    Arguments = string.Format("{0} {1}", _processProvider.GetCurrentProcess().Id, _configFileProvider.Guid)
+                };
+
+            var process = _processProvider.Start(startInfo);
 
-        if (_diskProvider.FolderExists(_environmentProvider.GetUpdateLogFolder()))
+            _processProvider.WaitForExit(process);
+        }
+
+        public Dictionary<DateTime, string> GetUpdateLogFiles()
         {
-            var provider = CultureInfo.InvariantCulture;
+            var list = new Dictionary<DateTime, string>();
-            var files = _diskProvider.GetFiles(_environmentProvider.GetUpdateLogFolder(), SearchOption.TopDirectoryOnly).ToList();
 
-            foreach (var file in files.Select(c => new FileInfo(c)).OrderByDescending(c => c.Name))
+            if (_diskProvider.FolderExists(_environmentProvider.GetUpdateLogFolder()))
             {
-                list.Add(DateTime.ParseExact(file.Name.Replace(file.Extension, string.Empty), "yyyy.MM.dd-H-mm", provider), file.FullName);
+                var provider = CultureInfo.InvariantCulture;
+                var files =
+                    _diskProvider.GetFiles(_environmentProvider.GetUpdateLogFolder(), SearchOption.TopDirectoryOnly)
+                                 .ToList();
+
+                foreach (var file in files.Select(c => new FileInfo(c)).OrderByDescending(c => c.Name))
+                {
+                    list.Add(
+                        DateTime.ParseExact(file.Name.Replace(file.Extension, string.Empty), "yyyy.MM.dd-H-mm", provider),
+                        file.FullName);
+                }
             }
+
+            return list;
         }
 
-        return list;
+        public UpdatePackage AvailableUpdate()
-    }
+        {
+            var latestAvailable = _updatePackageProvider.GetLatestUpdate();
 
-    public void Execute(ApplicationUpdateCommand message)
+            if (latestAvailable == null || latestAvailable.Version <= _environmentProvider.Version)
-    {
+            {
-        var latestAvailable = _updatePackageProvider.GetLatestUpdate();
+                _logger.Debug("No update available.");
+                return null;
+            }
 
-        if (latestAvailable == null || latestAvailable.Version <= _environmentProvider.Version)
+            return latestAvailable;
-        {
-            _logger.Debug("No update available.");
-            return;
         }
 
-        InstallUpdate(latestAvailable);
+        public void Execute(ApplicationUpdateCommand message)
+        {
+            var latestAvailable = AvailableUpdate();
+
+            if (latestAvailable != null)
+            {
+                InstallUpdate(latestAvailable);
+            }
+        }
     }
 }

NzbDrone.Update/NLog.config

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <extensions>
+    <add assembly="NzbDrone.Common"/>
+  </extensions>
   <targets>
     <target xsi:type="ColoredConsole" name="consoleLogger" layout="[${level}] ${logger}: ${message} ${onexception:inner=${newline}${newline}${exception:format=ToString}${newline}}"/>
-    <target xsi:type="File" name="fileLogger" fileName="${date:format=yyyy.MM.dd-H-mm}.txt" autoFlush="true" keepFileOpen="false"
+    <target xsi:type="File" name="fileLogger" fileName="${updateLog}" autoFlush="true" keepFileOpen="false"
-           concurrentWrites="false" concurrentWriteAttemptDelay="50" concurrentWriteAttempts ="10" 
+           concurrentWrites="false" concurrentWriteAttemptDelay="50" concurrentWriteAttempts ="10"
-            layout="${date:format=yy-M-d HH\:mm\:ss.f}|${logger}}|${level}|${message}|${exception:format=ToString}"/>
+            layout="${date:format=yy-M-d HH\:mm\:ss.f}|${level}|${logger}|${message}${onexception:inner=${newline}${newline}${exception:format=ToString}${newline}}"/>
   </targets>
   <rules>
     <logger name="*" minlevel="Debug" writeTo="consoleLogger"/>

NzbDrone.Update/Program.cs

@@ -37,28 +37,10 @@ namespace NzbDrone.Update
                 logger.FatalException("An error has occurred while applying update package.", e);
             }
 
-            TransferUpdateLogs();
         }
 
-        private static void TransferUpdateLogs()
-        {
-            try
-            {
-                var environmentProvider = _container.Resolve<IEnvironmentProvider>();
-                var diskProvider = _container.Resolve<IDiskProvider>();
-                logger.Info("Copying log files to application directory.");
-                diskProvider.CopyDirectory(environmentProvider.GetSandboxLogFolder(), environmentProvider.GetUpdateLogFolder());
-            }
-            catch (Exception e)
-            {
-                logger.FatalException("Can't copy upgrade log files to target folder", e);
-            }
-        }
-
-
         public void Start(string[] args)
         {
-            VerfityArguments(args);
             int processId = ParseProcessId(args);
 
             var exeFileInfo = new FileInfo(_processProvider.GetProcessById(processId).StartPath);
@@ -79,13 +61,5 @@ namespace NzbDrone.Update
             logger.Debug("NzbDrone processId:{0}", id);
             return id;
         }
-
-        private void VerfityArguments(string[] args)
-        {
-            if (args == null || args.Length != 2)
-                throw new ArgumentException("Wrong number of parameters were passed in.");
-
-            logger.Debug("Arguments verified. [{0}] , [{1}]", args[0], args[1]);
-        }
     }
 }

NzbDrone.Update/UpdateContainerBuilder.cs

@@ -5,7 +5,7 @@ namespace NzbDrone.Update
 {
     public class UpdateContainerBuilder : ContainerBuilderBase
     {
-        public UpdateContainerBuilder()
+        private UpdateContainerBuilder()
             : base("NzbDrone.Update", "NzbDrone.Common")
         {
 

NzbDrone/AppMain.cs

@@ -2,6 +2,8 @@
 using System.Diagnostics;
 using System.Reflection;
 using NLog;
+using NzbDrone.Core.Update;
+using NzbDrone.Core.Update.Commands;
 
 namespace NzbDrone
 {
@@ -42,6 +44,14 @@ namespace NzbDrone
                 }
 
                 var container = MainAppContainerBuilder.BuildContainer();
+                try
+                {
+                    container.Resolve<IUpdateService>().Execute(new ApplicationUpdateCommand());
+                }
+                catch (Exception e)
+                {
+                    logger.ErrorException("Application update failed.", e);
+                }
 
                 container.Resolve<Router>().Route(args);
             }

NzbDrone/NLog.config

@@ -4,9 +4,8 @@
       autoReload="true"
       internalLogLevel="Info"
       throwExceptions="true"
-      internalLogToConsole="false"
+      internalLogToConsole="true"
-      internalLogToConsoleError="true"
+      internalLogToConsoleError="true">
-      internalLogFile="nlog.txt">
   <extensions>
     <add assembly="NzbDrone.Core"/>
     <add assembly="NzbDrone.Common"/>
@@ -19,14 +18,14 @@
         <layout>${exception:format=ToString}</layout>
       </parameter>
     </target>
-    <target xsi:type="File" name="rollingFileLogger" fileName="nzbdrone.log.txt" autoFlush="true" keepFileOpen="false"
+    <target xsi:type="File" name="rollingFileLogger" fileName="${appLog}" autoFlush="true" keepFileOpen="false"
            concurrentWrites="false" concurrentWriteAttemptDelay="50" concurrentWriteAttempts ="10"
             archiveAboveSize="1024000" maxArchiveFiles="5" enableFileDelete="true" archiveNumbering ="Rolling"
-            layout="${date:format=yy-M-d HH\:mm\:ss.f}|${logger}}|${level}|${message}|${exception:format=ToString}"/>
+            layout="${date:format=yy-M-d HH\:mm\:ss.f}|${level}|${logger}|${message}${onexception:inner=${newline}${newline}${exception:format=ToString}${newline}}"/>
   </targets>
   <rules>
     <logger name="*" minlevel="Trace" writeTo="consoleLogger"/>
     <logger name="*" minlevel="Off" writeTo="udpTarget"/>
-    <logger name="*" minlevel="Warn" writeTo="rollingFileLogger"/>
+    <logger name="*" minlevel="Debug" writeTo="rollingFileLogger"/>
   </rules>
 </nlog>

build.ps1

@@ -77,15 +77,9 @@ Function Nunit()
 Function RunGrunt()
 {
    $gruntPath = [environment]::getfolderpath("applicationdata") + '\npm\node_modules\grunt-cli\bin\grunt'
-
+   Invoke-Expression  'npm install'
-    if(!(Test-Path $gruntPath))
-    {
-      Invoke-Expression  'npm install grunt-cli -g'
-    }
-
-    Invoke-Expression  'npm install'
     
-    Invoke-Expression  ('node ' + $gruntPath + ' package')
+   Invoke-Expression  ('node ' + $gruntPath + ' package')
 }
 
 Build