mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2024-12-25 17:27:18 +00:00
Code Issues Releases Wiki Activity

fixed update again.

Browse source
This commit is contained in:
kay.one 2013-08-15 20:32:23 -07:00
parent 06f5ff7cb8
commit 2f20aeaec5
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
NzbDrone.Common/Composition/ContainerBuilderBase.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Messaging; using NzbDrone.Common.Messaging;
using TinyIoC; using TinyIoC;
@ -14,8 +15,10 @@ namespace NzbDrone.Common.Composition
public IContainer Container { get; private set; } public IContainer Container { get; private set; }
protected ContainerBuilderBase(params string[] assemblies) protected ContainerBuilderBase(IStartupArguments args, params string[] assemblies)
{ {
_loadedTypes = new List<Type>(); _loadedTypes = new List<Type>();
foreach (var assembly in assemblies) foreach (var assembly in assemblies)
@ -25,6 +28,7 @@ namespace NzbDrone.Common.Composition
Container = new Container(new TinyIoCContainer(), _loadedTypes); Container = new Container(new TinyIoCContainer(), _loadedTypes);
AutoRegisterInterfaces(); AutoRegisterInterfaces();
Container.Register(args);
} }
private void AutoRegisterInterfaces() private void AutoRegisterInterfaces()

3
NzbDrone.Host/MainAppContainerBuilder.cs
View file

@ -17,9 +17,8 @@ namespace NzbDrone.Host
} }
private MainAppContainerBuilder(StartupArguments args) private MainAppContainerBuilder(StartupArguments args)
: base("NzbDrone.Host", "NzbDrone.Common", "NzbDrone.Core", "NzbDrone.Api") : base(args, "NzbDrone.Host", "NzbDrone.Common", "NzbDrone.Core", "NzbDrone.Api")
{ {
Container.Register<IStartupArguments>(args);
AutoRegisterImplementations<NzbDronePersistentConnection>(); AutoRegisterImplementations<NzbDronePersistentConnection>();

2
NzbDrone.Update/UpdateApp.cs
View file

@ -35,7 +35,7 @@ namespace NzbDrone.Update
GlobalExceptionHandlers.Register(); GlobalExceptionHandlers.Register();
new LogglyTarget().Register(LogLevel.Trace); new LogglyTarget().Register(LogLevel.Trace);
_container = UpdateContainerBuilder.Build(); _container = UpdateContainerBuilder.Build(new StartupArguments(args));
logger.Info("Updating NzbDrone to version {0}", BuildInfo.Version); logger.Info("Updating NzbDrone to version {0}", BuildInfo.Version);
_container.Resolve<UpdateApp>().Start(args); _container.Resolve<UpdateApp>().Start(args);

9
NzbDrone.Update/UpdateContainerBuilder.cs
View file

@ -1,18 +1,19 @@
using NzbDrone.Common.Composition; using NzbDrone.Common.Composition;
using NzbDrone.Common.EnvironmentInfo;
namespace NzbDrone.Update namespace NzbDrone.Update
{ {
public class UpdateContainerBuilder : ContainerBuilderBase public class UpdateContainerBuilder : ContainerBuilderBase
{ {
private UpdateContainerBuilder() private UpdateContainerBuilder(IStartupArguments startupArguments)
: base("NzbDrone.Update", "NzbDrone.Common") : base(startupArguments, "NzbDrone.Update", "NzbDrone.Common")
{ {
} }
public static IContainer Build() public static IContainer Build(IStartupArguments startupArguments)
{ {
return new UpdateContainerBuilder().Container; return new UpdateContainerBuilder(startupArguments).Container;
} }
} }
} }