Merge branch 'master' of git://github.com/kayone/NzbDrone

pull/2/head
Mark McDowall 14 years ago
commit 351f73b520

@ -51,6 +51,7 @@ namespace NzbDrone.Core.Test
var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult); var ep = mocker.Resolve<EpisodeProvider>().GetEpisodesByParseResult(parseResult);
ep.Should().HaveCount(1); ep.Should().HaveCount(1);
parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title);
ep.First().ShouldHave().AllPropertiesBut(e => e.Series); ep.First().ShouldHave().AllPropertiesBut(e => e.Series);
} }
@ -138,6 +139,7 @@ namespace NzbDrone.Core.Test
ep.Should().HaveCount(2); ep.Should().HaveCount(2);
db.Fetch<Episode>().Should().HaveCount(2); db.Fetch<Episode>().Should().HaveCount(2);
ep.First().ShouldHave().AllPropertiesBut(e => e.Series); ep.First().ShouldHave().AllPropertiesBut(e => e.Series);
parseResult.EpisodeTitle.Should().Be(fakeEpisode.Title);
} }
[Test] [Test]

@ -354,6 +354,8 @@ namespace PetaPoco
// Open a connection (can be nested) // Open a connection (can be nested)
public void OpenSharedConnection() public void OpenSharedConnection()
{
using (MvcMiniProfiler.MiniProfiler.StepStatic("OpenSharedConnection"))
{ {
if (_sharedConnectionDepth == 0) if (_sharedConnectionDepth == 0)
{ {
@ -366,6 +368,7 @@ namespace PetaPoco
} }
_sharedConnectionDepth++; _sharedConnectionDepth++;
} }
}
/// <summary> /// <summary>
/// Close a previously opened connection /// Close a previously opened connection

@ -137,6 +137,7 @@ namespace NzbDrone.Core.Providers
if (episodeInfo != null) if (episodeInfo != null)
{ {
result.Add(episodeInfo); result.Add(episodeInfo);
parseResult.EpisodeTitle = episodeInfo.Title;
} }
else else
{ {

@ -34,12 +34,14 @@ namespace NzbDrone
#if DEBUG #if DEBUG
Attach(); Attach();
#endif #endif
if (Environment.UserInteractive)
{
try try
{ {
Logger.Info("Starting default browser. {0}",IISController.AppUrl); Logger.Info("Starting default browser. {0}", IISController.AppUrl);
Process.Start(IISController.AppUrl); Process.Start(IISController.AppUrl);
} }
catch(Exception e) catch (Exception e)
{ {
Logger.ErrorException("Failed to open URL in default browser.", e); Logger.ErrorException("Failed to open URL in default browser.", e);
} }
@ -48,6 +50,7 @@ namespace NzbDrone
Console.ReadLine(); Console.ReadLine();
} }
} }
}
catch (Exception e) catch (Exception e)
{ {
AppDomainException(e); AppDomainException(e);

Loading…
Cancel
Save