From 08b2e293d3f1d1d43023b1e4740ad01f96ed1868 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 24 Jul 2014 18:02:47 -0700 Subject: [PATCH 001/105] Verify disk scan won't scan if root folder doesn't exist --- .../DiskScanServiceTests/ScanFixture.cs | 44 +++++++++++++++++++ .../NzbDrone.Core.Test.csproj | 1 + .../Configuration/ConfigFileProvider.cs | 4 +- .../MediaFiles/DiskScanService.cs | 4 +- 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs diff --git a/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs new file mode 100644 index 000000000..ea1a07f8d --- /dev/null +++ b/src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs @@ -0,0 +1,44 @@ +using System; +using System.IO; +using FizzWare.NBuilder; +using Moq; +using NUnit.Framework; +using NzbDrone.Common.Disk; +using NzbDrone.Core.MediaFiles; +using NzbDrone.Core.MediaFiles.Commands; +using NzbDrone.Core.Messaging.Commands; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Tv; +using NzbDrone.Test.Common; + +namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests +{ + [TestFixture] + public class ScanFixture : CoreTest + { + private Series _series; + + [SetUp] + public void Setup() + { + _series = Builder.CreateNew() + .With(s => s.Path = @"C:\Test\TV\Series") + .Build(); + + Mocker.GetMock() + .Setup(s => s.GetParentFolder(It.IsAny())) + .Returns((String path) => Directory.GetParent(path).FullName); + } + + [Test] + public void should_not_scan_if_series_root_folder_does_not_exist() + { + Subject.Scan(_series); + + ExceptionVerification.ExpectedWarns(1); + + Mocker.GetMock() + .Verify(v => v.PublishCommand(It.IsAny()), Times.Never()); + } + } +} diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 59e3a0599..a36695aa6 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -155,6 +155,7 @@ + diff --git a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs index d0954c221..ecb23d0a2 100644 --- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs +++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs @@ -168,9 +168,9 @@ namespace NzbDrone.Core.Configuration { get { - var urlBase = GetValue("UrlBase", ""); + var urlBase = GetValue("UrlBase", "").Trim('/'); - if (String.IsNullOrEmpty(urlBase)) + if (urlBase.IsNullOrWhiteSpace()) { return urlBase; } diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs index c8d94c2ed..4bdfe04b7 100644 --- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs +++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; +using System.Diagnostics; using System.IO; using System.Linq; using NLog; From 41583a8c67cbc7bf77d10b64bd77bed0fe9436dc Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 24 Jul 2014 23:08:32 -0700 Subject: [PATCH 002/105] New: Pushalot notification support --- .../Notifications/Pushalot/Pushalot.cs | 50 +++++++++ .../Pushalot/PushalotPriority.cs | 9 ++ .../Notifications/Pushalot/PushalotProxy.cs | 102 ++++++++++++++++++ .../Pushalot/PushalotResponse.cs | 11 ++ .../Pushalot/PushalotSettings.cs | 40 +++++++ src/NzbDrone.Core/NzbDrone.Core.csproj | 5 + 6 files changed, 217 insertions(+) create mode 100644 src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs create mode 100644 src/NzbDrone.Core/Notifications/Pushalot/PushalotPriority.cs create mode 100644 src/NzbDrone.Core/Notifications/Pushalot/PushalotProxy.cs create mode 100644 src/NzbDrone.Core/Notifications/Pushalot/PushalotResponse.cs create mode 100644 src/NzbDrone.Core/Notifications/Pushalot/PushalotSettings.cs diff --git a/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs b/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs new file mode 100644 index 000000000..0f54e344e --- /dev/null +++ b/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using FluentValidation.Results; +using NzbDrone.Common; +using NzbDrone.Core.Tv; + +namespace NzbDrone.Core.Notifications.Pushalot +{ + public class Pushalot : NotificationBase + { + private readonly IPushalotProxy _proxy; + + public Pushalot(IPushalotProxy proxy) + { + _proxy = proxy; + } + + public override string Link + { + get { return "https://www.Pushalot.com/"; } + } + + public override void OnGrab(String message) + { + const string title = "Episode Grabbed"; + + _proxy.SendNotification(title, message, Settings); + } + + public override void OnDownload(DownloadMessage message) + { + const string title = "Episode Downloaded"; + + _proxy.SendNotification(title, message.Message, Settings); + } + + public override void AfterRename(Series series) + { + } + + public override ValidationResult Test() + { + var failures = new List(); + + failures.AddIfNotNull(_proxy.Test(Settings)); + + return new ValidationResult(failures); + } + } +} diff --git a/src/NzbDrone.Core/Notifications/Pushalot/PushalotPriority.cs b/src/NzbDrone.Core/Notifications/Pushalot/PushalotPriority.cs new file mode 100644 index 000000000..58effba2f --- /dev/null +++ b/src/NzbDrone.Core/Notifications/Pushalot/PushalotPriority.cs @@ -0,0 +1,9 @@ +namespace NzbDrone.Core.Notifications.Pushalot +{ + public enum PushalotPriority + { + Silent = -1, + Normal = 0, + Important = 1 + } +} diff --git a/src/NzbDrone.Core/Notifications/Pushalot/PushalotProxy.cs b/src/NzbDrone.Core/Notifications/Pushalot/PushalotProxy.cs new file mode 100644 index 000000000..aeb3a71d0 --- /dev/null +++ b/src/NzbDrone.Core/Notifications/Pushalot/PushalotProxy.cs @@ -0,0 +1,102 @@ +using System; +using System.Net; +using FluentValidation.Results; +using NLog; +using NzbDrone.Common.Serializer; +using NzbDrone.Core.Rest; +using RestSharp; + +namespace NzbDrone.Core.Notifications.Pushalot +{ + public interface IPushalotProxy + { + void SendNotification(String title, String message, PushalotSettings settings); + ValidationFailure Test(PushalotSettings settings); + } + + public class PushalotProxy : IPushalotProxy + { + private readonly Logger _logger; + private const string URL = "https://pushalot.com/api/sendmessage"; + + public PushalotProxy(Logger logger) + { + _logger = logger; + } + + public void SendNotification(String title, String message, PushalotSettings settings) + { + var client = RestClientFactory.BuildClient(URL); + var request = BuildRequest(); + + request.AddParameter("Source", "NzbDrone"); + request.AddParameter("Image", "https://raw.githubusercontent.com/NzbDrone/NzbDrone/master/Logo/128.png"); + + request.AddParameter("Title", title); + request.AddParameter("Body", message); + request.AddParameter("AuthorizationToken", settings.AuthToken); + + if ((PushalotPriority)settings.Priority == PushalotPriority.Important) + { + request.AddParameter("IsImportant", true); + } + + if ((PushalotPriority)settings.Priority == PushalotPriority.Silent) + { + request.AddParameter("IsSilent", true); + } + + client.ExecuteAndValidate(request); + } + + public RestRequest BuildRequest() + { + var request = new RestRequest(Method.POST); + + return request; + } + + public ValidationFailure Test(PushalotSettings settings) + { + try + { + const string title = "Test Notification"; + const string body = "This is a test message from NzbDrone"; + + SendNotification(title, body, settings); + } + catch (RestException ex) + { + if (ex.Response.StatusCode == HttpStatusCode.Unauthorized) + { + _logger.ErrorException("Authentication Token is invalid: " + ex.Message, ex); + return new ValidationFailure("AuthToken", "Authentication Token is invalid"); + } + + if (ex.Response.StatusCode == HttpStatusCode.NotAcceptable) + { + _logger.ErrorException("Message limit reached: " + ex.Message, ex); + return new ValidationFailure("AuthToken", "Message limit reached"); + } + + if (ex.Response.StatusCode == HttpStatusCode.Gone) + { + _logger.ErrorException("Authorization Token is no longer valid: " + ex.Message, ex); + return new ValidationFailure("AuthToken", "Authorization Token is no longer valid, please use a new one."); + } + + var response = Json.Deserialize(ex.Response.Content); + + _logger.ErrorException("Unable to send test message: " + ex.Message, ex); + return new ValidationFailure("AuthToken", response.Description); + } + catch (Exception ex) + { + _logger.ErrorException("Unable to send test message: " + ex.Message, ex); + return new ValidationFailure("", "Unable to send test message"); + } + + return null; + } + } +} diff --git a/src/NzbDrone.Core/Notifications/Pushalot/PushalotResponse.cs b/src/NzbDrone.Core/Notifications/Pushalot/PushalotResponse.cs new file mode 100644 index 000000000..f98807a5a --- /dev/null +++ b/src/NzbDrone.Core/Notifications/Pushalot/PushalotResponse.cs @@ -0,0 +1,11 @@ +using System; + +namespace NzbDrone.Core.Notifications.Pushalot +{ + public class PushalotResponse + { + public Boolean Success { get; set; } + public Int32 Status { get; set; } + public String Description { get; set; } + } +} diff --git a/src/NzbDrone.Core/Notifications/Pushalot/PushalotSettings.cs b/src/NzbDrone.Core/Notifications/Pushalot/PushalotSettings.cs new file mode 100644 index 000000000..7e5e9c8cd --- /dev/null +++ b/src/NzbDrone.Core/Notifications/Pushalot/PushalotSettings.cs @@ -0,0 +1,40 @@ +using System; +using FluentValidation; +using FluentValidation.Results; +using NzbDrone.Core.Annotations; +using NzbDrone.Core.ThingiProvider; + +namespace NzbDrone.Core.Notifications.Pushalot +{ + public class PushalotSettingsValidator : AbstractValidator + { + public PushalotSettingsValidator() + { + RuleFor(c => c.AuthToken).NotEmpty(); + } + } + + public class PushalotSettings : IProviderConfig + { + private static readonly PushalotSettingsValidator Validator = new PushalotSettingsValidator(); + + [FieldDefinition(0, Label = "Authorization Token", HelpLink = "https://pushalot.com/manager/authorizations")] + public String AuthToken { get; set; } + + [FieldDefinition(1, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(PushalotPriority))] + public Int32 Priority { get; set; } + + public bool IsValid + { + get + { + return !String.IsNullOrWhiteSpace(AuthToken); + } + } + + public ValidationResult Validate() + { + return Validator.Validate(this); + } + } +} diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 7e12f2d21..f85d0f043 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -415,6 +415,11 @@ + + + + + From a4500606a9568770195329513a3ebbd2684aa4d3 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 24 Jul 2014 23:37:32 -0700 Subject: [PATCH 003/105] Fixed: mono version check will check running mono version instead running another version --- src/NzbDrone.Common/NzbDrone.Common.csproj | 1 + .../Processes/IRuntimeProvider.cs | 9 ++++ .../Checks/MonoVersionCheckFixture.cs | 39 +++++------------- .../HealthCheck/Checks/MonoVersionCheck.cs | 23 ++++------- src/NzbDrone.Mono/MonoRuntimeProvider.cs | 41 +++++++++++++++++++ src/NzbDrone.Mono/NzbDrone.Mono.csproj | 1 + 6 files changed, 72 insertions(+), 42 deletions(-) create mode 100644 src/NzbDrone.Common/Processes/IRuntimeProvider.cs create mode 100644 src/NzbDrone.Mono/MonoRuntimeProvider.cs diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index c5ebd8d90..e5ef0d4e7 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -112,6 +112,7 @@ + diff --git a/src/NzbDrone.Common/Processes/IRuntimeProvider.cs b/src/NzbDrone.Common/Processes/IRuntimeProvider.cs new file mode 100644 index 000000000..96f7a1e62 --- /dev/null +++ b/src/NzbDrone.Common/Processes/IRuntimeProvider.cs @@ -0,0 +1,9 @@ +using System; + +namespace NzbDrone.Common.Processes +{ + public interface IRuntimeProvider + { + String GetVersion(); + } +} diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs index 8a0bbf7da..3184496ef 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using NUnit.Framework; using NzbDrone.Common.Processes; using NzbDrone.Core.HealthCheck.Checks; @@ -18,16 +17,9 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks private void GivenOutput(string version) { - Mocker.GetMock() - .Setup(s => s.StartAndCapture("mono", "--version")) - .Returns(new ProcessOutput - { - Standard = new List - { - String.Format("Mono JIT compiler version {0} (Debian {0}-8)", version), - "Copyright (C) 2002-2011 Novell, Inc, Xamarin, Inc and Contributors. www.mono-project.com" - } - }); + Mocker.GetMock() + .Setup(s => s.GetVersion()) + .Returns(String.Format("{0} (tarball Wed Sep 25 16:35:44 CDT 2013)", version)); } [Test] @@ -46,6 +38,14 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks Subject.Check().ShouldBeWarning(); } + [Test] + public void should_return_warning_when_mono_2_10_2() + { + GivenOutput("2.10.2"); + + Subject.Check().ShouldBeWarning(); + } + [Test] public void should_return_ok_when_mono_3_2() { @@ -85,22 +85,5 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks Subject.Check().ShouldBeOk(); } - - [Test] - public void should_return_ok_when_mono_3_6_1_with_custom_output() - { - Mocker.GetMock() - .Setup(s => s.StartAndCapture("mono", "--version")) - .Returns(new ProcessOutput - { - Standard = new List - { - "Mono JIT compiler version 3.6.1 (master/fce3972 Fri Jul 4 01:12:43 CEST 2014)", - "Copyright (C) 2002-2011 Novell, Inc, Xamarin, Inc and Contributors. www.mono-project.com" - } - }); - - Subject.Check().ShouldBeOk(); - } } } diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs index 733d5e61a..52944faa1 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs @@ -8,13 +8,13 @@ namespace NzbDrone.Core.HealthCheck.Checks { public class MonoVersionCheck : HealthCheckBase { - private readonly IProcessProvider _processProvider; + private readonly IRuntimeProvider _runtimeProvider; private readonly Logger _logger; private static readonly Regex VersionRegex = new Regex(@"(?<=\W)(?\d+\.\d+\.\d+(\.\d+)?)(?=\W)", RegexOptions.Compiled | RegexOptions.IgnoreCase); - public MonoVersionCheck(IProcessProvider processProvider, Logger logger) + public MonoVersionCheck(IRuntimeProvider runtimeProvider, Logger logger) { - _processProvider = processProvider; + _runtimeProvider = runtimeProvider; _logger = logger; } @@ -25,21 +25,16 @@ namespace NzbDrone.Core.HealthCheck.Checks return new HealthCheck(GetType()); } - var output = _processProvider.StartAndCapture("mono", "--version"); + var versionMatch = VersionRegex.Match(_runtimeProvider.GetVersion()); - foreach (var line in output.Standard) + if (versionMatch.Success) { - var versionMatch = VersionRegex.Match(line); + var version = new Version(versionMatch.Groups["version"].Value); - if (versionMatch.Success) + if (version >= new Version(3, 2)) { - var version = new Version(versionMatch.Groups["version"].Value); - - if (version >= new Version(3, 2)) - { - _logger.Debug("mono version is 3.2 or better: {0}", version.ToString()); - return new HealthCheck(GetType()); - } + _logger.Debug("mono version is 3.2 or better: {0}", version.ToString()); + return new HealthCheck(GetType()); } } diff --git a/src/NzbDrone.Mono/MonoRuntimeProvider.cs b/src/NzbDrone.Mono/MonoRuntimeProvider.cs new file mode 100644 index 000000000..af0fe4115 --- /dev/null +++ b/src/NzbDrone.Mono/MonoRuntimeProvider.cs @@ -0,0 +1,41 @@ +using System; +using System.Reflection; +using NLog; +using NzbDrone.Common.Processes; + +namespace NzbDrone.Mono +{ + public class MonoRuntimeProvider : IRuntimeProvider + { + private readonly Logger _logger; + + public MonoRuntimeProvider(Logger logger) + { + _logger = logger; + } + + public String GetVersion() + { + try + { + var type = Type.GetType("Mono.Runtime"); + + if (type != null) + { + var displayName = type.GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static); + + if (displayName != null) + { + return displayName.Invoke(null, null).ToString(); + } + } + } + catch (Exception ex) + { + _logger.ErrorException("Unable to get mono version: " + ex.Message, ex); + } + + return String.Empty; + } + } +} diff --git a/src/NzbDrone.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj index 91d0efeb3..fa37ac15e 100644 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ b/src/NzbDrone.Mono/NzbDrone.Mono.csproj @@ -70,6 +70,7 @@ + From 0d112075cbd855cff205ec0be0077e39b4d3e94f Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 24 Jul 2014 23:40:55 -0700 Subject: [PATCH 004/105] Added implementation of IRuntimeProvider for Windows --- src/NzbDrone.Windows/DotNetRuntimeProvider.cs | 13 +++++++++++++ src/NzbDrone.Windows/NzbDrone.Windows.csproj | 1 + 2 files changed, 14 insertions(+) create mode 100644 src/NzbDrone.Windows/DotNetRuntimeProvider.cs diff --git a/src/NzbDrone.Windows/DotNetRuntimeProvider.cs b/src/NzbDrone.Windows/DotNetRuntimeProvider.cs new file mode 100644 index 000000000..40203278d --- /dev/null +++ b/src/NzbDrone.Windows/DotNetRuntimeProvider.cs @@ -0,0 +1,13 @@ +using System; +using NzbDrone.Common.Processes; + +namespace NzbDrone.Windows +{ + public class DotNetRuntimeProvider : IRuntimeProvider + { + public String GetVersion() + { + return Environment.Version.ToString(); + } + } +} diff --git a/src/NzbDrone.Windows/NzbDrone.Windows.csproj b/src/NzbDrone.Windows/NzbDrone.Windows.csproj index 607f09a4e..4c3d83721 100644 --- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj +++ b/src/NzbDrone.Windows/NzbDrone.Windows.csproj @@ -63,6 +63,7 @@ + From 502c2fa6cf64d95e3de81264f242bc6684fff2b9 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 24 Jul 2014 23:57:54 -0700 Subject: [PATCH 005/105] Better regex for mono version parsing --- src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs index 52944faa1..43f385e8e 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs @@ -10,7 +10,7 @@ namespace NzbDrone.Core.HealthCheck.Checks { private readonly IRuntimeProvider _runtimeProvider; private readonly Logger _logger; - private static readonly Regex VersionRegex = new Regex(@"(?<=\W)(?\d+\.\d+\.\d+(\.\d+)?)(?=\W)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex VersionRegex = new Regex(@"(?<=\W|^)(?\d+\.\d+\.\d+(\.\d+)?)(?=\W)", RegexOptions.Compiled | RegexOptions.IgnoreCase); public MonoVersionCheck(IRuntimeProvider runtimeProvider, Logger logger) { @@ -25,7 +25,8 @@ namespace NzbDrone.Core.HealthCheck.Checks return new HealthCheck(GetType()); } - var versionMatch = VersionRegex.Match(_runtimeProvider.GetVersion()); + var versionString = _runtimeProvider.GetVersion(); + var versionMatch = VersionRegex.Match(versionString); if (versionMatch.Success) { From d9f4eeb0f0c41fa4227e0ce743273a1e976b1b56 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 25 Jul 2014 06:37:25 -0700 Subject: [PATCH 006/105] Fixed: Manual search won't fail if release wasn't parsed correctly --- .../DecisionEngine/DownloadDecisionPriorizationService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs index 2980a1132..9f01356b2 100644 --- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs +++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs @@ -21,7 +21,7 @@ namespace NzbDrone.Core.DecisionEngine .GroupBy(c => c.RemoteEpisode.Series.Id, (i, s) => s .OrderByDescending(c => c.RemoteEpisode.ParsedEpisodeInfo.Quality, new QualityModelComparer(s.First().RemoteEpisode.Series.QualityProfile)) .ThenBy(c => c.RemoteEpisode.Episodes.Select(e => e.EpisodeNumber).MinOrDefault()) - .ThenBy(c => c.RemoteEpisode.Release.Size.Round(200.Megabytes()) / c.RemoteEpisode.Episodes.Count) + .ThenBy(c => c.RemoteEpisode.Release.Size.Round(200.Megabytes()) / Math.Max(1, c.RemoteEpisode.Episodes.Count)) .ThenBy(c => c.RemoteEpisode.Release.Age)) .SelectMany(c => c) .Union(decisions.Where(c => c.RemoteEpisode.Series == null)) From a929b936957966d7988133a569558fed32c92952 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 25 Jul 2014 07:36:55 -0700 Subject: [PATCH 007/105] Tests are good too. --- .../PrioritizeDownloadDecisionFixture.cs | 57 ++++++++++++------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs index a4c62160d..b91614795 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using NzbDrone.Core.Tv; -using NzbDrone.Core.Download; using NzbDrone.Core.Qualities; using NzbDrone.Core.Parser.Model; using NzbDrone.Core.DecisionEngine; @@ -17,7 +16,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests [TestFixture] public class PrioritizeDownloadDecisionFixture : CoreTest { - private Episode GetEpisode(int id) + private Episode GivenEpisode(int id) { return Builder.CreateNew() .With(e => e.Id = id) @@ -25,7 +24,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests .Build(); } - private RemoteEpisode GetRemoteEpisode(List episodes, QualityModel quality, int Age = 0, long size = 0) + private RemoteEpisode GivenRemoteEpisode(List episodes, QualityModel quality, int age = 0, long size = 0) { var remoteEpisode = new RemoteEpisode(); remoteEpisode.ParsedEpisodeInfo = new ParsedEpisodeInfo(); @@ -35,7 +34,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests remoteEpisode.Episodes.AddRange(episodes); remoteEpisode.Release = new ReleaseInfo(); - remoteEpisode.Release.PublishDate = DateTime.Now.AddDays(-Age); + remoteEpisode.Release.PublishDate = DateTime.Now.AddDays(-age); remoteEpisode.Release.Size = size; remoteEpisode.Series = Builder.CreateNew() @@ -48,8 +47,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests [Test] public void should_put_propers_before_non_propers() { - var remoteEpisode1 = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.HDTV720p, false)); - var remoteEpisode2 = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.HDTV720p, true)); + var remoteEpisode1 = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p, false)); + var remoteEpisode2 = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p, true)); var decisions = new List(); decisions.Add(new DownloadDecision(remoteEpisode1)); @@ -62,8 +61,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests [Test] public void should_put_higher_quality_before_lower() { - var remoteEpisode1 = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.SDTV)); - var remoteEpisode2 = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.HDTV720p)); + var remoteEpisode1 = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.SDTV)); + var remoteEpisode2 = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p)); var decisions = new List(); decisions.Add(new DownloadDecision(remoteEpisode1)); @@ -76,8 +75,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests [Test] public void should_order_by_lowest_number_of_episodes() { - var remoteEpisode1 = GetRemoteEpisode(new List { GetEpisode(2) }, new QualityModel(Quality.HDTV720p)); - var remoteEpisode2 = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.HDTV720p)); + var remoteEpisode1 = GivenRemoteEpisode(new List { GivenEpisode(2) }, new QualityModel(Quality.HDTV720p)); + var remoteEpisode2 = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p)); var decisions = new List(); decisions.Add(new DownloadDecision(remoteEpisode1)); @@ -90,8 +89,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests [Test] public void should_order_by_lowest_number_of_episodes_with_multiple_episodes() { - var remoteEpisode1 = GetRemoteEpisode(new List { GetEpisode(2), GetEpisode(3) }, new QualityModel(Quality.HDTV720p)); - var remoteEpisode2 = GetRemoteEpisode(new List { GetEpisode(1), GetEpisode(2) }, new QualityModel(Quality.HDTV720p)); + var remoteEpisode1 = GivenRemoteEpisode(new List { GivenEpisode(2), GivenEpisode(3) }, new QualityModel(Quality.HDTV720p)); + var remoteEpisode2 = GivenRemoteEpisode(new List { GivenEpisode(1), GivenEpisode(2) }, new QualityModel(Quality.HDTV720p)); var decisions = new List(); decisions.Add(new DownloadDecision(remoteEpisode1)); @@ -101,30 +100,29 @@ namespace NzbDrone.Core.Test.DecisionEngineTests qualifiedReports.First().RemoteEpisode.Episodes.First().EpisodeNumber.Should().Be(1); } - [Test] public void should_order_by_smallest_rounded_to_200mb_then_age() { - var remoteEpisodeSd = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.SDTV), size: 100.Megabytes(), Age: 1); - var remoteEpisodeHdSmallOld = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 1200.Megabytes(), Age: 1000); - var remoteEpisodeHdSmallYounge = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 1250.Megabytes(), Age: 10); - var remoteEpisodeHdLargeYounge = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 3000.Megabytes(), Age: 1); + var remoteEpisodeSd = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.SDTV), size: 100.Megabytes(), age: 1); + var remoteEpisodeHdSmallOld = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 1200.Megabytes(), age: 1000); + var remoteEpisodeSmallYoung = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 1250.Megabytes(), age: 10); + var remoteEpisodeHdLargeYoung = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 3000.Megabytes(), age: 1); var decisions = new List(); decisions.Add(new DownloadDecision(remoteEpisodeSd)); decisions.Add(new DownloadDecision(remoteEpisodeHdSmallOld)); - decisions.Add(new DownloadDecision(remoteEpisodeHdSmallYounge)); - decisions.Add(new DownloadDecision(remoteEpisodeHdLargeYounge)); + decisions.Add(new DownloadDecision(remoteEpisodeSmallYoung)); + decisions.Add(new DownloadDecision(remoteEpisodeHdLargeYoung)); var qualifiedReports = Subject.PrioritizeDecisions(decisions); - qualifiedReports.First().RemoteEpisode.Should().Be(remoteEpisodeHdSmallYounge); + qualifiedReports.First().RemoteEpisode.Should().Be(remoteEpisodeSmallYoung); } [Test] public void should_order_by_youngest() { - var remoteEpisode1 = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.HDTV720p), Age: 10); - var remoteEpisode2 = GetRemoteEpisode(new List { GetEpisode(1) }, new QualityModel(Quality.HDTV720p), Age: 5); + var remoteEpisode1 = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), age: 10); + var remoteEpisode2 = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), age: 5); var decisions = new List(); @@ -134,5 +132,20 @@ namespace NzbDrone.Core.Test.DecisionEngineTests var qualifiedReports = Subject.PrioritizeDecisions(decisions); qualifiedReports.First().RemoteEpisode.Should().Be(remoteEpisode2); } + + [Test] + public void should_not_throw_if_no_episodes_are_found() + { + var remoteEpisode1 = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 500.Megabytes()); + var remoteEpisode2 = GivenRemoteEpisode(new List { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 500.Megabytes()); + + remoteEpisode1.Episodes = new List(); + + var decisions = new List(); + decisions.Add(new DownloadDecision(remoteEpisode1)); + decisions.Add(new DownloadDecision(remoteEpisode2)); + + Subject.PrioritizeDecisions(decisions); + } } } From daaf4e183121ac04269deb542a5a4a85b4ecd129 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 25 Jul 2014 08:33:51 -0700 Subject: [PATCH 008/105] New: Parse 6 digit date format (yymmdd) --- .../ParserTests/DailyEpisodeParserFixture.cs | 1 + src/NzbDrone.Core/Parser/Parser.cs | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/NzbDrone.Core.Test/ParserTests/DailyEpisodeParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/DailyEpisodeParserFixture.cs index 67f3bed2d..56e8e9e7b 100644 --- a/src/NzbDrone.Core.Test/ParserTests/DailyEpisodeParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/DailyEpisodeParserFixture.cs @@ -26,6 +26,7 @@ namespace NzbDrone.Core.Test.ParserTests [TestCase("2020.NZ.2011.12.02.PDTV.XviD-C4TV", "2020nz", 2011, 12, 2)] [TestCase("Series Title - 2013-10-30 - Episode Title (1) [HDTV-720p]", "Series Title", 2013, 10, 30)] [TestCase("The_Voice_US_04.28.2014_hdtv.x264.Poke.mp4", "The Voice US", 2014, 4, 28)] + [TestCase("At.Midnight.140722.720p.HDTV.x264-YesTV", "At Midnight", 2014, 07, 22)] public void should_parse_daily_episode(string postTitle, string title, int year, int month, int day) { var result = Parser.Parser.ParseTitle(postTitle); diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs index 63576914b..6c9e74532 100644 --- a/src/NzbDrone.Core/Parser/Parser.cs +++ b/src/NzbDrone.Core/Parser/Parser.cs @@ -132,6 +132,9 @@ namespace NzbDrone.Core.Parser private static readonly Regex AirDateRegex = new Regex(@"^(.*?)(?\d{4})[_.-](?[0-1][0-9])[_.-](?[0-3][0-9])|(?[0-1][0-9])[_.-](?[0-3][0-9])[_.-](?\d{4}))(?!\d)", RegexOptions.IgnoreCase | RegexOptions.Compiled); + private static readonly Regex SixDigitAirDateRegex = new Regex(@"^(?:.*?)(?(?\d{2})(?[0-1][0-9])(?[0-3][0-9]))", + RegexOptions.IgnoreCase | RegexOptions.Compiled); + private static readonly Regex ReleaseGroupRegex = new Regex(@"-(?[a-z0-9]+)\b(? Date: Fri, 25 Jul 2014 08:34:29 -0700 Subject: [PATCH 009/105] Using absolute episode number logging moved to Debug --- src/NzbDrone.Core/Parser/ParsingService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs index 5acc542f7..61ede3492 100644 --- a/src/NzbDrone.Core/Parser/ParsingService.cs +++ b/src/NzbDrone.Core/Parser/ParsingService.cs @@ -186,7 +186,7 @@ namespace NzbDrone.Core.Parser if (episode != null) { - _logger.Info("Using absolute episode number {0} for: {1} - TVDB: {2}x{3:00}", + _logger.Debug("Using absolute episode number {0} for: {1} - TVDB: {2}x{3:00}", absoluteEpisodeNumber, series.Title, episode.SeasonNumber, From 74a38415cf19093dee2afbc177e2861fbf43a535 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 8 Jun 2014 01:22:55 -0700 Subject: [PATCH 010/105] Profiles Indexes are created with the same uniqueness when copying a table New: Non-English episode support New: Renamed Quality Profiles to Profiles and made them more powerful New: Configurable wait time before grabbing a release to wait for a better quality --- .../MappingTests/ResourceMappingFixture.cs | 17 +- src/NzbDrone.Api/Indexers/ReleaseModule.cs | 6 +- src/NzbDrone.Api/Indexers/ReleaseResource.cs | 2 + src/NzbDrone.Api/NzbDrone.Api.csproj | 11 +- .../Profiles/Languages/LanguageModule.cs | 39 + .../Profiles/Languages/LanguageResource.cs | 14 + .../Profiles/LegacyProfileModule.cs | 36 + src/NzbDrone.Api/Profiles/ProfileModule.cs | 67 + src/NzbDrone.Api/Profiles/ProfileResource.cs | 25 + .../ProfileSchemaModule.cs} | 23 +- .../ProfileValidation.cs} | 8 +- .../Qualities/QualityProfileModule.cs | 60 - .../Qualities/QualityProfileResource.cs | 20 - src/NzbDrone.Api/Queue/QueueModule.cs | 23 +- src/NzbDrone.Api/Series/SeriesModule.cs | 5 +- src/NzbDrone.Api/Series/SeriesResource.cs | 22 +- .../Datastore/MarrDataLazyLoadingFixture.cs | 19 +- .../AlterFixture.cs | 19 + .../DuplicateFixture.cs | 4 +- .../CutoffSpecificationFixture.cs | 11 +- .../HistorySpecificationFixture.cs | 17 +- .../LanguageSpecificationFixture.cs | 44 +- .../NotInQueueSpecificationFixture.cs | 3 +- .../PrioritizeDownloadDecisionFixture.cs | 4 +- ...ityAllowedByProfileSpecificationFixture.cs | 7 +- .../QualityUpgradeSpecificationFixture.cs | 9 +- .../RssSync/DelaySpecificationFixture.cs | 253 +++ .../RssSync/ProperSpecificationFixture.cs | 3 +- .../UpgradeDiskSpecificationFixture.cs | 3 +- .../DownloadApprovedFixture.cs | 26 +- .../ProcessFixture.cs | 165 ++ .../HistoryTests/HistoryServiceFixture.cs | 9 +- .../CleanupOrphanedBlacklistFixture.cs | 42 + .../CleanupOrphanedPendingReleasesFixture.cs | 42 + .../NzbSearchServiceFixture.cs | 7 +- .../ImportDecisionMakerFixture.cs | 3 +- .../UpgradeSpecificationFixture.cs | 5 +- .../ImportApprovedEpisodesFixture.cs | 3 +- .../NzbDrone.Core.Test.csproj | 11 +- .../ProfileRepositoryFixture.cs} | 14 +- .../ProfileServiceFixture.cs} | 27 +- .../Qualities/QualityFixture.cs | 5 +- .../Qualities/QualityModelComparerFixture.cs | 19 +- .../EpisodeProviderTest.cs | 1519 ----------------- .../EpisodesWhereCutoffUnmetFixture.cs | 17 +- ...yFixture.cs => SeriesRepositoryFixture.cs} | 10 +- .../UpdateMultipleSeriesFixture.cs | 2 +- .../Extensions/RelationshipExtensions.cs | 5 - .../036_update_with_quality_converters.cs | 3 +- .../Migration/054_rename_profiles.cs | 31 + .../Migration/055_drop_old_profile_columns.cs | 14 + .../Migration/Framework/SQLiteIndex.cs | 7 +- .../Framework/SQLiteMigrationHelper.cs | 6 - src/NzbDrone.Core/Datastore/TableMapping.cs | 16 +- .../{Specifications => }/DownloadDecision.cs | 25 +- .../DecisionEngine/DownloadDecisionMaker.cs | 16 +- .../DownloadDecisionPriorizationService.cs | 2 +- .../IDecisionEngineSpecification.cs | 5 +- .../DecisionEngine/IRejectWithReason.cs | 2 +- .../QualityUpgradableSpecification.cs | 9 +- src/NzbDrone.Core/DecisionEngine/Rejection.cs | 21 + .../DecisionEngine/RejectionType.cs | 8 + .../AcceptableSizeSpecification.cs | 7 +- .../Specifications/BlacklistSpecification.cs | 2 + .../Specifications/CutoffSpecification.cs | 4 +- .../Specifications/LanguageSpecification.cs | 12 +- .../Specifications/NotInQueueSpecification.cs | 4 +- .../NotRestrictedReleaseSpecification.cs | 2 + .../Specifications/NotSampleSpecification.cs | 2 + .../QualityAllowedByProfileSpecification.cs | 4 +- .../Specifications/RetentionSpecification.cs | 2 + .../Specifications/RetrySpecification.cs | 2 + .../RssSync/DelaySpecification.cs | 116 ++ .../RssSync/HistorySpecification.cs | 6 +- .../RssSync/MonitoredEpisodeSpecification.cs | 2 + .../RssSync/ProperSpecification.cs | 2 + .../Search/DailyEpisodeMatchSpecification.cs | 3 + .../Search/EpisodeRequestedSpecification.cs | 2 + .../Search/SeasonMatchSpecification.cs | 2 + .../Search/SeriesSpecification.cs | 2 + .../SingleEpisodeSearchMatchSpecification.cs | 2 + .../UpgradeDiskSpecification.cs | 4 +- .../Download/DownloadApprovedReports.cs | 67 - .../Download/DownloadClientItem.cs | 3 - .../Download/Pending/PendingRelease.cs | 18 + .../Pending/PendingReleaseRepository.cs | 31 + .../Download/Pending/PendingReleaseService.cs | 219 +++ .../Pending/PendingReleasesUpdatedEvent.cs | 8 + .../Download/ProcessDownloadDecisions.cs | 103 ++ .../Download/ProcessedDecisions.cs | 17 + src/NzbDrone.Core/History/HistoryService.cs | 7 +- .../CleanupOrphanedPendingReleases.cs | 31 + .../IndexerSearch/EpisodeSearchService.cs | 19 +- .../IndexerSearch/SeasonSearchService.cs | 10 +- .../IndexerSearch/SeriesSearchService.cs | 8 +- .../Indexers/RssSyncCompleteEvent.cs | 8 + src/NzbDrone.Core/Indexers/RssSyncService.cs | 38 +- .../EpisodeImport/ImportApprovedEpisodes.cs | 2 +- .../EpisodeImport/ImportDecisionMaker.cs | 3 +- .../Specifications/UpgradeSpecification.cs | 3 +- src/NzbDrone.Core/NzbDrone.Core.csproj | 30 +- src/NzbDrone.Core/Parser/Language.cs | 25 +- src/NzbDrone.Core/Profiles/GrabDelayMode.cs | 9 + src/NzbDrone.Core/Profiles/Profile.cs | 18 + .../Profiles/ProfileInUseException.cs | 13 + .../Profiles/ProfileQualityItem.cs | 11 + .../Profiles/ProfileRepository.cs | 18 + src/NzbDrone.Core/Profiles/ProfileService.cs | 106 ++ .../Qualities/QualityModelComparer.cs | 21 +- src/NzbDrone.Core/Qualities/QualityProfile.cs | 12 - .../Qualities/QualityProfileInUseException.cs | 13 - .../Qualities/QualityProfileItem.cs | 11 - .../Qualities/QualityProfileRepository.cs | 19 - .../Qualities/QualityProfileService.cs | 105 -- src/NzbDrone.Core/Queue/QueueService.cs | 29 +- src/NzbDrone.Core/Tv/EpisodeCutoffService.cs | 17 +- src/NzbDrone.Core/Tv/EpisodeRepository.cs | 2 +- src/NzbDrone.Core/Tv/Series.cs | 6 +- .../Validation/LangaugeValidator.cs | 21 + .../Validation/RuleBuilderExtensions.cs | 6 + .../EpisodeIntegrationTests.cs | 2 +- .../NzbDrone.Integration.Test.csproj | 1 - .../QualityProfileIntegrationTest.cs | 10 - .../SeriesEditorIntegrationTest.cs | 6 +- .../SeriesIntegrationTest.cs | 4 +- src/UI/AddSeries/AddSeriesLayout.js | 6 +- src/UI/AddSeries/SearchResultView.js | 36 +- .../AddSeries/SearchResultViewTemplate.html | 4 +- src/UI/Cells/Edit/QualityCellEditor.js | 14 +- .../{QualityProfileCell.js => ProfileCell.js} | 10 +- src/UI/Config.js | 2 +- .../Summary/EpisodeSummaryLayoutTemplate.html | 2 +- src/UI/Handlebars/Helpers/Quality.js | 10 +- src/UI/Handlebars/Helpers/String.js | 9 + .../backbone.marionette.templates.js | 2 +- src/UI/History/Queue/QueueStatusCell.js | 5 + src/UI/History/Queue/TimeleftCell.js | 11 +- src/UI/Profile/ProfileCollection.js | 18 + .../ProfileModel.js} | 0 .../ProfileSelectionPartial.html} | 2 +- src/UI/Quality/QualityProfileCollection.js | 18 - src/UI/Series/Details/InfoViewTemplate.html | 2 +- src/UI/Series/Edit/EditSeriesView.js | 12 +- .../Series/Edit/EditSeriesViewTemplate.html | 6 +- .../Series/Editor/SeriesEditorFooterView.js | 18 +- .../SeriesEditorFooterViewTemplate.html | 6 +- src/UI/Series/Editor/SeriesEditorLayout.js | 52 +- .../SeriesOverviewItemViewTemplate.html | 2 +- src/UI/Series/Index/SeriesIndexLayout.js | 12 +- .../{Quality => }/Profile/AllowedLabeler.js | 1 + .../DeleteProfileView.js} | 2 +- .../DeleteProfileViewTemplate.html} | 0 .../Edit/EditProfileItemView.js} | 2 +- .../Edit/EditProfileItemViewTemplate.html} | 0 .../Edit/EditProfileLayout.js} | 28 +- .../Edit/EditProfileLayoutTemplate.html} | 0 .../Settings/Profile/Edit/EditProfileView.js | 61 + .../Profile/Edit/EditProfileViewTemplate.html | 71 + .../Edit/QualitySortableCollectionView.js | 22 + .../Profile/Language/LanguageCollection.js | 18 + .../Profile/Language/LanguageModel.js | 10 + src/UI/Settings/Profile/LanguageLabel.js | 20 + .../ProfileCollectionTemplate.html} | 6 +- .../ProfileCollectionView.js} | 14 +- src/UI/Settings/Profile/ProfileLayout.js | 27 + .../Profile/ProfileLayoutTemplate.html | 3 + .../Profile/ProfileSchemaCollection.js | 13 + .../ProfileView.js} | 7 +- .../Settings/Profile/ProfileViewTemplate.html | 16 + src/UI/Settings/Profile/profile.less | 31 + .../Definition/QualityDefinitionView.js | 2 +- .../Profile/Edit/EditQualityProfileView.js | 26 - .../Edit/EditQualityProfileViewTemplate.html | 23 - .../Edit/QualitySortableCollectionView.js | 22 - .../Profile/QualityProfileSchemaCollection.js | 13 - .../Profile/QualityProfileViewTemplate.html | 9 - src/UI/Settings/Quality/QualityLayout.js | 7 +- .../Quality/QualityLayoutTemplate.html | 6 - src/UI/Settings/Quality/quality.less | 24 - src/UI/Settings/SettingsLayout.js | 18 + src/UI/Settings/SettingsLayoutTemplate.html | 2 + src/UI/Settings/settings.less | 1 + 182 files changed, 2493 insertions(+), 2433 deletions(-) create mode 100644 src/NzbDrone.Api/Profiles/Languages/LanguageModule.cs create mode 100644 src/NzbDrone.Api/Profiles/Languages/LanguageResource.cs create mode 100644 src/NzbDrone.Api/Profiles/LegacyProfileModule.cs create mode 100644 src/NzbDrone.Api/Profiles/ProfileModule.cs create mode 100644 src/NzbDrone.Api/Profiles/ProfileResource.cs rename src/NzbDrone.Api/{Qualities/QualityProfileSchemaModule.cs => Profiles/ProfileSchemaModule.cs} (50%) rename src/NzbDrone.Api/{Qualities/QualityProfileValidation.cs => Profiles/ProfileValidation.cs} (69%) delete mode 100644 src/NzbDrone.Api/Qualities/QualityProfileModule.cs delete mode 100644 src/NzbDrone.Api/Qualities/QualityProfileResource.cs create mode 100644 src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs create mode 100644 src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/ProcessFixture.cs create mode 100644 src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBlacklistFixture.cs create mode 100644 src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedPendingReleasesFixture.cs rename src/NzbDrone.Core.Test/{Qualities/QualityProfileRepositoryFixture.cs => Profiles/ProfileRepositoryFixture.cs} (52%) rename src/NzbDrone.Core.Test/{Qualities/QualityProfileServiceFixture.cs => Profiles/ProfileServiceFixture.cs} (61%) delete mode 100644 src/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs rename src/NzbDrone.Core.Test/TvTests/SeriesRepositoryTests/{QualityProfileRepositoryFixture.cs => SeriesRepositoryFixture.cs} (74%) create mode 100644 src/NzbDrone.Core/Datastore/Migration/054_rename_profiles.cs create mode 100644 src/NzbDrone.Core/Datastore/Migration/055_drop_old_profile_columns.cs rename src/NzbDrone.Core/DecisionEngine/{Specifications => }/DownloadDecision.cs (53%) create mode 100644 src/NzbDrone.Core/DecisionEngine/Rejection.cs create mode 100644 src/NzbDrone.Core/DecisionEngine/RejectionType.cs create mode 100644 src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs delete mode 100644 src/NzbDrone.Core/Download/DownloadApprovedReports.cs create mode 100644 src/NzbDrone.Core/Download/Pending/PendingRelease.cs create mode 100644 src/NzbDrone.Core/Download/Pending/PendingReleaseRepository.cs create mode 100644 src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs create mode 100644 src/NzbDrone.Core/Download/Pending/PendingReleasesUpdatedEvent.cs create mode 100644 src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs create mode 100644 src/NzbDrone.Core/Download/ProcessedDecisions.cs create mode 100644 src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedPendingReleases.cs create mode 100644 src/NzbDrone.Core/Indexers/RssSyncCompleteEvent.cs create mode 100644 src/NzbDrone.Core/Profiles/GrabDelayMode.cs create mode 100644 src/NzbDrone.Core/Profiles/Profile.cs create mode 100644 src/NzbDrone.Core/Profiles/ProfileInUseException.cs create mode 100644 src/NzbDrone.Core/Profiles/ProfileQualityItem.cs create mode 100644 src/NzbDrone.Core/Profiles/ProfileRepository.cs create mode 100644 src/NzbDrone.Core/Profiles/ProfileService.cs delete mode 100644 src/NzbDrone.Core/Qualities/QualityProfile.cs delete mode 100644 src/NzbDrone.Core/Qualities/QualityProfileInUseException.cs delete mode 100644 src/NzbDrone.Core/Qualities/QualityProfileItem.cs delete mode 100644 src/NzbDrone.Core/Qualities/QualityProfileRepository.cs delete mode 100644 src/NzbDrone.Core/Qualities/QualityProfileService.cs create mode 100644 src/NzbDrone.Core/Validation/LangaugeValidator.cs delete mode 100644 src/NzbDrone.Integration.Test/QualityProfileIntegrationTest.cs rename src/UI/Cells/{QualityProfileCell.js => ProfileCell.js} (51%) create mode 100644 src/UI/Handlebars/Helpers/String.js create mode 100644 src/UI/Profile/ProfileCollection.js rename src/UI/{Quality/QualityProfileModel.js => Profile/ProfileModel.js} (100%) rename src/UI/{Quality/QualityProfileSelectionPartial.html => Profile/ProfileSelectionPartial.html} (53%) delete mode 100644 src/UI/Quality/QualityProfileCollection.js rename src/UI/Settings/{Quality => }/Profile/AllowedLabeler.js (99%) rename src/UI/Settings/{Quality/Profile/DeleteQualityProfileView.js => Profile/DeleteProfileView.js} (86%) rename src/UI/Settings/{Quality/Profile/DeleteQualityProfileViewTemplate.html => Profile/DeleteProfileViewTemplate.html} (100%) rename src/UI/Settings/{Quality/Profile/Edit/EditQualityProfileItemView.js => Profile/Edit/EditProfileItemView.js} (61%) rename src/UI/Settings/{Quality/Profile/Edit/EditQualityProfileItemViewTemplate.html => Profile/Edit/EditProfileItemViewTemplate.html} (100%) rename src/UI/Settings/{Quality/Profile/Edit/EditQualityProfileLayout.js => Profile/Edit/EditProfileLayout.js} (83%) rename src/UI/Settings/{Quality/Profile/Edit/EditQualityProfileLayoutTemplate.html => Profile/Edit/EditProfileLayoutTemplate.html} (100%) create mode 100644 src/UI/Settings/Profile/Edit/EditProfileView.js create mode 100644 src/UI/Settings/Profile/Edit/EditProfileViewTemplate.html create mode 100644 src/UI/Settings/Profile/Edit/QualitySortableCollectionView.js create mode 100644 src/UI/Settings/Profile/Language/LanguageCollection.js create mode 100644 src/UI/Settings/Profile/Language/LanguageModel.js create mode 100644 src/UI/Settings/Profile/LanguageLabel.js rename src/UI/Settings/{Quality/Profile/QualityProfileCollectionTemplate.html => Profile/ProfileCollectionTemplate.html} (64%) rename src/UI/Settings/{Quality/Profile/QualityProfileCollectionView.js => Profile/ProfileCollectionView.js} (69%) create mode 100644 src/UI/Settings/Profile/ProfileLayout.js create mode 100644 src/UI/Settings/Profile/ProfileLayoutTemplate.html create mode 100644 src/UI/Settings/Profile/ProfileSchemaCollection.js rename src/UI/Settings/{Quality/Profile/QualityProfileView.js => Profile/ProfileView.js} (81%) create mode 100644 src/UI/Settings/Profile/ProfileViewTemplate.html create mode 100644 src/UI/Settings/Profile/profile.less delete mode 100644 src/UI/Settings/Quality/Profile/Edit/EditQualityProfileView.js delete mode 100644 src/UI/Settings/Quality/Profile/Edit/EditQualityProfileViewTemplate.html delete mode 100644 src/UI/Settings/Quality/Profile/Edit/QualitySortableCollectionView.js delete mode 100644 src/UI/Settings/Quality/Profile/QualityProfileSchemaCollection.js delete mode 100644 src/UI/Settings/Quality/Profile/QualityProfileViewTemplate.html diff --git a/src/NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs b/src/NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs index 00c52d90e..1e02507f0 100644 --- a/src/NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs +++ b/src/NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs @@ -11,15 +11,16 @@ using NzbDrone.Api.History; using NzbDrone.Api.Indexers; using NzbDrone.Api.Logs; using NzbDrone.Api.Mapping; -using NzbDrone.Api.Qualities; +using NzbDrone.Api.Profiles; using NzbDrone.Api.RootFolders; using NzbDrone.Api.Series; -using NzbDrone.Core.DecisionEngine.Specifications; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Indexers; using NzbDrone.Core.Instrumentation; using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Organizer; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.RootFolders; using NzbDrone.Core.Tv; @@ -41,8 +42,8 @@ namespace NzbDrone.Api.Test.MappingTests [TestCase(typeof(ParsedEpisodeInfo), typeof(ReleaseResource))] [TestCase(typeof(DownloadDecision), typeof(ReleaseResource))] [TestCase(typeof(Core.History.History), typeof(HistoryResource))] - [TestCase(typeof(QualityProfile), typeof(QualityProfileResource))] - [TestCase(typeof(QualityProfileItem), typeof(QualityProfileItemResource))] + [TestCase(typeof(Profile), typeof(ProfileResource))] + [TestCase(typeof(ProfileQualityItem), typeof(ProfileQualityItemResource))] [TestCase(typeof(Log), typeof(LogResource))] [TestCase(typeof(Command), typeof(CommandResource))] public void matching_fields(Type modelType, Type resourceType) @@ -105,16 +106,16 @@ namespace NzbDrone.Api.Test.MappingTests [Test] - public void should_map_qualityprofile() + public void should_map_profile() { - var profileResource = new QualityProfileResource + var profileResource = new ProfileResource { Cutoff = Quality.WEBDL1080p, - Items = new List { new QualityProfileItemResource { Quality = Quality.WEBDL1080p, Allowed = true } } + Items = new List { new ProfileQualityItemResource { Quality = Quality.WEBDL1080p, Allowed = true } } }; - profileResource.InjectTo(); + profileResource.InjectTo(); } diff --git a/src/NzbDrone.Api/Indexers/ReleaseModule.cs b/src/NzbDrone.Api/Indexers/ReleaseModule.cs index 0e01fada3..a64222b0b 100644 --- a/src/NzbDrone.Api/Indexers/ReleaseModule.cs +++ b/src/NzbDrone.Api/Indexers/ReleaseModule.cs @@ -5,7 +5,6 @@ using Nancy; using NLog; using NzbDrone.Api.Mapping; using NzbDrone.Core.DecisionEngine; -using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.Download; using NzbDrone.Core.IndexerSearch; using NzbDrone.Core.Indexers; @@ -15,7 +14,6 @@ using Omu.ValueInjecter; using System.Linq; using Nancy.ModelBinding; using NzbDrone.Api.Extensions; -using NzbDrone.Core.Qualities; namespace NzbDrone.Api.Indexers { @@ -106,14 +104,14 @@ namespace NzbDrone.Api.Indexers release.InjectFrom(downloadDecision.RemoteEpisode.Release); release.InjectFrom(downloadDecision.RemoteEpisode.ParsedEpisodeInfo); release.InjectFrom(downloadDecision); - release.Rejections = downloadDecision.Rejections.ToList(); + release.Rejections = downloadDecision.Rejections.Select(r => r.Reason).ToList(); release.DownloadAllowed = downloadDecision.RemoteEpisode.DownloadAllowed; release.ReleaseWeight = result.Count; if (downloadDecision.RemoteEpisode.Series != null) { - release.QualityWeight = downloadDecision.RemoteEpisode.Series.QualityProfile.Value.Items.FindIndex(v => v.Quality == release.Quality.Quality) * 2; + release.QualityWeight = downloadDecision.RemoteEpisode.Series.Profile.Value.Items.FindIndex(v => v.Quality == release.Quality.Quality) * 2; } if (!release.Quality.Proper) diff --git a/src/NzbDrone.Api/Indexers/ReleaseResource.cs b/src/NzbDrone.Api/Indexers/ReleaseResource.cs index bb6f53379..a07861eb0 100644 --- a/src/NzbDrone.Api/Indexers/ReleaseResource.cs +++ b/src/NzbDrone.Api/Indexers/ReleaseResource.cs @@ -28,6 +28,8 @@ namespace NzbDrone.Api.Indexers public int[] EpisodeNumbers { get; set; } public int[] AbsoluteEpisodeNumbers { get; set; } public Boolean Approved { get; set; } + public Boolean TemporarilyRejected { get; set; } + public Boolean Rejected { get; set; } public Int32 TvRageId { get; set; } public IEnumerable Rejections { get; set; } public DateTime PublishDate { get; set; } diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index 75878901e..80bb065fb 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -150,6 +150,9 @@ + + + @@ -175,7 +178,7 @@ - + @@ -183,7 +186,7 @@ - + @@ -202,8 +205,8 @@ - - + + diff --git a/src/NzbDrone.Api/Profiles/Languages/LanguageModule.cs b/src/NzbDrone.Api/Profiles/Languages/LanguageModule.cs new file mode 100644 index 000000000..147bc69aa --- /dev/null +++ b/src/NzbDrone.Api/Profiles/Languages/LanguageModule.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using NzbDrone.Core.Parser; + +namespace NzbDrone.Api.Profiles.Languages +{ + public class LanguageModule : NzbDroneRestModule + { + public LanguageModule() + { + GetResourceAll = GetAll; + GetResourceById = GetById; + } + + private LanguageResource GetById(int id) + { + var language = (Language)id; + + return new LanguageResource + { + Id = (int)language, + Name = language.ToString() + }; + } + + private List GetAll() + { + return ((Language[])Enum.GetValues(typeof (Language))) + .Select(l => new LanguageResource + { + Id = (int) l, + Name = l.ToString() + }) + .OrderBy(l => l.Name) + .ToList(); + } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Api/Profiles/Languages/LanguageResource.cs b/src/NzbDrone.Api/Profiles/Languages/LanguageResource.cs new file mode 100644 index 000000000..e51d3f555 --- /dev/null +++ b/src/NzbDrone.Api/Profiles/Languages/LanguageResource.cs @@ -0,0 +1,14 @@ +using System; +using Newtonsoft.Json; +using NzbDrone.Api.REST; + +namespace NzbDrone.Api.Profiles.Languages +{ + public class LanguageResource : RestResource + { + [JsonProperty(DefaultValueHandling = DefaultValueHandling.Include)] + public Int32 Id { get; set; } + public String Name { get; set; } + public String NameLower { get { return Name.ToLowerInvariant(); } } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Api/Profiles/LegacyProfileModule.cs b/src/NzbDrone.Api/Profiles/LegacyProfileModule.cs new file mode 100644 index 000000000..23f76fc3c --- /dev/null +++ b/src/NzbDrone.Api/Profiles/LegacyProfileModule.cs @@ -0,0 +1,36 @@ +using System; +using System.Text; +using Nancy; +using Nancy.Responses; + +namespace NzbDrone.Api.Profiles +{ + class LegacyProfileModule : NzbDroneApiModule + { + public LegacyProfileModule() + : base("qualityprofile") + { + Get["/"] = x => + { + string queryString = ConvertQueryParams(Request.Query); + var url = String.Format("/api/profile?{0}", queryString); + + return Response.AsRedirect(url, RedirectResponse.RedirectType.Permanent); + }; + } + + private string ConvertQueryParams(DynamicDictionary query) + { + var sb = new StringBuilder(); + + foreach (var key in query) + { + var value = query[key]; + + sb.AppendFormat("&{0}={1}", key, value); + } + + return sb.ToString().Trim('&'); + } + } +} diff --git a/src/NzbDrone.Api/Profiles/ProfileModule.cs b/src/NzbDrone.Api/Profiles/ProfileModule.cs new file mode 100644 index 000000000..413d99281 --- /dev/null +++ b/src/NzbDrone.Api/Profiles/ProfileModule.cs @@ -0,0 +1,67 @@ +using System.Collections.Generic; +using FluentValidation; +using NzbDrone.Api.Mapping; +using NzbDrone.Core.Profiles; +using NzbDrone.Core.Qualities; +using NzbDrone.Core.Validation; + +namespace NzbDrone.Api.Profiles +{ + public class ProfileModule : NzbDroneRestModule + { + private readonly IProfileService _profileService; + + public ProfileModule(IProfileService profileService) + { + _profileService = profileService; + SharedValidator.RuleFor(c => c.Name).NotEmpty(); + SharedValidator.RuleFor(c => c.Cutoff).NotNull(); + SharedValidator.RuleFor(c => c.Items).MustHaveAllowedQuality(); + SharedValidator.RuleFor(c => c.Language).ValidLanguage(); + + GetResourceAll = GetAll; + GetResourceById = GetById; + UpdateResource = Update; + CreateResource = Create; + DeleteResource = DeleteProfile; + } + + private int Create(ProfileResource resource) + { + var model = resource.InjectTo(); + model = _profileService.Add(model); + return model.Id; + } + + private void DeleteProfile(int id) + { + _profileService.Delete(id); + } + + private void Update(ProfileResource resource) + { + var model = _profileService.Get(resource.Id); + + model.Name = resource.Name; + model.Cutoff = (Quality)resource.Cutoff.Id; + model.Items = resource.Items.InjectTo>(); + model.Language = resource.Language; + model.GrabDelay = resource.GrabDelay; + model.GrabDelayMode = resource.GrabDelayMode; + + _profileService.Update(model); + } + + private ProfileResource GetById(int id) + { + return _profileService.Get(id).InjectTo(); + } + + private List GetAll() + { + var profiles = _profileService.All().InjectTo>(); + + return profiles; + } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Api/Profiles/ProfileResource.cs b/src/NzbDrone.Api/Profiles/ProfileResource.cs new file mode 100644 index 000000000..432569460 --- /dev/null +++ b/src/NzbDrone.Api/Profiles/ProfileResource.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using NzbDrone.Api.REST; +using NzbDrone.Core.Parser; +using NzbDrone.Core.Profiles; +using NzbDrone.Core.Qualities; + +namespace NzbDrone.Api.Profiles +{ + public class ProfileResource : RestResource + { + public String Name { get; set; } + public Quality Cutoff { get; set; } + public List Items { get; set; } + public Language Language { get; set; } + public Int32 GrabDelay { get; set; } + public GrabDelayMode GrabDelayMode { get; set; } + } + + public class ProfileQualityItemResource : RestResource + { + public Quality Quality { get; set; } + public bool Allowed { get; set; } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Api/Qualities/QualityProfileSchemaModule.cs b/src/NzbDrone.Api/Profiles/ProfileSchemaModule.cs similarity index 50% rename from src/NzbDrone.Api/Qualities/QualityProfileSchemaModule.cs rename to src/NzbDrone.Api/Profiles/ProfileSchemaModule.cs index 9fb05c48a..baa115cfe 100644 --- a/src/NzbDrone.Api/Qualities/QualityProfileSchemaModule.cs +++ b/src/NzbDrone.Api/Profiles/ProfileSchemaModule.cs @@ -1,34 +1,37 @@ using System.Collections.Generic; -using NzbDrone.Core.Qualities; -using NzbDrone.Api.Mapping; using System.Linq; +using NzbDrone.Api.Mapping; +using NzbDrone.Core.Parser; +using NzbDrone.Core.Profiles; +using NzbDrone.Core.Qualities; -namespace NzbDrone.Api.Qualities +namespace NzbDrone.Api.Profiles { - public class QualityProfileSchemaModule : NzbDroneRestModule + public class ProfileSchemaModule : NzbDroneRestModule { private readonly IQualityDefinitionService _qualityDefinitionService; - public QualityProfileSchemaModule(IQualityDefinitionService qualityDefinitionService) - : base("/qualityprofile/schema") + public ProfileSchemaModule(IQualityDefinitionService qualityDefinitionService) + : base("/profile/schema") { _qualityDefinitionService = qualityDefinitionService; GetResourceAll = GetAll; } - private List GetAll() + private List GetAll() { var items = _qualityDefinitionService.All() .OrderBy(v => v.Weight) - .Select(v => new QualityProfileItem { Quality = v.Quality, Allowed = false }) + .Select(v => new ProfileQualityItem { Quality = v.Quality, Allowed = false }) .ToList(); - var profile = new QualityProfile(); + var profile = new Profile(); profile.Cutoff = Quality.Unknown; profile.Items = items; + profile.Language = Language.English; - return new List { profile.InjectTo() }; + return new List { profile.InjectTo() }; } } } \ No newline at end of file diff --git a/src/NzbDrone.Api/Qualities/QualityProfileValidation.cs b/src/NzbDrone.Api/Profiles/ProfileValidation.cs similarity index 69% rename from src/NzbDrone.Api/Qualities/QualityProfileValidation.cs rename to src/NzbDrone.Api/Profiles/ProfileValidation.cs index c90ebda61..003c96f39 100644 --- a/src/NzbDrone.Api/Qualities/QualityProfileValidation.cs +++ b/src/NzbDrone.Api/Profiles/ProfileValidation.cs @@ -3,11 +3,11 @@ using System.Linq; using FluentValidation; using FluentValidation.Validators; -namespace NzbDrone.Api.Qualities +namespace NzbDrone.Api.Profiles { - public static class QualityProfileValidation + public static class ProfileValidation { - public static IRuleBuilderOptions> MustHaveAllowedQuality(this IRuleBuilder> ruleBuilder) + public static IRuleBuilderOptions> MustHaveAllowedQuality(this IRuleBuilder> ruleBuilder) { ruleBuilder.SetValidator(new NotEmptyValidator(null)); @@ -25,7 +25,7 @@ namespace NzbDrone.Api.Qualities protected override bool IsValid(PropertyValidatorContext context) { - var list = context.PropertyValue as IList; + var list = context.PropertyValue as IList; if (list == null) { diff --git a/src/NzbDrone.Api/Qualities/QualityProfileModule.cs b/src/NzbDrone.Api/Qualities/QualityProfileModule.cs deleted file mode 100644 index 6cb1b16df..000000000 --- a/src/NzbDrone.Api/Qualities/QualityProfileModule.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System.Collections.Generic; -using NzbDrone.Core.Qualities; -using NzbDrone.Api.Mapping; -using FluentValidation; - -namespace NzbDrone.Api.Qualities -{ - public class QualityProfileModule : NzbDroneRestModule - { - private readonly IQualityProfileService _qualityProfileService; - - public QualityProfileModule(IQualityProfileService qualityProfileService) - { - _qualityProfileService = qualityProfileService; - SharedValidator.RuleFor(c => c.Name).NotEmpty(); - SharedValidator.RuleFor(c => c.Cutoff).NotNull(); - SharedValidator.RuleFor(c => c.Items).MustHaveAllowedQuality();//.SetValidator(new AllowedValidator()); - - GetResourceAll = GetAll; - GetResourceById = GetById; - UpdateResource = Update; - CreateResource = Create; - DeleteResource = DeleteProfile; - } - - private int Create(QualityProfileResource resource) - { - var model = resource.InjectTo(); - model = _qualityProfileService.Add(model); - return model.Id; - } - - private void DeleteProfile(int id) - { - _qualityProfileService.Delete(id); - } - - private void Update(QualityProfileResource resource) - { - var model = _qualityProfileService.Get(resource.Id); - - model.Name = resource.Name; - model.Cutoff = (Quality)resource.Cutoff.Id; - model.Items = resource.Items.InjectTo>(); - _qualityProfileService.Update(model); - } - - private QualityProfileResource GetById(int id) - { - return _qualityProfileService.Get(id).InjectTo(); - } - - private List GetAll() - { - var profiles = _qualityProfileService.All().InjectTo>(); - - return profiles; - } - } -} \ No newline at end of file diff --git a/src/NzbDrone.Api/Qualities/QualityProfileResource.cs b/src/NzbDrone.Api/Qualities/QualityProfileResource.cs deleted file mode 100644 index dbeff0fa0..000000000 --- a/src/NzbDrone.Api/Qualities/QualityProfileResource.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using NzbDrone.Api.REST; -using NzbDrone.Core.Qualities; - -namespace NzbDrone.Api.Qualities -{ - public class QualityProfileResource : RestResource - { - public String Name { get; set; } - public Quality Cutoff { get; set; } - public List Items { get; set; } - } - - public class QualityProfileItemResource : RestResource - { - public Quality Quality { get; set; } - public bool Allowed { get; set; } - } -} \ No newline at end of file diff --git a/src/NzbDrone.Api/Queue/QueueModule.cs b/src/NzbDrone.Api/Queue/QueueModule.cs index 148a2210f..1c735050a 100644 --- a/src/NzbDrone.Api/Queue/QueueModule.cs +++ b/src/NzbDrone.Api/Queue/QueueModule.cs @@ -1,5 +1,7 @@ using System.Collections.Generic; +using System.Linq; using NzbDrone.Core.Datastore.Events; +using NzbDrone.Core.Download.Pending; using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Queue; @@ -7,25 +9,40 @@ using NzbDrone.Core.Queue; namespace NzbDrone.Api.Queue { public class QueueModule : NzbDroneRestModuleWithSignalR, - IHandle + IHandle, IHandle { private readonly IQueueService _queueService; + private readonly IPendingReleaseService _pendingReleaseService; - public QueueModule(ICommandExecutor commandExecutor, IQueueService queueService) + public QueueModule(ICommandExecutor commandExecutor, IQueueService queueService, IPendingReleaseService pendingReleaseService) : base(commandExecutor) { _queueService = queueService; + _pendingReleaseService = pendingReleaseService; GetResourceAll = GetQueue; } private List GetQueue() { - return ToListResource(_queueService.GetQueue); + return ToListResource(GetQueueItems); + } + + private IEnumerable GetQueueItems() + { + var queue = _queueService.GetQueue(); + var pending = _pendingReleaseService.GetPendingQueue(); + + return queue.Concat(pending); } public void Handle(UpdateQueueEvent message) { BroadcastResourceChange(ModelAction.Sync); } + + public void Handle(PendingReleasesUpdatedEvent message) + { + BroadcastResourceChange(ModelAction.Sync); + } } } \ No newline at end of file diff --git a/src/NzbDrone.Api/Series/SeriesModule.cs b/src/NzbDrone.Api/Series/SeriesModule.cs index 1c5806549..d80bf60ff 100644 --- a/src/NzbDrone.Api/Series/SeriesModule.cs +++ b/src/NzbDrone.Api/Series/SeriesModule.cs @@ -15,7 +15,6 @@ using NzbDrone.Api.Mapping; using NzbDrone.Core.Tv.Events; using NzbDrone.Core.Validation.Paths; using NzbDrone.Core.DataAugmentation.Scene; -using Omu.ValueInjecter; namespace NzbDrone.Api.Series { @@ -27,7 +26,6 @@ namespace NzbDrone.Api.Series IHandle { - private readonly ICommandExecutor _commandExecutor; private readonly ISeriesService _seriesService; private readonly ISeriesStatisticsService _seriesStatisticsService; private readonly ISceneMappingService _sceneMappingService; @@ -47,7 +45,6 @@ namespace NzbDrone.Api.Series ) : base(commandExecutor) { - _commandExecutor = commandExecutor; _seriesService = seriesService; _seriesStatisticsService = seriesStatisticsService; _sceneMappingService = sceneMappingService; @@ -60,7 +57,7 @@ namespace NzbDrone.Api.Series UpdateResource = UpdateSeries; DeleteResource = DeleteSeries; - SharedValidator.RuleFor(s => s.QualityProfileId).ValidId(); + SharedValidator.RuleFor(s => s.ProfileId).ValidId(); SharedValidator.RuleFor(s => s.Path) .Cascade(CascadeMode.StopOnFirstFailure) diff --git a/src/NzbDrone.Api/Series/SeriesResource.cs b/src/NzbDrone.Api/Series/SeriesResource.cs index b6b980b03..39ee26e0a 100644 --- a/src/NzbDrone.Api/Series/SeriesResource.cs +++ b/src/NzbDrone.Api/Series/SeriesResource.cs @@ -12,7 +12,7 @@ namespace NzbDrone.Api.Series { //Todo: Sorters should be done completely on the client //Todo: Is there an easy way to keep IgnoreArticlesWhenSorting in sync between, Series, History, Missing? - //Todo: We should get the entire QualityProfile instead of ID and Name separately + //Todo: We should get the entire Profile instead of ID and Name separately //View Only public String Title { get; set; } @@ -32,7 +32,7 @@ namespace NzbDrone.Api.Series public Int32 EpisodeCount { get; set; } public Int32 EpisodeFileCount { get; set; } public SeriesStatusType Status { get; set; } - public String QualityProfileName { get; set; } + public String ProfileName { get; set; } public String Overview { get; set; } public DateTime? NextAiring { get; set; } public DateTime? PreviousAiring { get; set; } @@ -46,7 +46,7 @@ namespace NzbDrone.Api.Series //View & Edit public String Path { get; set; } - public Int32 QualityProfileId { get; set; } + public Int32 ProfileId { get; set; } //Editing Only public Boolean SeasonFolder { get; set; } @@ -65,5 +65,21 @@ namespace NzbDrone.Api.Series public String RootFolderPath { get; set; } public String Certification { get; set; } public List Genres { get; set; } + + //Used to support legacy consumers + public Int32 QualityProfileId + { + get + { + return ProfileId; + } + set + { + if (value > 0 && ProfileId == 0) + { + ProfileId = value; + } + } + } } } diff --git a/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs b/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs index 32aee7226..8cf59717b 100644 --- a/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs @@ -1,6 +1,7 @@ using FizzWare.NBuilder; using NUnit.Framework; using NzbDrone.Core.Datastore; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; using NzbDrone.Core.Qualities; @@ -15,19 +16,19 @@ namespace NzbDrone.Core.Test.Datastore [SetUp] public void Setup() { - var qualityProfile = new NzbDrone.Core.Qualities.QualityProfile + var profile = new Profile { Name = "Test", Cutoff = Quality.WEBDL720p, - Items = NzbDrone.Core.Test.Qualities.QualityFixture.GetDefaultQualities() + Items = Qualities.QualityFixture.GetDefaultQualities() }; - qualityProfile = Db.Insert(qualityProfile); + profile = Db.Insert(profile); var series = Builder.CreateListOfSize(1) .All() - .With(v => v.QualityProfileId = qualityProfile.Id) + .With(v => v.ProfileId = profile.Id) .BuildListOfNew(); Db.InsertMany(series); @@ -50,7 +51,7 @@ namespace NzbDrone.Core.Test.Datastore } [Test] - public void should_lazy_load_qualityprofile_if_not_joined() + public void should_lazy_load_profile_if_not_joined() { var db = Mocker.Resolve(); var DataMapper = db.GetDataMapper(); @@ -62,7 +63,7 @@ namespace NzbDrone.Core.Test.Datastore foreach (var episode in episodes) { Assert.IsNotNull(episode.Series); - Assert.IsFalse(episode.Series.QualityProfile.IsLoaded); + Assert.IsFalse(episode.Series.Profile.IsLoaded); } } @@ -84,20 +85,20 @@ namespace NzbDrone.Core.Test.Datastore } [Test] - public void should_explicit_load_qualityprofile_if_joined() + public void should_explicit_load_profile_if_joined() { var db = Mocker.Resolve(); var DataMapper = db.GetDataMapper(); var episodes = DataMapper.Query() .Join(Marr.Data.QGen.JoinType.Inner, v => v.Series, (l, r) => l.SeriesId == r.Id) - .Join(Marr.Data.QGen.JoinType.Inner, v => v.QualityProfile, (l, r) => l.QualityProfileId == r.Id) + .Join(Marr.Data.QGen.JoinType.Inner, v => v.Profile, (l, r) => l.ProfileId == r.Id) .ToList(); foreach (var episode in episodes) { Assert.IsNotNull(episode.Series); - Assert.IsTrue(episode.Series.QualityProfile.IsLoaded); + Assert.IsTrue(episode.Series.Profile.IsLoaded); } } diff --git a/src/NzbDrone.Core.Test/Datastore/SQLiteMigrationHelperTests/AlterFixture.cs b/src/NzbDrone.Core.Test/Datastore/SQLiteMigrationHelperTests/AlterFixture.cs index 17b45da97..2db04935f 100644 --- a/src/NzbDrone.Core.Test/Datastore/SQLiteMigrationHelperTests/AlterFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/SQLiteMigrationHelperTests/AlterFixture.cs @@ -6,6 +6,7 @@ using NzbDrone.Core.Datastore.Migration.Framework; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; using System.Linq; +using NzbDrone.Test.Common; namespace NzbDrone.Core.Test.Datastore.SQLiteMigrationHelperTests { @@ -119,5 +120,23 @@ namespace NzbDrone.Core.Test.Datastore.SQLiteMigrationHelperTests newColumns.Values.Should().HaveSameCount(columns.Values); newIndexes.Should().Contain(i=>i.Column == "AirTime"); } + + [Test] + public void should_create_indexes_with_the_same_uniqueness() + { + var columns = _subject.GetColumns("Series"); + var indexes = _subject.GetIndexes("Series"); + + var tempIndexes = indexes.JsonClone(); + + tempIndexes[0].Unique = false; + tempIndexes[1].Unique = true; + + _subject.CreateTable("Series_New", columns.Values, tempIndexes); + var newIndexes = _subject.GetIndexes("Series_New"); + + newIndexes.Should().HaveSameCount(tempIndexes); + newIndexes.ShouldAllBeEquivalentTo(tempIndexes, options => options.Excluding(o => o.IndexName).Excluding(o => o.Table)); + } } } \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/Datastore/SQLiteMigrationHelperTests/DuplicateFixture.cs b/src/NzbDrone.Core.Test/Datastore/SQLiteMigrationHelperTests/DuplicateFixture.cs index d193fb1ec..c7e8e2ad3 100644 --- a/src/NzbDrone.Core.Test/Datastore/SQLiteMigrationHelperTests/DuplicateFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/SQLiteMigrationHelperTests/DuplicateFixture.cs @@ -25,12 +25,12 @@ namespace NzbDrone.Core.Test.Datastore.SQLiteMigrationHelperTests { var series = Builder.CreateListOfSize(10) .Random(3) - .With(c => c.QualityProfileId = 100) + .With(c => c.ProfileId = 100) .BuildListOfNew(); Db.InsertMany(series); - var duplicates = _subject.GetDuplicates("series", "QualityProfileId").ToList(); + var duplicates = _subject.GetDuplicates("series", "ProfileId").ToList(); duplicates.Should().HaveCount(1); diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs index 861d39d32..d7ae1643c 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/CutoffSpecificationFixture.cs @@ -1,5 +1,6 @@ using FluentAssertions; using NUnit.Framework; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; using NzbDrone.Core.DecisionEngine; @@ -13,35 +14,35 @@ namespace NzbDrone.Core.Test.DecisionEngineTests [Test] public void should_return_true_if_current_episode_is_less_than_cutoff() { - Subject.CutoffNotMet(new QualityProfile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() }, + Subject.CutoffNotMet(new Profile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() }, new QualityModel(Quality.DVD, true)).Should().BeTrue(); } [Test] public void should_return_false_if_current_episode_is_equal_to_cutoff() { - Subject.CutoffNotMet(new QualityProfile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() }, + Subject.CutoffNotMet(new Profile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() }, new QualityModel(Quality.HDTV720p, true)).Should().BeFalse(); } [Test] public void should_return_false_if_current_episode_is_greater_than_cutoff() { - Subject.CutoffNotMet(new QualityProfile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() }, + Subject.CutoffNotMet(new Profile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() }, new QualityModel(Quality.Bluray1080p, true)).Should().BeFalse(); } [Test] public void should_return_true_when_new_episode_is_proper_but_existing_is_not() { - Subject.CutoffNotMet(new QualityProfile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() }, + Subject.CutoffNotMet(new Profile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() }, new QualityModel(Quality.HDTV720p, false), new QualityModel(Quality.HDTV720p, true)).Should().BeTrue(); } [Test] public void should_return_false_if_cutoff_is_met_and_quality_is_higher() { - Subject.CutoffNotMet(new QualityProfile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() }, + Subject.CutoffNotMet(new Profile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() }, new QualityModel(Quality.HDTV720p, true), new QualityModel(Quality.Bluray1080p, true)).Should().BeFalse(); } } diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs index 0fc46ab1f..f26cdf7ea 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/HistorySpecificationFixture.cs @@ -9,6 +9,7 @@ using NzbDrone.Core.Download.Clients.Sabnzbd; using NzbDrone.Core.History; using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; using NzbDrone.Core.DecisionEngine; @@ -42,7 +43,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests }; _fakeSeries = Builder.CreateNew() - .With(c => c.QualityProfile = new QualityProfile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() }) + .With(c => c.Profile = new Profile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() }) .Build(); _parseResultMulti = new RemoteEpisode @@ -62,9 +63,9 @@ namespace NzbDrone.Core.Test.DecisionEngineTests _upgradableQuality = new QualityModel(Quality.SDTV, false); _notupgradableQuality = new QualityModel(Quality.HDTV1080p, true); - Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 1)).Returns(_notupgradableQuality); - Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 2)).Returns(_notupgradableQuality); - Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 3)).Returns(null); + Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 1)).Returns(_notupgradableQuality); + Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 2)).Returns(_notupgradableQuality); + Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 3)).Returns(null); Mocker.GetMock() .Setup(c => c.GetDownloadClients()) @@ -73,12 +74,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests private void WithFirstReportUpgradable() { - Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 1)).Returns(_upgradableQuality); + Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 1)).Returns(_upgradableQuality); } private void WithSecondReportUpgradable() { - Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 2)).Returns(_upgradableQuality); + Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 2)).Returns(_upgradableQuality); } private void GivenSabnzbdDownloadClient() @@ -132,11 +133,11 @@ namespace NzbDrone.Core.Test.DecisionEngineTests [Test] public void should_not_be_upgradable_if_episode_is_of_same_quality_as_existing() { - _fakeSeries.QualityProfile = new QualityProfile { Cutoff = Quality.WEBDL1080p, Items = Qualities.QualityFixture.GetDefaultQualities() }; + _fakeSeries.Profile = new Profile { Cutoff = Quality.WEBDL1080p, Items = Qualities.QualityFixture.GetDefaultQualities() }; _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL1080p, false); _upgradableQuality = new QualityModel(Quality.WEBDL1080p, false); - Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 1)).Returns(_upgradableQuality); + Mocker.GetMock().Setup(c => c.GetBestQualityInHistory(It.IsAny(), 1)).Returns(_upgradableQuality); _upgradeHistory.IsSatisfiedBy(_parseResultSingle, null).Should().BeFalse(); } diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs index 10ffdc806..37cde0cd2 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/LanguageSpecificationFixture.cs @@ -1,9 +1,12 @@ using FluentAssertions; +using Marr.Data; using NUnit.Framework; using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.Parser; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Tv; namespace NzbDrone.Core.Test.DecisionEngineTests { @@ -11,28 +14,35 @@ namespace NzbDrone.Core.Test.DecisionEngineTests public class LanguageSpecificationFixture : CoreTest { - private RemoteEpisode parseResult; + private RemoteEpisode _remoteEpisode; + + [SetUp] + public void Setup() + { + _remoteEpisode = new RemoteEpisode + { + ParsedEpisodeInfo = new ParsedEpisodeInfo + { + Language = Language.English + }, + Series = new Series + { + Profile = new LazyLoaded(new Profile + { + Language = Language.English + }) + } + }; + } private void WithEnglishRelease() { - parseResult = new RemoteEpisode - { - ParsedEpisodeInfo = new ParsedEpisodeInfo - { - Language = Language.English - } - }; + _remoteEpisode.ParsedEpisodeInfo.Language = Language.English; } private void WithGermanRelease() { - parseResult = new RemoteEpisode - { - ParsedEpisodeInfo = new ParsedEpisodeInfo - { - Language = Language.German - } - }; + _remoteEpisode.ParsedEpisodeInfo.Language = Language.German; } [Test] @@ -40,7 +50,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests { WithEnglishRelease(); - Mocker.Resolve().IsSatisfiedBy(parseResult, null).Should().BeTrue(); + Mocker.Resolve().IsSatisfiedBy(_remoteEpisode, null).Should().BeTrue(); } [Test] @@ -48,7 +58,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests { WithGermanRelease(); - Mocker.Resolve().IsSatisfiedBy(parseResult, null).Should().BeFalse(); + Mocker.Resolve().IsSatisfiedBy(_remoteEpisode, null).Should().BeFalse(); } } } \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/NotInQueueSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/NotInQueueSpecificationFixture.cs index ff0457b43..be385ae90 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/NotInQueueSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/NotInQueueSpecificationFixture.cs @@ -6,6 +6,7 @@ using NUnit.Framework; using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.Download; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; using NzbDrone.Core.Test.Framework; @@ -27,7 +28,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests public void Setup() { _series = Builder.CreateNew() - .With(e => e.QualityProfile = new QualityProfile { Items = Qualities.QualityFixture.GetDefaultQualities() }) + .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() }) .Build(); _episode = Builder.CreateNew() diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs index b91614795..1f8119b68 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.Linq; using NzbDrone.Core.Tv; +using NzbDrone.Core.DecisionEngine; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Parser.Model; using NzbDrone.Core.DecisionEngine; @@ -38,7 +40,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests remoteEpisode.Release.Size = size; remoteEpisode.Series = Builder.CreateNew() - .With(e => e.QualityProfile = new QualityProfile { Items = Qualities.QualityFixture.GetDefaultQualities() }) + .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() }) .Build(); return remoteEpisode; diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs index d8d46f3c0..02f017d7a 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/QualityAllowedByProfileSpecificationFixture.cs @@ -5,6 +5,7 @@ using Marr.Data; using NUnit.Framework; using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; using NzbDrone.Core.Test.Framework; @@ -35,7 +36,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests public void Setup() { var fakeSeries = Builder.CreateNew() - .With(c => c.QualityProfile = (LazyLoaded)new QualityProfile { Cutoff = Quality.Bluray1080p }) + .With(c => c.Profile = (LazyLoaded)new Profile { Cutoff = Quality.Bluray1080p }) .Build(); remoteEpisode = new RemoteEpisode @@ -49,7 +50,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests public void should_allow_if_quality_is_defined_in_profile(Quality qualityType) { remoteEpisode.ParsedEpisodeInfo.Quality.Quality = qualityType; - remoteEpisode.Series.QualityProfile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.HDTV720p, Quality.Bluray1080p); + remoteEpisode.Series.Profile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.HDTV720p, Quality.Bluray1080p); Subject.IsSatisfiedBy(remoteEpisode, null).Should().BeTrue(); } @@ -58,7 +59,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests public void should_not_allow_if_quality_is_not_defined_in_profile(Quality qualityType) { remoteEpisode.ParsedEpisodeInfo.Quality.Quality = qualityType; - remoteEpisode.Series.QualityProfile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.HDTV720p, Quality.Bluray1080p); + remoteEpisode.Series.Profile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.HDTV720p, Quality.Bluray1080p); Subject.IsSatisfiedBy(remoteEpisode, null).Should().BeFalse(); } diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs index e91771776..b8596840f 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/QualityUpgradeSpecificationFixture.cs @@ -2,6 +2,7 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Configuration; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; using NzbDrone.Core.DecisionEngine; @@ -43,9 +44,9 @@ namespace NzbDrone.Core.Test.DecisionEngineTests { GivenAutoDownloadPropers(true); - var qualityProfile = new QualityProfile { Items = Qualities.QualityFixture.GetDefaultQualities() }; + var profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() }; - Subject.IsUpgradable(qualityProfile, new QualityModel(current, currentProper), new QualityModel(newQuality, newProper)) + Subject.IsUpgradable(profile, new QualityModel(current, currentProper), new QualityModel(newQuality, newProper)) .Should().Be(expected); } @@ -54,9 +55,9 @@ namespace NzbDrone.Core.Test.DecisionEngineTests { GivenAutoDownloadPropers(false); - var qualityProfile = new QualityProfile { Items = Qualities.QualityFixture.GetDefaultQualities() }; + var profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() }; - Subject.IsUpgradable(qualityProfile, new QualityModel(Quality.DVD, true), new QualityModel(Quality.DVD, false)) + Subject.IsUpgradable(profile, new QualityModel(Quality.DVD, true), new QualityModel(Quality.DVD, false)) .Should().BeFalse(); } } diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs new file mode 100644 index 000000000..29ce17057 --- /dev/null +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs @@ -0,0 +1,253 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using FizzWare.NBuilder; +using FluentAssertions; +using Marr.Data; +using Moq; +using NUnit.Framework; +using NzbDrone.Core.DecisionEngine.Specifications.RssSync; +using NzbDrone.Core.Download.Pending; +using NzbDrone.Core.History; +using NzbDrone.Core.IndexerSearch.Definitions; +using NzbDrone.Core.MediaFiles; +using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; +using NzbDrone.Core.Qualities; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Tv; +using NzbDrone.Test.Common; + +namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync +{ + [TestFixture] + public class DelaySpecificationFixture : CoreTest + { + private Profile _profile; + private RemoteEpisode _remoteEpisode; + + [SetUp] + public void Setup() + { + _profile = Builder.CreateNew() + .Build(); + + var series = Builder.CreateNew() + .With(s => s.Profile = _profile) + .Build(); + + _remoteEpisode = Builder.CreateNew() + .With(r => r.Series = series) + .Build(); + + _profile.Items = new List(); + _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.HDTV720p }); + _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL720p }); + _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.Bluray720p }); + + _profile.Cutoff = Quality.WEBDL720p; + + _profile.GrabDelayMode = GrabDelayMode.Always; + + _remoteEpisode.ParsedEpisodeInfo = new ParsedEpisodeInfo(); + _remoteEpisode.Release = new ReleaseInfo(); + + _remoteEpisode.Episodes = Builder.CreateListOfSize(1).Build().ToList(); + } + + private void GivenExistingFile(QualityModel quality) + { + _remoteEpisode.Episodes[0].EpisodeFile = new LazyLoaded(new EpisodeFile + { + Quality = quality + }); + } + + [Test] + public void should_be_true_when_search() + { + Subject.IsSatisfiedBy(new RemoteEpisode(), new SingleEpisodeSearchCriteria()).Should().BeTrue(); + } + + [Test] + public void should_be_true_when_profile_does_not_have_a_delay() + { + _profile.GrabDelay = 0; + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeTrue(); + } + + [Test] + public void should_be_true_when_quality_is_last_allowed_in_profile() + { + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.Bluray720p); + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeTrue(); + } + + [Test] + public void should_be_true_when_release_is_older_than_delay() + { + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow.AddHours(-10); + + _profile.GrabDelay = 1; + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeTrue(); + } + + [Test] + public void should_be_false_when_release_is_younger_than_delay() + { + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.SDTV); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow; + + _profile.GrabDelay = 12; + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeFalse(); + } + + [Test] + public void should_be_true_when_release_is_proper_for_existing_episode() + { + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p, true); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow; + + GivenExistingFile(new QualityModel(Quality.HDTV720p)); + + _profile.GrabDelay = 12; + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeTrue(); + } + + [Test] + public void should_be_false_when_release_is_proper_and_no_existing_episode() + { + + } + + [Test] + public void should_be_true_when_release_meets_cutoff_and_mode_is_cutoff() + { + _profile.GrabDelayMode = GrabDelayMode.Cutoff; + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL720p); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow; + + _profile.GrabDelay = 12; + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeTrue(); + } + + [Test] + public void should_be_true_when_release_exceeds_cutoff_and_mode_is_cutoff() + { + _profile.GrabDelayMode = GrabDelayMode.Cutoff; + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.Bluray720p); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow; + + _profile.GrabDelay = 12; + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeTrue(); + } + + [Test] + public void should_be_false_when_release_is_below_cutoff_and_mode_is_cutoff() + { + _profile.GrabDelayMode = GrabDelayMode.Cutoff; + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow; + + _profile.GrabDelay = 12; + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeFalse(); + } + + [Test] + public void should_be_false_when_release_is_proper_for_existing_episode_of_different_quality() + { + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p, true); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow; + + GivenExistingFile(new QualityModel(Quality.SDTV)); + + _profile.GrabDelay = 12; + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeFalse(); + } + + [Test] + public void should_be_false_when_release_is_first_detected_and_mode_is_first() + { + _profile.GrabDelayMode = GrabDelayMode.First; + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow; + + _profile.GrabDelay = 12; + + Mocker.GetMock() + .Setup(s => s.GetPendingRemoteEpisodes(It.IsAny())) + .Returns(new List()); + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeFalse(); + } + + [Test] + public void should_be_false_when_release_is_not_first_but_oldest_has_not_expired_and_type_is_first() + { + _profile.GrabDelayMode = GrabDelayMode.First; + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow; + + _profile.GrabDelay = 12; + + var pendingRemoteEpisode = _remoteEpisode.JsonClone(); + + Mocker.GetMock() + .Setup(s => s.GetPendingRemoteEpisodes(It.IsAny())) + .Returns(new List { _remoteEpisode.JsonClone() }); + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeFalse(); + } + + [Test] + public void should_be_true_when_existing_pending_release_expired_and_mode_is_first() + { + _profile.GrabDelayMode = GrabDelayMode.First; + + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL720p); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow; + _profile.GrabDelay = 12; + + var pendingRemoteEpisode = _remoteEpisode.JsonClone(); + pendingRemoteEpisode.Release.PublishDate = DateTime.UtcNow.AddHours(-15); + + Mocker.GetMock() + .Setup(s => s.GetPendingRemoteEpisodes(It.IsAny())) + .Returns(new List { pendingRemoteEpisode }); + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeTrue(); + } + + [Test] + public void should_be_true_when_one_existing_pending_release_is_expired_and_mode_is_first() + { + _profile.GrabDelayMode = GrabDelayMode.First; + + _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL720p); + _remoteEpisode.Release.PublishDate = DateTime.UtcNow; + _profile.GrabDelay = 12; + + var pendingRemoteEpisode1 = _remoteEpisode.JsonClone(); + pendingRemoteEpisode1.Release.PublishDate = DateTime.UtcNow.AddHours(-15); + + var pendingRemoteEpisode2 = _remoteEpisode.JsonClone(); + pendingRemoteEpisode2.Release.PublishDate = DateTime.UtcNow.AddHours(5); + + Mocker.GetMock() + .Setup(s => s.GetPendingRemoteEpisodes(It.IsAny())) + .Returns(new List { pendingRemoteEpisode1, pendingRemoteEpisode2 }); + + Subject.IsSatisfiedBy(_remoteEpisode, null).Should().BeTrue(); + } + } +} diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/ProperSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/ProperSpecificationFixture.cs index b95925ced..f377b80d5 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/ProperSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/ProperSpecificationFixture.cs @@ -8,6 +8,7 @@ using NzbDrone.Core.DecisionEngine.Specifications.RssSync; using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; using NzbDrone.Core.DecisionEngine; @@ -37,7 +38,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync var doubleEpisodeList = new List { new Episode { EpisodeFile = _firstFile, EpisodeFileId = 1 }, new Episode { EpisodeFile = _secondFile, EpisodeFileId = 1 }, new Episode { EpisodeFile = null } }; var fakeSeries = Builder.CreateNew() - .With(c => c.QualityProfile = new QualityProfile { Cutoff = Quality.Bluray1080p }) + .With(c => c.Profile = new Profile { Cutoff = Quality.Bluray1080p }) .Build(); _parseResultMulti = new RemoteEpisode diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs index c9e03d256..e21e10d12 100644 --- a/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/DecisionEngineTests/UpgradeDiskSpecificationFixture.cs @@ -6,6 +6,7 @@ using NUnit.Framework; using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; using NzbDrone.Core.DecisionEngine; @@ -38,7 +39,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests var doubleEpisodeList = new List { new Episode { EpisodeFile = _firstFile, EpisodeFileId = 1 }, new Episode { EpisodeFile = _secondFile, EpisodeFileId = 1 }, new Episode { EpisodeFile = null } }; var fakeSeries = Builder.CreateNew() - .With(c => c.QualityProfile = new QualityProfile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() }) + .With(c => c.Profile = new Profile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() }) .Build(); _parseResultMulti = new RemoteEpisode diff --git a/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs index ed80e2c3c..529c1e355 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs @@ -4,19 +4,19 @@ using FizzWare.NBuilder; using FluentAssertions; using Moq; using NUnit.Framework; -using NzbDrone.Core.DecisionEngine.Specifications; +using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Download; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; using NzbDrone.Test.Common; -using NzbDrone.Core.DecisionEngine; namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests { [TestFixture] - public class DownloadApprovedFixture : CoreTest + public class DownloadApprovedFixture : CoreTest { [SetUp] public void SetUp() @@ -47,7 +47,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests remoteEpisode.Release.PublishDate = DateTime.UtcNow; remoteEpisode.Series = Builder.CreateNew() - .With(e => e.QualityProfile = new QualityProfile { Items = Qualities.QualityFixture.GetDefaultQualities() }) + .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() }) .Build(); return remoteEpisode; @@ -62,7 +62,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests var decisions = new List(); decisions.Add(new DownloadDecision(remoteEpisode)); - Subject.DownloadApproved(decisions); + Subject.ProcessDecisions(decisions); Mocker.GetMock().Verify(v => v.DownloadReport(It.IsAny()), Times.Once()); } @@ -76,7 +76,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests decisions.Add(new DownloadDecision(remoteEpisode)); decisions.Add(new DownloadDecision(remoteEpisode)); - Subject.DownloadApproved(decisions); + Subject.ProcessDecisions(decisions); Mocker.GetMock().Verify(v => v.DownloadReport(It.IsAny()), Times.Once()); } @@ -97,7 +97,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests decisions.Add(new DownloadDecision(remoteEpisode1)); decisions.Add(new DownloadDecision(remoteEpisode2)); - Subject.DownloadApproved(decisions); + Subject.ProcessDecisions(decisions); Mocker.GetMock().Verify(v => v.DownloadReport(It.IsAny()), Times.Once()); } @@ -110,7 +110,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests var decisions = new List(); decisions.Add(new DownloadDecision(remoteEpisode)); - Subject.DownloadApproved(decisions).Should().HaveCount(1); + Subject.ProcessDecisions(decisions).Grabbed.Should().HaveCount(1); } [Test] @@ -130,7 +130,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests decisions.Add(new DownloadDecision(remoteEpisode1)); decisions.Add(new DownloadDecision(remoteEpisode2)); - Subject.DownloadApproved(decisions).Should().HaveCount(2); + Subject.ProcessDecisions(decisions).Grabbed.Should().HaveCount(2); } [Test] @@ -156,7 +156,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests decisions.Add(new DownloadDecision(remoteEpisode2)); decisions.Add(new DownloadDecision(remoteEpisode3)); - Subject.DownloadApproved(decisions).Should().HaveCount(2); + Subject.ProcessDecisions(decisions).Grabbed.Should().HaveCount(2); } [Test] @@ -169,7 +169,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests decisions.Add(new DownloadDecision(remoteEpisode)); Mocker.GetMock().Setup(s => s.DownloadReport(It.IsAny())).Throws(new Exception()); - Subject.DownloadApproved(decisions).Should().BeEmpty(); + Subject.ProcessDecisions(decisions).Grabbed.Should().BeEmpty(); ExceptionVerification.ExpectedWarns(1); } @@ -177,8 +177,8 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests public void should_return_an_empty_list_when_none_are_appproved() { var decisions = new List(); - decisions.Add(new DownloadDecision(null, "Failure!")); - decisions.Add(new DownloadDecision(null, "Failure!")); + decisions.Add(new DownloadDecision(null, new Rejection("Failure!"))); + decisions.Add(new DownloadDecision(null, new Rejection("Failure!"))); Subject.GetQualifiedReports(decisions).Should().BeEmpty(); } diff --git a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/ProcessFixture.cs b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/ProcessFixture.cs new file mode 100644 index 000000000..a913b62b1 --- /dev/null +++ b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/ProcessFixture.cs @@ -0,0 +1,165 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using FizzWare.NBuilder; +using FluentAssertions; +using Marr.Data; +using Moq; +using NUnit.Framework; +using NzbDrone.Core.DecisionEngine; +using NzbDrone.Core.Download.Pending; +using NzbDrone.Core.Parser; +using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; +using NzbDrone.Core.Qualities; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Tv; +using NzbDrone.Test.Common; + +namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests +{ + [TestFixture] + public class ProcessFixture : CoreTest + { + private DownloadDecision _temporarilyRejected; + private Series _series; + private Episode _episode; + private Profile _profile; + private ReleaseInfo _release; + private ParsedEpisodeInfo _parsedEpisodeInfo; + private RemoteEpisode _remoteEpisode; + + [SetUp] + public void Setup() + { + _series = Builder.CreateNew() + .Build(); + + _episode = Builder.CreateNew() + .Build(); + + _profile = new Profile + { + Name = "Test", + Cutoff = Quality.HDTV720p, + GrabDelay = 1, + Items = new List + { + new ProfileQualityItem { Allowed = true, Quality = Quality.HDTV720p }, + new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL720p }, + new ProfileQualityItem { Allowed = true, Quality = Quality.Bluray720p } + }, + }; + + _series.Profile = new LazyLoaded(_profile); + + _release = Builder.CreateNew().Build(); + + _parsedEpisodeInfo = Builder.CreateNew().Build(); + _parsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p); + + _remoteEpisode = new RemoteEpisode(); + _remoteEpisode.Episodes = new List{ _episode }; + _remoteEpisode.Series = _series; + _remoteEpisode.ParsedEpisodeInfo = _parsedEpisodeInfo; + _remoteEpisode.Release = _release; + + _temporarilyRejected = new DownloadDecision(_remoteEpisode, new Rejection("Temp Rejected", RejectionType.Temporary)); + + Mocker.GetMock() + .Setup(s => s.All()) + .Returns(new List()); + + Mocker.GetMock() + .Setup(s => s.GetSeries(It.IsAny())) + .Returns(_series); + + Mocker.GetMock() + .Setup(s => s.GetEpisodes(It.IsAny(), _series, true, null)) + .Returns(new List {_episode}); + + Mocker.GetMock() + .Setup(s => s.PrioritizeDecisions(It.IsAny>())) + .Returns((List d) => d); + } + + private void GivenHeldRelease(String title, String indexer, DateTime publishDate) + { + var release = _release.JsonClone(); + release.Indexer = indexer; + release.PublishDate = publishDate; + + + var heldReleases = Builder.CreateListOfSize(1) + .All() + .With(h => h.SeriesId = _series.Id) + .With(h => h.Title = title) + .With(h => h.Release = release) + .Build(); + + Mocker.GetMock() + .Setup(s => s.All()) + .Returns(heldReleases); + } + + [Test] + public void should_add() + { + Subject.Add(_temporarilyRejected); + + VerifyInsert(); + } + + [Test] + public void should_not_add_if_it_is_the_same_release_from_the_same_indexer() + { + GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate); + + Subject.Add(_temporarilyRejected); + + VerifyNoInsert(); + } + + [Test] + public void should_add_if_title_is_different() + { + GivenHeldRelease(_release.Title + "-RP", _release.Indexer, _release.PublishDate); + + Subject.Add(_temporarilyRejected); + + VerifyInsert(); + } + + [Test] + public void should_add_if_indexer_is_different() + { + GivenHeldRelease(_release.Title, "AnotherIndexer", _release.PublishDate); + + Subject.Add(_temporarilyRejected); + + VerifyInsert(); + } + [Test] + public void should_add_if_publish_date_is_different() + { + GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate.AddHours(1)); + + Subject.Add(_temporarilyRejected); + + VerifyInsert(); + } + + private void VerifyInsert() + { + Mocker.GetMock() + .Verify(v => v.Insert(It.IsAny()), Times.Once()); + } + + private void VerifyNoInsert() + { + Mocker.GetMock() + .Verify(v => v.Insert(It.IsAny()), Times.Never()); + } + } +} diff --git a/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs b/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs index 717f9f915..c7ea148ef 100644 --- a/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs +++ b/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.History; using NzbDrone.Core.Qualities; @@ -10,14 +11,14 @@ namespace NzbDrone.Core.Test.HistoryTests { public class HistoryServiceFixture : CoreTest { - private QualityProfile _profile; - private QualityProfile _profileCustom; + private Profile _profile; + private Profile _profileCustom; [SetUp] public void Setup() { - _profile = new QualityProfile { Cutoff = Quality.WEBDL720p, Items = QualityFixture.GetDefaultQualities() }; - _profileCustom = new QualityProfile { Cutoff = Quality.WEBDL720p, Items = QualityFixture.GetDefaultQualities(Quality.DVD) }; + _profile = new Profile { Cutoff = Quality.WEBDL720p, Items = QualityFixture.GetDefaultQualities() }; + _profileCustom = new Profile { Cutoff = Quality.WEBDL720p, Items = QualityFixture.GetDefaultQualities(Quality.DVD) }; } [Test] diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBlacklistFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBlacklistFixture.cs new file mode 100644 index 000000000..350471a1d --- /dev/null +++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBlacklistFixture.cs @@ -0,0 +1,42 @@ +using FizzWare.NBuilder; +using FluentAssertions; +using NUnit.Framework; +using NzbDrone.Core.Blacklisting; +using NzbDrone.Core.Housekeeping.Housekeepers; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Tv; + +namespace NzbDrone.Core.Test.Housekeeping.Housekeepers +{ + [TestFixture] + public class CleanupOrphanedBlacklistFixture : DbTest + { + [Test] + public void should_delete_orphaned_blacklist_items() + { + var blacklist = Builder.CreateNew() + .BuildNew(); + + Db.Insert(blacklist); + Subject.Clean(); + AllStoredModels.Should().BeEmpty(); + } + + [Test] + public void should_not_delete_unorphaned_blacklist_items() + { + var series = Builder.CreateNew().BuildNew(); + + Db.Insert(series); + + var blacklist = Builder.CreateNew() + .With(b => b.SeriesId = series.Id) + .BuildNew(); + + Db.Insert(blacklist); + + Subject.Clean(); + AllStoredModels.Should().HaveCount(1); + } + } +} diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedPendingReleasesFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedPendingReleasesFixture.cs new file mode 100644 index 000000000..34965efae --- /dev/null +++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedPendingReleasesFixture.cs @@ -0,0 +1,42 @@ +using FizzWare.NBuilder; +using FluentAssertions; +using NUnit.Framework; +using NzbDrone.Core.Download.Pending; +using NzbDrone.Core.Housekeeping.Housekeepers; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Tv; + +namespace NzbDrone.Core.Test.Housekeeping.Housekeepers +{ + [TestFixture] + public class CleanupOrphanedPendingReleasesFixture : DbTest + { + [Test] + public void should_delete_orphaned_pending_items() + { + var pendingRelease = Builder.CreateNew() + .BuildNew(); + + Db.Insert(pendingRelease); + Subject.Clean(); + AllStoredModels.Should().BeEmpty(); + } + + [Test] + public void should_not_delete_unorphaned_pending_items() + { + var series = Builder.CreateNew().BuildNew(); + + Db.Insert(series); + + var pendingRelease = Builder.CreateNew() + .With(h => h.SeriesId = series.Id) + .BuildNew(); + + Db.Insert(pendingRelease); + + Subject.Clean(); + AllStoredModels.Should().HaveCount(1); + } + } +} diff --git a/src/NzbDrone.Core.Test/IndexerSearchTests/NzbSearchServiceFixture.cs b/src/NzbDrone.Core.Test/IndexerSearchTests/NzbSearchServiceFixture.cs index c0e7c0e1c..9570fbfc4 100644 --- a/src/NzbDrone.Core.Test/IndexerSearchTests/NzbSearchServiceFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerSearchTests/NzbSearchServiceFixture.cs @@ -1,4 +1,5 @@ -using NzbDrone.Core.DataAugmentation.Scene; +using NzbDrone.Core.DecisionEngine; +using NzbDrone.Core.DataAugmentation.Scene; using NzbDrone.Core.IndexerSearch; using NzbDrone.Core.Test.Framework; using FizzWare.NBuilder; @@ -30,9 +31,9 @@ namespace NzbDrone.Core.Test.IndexerSearchTests .Setup(s => s.GetAvailableProviders()) .Returns(new List { indexer.Object }); - Mocker.GetMock() + Mocker.GetMock() .Setup(s => s.GetSearchDecision(It.IsAny>(), It.IsAny())) - .Returns(new List()); + .Returns(new List()); _xemSeries = Builder.CreateNew() .With(v => v.UseSceneNumbering = true) diff --git a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/ImportDecisionMakerFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/ImportDecisionMakerFixture.cs index 0dea398ea..ccaf18d11 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/ImportDecisionMakerFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/ImportDecisionMakerFixture.cs @@ -9,6 +9,7 @@ using NzbDrone.Core.MediaFiles; using NzbDrone.Core.MediaFiles.EpisodeImport; using NzbDrone.Core.Parser; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -65,7 +66,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport _videoFiles = new List { @"C:\Test\Unsorted\The.Office.S03E115.DVDRip.XviD-OSiTV.avi" }; _series = Builder.CreateNew() - .With(e => e.QualityProfile = new QualityProfile { Items = Qualities.QualityFixture.GetDefaultQualities() }) + .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() }) .Build(); _quality = new QualityModel(Quality.DVD); diff --git a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/UpgradeSpecificationFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/UpgradeSpecificationFixture.cs index a0bff8424..a217610af 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/UpgradeSpecificationFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/UpgradeSpecificationFixture.cs @@ -6,6 +6,7 @@ using NUnit.Framework; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -22,8 +23,8 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications public void Setup() { _series = Builder.CreateNew() - .With(s => s.SeriesType = SeriesTypes.Standard) - .With(e => e.QualityProfile = new QualityProfile { Items = Qualities.QualityFixture.GetDefaultQualities() }) + .With(s => s.SeriesType = SeriesTypes.Standard) + .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() }) .Build(); _localEpisode = new LocalEpisode diff --git a/src/NzbDrone.Core.Test/MediaFiles/ImportApprovedEpisodesFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/ImportApprovedEpisodesFixture.cs index 904a0e5c7..251e02c31 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/ImportApprovedEpisodesFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/ImportApprovedEpisodesFixture.cs @@ -9,6 +9,7 @@ using NzbDrone.Core.MediaFiles.EpisodeImport; using NzbDrone.Core.MediaFiles.Events; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -29,7 +30,7 @@ namespace NzbDrone.Core.Test.MediaFiles _approvedDecisions = new List(); var series = Builder.CreateNew() - .With(e => e.QualityProfile = new QualityProfile { Items = Qualities.QualityFixture.GetDefaultQualities() }) + .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() }) .Build(); var episodes = Builder.CreateListOfSize(5) diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index a36695aa6..b04fdc1b6 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -111,6 +111,7 @@ + @@ -123,6 +124,7 @@ + @@ -141,6 +143,8 @@ + + @@ -209,7 +213,7 @@ - + @@ -242,7 +246,7 @@ - + @@ -260,11 +264,10 @@ - - + diff --git a/src/NzbDrone.Core.Test/Qualities/QualityProfileRepositoryFixture.cs b/src/NzbDrone.Core.Test/Profiles/ProfileRepositoryFixture.cs similarity index 52% rename from src/NzbDrone.Core.Test/Qualities/QualityProfileRepositoryFixture.cs rename to src/NzbDrone.Core.Test/Profiles/ProfileRepositoryFixture.cs index 10b8ece92..3c9003da7 100644 --- a/src/NzbDrone.Core.Test/Qualities/QualityProfileRepositoryFixture.cs +++ b/src/NzbDrone.Core.Test/Profiles/ProfileRepositoryFixture.cs @@ -1,20 +1,20 @@ -using System.Collections.Generic; using FluentAssertions; using NUnit.Framework; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; -namespace NzbDrone.Core.Test.Qualities +namespace NzbDrone.Core.Test.Profiles { [TestFixture] - public class QualityProfileRepositoryFixture : DbTest + public class ProfileRepositoryFixture : DbTest { [Test] public void should_be_able_to_read_and_write() { - var profile = new QualityProfile + var profile = new Profile { - Items = Qualities.QualityFixture.GetDefaultQualities(Quality.Bluray1080p, Quality.DVD, Quality.HDTV720p), + Items = Qualities.QualityFixture.GetDefaultQualities(Quality.Bluray1080p, Quality.DVD, Quality.HDTV720p), Cutoff = Quality.Bluray1080p, Name = "TestProfile" }; @@ -23,8 +23,8 @@ namespace NzbDrone.Core.Test.Qualities StoredModel.Name.Should().Be(profile.Name); StoredModel.Cutoff.Should().Be(profile.Cutoff); - - StoredModel.Items.Should().Equal(profile.Items, (a,b) => a.Quality == b.Quality && a.Allowed == b.Allowed); + + StoredModel.Items.Should().Equal(profile.Items, (a, b) => a.Quality == b.Quality && a.Allowed == b.Allowed); } diff --git a/src/NzbDrone.Core.Test/Qualities/QualityProfileServiceFixture.cs b/src/NzbDrone.Core.Test/Profiles/ProfileServiceFixture.cs similarity index 61% rename from src/NzbDrone.Core.Test/Qualities/QualityProfileServiceFixture.cs rename to src/NzbDrone.Core.Test/Profiles/ProfileServiceFixture.cs index 9390925c1..7e33072af 100644 --- a/src/NzbDrone.Core.Test/Qualities/QualityProfileServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Profiles/ProfileServiceFixture.cs @@ -3,23 +3,24 @@ using FizzWare.NBuilder; using Moq; using NUnit.Framework; using NzbDrone.Core.Lifecycle; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; -namespace NzbDrone.Core.Test.Qualities +namespace NzbDrone.Core.Test.Profiles { [TestFixture] - public class QualityProfileServiceFixture : CoreTest + public class ProfileServiceFixture : CoreTest { [Test] public void Init_should_add_two_profiles() { Subject.Handle(new ApplicationStartedEvent()); - Mocker.GetMock() - .Verify(v => v.Insert(It.IsAny()), Times.Exactly(4)); + Mocker.GetMock() + .Verify(v => v.Insert(It.IsAny()), Times.Exactly(4)); } [Test] @@ -27,14 +28,14 @@ namespace NzbDrone.Core.Test.Qualities //We don't want to keep adding them back if a user deleted them on purpose. public void Init_should_skip_if_any_profiles_already_exist() { - Mocker.GetMock() + Mocker.GetMock() .Setup(s => s.All()) - .Returns(Builder.CreateListOfSize(2).Build().ToList()); + .Returns(Builder.CreateListOfSize(2).Build().ToList()); Subject.Handle(new ApplicationStartedEvent()); - Mocker.GetMock() - .Verify(v => v.Insert(It.IsAny()), Times.Never()); + Mocker.GetMock() + .Verify(v => v.Insert(It.IsAny()), Times.Never()); } @@ -43,15 +44,15 @@ namespace NzbDrone.Core.Test.Qualities { var seriesList = Builder.CreateListOfSize(3) .Random(1) - .With(c => c.QualityProfileId = 2) + .With(c => c.ProfileId = 2) .Build().ToList(); Mocker.GetMock().Setup(c => c.GetAllSeries()).Returns(seriesList); - Assert.Throws(() => Subject.Delete(2)); + Assert.Throws(() => Subject.Delete(2)); - Mocker.GetMock().Verify(c => c.Delete(It.IsAny()), Times.Never()); + Mocker.GetMock().Verify(c => c.Delete(It.IsAny()), Times.Never()); } @@ -61,7 +62,7 @@ namespace NzbDrone.Core.Test.Qualities { var seriesList = Builder.CreateListOfSize(3) .All() - .With(c => c.QualityProfileId = 2) + .With(c => c.ProfileId = 2) .Build().ToList(); @@ -69,7 +70,7 @@ namespace NzbDrone.Core.Test.Qualities Subject.Delete(1); - Mocker.GetMock().Verify(c => c.Delete(1), Times.Once()); + Mocker.GetMock().Verify(c => c.Delete(1), Times.Once()); } } } \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/Qualities/QualityFixture.cs b/src/NzbDrone.Core.Test/Qualities/QualityFixture.cs index ddab8f19b..673ca0ca9 100644 --- a/src/NzbDrone.Core.Test/Qualities/QualityFixture.cs +++ b/src/NzbDrone.Core.Test/Qualities/QualityFixture.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using NUnit.Framework; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; @@ -44,7 +45,7 @@ namespace NzbDrone.Core.Test.Qualities i.Should().Be(expected); } - public static List GetDefaultQualities(params Quality[] allowed) + public static List GetDefaultQualities(params Quality[] allowed) { var qualities = new List { @@ -66,7 +67,7 @@ namespace NzbDrone.Core.Test.Qualities var items = qualities .Except(allowed) .Concat(allowed) - .Select(v => new QualityProfileItem { Quality = v, Allowed = allowed.Contains(v) }).ToList(); + .Select(v => new ProfileQualityItem { Quality = v, Allowed = allowed.Contains(v) }).ToList(); return items; } diff --git a/src/NzbDrone.Core.Test/Qualities/QualityModelComparerFixture.cs b/src/NzbDrone.Core.Test/Qualities/QualityModelComparerFixture.cs index 187455abb..78262f0a5 100644 --- a/src/NzbDrone.Core.Test/Qualities/QualityModelComparerFixture.cs +++ b/src/NzbDrone.Core.Test/Qualities/QualityModelComparerFixture.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using FluentAssertions; using NUnit.Framework; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; using NzbDrone.Core.Test.Framework; @@ -13,20 +14,20 @@ namespace NzbDrone.Core.Test.Qualities { public QualityModelComparer Subject { get; set; } - private void GivenDefaultQualityProfile() + private void GivenDefaultProfile() { - Subject = new QualityModelComparer(new QualityProfile { Items = QualityFixture.GetDefaultQualities() }); + Subject = new QualityModelComparer(new Profile { Items = QualityFixture.GetDefaultQualities() }); } - private void GivenCustomQualityProfile() + private void GivenCustomProfile() { - Subject = new QualityModelComparer(new QualityProfile { Items = QualityFixture.GetDefaultQualities(Quality.Bluray720p, Quality.DVD) }); + Subject = new QualityModelComparer(new Profile { Items = QualityFixture.GetDefaultQualities(Quality.Bluray720p, Quality.DVD) }); } [Test] public void Icomparer_greater_test() { - GivenDefaultQualityProfile(); + GivenDefaultProfile(); var first = new QualityModel(Quality.DVD, true); var second = new QualityModel(Quality.Bluray1080p, true); @@ -39,7 +40,7 @@ namespace NzbDrone.Core.Test.Qualities [Test] public void Icomparer_greater_proper() { - GivenDefaultQualityProfile(); + GivenDefaultProfile(); var first = new QualityModel(Quality.Bluray1080p, false); var second = new QualityModel(Quality.Bluray1080p, true); @@ -52,7 +53,7 @@ namespace NzbDrone.Core.Test.Qualities [Test] public void Icomparer_lesser() { - GivenDefaultQualityProfile(); + GivenDefaultProfile(); var first = new QualityModel(Quality.DVD, true); var second = new QualityModel(Quality.Bluray1080p, true); @@ -65,7 +66,7 @@ namespace NzbDrone.Core.Test.Qualities [Test] public void Icomparer_lesser_proper() { - GivenDefaultQualityProfile(); + GivenDefaultProfile(); var first = new QualityModel(Quality.DVD, false); var second = new QualityModel(Quality.DVD, true); @@ -78,7 +79,7 @@ namespace NzbDrone.Core.Test.Qualities [Test] public void Icomparer_greater_custom_order() { - GivenCustomQualityProfile(); + GivenCustomProfile(); var first = new QualityModel(Quality.DVD, true); var second = new QualityModel(Quality.Bluray720p, true); diff --git a/src/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs b/src/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs deleted file mode 100644 index 6ed79d4bc..000000000 --- a/src/NzbDrone.Core.Test/TvTests/EpisodeProviderTests/EpisodeProviderTest.cs +++ /dev/null @@ -1,1519 +0,0 @@ -//TODO: Alrighty then... We should delete this or uncomment some of these tests... - -/* - - -using System; -using System.Collections.Generic; -using System.Linq; -using FizzWare.NBuilder; -using FluentAssertions; -using Moq; -using NUnit.Framework; -using NzbDrone.Core.Configuration; -using NzbDrone.Core.Download; -using NzbDrone.Core.MediaFiles; -using NzbDrone.Core.Qualities; -using NzbDrone.Core.Tv; -using NzbDrone.Core.Model; -using NzbDrone.Core.Providers; -using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Test.Framework; - -using TvdbLib.Data; - -namespace NzbDrone.Core.Test.TvTests.EpisodeProviderTests -{ - [TestFixture] - - public class EpisodeProviderTest : ObjectDbTest - { - [Test] - public void GetEpisodes_exists() - { - - - var fakeSeries = Builder.CreateNew().Build(); - var fakeEpisodes = Builder.CreateListOfSize(5) - .All().With(e => e.SeriesId = 1).Build(); - - Db.Insert(fakeSeries); - Db.InsertMany(fakeEpisodes); - - - var episode = Mocker.Resolve().GetEpisode(1); - - - episode.ShouldHave().AllPropertiesBut(e => e.Series, e => e.EpisodeFile).EqualTo(fakeEpisodes.First()); - episode.Series.ShouldHave().AllPropertiesBut(s => s.EpisodeCount, s => s.EpisodeFileCount, s => s.SeasonCount, s => s.NextAiring).EqualTo(fakeSeries); - } - - [Test] - public void GetEpisodes_by_season_episode_exists() - { - - - var fakeSeries = Builder.CreateNew() - .With(s => s.Id = 1) - .Build(); - var fakeEpisodes = Builder.CreateNew() - .With(e => e.SeriesId = 1) - .With(e => e.EpisodeNumber = 1) - .And(e => e.SeasonNumber = 2).Build(); - - Db.Insert(fakeSeries); - Db.Insert(fakeEpisodes); - - - var episode = Mocker.Resolve().GetEpisode(fakeSeries.Id, 2, 1); - - - episode.ShouldHave().AllPropertiesBut(e => e.Series).EqualTo(fakeEpisodes); - episode.Series.ShouldHave().AllPropertiesBut(s => s.EpisodeCount, s => s.EpisodeFileCount, s => s.SeasonCount, s => s.NextAiring).EqualTo(fakeSeries); - } - - [Test] - public void GetEpisodes_by_season_episode_doesnt_exists() - { - - - - var episode = Mocker.Resolve().GetEpisode(1, 1, 1); - - - episode.Should().BeNull(); - } - - [Test] - public void GetEpisode_with_EpisodeFile() - { - - - var fakeSeries = Builder.CreateNew().Build(); - var fakeFile = Builder.CreateNew().With(f => f.Id).With(c => c.Quality = Quality.SDTV).Build(); - var fakeEpisodes = Builder.CreateListOfSize(5) - .All().With(e => e.SeriesId = 1).TheFirst(1).With(e => e.EpisodeFile = new EpisodeFile { Id = 1 }).With(e => e.EpisodeFile = fakeFile).Build(); - - Db.Insert(fakeSeries); - Db.InsertMany(fakeEpisodes); - Db.Insert(fakeFile); - - - var episode = Mocker.Resolve().GetEpisode(1); - - - episode.ShouldHave().AllPropertiesBut(e => e.Series, e => e.EpisodeFile).EqualTo(fakeEpisodes.First()); - episode.Series.ShouldHave().AllPropertiesBut(s => s.EpisodeCount, s => s.EpisodeFileCount, s => s.SeasonCount, s => s.NextAiring).EqualTo(fakeSeries); - episode.EpisodeFile.Should().NotBeNull(); - } - - [Test] - [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = "Sequence contains no elements")] - public void GetEpisodes_invalid_series() - { - - - Mocker.Resolve(); - - var fakeEpisodes = Builder.CreateListOfSize(5) - .All().With(e => e.SeriesId = 1).Build(); - - - Db.InsertMany(fakeEpisodes); - - - - Mocker.Resolve().GetEpisode(1); - } - - [Test] - public void GetEpisodesBySeason_success() - { - - - var fakeSeries = Builder.CreateNew() - .With(s => s.Id = 12) - .Build(); - - var episodes = Builder.CreateListOfSize(10) - .All().With(c => c.SeriesId = 12).And(c => c.SeasonNumber = 2) - .TheFirst(5).With(c => c.SeasonNumber = 1) - .Build(); - - Db.Insert(fakeSeries); - Db.InsertMany(episodes); - - - var seasonEposodes = Mocker.Resolve().GetEpisodesBySeason(12, 2); - - - Db.Fetch().Should().HaveCount(10); - seasonEposodes.Should().HaveCount(5); - } - - [Test] - public void RefreshEpisodeInfo_emptyRepo() - { - //Arrange - const int seriesId = 71663; - const int episodeCount = 10; - - var fakeEpisodes = Builder.CreateNew().With( - c => c.Episodes = - new List(Builder.CreateListOfSize(episodeCount). - All() - .With(l => l.Language = new TvdbLanguage(0, "eng", "a")) - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - - Db.Insert(fakeSeries); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(fakeEpisodes); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var actualCount = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList().Count; - Mocker.GetMock().VerifyAll(); - actualCount.Should().Be(episodeCount); - } - - [Test] - public void RefreshEpisodeInfo_should_set_older_than_1900_to_null() - { - //Arrange - const int seriesId = 71663; - - var fakeEpisodes = Builder.CreateNew().With( - c => c.Episodes = - new List(Builder.CreateListOfSize(10). - All() - .With(l => l.Language = new TvdbLanguage(0, "eng", "a")).And(e => e.FirstAired = DateTime.Now) - .TheFirst(7).With(e => e.FirstAired = new DateTime(1800, 1, 1)) - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - - Db.Insert(fakeSeries); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(fakeEpisodes); - - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var storedEpisodes = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); - storedEpisodes.Should().HaveCount(10); - storedEpisodes.Where(e => e.AirDate == null).Should().HaveCount(7); - storedEpisodes.Where(e => e.AirDate != null).Should().HaveCount(3); - } - - [Test] - public void RefreshEpisodeInfo_should_set_older_than_1900_to_null_for_existing_episodes() - { - //Arrange - const int seriesId = 71663; - - var fakeEpisode = Builder.CreateNew() - .With(e => e.TvDbEpisodeId = 12345) - .With(e => e.AirDate = DateTime.Today) - .Build(); - - var fakeTvDbEpisodes = Builder.CreateNew().With( - c => c.Episodes = - new List(Builder.CreateListOfSize(1) - .All() - .With(l => l.Language = new TvdbLanguage(0, "eng", "a")).And(e => e.FirstAired = DateTime.Now) - .TheFirst(1).With(e => e.FirstAired = new DateTime(1800, 1, 1)) - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - Db.Insert(fakeSeries); - Db.Insert(fakeEpisode); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(fakeTvDbEpisodes); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var storedEpisodes = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); - storedEpisodes.Should().HaveCount(1); - storedEpisodes.Where(e => e.AirDate == null).Should().HaveCount(1); - } - - [Test] - public void RefreshEpisodeInfo_ignore_episode_zero() - { - //Arrange - const int seriesId = 71663; - const int episodeCount = 10; - - var fakeEpisodes = Builder.CreateNew().With( - c => c.Episodes = - new List(Builder.CreateListOfSize(episodeCount). - All() - .With(l => l.Language = new TvdbLanguage(0, "eng", "a")) - .TheFirst(1) - .With(e => e.EpisodeNumber = 0) - .With(e => e.SeasonNumber = 15) - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - - Db.Insert(fakeSeries); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(fakeEpisodes); - - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var result = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); - Mocker.GetMock().VerifyAll(); - result.Should().HaveCount(episodeCount); - result.Where(e => e.EpisodeNumber == 0 && e.SeasonNumber == 15).Single().Ignored.Should().BeTrue(); - } - - [Test] - public void RefreshEpisodeInfo_should_skip_future_episodes_with_no_title() - { - //Arrange - const int seriesId = 71663; - const int episodeCount = 10; - - var fakeEpisodes = Builder.CreateNew().With( - c => c.Episodes = new List(Builder.CreateListOfSize(episodeCount). - All() - .With(a => c.FirstAired = DateTime.Now.AddDays(-2)) - .With(e => e.EpisodeName = "Something") - .TheFirst(3) - .With(e => e.EpisodeName = "") - .With(e => e.FirstAired = DateTime.Now.AddDays(10)) - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - - Db.Insert(fakeSeries); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(fakeEpisodes); - - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var result = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); - result.Should().HaveCount(episodeCount - 3); - result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.Title) || c.AirDate < DateTime.Now); - } - - [Test] - public void RefreshEpisodeInfo_should_skip_older_than_1900_year_episodes_with_no_title() - { - //Arrange - const int seriesId = 71663; - const int episodeCount = 10; - - var fakeEpisodes = Builder.CreateNew().With( - c => c.Episodes = new List(Builder.CreateListOfSize(episodeCount). - All() - .With(a => c.FirstAired = DateTime.Now.AddDays(-2)) - .With(e => e.EpisodeName = "Something") - .TheFirst(3) - .With(e => e.EpisodeName = "") - .With(e => e.FirstAired = new DateTime(1889, 1, 1)) - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - - Db.Insert(fakeSeries); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(fakeEpisodes); - - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var result = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); - result.Should().HaveCount(episodeCount - 3); - result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.Title) || c.AirDate < DateTime.Now); - } - - [Test] - public void RefreshEpisodeInfo_should_add_future_episodes_with_title() - { - const int seriesId = 71663; - - var fakeEpisodes = Builder.CreateNew().With( - c => c.Episodes = new List(Builder.CreateListOfSize(10). - All() - .With(a => a.FirstAired = DateTime.Now.AddDays(10)) - .With(e => e.EpisodeName = "Something") - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - - Db.Insert(fakeSeries); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(fakeEpisodes); - - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var result = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); - result.Should().HaveSameCount(fakeEpisodes.Episodes); - } - - [Test] - public void RefreshEpisodeInfo_should_add_old_episodes_with_no_title() - { - const int seriesId = 71663; - - - var fakeEpisodes = Builder.CreateNew().With( - c => c.Episodes = new List(Builder.CreateListOfSize(10). - All() - .With(a => a.FirstAired = DateTime.Now.AddDays(-10)) - .With(e => e.EpisodeName = string.Empty) - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - - Db.Insert(fakeSeries); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(fakeEpisodes); - - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var result = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); - result.Should().HaveSameCount(fakeEpisodes.Episodes); - } - - [Test] - public void RefreshEpisodeInfo_ignore_season_zero() - { - //Arrange - const int seriesId = 71663; - const int episodeCount = 10; - - var fakeEpisodes = Builder.CreateNew().With( - c => c.Episodes = - new List(Builder.CreateListOfSize(episodeCount). - All() - .With(l => l.Language = new TvdbLanguage(0, "eng", "a")) - .With(e => e.SeasonNumber = 0) - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - - Db.Insert(fakeSeries); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(fakeEpisodes); - - Mocker.GetMock() - .Setup(s => s.IsIgnored(seriesId, 0)) - .Returns(true); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var result = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); - Mocker.GetMock().VerifyAll(); - result.Should().HaveCount(episodeCount); - result.Where(e => e.Ignored).Should().HaveCount(episodeCount); - } - - [Test] - public void new_episodes_only_calls_Insert() - { - const int seriesId = 71663; - var tvdbSeries = Builder.CreateNew() - .With(c => c.Episodes = new List(Builder.CreateListOfSize(5).Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - var currentEpisodes = new List(); - - Mocker.GetMock(MockBehavior.Strict) - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(tvdbSeries); - - Mocker.GetMock() - .Setup(d => d.Fetch(It.IsAny(), It.IsAny())) - .Returns(currentEpisodes); - - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - Mocker.GetMock().Verify(c => c.InsertMany(It.Is>(l => l.Count() == 5)), Times.Once()); - Mocker.GetMock().Verify(c => c.Update(It.IsAny>()), Times.Never()); - - Mocker.VerifyAllMocks(); - } - - [Test] - public void existing_episodes_only_calls_Update() - { - const int seriesId = 71663; - var tvdbSeries = Builder.CreateNew() - .With(c => c.Episodes = new List(Builder.CreateListOfSize(5).Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - var currentEpisodes = new List(); - foreach (var tvDbEpisode in tvdbSeries.Episodes) - { - currentEpisodes.Add(new Episode { TvDbEpisodeId = tvDbEpisode.Id, Series = fakeSeries }); - } - - Mocker.GetMock(MockBehavior.Strict) - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(tvdbSeries); - - Mocker.GetMock() - .Setup(d => d.Fetch(It.IsAny(), It.IsAny())) - .Returns(currentEpisodes); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - Mocker.GetMock().Verify(c => c.InsertMany(It.Is>(l => l.Count() == 0)), Times.Once()); - Mocker.GetMock().Verify(c => c.UpdateMany(It.Is>(l => l.Count() == 5)), Times.Once()); - Mocker.VerifyAllMocks(); - } - - [Test] - public void should_try_to_get_existing_episode_using_tvdbid_first() - { - const int seriesId = 71663; - var fakeTvDbResult = Builder.CreateNew() - .With(c => c.Id = seriesId) - .With(c => c.Episodes = new List( - Builder.CreateListOfSize(1) - .All().With(g => g.Id = 99) - .Build()) - ) - .Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - var fakeEpisodeList = new List { new Episode { TvDbEpisodeId = 99, SeasonNumber = 10, EpisodeNumber = 10, Series = fakeSeries } }; - - Mocker.GetMock() - .Setup(d => d.Fetch(It.IsAny(), It.IsAny())) - .Returns(fakeEpisodeList); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(fakeTvDbResult); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - Mocker.VerifyAllMocks(); - Mocker.GetMock().Verify(c => c.UpdateMany(fakeEpisodeList), Times.Once()); - } - - [Test] - public void should_try_to_get_existing_episode_using_tvdbid_first_then_season_episode() - { - const int seriesId = 71663; - var tvdbSeries = Builder.CreateNew() - .With(c => c.Id = seriesId) - .With(c => c.Episodes = new List{ - Builder.CreateNew() - .With(g => g.Id = 99) - .With(g => g.SeasonNumber = 4) - .With(g => g.EpisodeNumber = 15) - .With(g=>g.SeriesId = seriesId) - .Build() - }) - .Build(); - - var localEpisode = Builder.CreateNew() - .With(c => c.SeriesId = seriesId) - .With(c => c.SeasonNumber = 4) - .With(c => c.EpisodeNumber = 15) - .Build(); - - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - Mocker.GetMock(MockBehavior.Strict) - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(tvdbSeries); - - Mocker.GetMock() - .Setup(d => d.Fetch(It.IsAny(), It.IsAny())) - .Returns(new List { localEpisode }); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - Mocker.VerifyAllMocks(); - Mocker.GetMock().Verify(c => c.UpdateMany(new List { localEpisode }), Times.Once()); - } - - [Test] - public void existing_episodes_keep_their_episodeId_file_id() - { - const int seriesId = 71663; - var tvdbSeries = Builder.CreateNew() - .With(c => c.Episodes = new List(Builder.CreateListOfSize(5).Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - var currentEpisodes = new List(); - foreach (var tvDbEpisode in tvdbSeries.Episodes) - { - currentEpisodes.Add(new Episode - { - TvDbEpisodeId = tvDbEpisode.Id, - Id = 99, - EpisodeFile = new EpisodeFile { Id = 69 }, - Ignored = true, - Series = fakeSeries, - EpisodeNumber = tvDbEpisode.EpisodeNumber, - SeasonNumber = tvDbEpisode.SeasonNumber - }); - } - - Mocker.GetMock(MockBehavior.Strict) - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(tvdbSeries); - - var updatedEpisodes = new List(); - - Mocker.GetMock() - .Setup(d => d.Fetch(It.IsAny(), It.IsAny())) - .Returns(currentEpisodes); - - Mocker.GetMock() - .Setup(c => c.UpdateMany(It.IsAny>())) - .Callback>(ep => updatedEpisodes = ep.ToList()); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - updatedEpisodes.Should().HaveSameCount(tvdbSeries.Episodes); - updatedEpisodes.Should().OnlyContain(c => c.Id == 99); - updatedEpisodes.Should().OnlyContain(c => c.EpisodeFileId == 69); - updatedEpisodes.Should().OnlyContain(c => c.Ignored == true); - } - - [Test] - public void existing_episodes_remote_their_episodeId_file_id_when_episode_number_doesnt_match_tvdbid() - { - const int seriesId = 71663; - var tvdbSeries = Builder.CreateNew() - .With(c => c.Episodes = new List(Builder.CreateListOfSize(5).Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - var currentEpisodes = new List(); - foreach (var tvDbEpisode in tvdbSeries.Episodes) - { - currentEpisodes.Add(new Episode - { - TvDbEpisodeId = tvDbEpisode.Id, - Id = 99, - EpisodeFile = new EpisodeFile { Id = 69 }, - Ignored = true, - Series = fakeSeries, - EpisodeNumber = tvDbEpisode.EpisodeNumber + 1, - SeasonNumber = tvDbEpisode.SeasonNumber - }); - } - - Mocker.GetMock(MockBehavior.Strict) - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(tvdbSeries); - - var updatedEpisodes = new List(); - - Mocker.GetMock() - .Setup(d => d.Fetch(It.IsAny(), It.IsAny())) - .Returns(currentEpisodes); - - Mocker.GetMock() - .Setup(c => c.UpdateMany(It.IsAny>())) - .Callback>(ep => updatedEpisodes = ep.ToList()); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - updatedEpisodes.Should().OnlyContain(c => c.EpisodeFileId == 0); - } - - [Test] - public void existing_episodes_remote_their_episodeId_file_id_when_season_number_doesnt_match_tvdbid() - { - const int seriesId = 71663; - var tvdbSeries = Builder.CreateNew() - .With(c => c.Episodes = new List(Builder.CreateListOfSize(5).Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - var currentEpisodes = new List(); - foreach (var tvDbEpisode in tvdbSeries.Episodes) - { - currentEpisodes.Add(new Episode - { - TvDbEpisodeId = tvDbEpisode.Id, - Id = 99, - EpisodeFile = new EpisodeFile { Id = 69 }, - Ignored = true, - Series = fakeSeries, - EpisodeNumber = tvDbEpisode.EpisodeNumber, - SeasonNumber = tvDbEpisode.SeasonNumber + 1 - }); - } - - Mocker.GetMock(MockBehavior.Strict) - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(tvdbSeries); - - var updatedEpisodes = new List(); - - Mocker.GetMock() - .Setup(d => d.Fetch(It.IsAny(), It.IsAny())) - .Returns(currentEpisodes); - - Mocker.GetMock() - .Setup(c => c.UpdateMany(It.IsAny>())) - .Callback>(ep => updatedEpisodes = ep.ToList()); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - updatedEpisodes.Should().OnlyContain(c => c.EpisodeFileId == 0); - } - - [Test] - public void RefreshEpisodeInfo_should_ignore_new_episode_for_ignored_season() - { - //Arrange - const int seriesId = 71663; - const int episodeCount = 2; - - var fakeEpisode = Builder.CreateNew() - .With(e => e.SeasonNumber = 5) - .With(e => e.EpisodeNumber = 1) - .With(e => e.TvDbEpisodeId = 11) - .With(e => e.SeriesId = seriesId) - .With(e => e.Ignored = true) - .Build(); - - var tvdbSeries = Builder.CreateNew().With( - c => c.Episodes = - new List(Builder.CreateListOfSize(episodeCount). - All() - .With(l => l.Language = new TvdbLanguage(0, "eng", "a")) - .With(e => e.SeasonNumber = 5) - .TheFirst(1) - .With(e => e.EpisodeNumber = 1) - .With(e => e.Id = 11) - .TheNext(1) - .With(e => e.EpisodeNumber = 2) - .With(e => e.Id = 22) - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - - Db.Insert(fakeSeries); - Db.Insert(fakeEpisode); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(tvdbSeries); - - Mocker.GetMock() - .Setup(s => s.IsIgnored(seriesId, It.IsAny())) - .Returns(true); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var result = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); - Mocker.GetMock().VerifyAll(); - result.Should().HaveCount(episodeCount); - result.Where(e => e.Ignored).Should().HaveCount(episodeCount); - } - - [Test] - [Explicit] - public void Add_daily_show_episodes() - { - - Mocker.Resolve(); - - Mocker.GetMock() - .Setup(e => e.DefaultQualityProfile).Returns(1); - - Db.Insert(Builder.CreateNew().Build()); - - var seriesRepo = Mocker.Resolve(); - - const int tvDbSeriesId = 71256; - - var seriesProvider = Mocker.Resolve(); - - seriesProvider.AddSeries("Test Series", "c:\\test\\", tvDbSeriesId, 1, null); - - - - var episodeProvider = Mocker.Resolve(); - episodeProvider.RefreshEpisodeInfo(seriesRepo.Get(tvDbSeriesId)); - - - var episodes = episodeProvider.GetEpisodeBySeries(tvDbSeriesId); - episodes.Should().NotBeEmpty(); - } - - [Test] - public void GetEpisode_by_Season_Episode_none_existing() - { - - - - var episode = Mocker.Resolve().GetEpisode(1, 1, 1); - - - episode.Should().BeNull(); - } - - [Test] - public void GetEpisode_by_Season_Episode_with_EpisodeFile() - { - - - var fakeSeries = Builder.CreateNew().Build(); - var fakeFile = Builder.CreateNew().With(f => f.Id).With(c => c.Quality = Quality.SDTV).Build(); - var fakeEpisodes = Builder.CreateListOfSize(5) - .All().With(e => e.SeriesId = 1).TheFirst(1).With(c => c.EpisodeFile = new EpisodeFile { Id = 1 }).With(e => e.EpisodeFile = fakeFile).Build(); - - Db.Insert(fakeSeries); - Db.InsertMany(fakeEpisodes); - Db.Insert(fakeFile); - - - var episode = Mocker.Resolve().GetEpisode(1, 1, 1); - - - episode.ShouldHave().AllPropertiesBut(e => e.Series, e => e.EpisodeFile).EqualTo(fakeEpisodes.First()); - episode.Series.ShouldHave().AllPropertiesBut(s => s.EpisodeCount, s => s.EpisodeFileCount, s => s.SeasonCount, s => s.NextAiring).EqualTo(fakeSeries); - episode.EpisodeFile.Should().NotBeNull(); - } - - [Test] - public void GetEpisode_by_Season_Episode_without_EpisodeFile() - { - - - var fakeSeries = Builder.CreateNew().Build(); - var fakeEpisodes = Builder.CreateListOfSize(5) - .All().With(e => e.SeriesId = 1).TheFirst(1).Build(); - - Db.Insert(fakeSeries); - Db.InsertMany(fakeEpisodes); - - - var episode = Mocker.Resolve().GetEpisode(1, 1, 1); - - - episode.ShouldHave().AllPropertiesBut(e => e.Series).EqualTo(fakeEpisodes.First()); - episode.Series.ShouldHave().AllPropertiesBut(s => s.EpisodeCount, s => s.EpisodeFileCount, s => s.SeasonCount, s => s.NextAiring).EqualTo(fakeSeries); - episode.EpisodeFile.Should().BeNull(); - } - - [Test] - public void GetEpisode_by_AirDate_with_EpisodeFile() - { - - - var fakeSeries = Builder.CreateNew().Build(); - var fakeFile = Builder.CreateNew().With(f => f.Id).With(c => c.Quality = Quality.SDTV).Build(); - var fakeEpisodes = Builder.CreateListOfSize(5) - .All().With(e => e.SeriesId = 1).TheFirst(1).With(e => e.EpisodeFile = new EpisodeFile { Id = 1 }).With(e => e.EpisodeFile = fakeFile).Build(); - - Db.Insert(fakeSeries); - Db.InsertMany(fakeEpisodes); - Db.Insert(fakeFile); - - - var episode = Mocker.Resolve().GetEpisode(1, fakeEpisodes[0].AirDate.Value); - - - episode.ShouldHave().AllPropertiesBut(e => e.Series, e => e.EpisodeFile).EqualTo(fakeEpisodes.First()); - episode.Series.ShouldHave().AllPropertiesBut(s => s.EpisodeCount, s => s.EpisodeFileCount, s => s.SeasonCount, s => s.NextAiring).EqualTo(fakeSeries); - episode.EpisodeFile.Should().NotBeNull(); - } - - [Test] - public void GetEpisode_by_AirDate_without_EpisodeFile() - { - - - var fakeSeries = Builder.CreateNew().Build(); - var fakeEpisodes = Builder.CreateListOfSize(5) - .All().With(e => e.SeriesId = 1).TheFirst(1).With(e => e.EpisodeFile = new EpisodeFile { Id = 1 }).Build(); - - Db.InsertMany(fakeEpisodes); - Db.Insert(fakeSeries); - - - var episode = Mocker.Resolve().GetEpisode(1, fakeEpisodes[0].AirDate.Value); - - - episode.ShouldHave().AllPropertiesBut(e => e.Series).EqualTo(fakeEpisodes.First()); - episode.Series.ShouldHave().AllPropertiesBut(s => s.EpisodeCount, s => s.EpisodeFileCount, s => s.SeasonCount, s => s.NextAiring).EqualTo(fakeSeries); - episode.EpisodeFile.Should().BeNull(); - } - - [Test] - public void MarkEpisodeAsFetched() - { - - var fakeEpisodes = Builder.CreateListOfSize(2) - .All().With(e => e.GrabDate = null) - .Build(); - - var parseResult = new EpisodeParseResult() { Episodes = fakeEpisodes }; - - Mocker.Resolve().Handle(new EpisodeGrabbedEvent(parseResult)); - - Mocker.GetMock().Verify(c=>c.Update(fakeEpisodes[0]),Times.Once()); - Mocker.GetMock().Verify(c=>c.Update(fakeEpisodes[1]),Times.Once()); - } - - [Test] - public void AddEpisode_episode_is_ignored_when_full_season_is_ignored() - { - - - var episodes = Builder.CreateListOfSize(4) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .With(c => c.Ignored = true) - .Build().ToList(); - - episodes.ForEach(c => Db.Insert(c)); - - var newEpisode = Builder.CreateNew() - .With(e => e.SeriesId = 10) - .With(e => e.SeasonNumber = 1) - .With(e => e.EpisodeNumber = 8) - .With(e => e.SeasonNumber = 1) - .With(e => e.Ignored = false) - .Build(); - - Mocker.GetMock() - .Setup(s => s.IsIgnored(newEpisode.SeriesId, newEpisode.SeasonNumber)) - .Returns(true); - - - Mocker.Resolve().AddEpisode(newEpisode); - - - var episodesInDb = Db.Fetch(@"SELECT * FROM Episodes"); - - episodesInDb.Should().HaveCount(5); - episodesInDb.Should().OnlyContain(e => e.Ignored); - - Mocker.VerifyAllMocks(); - } - - [Test] - public void AddEpisode_episode_is_not_ignored_when_full_season_is_not_ignored() - { - - - var episodes = Builder.CreateListOfSize(4) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .With(c => c.Ignored = false) - .Build().ToList(); - - episodes.ForEach(c => Db.Insert(c)); - - var newEpisode = Builder.CreateNew() - .With(e => e.SeriesId = 10) - .With(e => e.SeasonNumber = 1) - .With(e => e.EpisodeNumber = 8) - .With(e => e.SeasonNumber = 1) - .With(e => e.Ignored = false) - .Build(); - - - Mocker.Resolve().AddEpisode(newEpisode); - - - var episodesInDb = Db.Fetch(@"SELECT * FROM Episodes"); - - episodesInDb.Should().HaveCount(5); - episodesInDb.Should().OnlyContain(e => e.Ignored == false); - - Mocker.VerifyAllMocks(); - } - - [Test] - public void AddEpisode_episode_is_not_ignored_when_not_full_season_is_not_ignored() - { - - - var episodes = Builder.CreateListOfSize(4) - .All() - .With(c => c.SeriesId = 10) - .And(c => c.SeasonNumber = 1) - .And(c => c.Ignored = true) - .TheFirst(2) - .With(c => c.Ignored = false) - .Build().ToList(); - - episodes.ForEach(c => Db.Insert(c)); - - var newEpisode = Builder.CreateNew() - .With(e => e.SeriesId = 10) - .With(e => e.SeasonNumber = 1) - .With(e => e.EpisodeNumber = 8) - .With(e => e.SeasonNumber = 1) - .With(e => e.Ignored = false) - .Build(); - - - Mocker.Resolve().AddEpisode(newEpisode); - - - var episodesInDb = Db.Fetch(@"SELECT * FROM Episodes"); - - episodesInDb.Should().HaveCount(5); - episodesInDb.Where(e => e.EpisodeNumber == 8 && !e.Ignored).Should().HaveCount(1); - - Mocker.VerifyAllMocks(); - } - - [Test] - public void IgnoreEpisode_Ignore() - { - - - var episodes = Builder.CreateListOfSize(4) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .With(c => c.Ignored = false) - .Build().ToList(); - - episodes.ForEach(c => Db.Insert(c)); - - - Mocker.Resolve().SetEpisodeIgnore(1, true); - - - var episodesInDb = Db.Fetch(@"SELECT * FROM Episodes"); - - episodesInDb.Should().HaveCount(4); - episodesInDb.Where(e => e.Ignored).Should().HaveCount(1); - - Mocker.VerifyAllMocks(); - } - - [Test] - public void IgnoreEpisode_RemoveIgnore() - { - - - var episodes = Builder.CreateListOfSize(4) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .With(c => c.Ignored = true) - .Build().ToList(); - - episodes.ForEach(c => Db.Insert(c)); - - - Mocker.Resolve().SetEpisodeIgnore(1, false); - - - var episodesInDb = Db.Fetch(@"SELECT * FROM Episodes"); - - episodesInDb.Should().HaveCount(4); - episodesInDb.Where(e => !e.Ignored).Should().HaveCount(1); - - Mocker.VerifyAllMocks(); - } - - [Test] - public void EpisodesWithoutFiles_no_specials() - { - - - var series = Builder.CreateNew() - .With(s => s.Id = 10) - .Build(); - - var episodes = Builder.CreateListOfSize(4) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .With(c => c.AirDate = DateTime.Today.AddDays(-4)) - .With(c => c.Ignored = true) - .TheFirst(2) - .Section(1, 2) - .With(c => c.Ignored = false) - .Build().ToList(); - - var specials = Builder.CreateListOfSize(2) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 0) - .With(c => c.AirDate = DateTime.Today.AddDays(-4)) - .With(c => c.Ignored = false) - .TheFirst(1).With(c => c.Ignored = true) - .Build().ToList(); - - Db.Insert(series); - Db.InsertMany(episodes); - Db.InsertMany(specials); - - - var missingFiles = Mocker.Resolve().EpisodesWithoutFiles(false); - - - missingFiles.Should().HaveCount(1); - missingFiles.Where(e => e.EpisodeFileId == 0).Should().HaveCount(1); - - Mocker.VerifyAllMocks(); - } - - [Test] - public void EpisodesWithoutFiles_with_specials() - { - - - var series = Builder.CreateNew() - .With(s => s.Id = 10) - .Build(); - - var episodes = Builder.CreateListOfSize(4) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .With(c => c.AirDate = DateTime.Today.AddDays(-4)) - .With(c => c.Ignored = true) - .TheFirst(2) - .Section(1, 2) - .With(c => c.Ignored = false) - .Build().ToList(); - - var specials = Builder.CreateListOfSize(2) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 0) - .With(c => c.AirDate = DateTime.Today.AddDays(-4)) - .With(c => c.Ignored = false) - .TheFirst(1) - .With(c => c.Ignored = true) - .Build().ToList(); - - Db.Insert(series); - Db.InsertMany(episodes); - Db.InsertMany(specials); - - - var missingFiles = Mocker.Resolve().EpisodesWithoutFiles(true); - - - missingFiles.Should().HaveCount(2); - missingFiles.Where(e => e.EpisodeFileId == 0).Should().HaveCount(2); - - Mocker.VerifyAllMocks(); - } - - [Test] - public void EpisodesWithFiles_success() - { - - - var series = Builder.CreateNew() - .With(s => s.Id = 10) - .Build(); - - var episodeFile = Builder.CreateNew() - .With(c => c.Id = 1) - .With(c => c.Quality = Quality.SDTV) - .Build(); - - var episodes = Builder.CreateListOfSize(2) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .With(c => c.AirDate = DateTime.Today.AddDays(-4)) - .With(c => c.Ignored = true) - .With(c => c.EpisodeFile = episodeFile) - .Build().ToList(); - - Db.Insert(series); - Db.Insert(episodeFile); - Db.InsertMany(episodes); - - - var withFiles = Mocker.Resolve().EpisodesWithFiles(); - - - withFiles.Should().HaveCount(2); - withFiles.Where(e => e.EpisodeFileId == 0).Should().HaveCount(0); - withFiles.Where(e => e.EpisodeFile == null).Should().HaveCount(0); - - foreach (var withFile in withFiles) - { - withFile.EpisodeFile.Should().NotBeNull(); - withFile.Series.Title.Should().NotBeNullOrEmpty(); - } - - Mocker.VerifyAllMocks(); - } - - [Test] - public void EpisodesWithFiles_no_files() - { - - - var series = Builder.CreateNew() - .With(s => s.Id = 10) - .Build(); - - var episodes = Builder.CreateListOfSize(2) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .With(c => c.AirDate = DateTime.Today.AddDays(-4)) - .With(c => c.Ignored = true) - .Build().ToList(); - - Db.Insert(series); - Db.InsertMany(episodes); - - - var withFiles = Mocker.Resolve().EpisodesWithFiles(); - - - withFiles.Should().HaveCount(0); - - Mocker.VerifyAllMocks(); - } - - [Test] - public void GetEpisodesByFileId_multi_episodes() - { - - - var series = Builder.CreateNew() - .With(s => s.Id = 10) - .Build(); - - var fakeEpisodes = Builder.CreateListOfSize(2) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .With(c => c.EpisodeFile = new EpisodeFile { Id = 12345 }) - .Build(); - - Db.Insert(series); - Db.InsertMany(fakeEpisodes); - - - var episodes = Mocker.Resolve().GetEpisodesByFileId(12345); - - - episodes.Should().HaveCount(2); - Mocker.VerifyAllMocks(); - } - - [Test] - public void GetEpisodesByFileId_single_episode() - { - - - var series = Builder.CreateNew() - .With(s => s.Id = 10) - .Build(); - - var fakeEpisode = Builder.CreateNew() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .With(c => c.EpisodeFile = new EpisodeFile { Id = 12345 }) - .Build(); - - Db.Insert(series); - Db.Insert(fakeEpisode); - - - var episodes = Mocker.Resolve().GetEpisodesByFileId(12345); - - - episodes.Should().HaveCount(1); - episodes.First().ShouldHave().AllPropertiesBut(e => e.Series).EqualTo(fakeEpisode); - Mocker.VerifyAllMocks(); - } - - [Test] - public void IsFirstOrLastEpisodeInSeason_false() - { - - - var fakeEpisodes = Builder.CreateListOfSize(10) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .Build(); - - Db.InsertMany(fakeEpisodes); - - - var result = Mocker.Resolve().IsFirstOrLastEpisodeOfSeason(10, 1, 5); - - - result.Should().BeFalse(); - } - - [Test] - public void IsFirstOrLastEpisodeInSeason_true_first() - { - - - var fakeEpisodes = Builder.CreateListOfSize(10) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .Build(); - - Db.InsertMany(fakeEpisodes); - - - var result = Mocker.Resolve().IsFirstOrLastEpisodeOfSeason(10, 1, 1); - - - result.Should().BeFalse(); - } - - [Test] - public void IsFirstOrLastEpisodeInSeason_true_last() - { - - - var fakeEpisodes = Builder.CreateListOfSize(10) - .All() - .With(c => c.SeriesId = 10) - .With(c => c.SeasonNumber = 1) - .Build(); - - Db.InsertMany(fakeEpisodes); - - - var result = Mocker.Resolve().IsFirstOrLastEpisodeOfSeason(10, 1, 10); - - - result.Should().BeFalse(); - } - - [TestCase("The Office (US) - S01E01 - Episode Title", PostDownloadStatusType.Unpacking, 1)] - [TestCase("The Office (US) - S01E01 - Episode Title", PostDownloadStatusType.Failed, 1)] - [TestCase("The Office (US) - S01E01E02 - Episode Title", PostDownloadStatusType.Unpacking, 2)] - [TestCase("The Office (US) - S01E01E02 - Episode Title", PostDownloadStatusType.Failed, 2)] - [TestCase("The Office (US) - Season 01 - Episode Title", PostDownloadStatusType.Unpacking, 10)] - [TestCase("The Office (US) - Season 01 - Episode Title", PostDownloadStatusType.Failed, 10)] - public void SetPostDownloadStatus(string folderName, PostDownloadStatusType postDownloadStatus, int episodeCount) - { - - - var fakeSeries = Builder.CreateNew() - .With(s => s.Id = 12345) - .With(s => s.CleanTitle = "officeus") - .Build(); - - var fakeEpisodes = Builder.CreateListOfSize(episodeCount) - .All() - .With(c => c.SeriesId = 12345) - .With(c => c.SeasonNumber = 1) - .With(c => c.PostDownloadStatus = PostDownloadStatusType.Unknown) - .Build(); - - Db.Insert(fakeSeries); - Db.InsertMany(fakeEpisodes); - - Mocker.GetMock().Setup(s => s.GetByTitle("officeus")).Returns(fakeSeries); - - - Mocker.Resolve().SetPostDownloadStatus(fakeEpisodes.Select(e => e.Id).ToList(), postDownloadStatus); - - - var result = Db.Fetch(); - result.Where(e => e.PostDownloadStatus == postDownloadStatus).Count().Should().Be(episodeCount); - } - - [Test] - public void SetPostDownloadStatus_Invalid_EpisodeId() - { - - - var postDownloadStatus = PostDownloadStatusType.Failed; - - var fakeSeries = Builder.CreateNew() - .With(s => s.Id = 12345) - .With(s => s.CleanTitle = "officeus") - .Build(); - - var fakeEpisodes = Builder.CreateListOfSize(1) - .All() - .With(c => c.SeriesId = 12345) - .With(c => c.SeasonNumber = 1) - .With(c => c.PostDownloadStatus = PostDownloadStatusType.Unknown) - .Build(); - - Db.Insert(fakeSeries); - Db.InsertMany(fakeEpisodes); - - Mocker.GetMock().Setup(s => s.GetByTitle("officeus")).Returns(fakeSeries); - - - Mocker.Resolve().SetPostDownloadStatus(new List { 300 }, postDownloadStatus); - - - var result = Db.Fetch(); - result.Where(e => e.PostDownloadStatus == postDownloadStatus).Count().Should().Be(0); - } - - [Test] - [ExpectedException(typeof(ArgumentException))] - public void SetPostDownloadStatus_should_throw_if_episode_list_is_empty() - { - Mocker.Resolve().SetPostDownloadStatus(new List(), PostDownloadStatusType.Failed); - } - - [Test] - public void RefreshEpisodeInfo_should_ignore_episode_zero_except_if_season_one() - { - //Arrange - const int seriesId = 71663; - const int episodeCount = 5; - - var tvdbSeries = Builder.CreateNew().With( - c => c.Episodes = - new List(Builder.CreateListOfSize(episodeCount). - All() - .With(l => l.Language = new TvdbLanguage(0, "eng", "a")) - .With(e => e.EpisodeNumber = 0) - .TheFirst(1) - .With(e => e.SeasonNumber = 1) - .TheNext(1) - .With(e => e.SeasonNumber = 2) - .TheNext(1) - .With(e => e.SeasonNumber = 3) - .TheNext(1) - .With(e => e.SeasonNumber = 4) - .TheNext(1) - .With(e => e.SeasonNumber = 5) - .Build()) - ).With(c => c.Id = seriesId).Build(); - - var fakeSeries = Builder.CreateNew().With(c => c.Id = seriesId).Build(); - - - - Db.Insert(fakeSeries); - - Mocker.GetMock() - .Setup(c => c.GetSeries(seriesId, true, false)) - .Returns(tvdbSeries); - - - Mocker.Resolve().RefreshEpisodeInfo(fakeSeries); - - - var result = Mocker.Resolve().GetEpisodeBySeries(seriesId).ToList(); - result.Should().HaveCount(episodeCount); - result.Where(e => e.Ignored).Should().HaveCount(episodeCount - 1); - result.Single(e => e.SeasonNumber == 1).Ignored.Should().BeFalse(); - } - - - } -} -*/ diff --git a/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWhereCutoffUnmetFixture.cs b/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWhereCutoffUnmetFixture.cs index 5a3f2e1fc..edd9c8369 100644 --- a/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWhereCutoffUnmetFixture.cs +++ b/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWhereCutoffUnmetFixture.cs @@ -4,6 +4,7 @@ using FizzWare.NBuilder; using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Datastore; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; using NzbDrone.Core.Qualities; @@ -22,15 +23,15 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests [SetUp] public void Setup() { - var qualityProfile = new QualityProfile + var profile = new Profile { Id = 1, Cutoff = Quality.WEBDL480p, - Items = new List + Items = new List { - new QualityProfileItem { Allowed = true, Quality = Quality.SDTV }, - new QualityProfileItem { Allowed = true, Quality = Quality.WEBDL480p }, - new QualityProfileItem { Allowed = true, Quality = Quality.RAWHD } + new ProfileQualityItem { Allowed = true, Quality = Quality.SDTV }, + new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL480p }, + new ProfileQualityItem { Allowed = true, Quality = Quality.RAWHD } } }; @@ -39,7 +40,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests .With(s => s.Runtime = 30) .With(s => s.Monitored = true) .With(s => s.TitleSlug = "Title3") - .With(s => s.Id = qualityProfile.Id) + .With(s => s.Id = profile.Id) .BuildNew(); _unmonitoredSeries = Builder.CreateNew() @@ -47,7 +48,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests .With(s => s.Runtime = 30) .With(s => s.Monitored = false) .With(s => s.TitleSlug = "Title2") - .With(s => s.Id = qualityProfile.Id) + .With(s => s.Id = profile.Id) .BuildNew(); _monitoredSeries.Id = Db.Insert(_monitoredSeries).Id; @@ -63,7 +64,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests _qualitiesBelowCutoff = new List { - new QualitiesBelowCutoff(qualityProfile.Id, new[] {Quality.SDTV.Id}) + new QualitiesBelowCutoff(profile.Id, new[] {Quality.SDTV.Id}) }; var qualityMet = new EpisodeFile { Path = "a", Quality = new QualityModel { Quality = Quality.WEBDL480p } }; diff --git a/src/NzbDrone.Core.Test/TvTests/SeriesRepositoryTests/QualityProfileRepositoryFixture.cs b/src/NzbDrone.Core.Test/TvTests/SeriesRepositoryTests/SeriesRepositoryFixture.cs similarity index 74% rename from src/NzbDrone.Core.Test/TvTests/SeriesRepositoryTests/QualityProfileRepositoryFixture.cs rename to src/NzbDrone.Core.Test/TvTests/SeriesRepositoryTests/SeriesRepositoryFixture.cs index 0685ccc0f..bbd18e7e1 100644 --- a/src/NzbDrone.Core.Test/TvTests/SeriesRepositoryTests/QualityProfileRepositoryFixture.cs +++ b/src/NzbDrone.Core.Test/TvTests/SeriesRepositoryTests/SeriesRepositoryFixture.cs @@ -1,7 +1,7 @@ -using System.Collections.Generic; using FizzWare.NBuilder; using FluentAssertions; using NUnit.Framework; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -15,7 +15,7 @@ namespace NzbDrone.Core.Test.TvTests.SeriesRepositoryTests [Test] public void should_lazyload_quality_profile() { - var profile = new QualityProfile + var profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities(Quality.Bluray1080p, Quality.DVD, Quality.HDTV720p), @@ -24,15 +24,15 @@ namespace NzbDrone.Core.Test.TvTests.SeriesRepositoryTests }; - Mocker.Resolve().Insert(profile); + Mocker.Resolve().Insert(profile); var series = Builder.CreateNew().BuildNew(); - series.QualityProfileId = profile.Id; + series.ProfileId = profile.Id; Subject.Insert(series); - StoredModel.QualityProfile.Should().NotBeNull(); + StoredModel.Profile.Should().NotBeNull(); } diff --git a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateMultipleSeriesFixture.cs b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateMultipleSeriesFixture.cs index 86cbe7320..f0585131d 100644 --- a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateMultipleSeriesFixture.cs +++ b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateMultipleSeriesFixture.cs @@ -20,7 +20,7 @@ namespace NzbDrone.Core.Test.TvTests.SeriesServiceTests { _series = Builder.CreateListOfSize(5) .All() - .With(s => s.QualityProfileId = 1) + .With(s => s.ProfileId = 1) .With(s => s.Monitored) .With(s => s.SeasonFolder) .With(s => s.Path = @"C:\Test\name".AsOsAgnostic()) diff --git a/src/NzbDrone.Core/Datastore/Extensions/RelationshipExtensions.cs b/src/NzbDrone.Core/Datastore/Extensions/RelationshipExtensions.cs index 2e40accd4..90be4a920 100644 --- a/src/NzbDrone.Core/Datastore/Extensions/RelationshipExtensions.cs +++ b/src/NzbDrone.Core/Datastore/Extensions/RelationshipExtensions.cs @@ -17,7 +17,6 @@ namespace NzbDrone.Core.Datastore.Extensions query: (db, parent) => db.Query().SingleOrDefault(c => c.Id == childIdSelector(parent)), condition: parent => childIdSelector(parent) > 0 ); - } public static RelationshipBuilder Relationship(this ColumnMapBuilder mapBuilder) @@ -25,16 +24,12 @@ namespace NzbDrone.Core.Datastore.Extensions return mapBuilder.Relationships.AutoMapComplexTypeProperties(); } - - public static RelationshipBuilder HasMany(this RelationshipBuilder relationshipBuilder, Expression>> portalExpression, Func childIdSelector) where TParent : ModelBase where TChild : ModelBase { return relationshipBuilder.For(portalExpression.GetMemberName()) .LazyLoad((db, parent) => db.Query().Where(c => c.Id == childIdSelector(parent)).ToList()); - - } private static string GetMemberName(this Expression> member) diff --git a/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs b/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs index ea6f38fdd..78ffb967d 100644 --- a/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs +++ b/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs @@ -3,6 +3,7 @@ using NzbDrone.Core.Datastore.Migration.Framework; using System.Data; using System.Linq; using NzbDrone.Common.Serializer; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using System.Collections.Generic; using NzbDrone.Core.Datastore.Converters; @@ -41,7 +42,7 @@ namespace NzbDrone.Core.Datastore.Migration var allowed = Json.Deserialize>(allowedJson); - var items = Quality.DefaultQualityDefinitions.OrderBy(v => v.Weight).Select(v => new QualityProfileItem { Quality = v.Quality, Allowed = allowed.Contains(v.Quality) }).ToList(); + var items = Quality.DefaultQualityDefinitions.OrderBy(v => v.Weight).Select(v => new ProfileQualityItem { Quality = v.Quality, Allowed = allowed.Contains(v.Quality) }).ToList(); var allowedNewJson = qualityProfileItemConverter.ToDB(items); diff --git a/src/NzbDrone.Core/Datastore/Migration/054_rename_profiles.cs b/src/NzbDrone.Core/Datastore/Migration/054_rename_profiles.cs new file mode 100644 index 000000000..e665c14a4 --- /dev/null +++ b/src/NzbDrone.Core/Datastore/Migration/054_rename_profiles.cs @@ -0,0 +1,31 @@ +using FluentMigrator; +using NzbDrone.Core.Datastore.Migration.Framework; + +namespace NzbDrone.Core.Datastore.Migration +{ + [Migration(54)] + public class rename_profiles : NzbDroneMigrationBase + { + protected override void MainDbUpgrade() + { + Rename.Table("QualityProfiles").To("Profiles"); + + Alter.Table("Profiles").AddColumn("Language").AsInt32().Nullable(); + Alter.Table("Profiles").AddColumn("GrabDelay").AsInt32().Nullable(); + Alter.Table("Profiles").AddColumn("GrabDelayMode").AsInt32().Nullable(); + Execute.Sql("UPDATE Profiles SET Language = 1, GrabDelay = 0, GrabDelayMode = 0"); + + //Rename QualityProfileId in Series + Alter.Table("Series").AddColumn("ProfileId").AsInt32().Nullable(); + Execute.Sql("UPDATE Series SET ProfileId = QualityProfileId"); + + //Add HeldReleases + Create.TableForModel("PendingReleases") + .WithColumn("SeriesId").AsInt32() + .WithColumn("Title").AsString() + .WithColumn("Added").AsDateTime() + .WithColumn("ParsedEpisodeInfo").AsString() + .WithColumn("Release").AsString(); + } + } +} diff --git a/src/NzbDrone.Core/Datastore/Migration/055_drop_old_profile_columns.cs b/src/NzbDrone.Core/Datastore/Migration/055_drop_old_profile_columns.cs new file mode 100644 index 000000000..349c10ca1 --- /dev/null +++ b/src/NzbDrone.Core/Datastore/Migration/055_drop_old_profile_columns.cs @@ -0,0 +1,14 @@ +using FluentMigrator; +using NzbDrone.Core.Datastore.Migration.Framework; + +namespace NzbDrone.Core.Datastore.Migration +{ + [Migration(55)] + public class drop_old_profile_columns : NzbDroneMigrationBase + { + protected override void MainDbUpgrade() + { + SqLiteAlter.DropColumns("Series", new[] { "QualityProfileId" }); + } + } +} diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/SQLiteIndex.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/SQLiteIndex.cs index cbf18dbd9..59129eaa0 100644 --- a/src/NzbDrone.Core/Datastore/Migration/Framework/SQLiteIndex.cs +++ b/src/NzbDrone.Core/Datastore/Migration/Framework/SQLiteIndex.cs @@ -33,7 +33,12 @@ namespace NzbDrone.Core.Datastore.Migration.Framework public string CreateSql(string tableName) { - return string.Format(@"CREATE UNIQUE INDEX ""{2}"" ON ""{0}"" (""{1}"" ASC)", tableName, Column, IndexName); + if (Unique) + { + return String.Format(@"CREATE UNIQUE INDEX ""{2}"" ON ""{0}"" (""{1}"" ASC)", tableName, Column, IndexName); + } + + return String.Format(@"CREATE INDEX ""{2}"" ON ""{0}"" (""{1}"" ASC)", tableName, Column, IndexName); } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/Datastore/Migration/Framework/SQLiteMigrationHelper.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/SQLiteMigrationHelper.cs index 3bb08dace..fabdefca9 100644 --- a/src/NzbDrone.Core/Datastore/Migration/Framework/SQLiteMigrationHelper.cs +++ b/src/NzbDrone.Core/Datastore/Migration/Framework/SQLiteMigrationHelper.cs @@ -147,14 +147,12 @@ namespace NzbDrone.Core.Datastore.Migration.Framework } } - public void DropTable(string tableName) { var dropCommand = BuildCommand("DROP TABLE {0};", tableName); dropCommand.ExecuteNonQuery(); } - public void RenameTable(string tableName, string newName) { var renameCommand = BuildCommand("ALTER TABLE {0} RENAME TO {1};", tableName, newName); @@ -184,7 +182,6 @@ namespace NzbDrone.Core.Datastore.Migration.Framework return Convert.ToInt32(countCommand.ExecuteScalar()); } - public SQLiteTransaction BeginTransaction() { return _connection.BeginTransaction(); @@ -197,7 +194,6 @@ namespace NzbDrone.Core.Datastore.Migration.Framework return command; } - public void ExecuteNonQuery(string command, params string[] args) { var sqLiteCommand = new SQLiteCommand(string.Format(command, args)) @@ -226,7 +222,5 @@ namespace NzbDrone.Core.Datastore.Migration.Framework } } - - } } \ No newline at end of file diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs index edb84e624..b0f14fc9d 100644 --- a/src/NzbDrone.Core/Datastore/TableMapping.cs +++ b/src/NzbDrone.Core/Datastore/TableMapping.cs @@ -9,6 +9,7 @@ using NzbDrone.Core.DataAugmentation.Scene; using NzbDrone.Core.Datastore.Converters; using NzbDrone.Core.Datastore.Extensions; using NzbDrone.Core.Download; +using NzbDrone.Core.Download.Pending; using NzbDrone.Core.Indexers; using NzbDrone.Core.Instrumentation; using NzbDrone.Core.Jobs; @@ -17,6 +18,8 @@ using NzbDrone.Core.Metadata; using NzbDrone.Core.Metadata.Files; using NzbDrone.Core.Notifications; using NzbDrone.Core.Organizer; +using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.RootFolders; using NzbDrone.Core.SeriesStats; @@ -27,7 +30,6 @@ namespace NzbDrone.Core.Datastore { public static class TableMapping { - private static readonly FluentMappings Mapper = new FluentMappings(true); public static void Map() @@ -52,7 +54,7 @@ namespace NzbDrone.Core.Datastore Mapper.Entity().RegisterModel("Series") .Ignore(s => s.RootFolderPath) .Relationship() - .HasOne(s => s.QualityProfile, s => s.QualityProfileId); + .HasOne(s => s.Profile, s => s.ProfileId); Mapper.Entity().RegisterModel("Episodes") .Ignore(e => e.SeriesTitle) @@ -64,14 +66,16 @@ namespace NzbDrone.Core.Datastore Mapper.Entity().RegisterModel("EpisodeFiles") .Relationships.AutoMapICollectionOrComplexProperties(); - Mapper.Entity().RegisterModel("QualityProfiles"); + Mapper.Entity().RegisterModel("Profiles"); Mapper.Entity().RegisterModel("QualityDefinitions"); Mapper.Entity().RegisterModel("Logs"); Mapper.Entity().RegisterModel("NamingConfig"); Mapper.Entity().MapResultSet(); Mapper.Entity().RegisterModel("Blacklist"); - Mapper.Entity().RegisterModel("MetadataFiles"); + + Mapper.Entity().RegisterModel("PendingReleases") + .Ignore(e => e.RemoteEpisode); } private static void RegisterMappers() @@ -84,11 +88,13 @@ namespace NzbDrone.Core.Datastore MapRepository.Instance.RegisterTypeConverter(typeof(Boolean), new BooleanIntConverter()); MapRepository.Instance.RegisterTypeConverter(typeof(Enum), new EnumIntConverter()); MapRepository.Instance.RegisterTypeConverter(typeof(Quality), new QualityIntConverter()); - MapRepository.Instance.RegisterTypeConverter(typeof(List), new EmbeddedDocumentConverter(new QualityIntConverter())); + MapRepository.Instance.RegisterTypeConverter(typeof(List), new EmbeddedDocumentConverter(new QualityIntConverter())); MapRepository.Instance.RegisterTypeConverter(typeof(QualityModel), new EmbeddedDocumentConverter(new QualityIntConverter())); MapRepository.Instance.RegisterTypeConverter(typeof(Dictionary), new EmbeddedDocumentConverter()); MapRepository.Instance.RegisterTypeConverter(typeof(List), new EmbeddedDocumentConverter()); MapRepository.Instance.RegisterTypeConverter(typeof(List), new EmbeddedDocumentConverter()); + MapRepository.Instance.RegisterTypeConverter(typeof(ParsedEpisodeInfo), new EmbeddedDocumentConverter()); + MapRepository.Instance.RegisterTypeConverter(typeof(ReleaseInfo), new EmbeddedDocumentConverter()); } private static void RegisterProviderSettingConverter() diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/DownloadDecision.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecision.cs similarity index 53% rename from src/NzbDrone.Core/DecisionEngine/Specifications/DownloadDecision.cs rename to src/NzbDrone.Core/DecisionEngine/DownloadDecision.cs index 22616a735..dfbca6e84 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/DownloadDecision.cs +++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecision.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using NzbDrone.Core.Parser.Model; -namespace NzbDrone.Core.DecisionEngine.Specifications +namespace NzbDrone.Core.DecisionEngine { public class DownloadDecision { public RemoteEpisode RemoteEpisode { get; private set; } - public IEnumerable Rejections { get; private set; } + public IEnumerable Rejections { get; private set; } public bool Approved { @@ -17,13 +17,28 @@ namespace NzbDrone.Core.DecisionEngine.Specifications } } - public DownloadDecision(RemoteEpisode episode, params string[] rejections) + public bool TemporarilyRejected + { + get + { + return Rejections.Any() && Rejections.All(r => r.Type == RejectionType.Temporary); + } + } + + public bool Rejected + { + get + { + return Rejections.Any() && Rejections.All(r => r.Type == RejectionType.Permanent); + } + } + + public DownloadDecision(RemoteEpisode episode, params Rejection[] rejections) { RemoteEpisode = episode; Rejections = rejections.ToList(); } - - + public override string ToString() { if (Approved) diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs index 3babd682b..4dd786a90 100644 --- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs +++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs @@ -4,7 +4,6 @@ using System.Linq; using NLog; using NzbDrone.Common; using NzbDrone.Common.Serializer; -using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.Instrumentation.Extensions; using NzbDrone.Core.Parser; @@ -17,6 +16,7 @@ namespace NzbDrone.Core.DecisionEngine { List GetRssDecision(List reports); List GetSearchDecision(List reports, SearchCriteriaBase searchCriteriaBase); + DownloadDecision GetDecisionForReport(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria = null); } public class DownloadDecisionMaker : IMakeDownloadDecision @@ -87,7 +87,7 @@ namespace NzbDrone.Core.DecisionEngine } else { - decision = new DownloadDecision(remoteEpisode, "Unknown Series"); + decision = new DownloadDecision(remoteEpisode, new Rejection("Unknown Series")); } } } @@ -110,19 +110,19 @@ namespace NzbDrone.Core.DecisionEngine } } - private DownloadDecision GetDecisionForReport(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria = null) + public DownloadDecision GetDecisionForReport(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria = null) { var reasons = _specifications.Select(c => EvaluateSpec(c, remoteEpisode, searchCriteria)) - .Where(c => !string.IsNullOrWhiteSpace(c)); + .Where(c => c != null); return new DownloadDecision(remoteEpisode, reasons.ToArray()); } - private string EvaluateSpec(IRejectWithReason spec, RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteriaBase = null) + private Rejection EvaluateSpec(IRejectWithReason spec, RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteriaBase = null) { try { - if (string.IsNullOrWhiteSpace(spec.RejectionReason)) + if (spec.RejectionReason.IsNullOrWhiteSpace()) { throw new InvalidOperationException("[Need Rejection Text]"); } @@ -130,7 +130,7 @@ namespace NzbDrone.Core.DecisionEngine var generalSpecification = spec as IDecisionEngineSpecification; if (generalSpecification != null && !generalSpecification.IsSatisfiedBy(remoteEpisode, searchCriteriaBase)) { - return spec.RejectionReason; + return new Rejection(spec.RejectionReason, generalSpecification.Type); } } catch (Exception e) @@ -138,7 +138,7 @@ namespace NzbDrone.Core.DecisionEngine e.Data.Add("report", remoteEpisode.Release.ToJson()); e.Data.Add("parsed", remoteEpisode.ParsedEpisodeInfo.ToJson()); _logger.ErrorException("Couldn't evaluate decision on " + remoteEpisode.Release.Title, e); - return string.Format("{0}: {1}", spec.GetType().Name, e.Message); + return new Rejection(String.Format("{0}: {1}", spec.GetType().Name, e.Message)); } return null; diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs index 9f01356b2..f9fa820b3 100644 --- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs +++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs @@ -19,7 +19,7 @@ namespace NzbDrone.Core.DecisionEngine return decisions .Where(c => c.RemoteEpisode.Series != null) .GroupBy(c => c.RemoteEpisode.Series.Id, (i, s) => s - .OrderByDescending(c => c.RemoteEpisode.ParsedEpisodeInfo.Quality, new QualityModelComparer(s.First().RemoteEpisode.Series.QualityProfile)) + .OrderByDescending(c => c.RemoteEpisode.ParsedEpisodeInfo.Quality, new QualityModelComparer(s.First().RemoteEpisode.Series.Profile)) .ThenBy(c => c.RemoteEpisode.Episodes.Select(e => e.EpisodeNumber).MinOrDefault()) .ThenBy(c => c.RemoteEpisode.Release.Size.Round(200.Megabytes()) / Math.Max(1, c.RemoteEpisode.Episodes.Count)) .ThenBy(c => c.RemoteEpisode.Release.Age)) diff --git a/src/NzbDrone.Core/DecisionEngine/IDecisionEngineSpecification.cs b/src/NzbDrone.Core/DecisionEngine/IDecisionEngineSpecification.cs index 089925c7b..69cbdc894 100644 --- a/src/NzbDrone.Core/DecisionEngine/IDecisionEngineSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/IDecisionEngineSpecification.cs @@ -1,3 +1,4 @@ +using System; using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.Parser.Model; @@ -5,6 +6,8 @@ namespace NzbDrone.Core.DecisionEngine { public interface IDecisionEngineSpecification : IRejectWithReason { - bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria); + RejectionType Type { get; } + + Boolean IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria); } } \ No newline at end of file diff --git a/src/NzbDrone.Core/DecisionEngine/IRejectWithReason.cs b/src/NzbDrone.Core/DecisionEngine/IRejectWithReason.cs index 503071e02..ee9f843d3 100644 --- a/src/NzbDrone.Core/DecisionEngine/IRejectWithReason.cs +++ b/src/NzbDrone.Core/DecisionEngine/IRejectWithReason.cs @@ -4,4 +4,4 @@ namespace NzbDrone.Core.DecisionEngine { string RejectionReason { get; } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Core/DecisionEngine/QualityUpgradableSpecification.cs b/src/NzbDrone.Core/DecisionEngine/QualityUpgradableSpecification.cs index a37f65ef3..0c83be0e3 100644 --- a/src/NzbDrone.Core/DecisionEngine/QualityUpgradableSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/QualityUpgradableSpecification.cs @@ -1,12 +1,13 @@ using NLog; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; namespace NzbDrone.Core.DecisionEngine { public interface IQualityUpgradableSpecification { - bool IsUpgradable(QualityProfile profile, QualityModel currentQuality, QualityModel newQuality = null); - bool CutoffNotMet(QualityProfile profile, QualityModel currentQuality, QualityModel newQuality = null); + bool IsUpgradable(Profile profile, QualityModel currentQuality, QualityModel newQuality = null); + bool CutoffNotMet(Profile profile, QualityModel currentQuality, QualityModel newQuality = null); bool IsProperUpgrade(QualityModel currentQuality, QualityModel newQuality); } @@ -19,7 +20,7 @@ namespace NzbDrone.Core.DecisionEngine _logger = logger; } - public bool IsUpgradable(QualityProfile profile, QualityModel currentQuality, QualityModel newQuality = null) + public bool IsUpgradable(Profile profile, QualityModel currentQuality, QualityModel newQuality = null) { if (newQuality != null) { @@ -39,7 +40,7 @@ namespace NzbDrone.Core.DecisionEngine return true; } - public bool CutoffNotMet(QualityProfile profile, QualityModel currentQuality, QualityModel newQuality = null) + public bool CutoffNotMet(Profile profile, QualityModel currentQuality, QualityModel newQuality = null) { int compare = new QualityModelComparer(profile).Compare(currentQuality.Quality, profile.Cutoff); diff --git a/src/NzbDrone.Core/DecisionEngine/Rejection.cs b/src/NzbDrone.Core/DecisionEngine/Rejection.cs new file mode 100644 index 000000000..315803b38 --- /dev/null +++ b/src/NzbDrone.Core/DecisionEngine/Rejection.cs @@ -0,0 +1,21 @@ +using System; + +namespace NzbDrone.Core.DecisionEngine +{ + public class Rejection + { + public String Reason { get; set; } + public RejectionType Type { get; set; } + + public Rejection(string reason, RejectionType type = RejectionType.Permanent) + { + Reason = reason; + Type = type; + } + + public override string ToString() + { + return String.Format("[{0}] {1}", Type, Reason); + } + } +} diff --git a/src/NzbDrone.Core/DecisionEngine/RejectionType.cs b/src/NzbDrone.Core/DecisionEngine/RejectionType.cs new file mode 100644 index 000000000..f15d810ce --- /dev/null +++ b/src/NzbDrone.Core/DecisionEngine/RejectionType.cs @@ -0,0 +1,8 @@ +namespace NzbDrone.Core.DecisionEngine +{ + public enum RejectionType + { + Permanent = 0, + Temporary = 1 + } +} diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs index 1d776f3e1..0983a9a50 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs @@ -1,3 +1,4 @@ +using System; using System.Linq; using NLog; using NzbDrone.Core.IndexerSearch.Definitions; @@ -21,12 +22,14 @@ namespace NzbDrone.Core.DecisionEngine.Specifications _logger = logger; } - public string RejectionReason + public String RejectionReason { get { return "File size too big or small"; } } - public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) + public RejectionType Type { get { return RejectionType.Permanent; } } + + public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { _logger.Debug("Beginning size check for: {0}", subject); diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/BlacklistSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/BlacklistSpecification.cs index 6ca2b588a..3e3f28a60 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/BlacklistSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/BlacklistSpecification.cs @@ -27,6 +27,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { if (!_configService.EnableFailedDownloadHandling) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs index 7ede1ed8d..198e26a39 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs @@ -24,6 +24,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value)) @@ -31,7 +33,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications _logger.Debug("Comparing file quality with report. Existing file is {0}", file.Quality); - if (!_qualityUpgradableSpecification.CutoffNotMet(subject.Series.QualityProfile, file.Quality, subject.ParsedEpisodeInfo.Quality)) + if (!_qualityUpgradableSpecification.CutoffNotMet(subject.Series.Profile, file.Quality, subject.ParsedEpisodeInfo.Quality)) { _logger.Debug("Cutoff already met, rejecting."); return false; diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/LanguageSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/LanguageSpecification.cs index 1ec1eb76d..b8916846f 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/LanguageSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/LanguageSpecification.cs @@ -1,6 +1,5 @@ using NLog; using NzbDrone.Core.IndexerSearch.Definitions; -using NzbDrone.Core.Parser; using NzbDrone.Core.Parser.Model; namespace NzbDrone.Core.DecisionEngine.Specifications @@ -18,16 +17,21 @@ namespace NzbDrone.Core.DecisionEngine.Specifications { get { - return "Not English"; + return "Language is not wanted"; } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { + var wantedLanguage = subject.Series.Profile.Value.Language; + _logger.Debug("Checking if report meets language requirements. {0}", subject.ParsedEpisodeInfo.Language); - if (subject.ParsedEpisodeInfo.Language != Language.English) + + if (subject.ParsedEpisodeInfo.Language != wantedLanguage) { - _logger.Debug("Report Language: {0} rejected because it is not English", subject.ParsedEpisodeInfo.Language); + _logger.Debug("Report Language: {0} rejected because it is not wanted, wanted {1}", subject.ParsedEpisodeInfo.Language, wantedLanguage); return false; } diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/NotInQueueSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/NotInQueueSpecification.cs index 64f19ad72..fa58e4119 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/NotInQueueSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/NotInQueueSpecification.cs @@ -28,6 +28,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { var queue = _downloadTrackingService.GetQueuedDownloads() @@ -46,7 +48,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications private bool IsInQueue(RemoteEpisode newEpisode, IEnumerable queue) { var matchingSeries = queue.Where(q => q.Series.Id == newEpisode.Series.Id); - var matchingSeriesAndQuality = matchingSeries.Where(q => new QualityModelComparer(q.Series.QualityProfile).Compare(q.ParsedEpisodeInfo.Quality, newEpisode.ParsedEpisodeInfo.Quality) >= 0); + var matchingSeriesAndQuality = matchingSeries.Where(q => new QualityModelComparer(q.Series.Profile).Compare(q.ParsedEpisodeInfo.Quality, newEpisode.ParsedEpisodeInfo.Quality) >= 0); return matchingSeriesAndQuality.Any(q => q.Episodes.Select(e => e.Id).Intersect(newEpisode.Episodes.Select(e => e.Id)).Any()); } diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs index 7a9e9f65c..6818ab5fa 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs @@ -25,6 +25,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { _logger.Debug("Checking if release contains any restricted terms: {0}", subject); diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs index c5e193012..a7568c96a 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs @@ -7,7 +7,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications public class NotSampleSpecification : IDecisionEngineSpecification { private readonly Logger _logger; + public string RejectionReason { get { return "Sample"; } } + public RejectionType Type { get { return RejectionType.Permanent; } } public NotSampleSpecification(Logger logger) { diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs index 758d9b2d6..b40a1acab 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs @@ -21,10 +21,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { _logger.Debug("Checking if report meets quality requirements. {0}", subject.ParsedEpisodeInfo.Quality); - if (!subject.Series.QualityProfile.Value.Items.Exists(v => v.Allowed && v.Quality == subject.ParsedEpisodeInfo.Quality.Quality)) + if (!subject.Series.Profile.Value.Items.Exists(v => v.Allowed && v.Quality == subject.ParsedEpisodeInfo.Quality.Quality)) { _logger.Debug("Quality {0} rejected by Series' quality profile", subject.ParsedEpisodeInfo.Quality); return false; diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs index 614794b92..5aa7539d2 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs @@ -25,6 +25,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { var age = subject.Release.Age; diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RetrySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RetrySpecification.cs index c99d24c59..dc964932f 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/RetrySpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RetrySpecification.cs @@ -30,6 +30,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { if (!_configService.EnableFailedDownloadHandling) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs new file mode 100644 index 000000000..3d117fc54 --- /dev/null +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs @@ -0,0 +1,116 @@ +using System.Linq; +using NLog; +using NzbDrone.Core.Download.Pending; +using NzbDrone.Core.IndexerSearch.Definitions; +using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; +using NzbDrone.Core.Qualities; + +namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync +{ + public class DelaySpecification : IDecisionEngineSpecification + { + private readonly IPendingReleaseService _pendingReleaseService; + private readonly Logger _logger; + + public DelaySpecification(IPendingReleaseService pendingReleaseService, Logger logger) + { + _pendingReleaseService = pendingReleaseService; + _logger = logger; + } + + public string RejectionReason + { + get + { + return "Waiting for better quality release"; + } + } + + public RejectionType Type { get { return RejectionType.Temporary; } } + + public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) + { + //How do we want to handle drone being off and the automatic search being triggered? + //TODO: Add a flag to the search to state it is a "scheduled" search + + if (searchCriteria != null) + { + _logger.Debug("Ignore delay for searches"); + return true; + } + + var profile = subject.Series.Profile.Value; + + if (profile.GrabDelay == 0) + { + _logger.Debug("Profile does not delay before download"); + return true; + } + + var comparer = new QualityModelComparer(profile); + + if (subject.ParsedEpisodeInfo.Quality.Proper) + { + foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value)) + { + if (comparer.Compare(subject.ParsedEpisodeInfo.Quality, file.Quality) > 0) + { + var properCompare = subject.ParsedEpisodeInfo.Quality.Proper.CompareTo(file.Quality.Proper); + + if (subject.ParsedEpisodeInfo.Quality.Quality == file.Quality.Quality && properCompare > 0) + { + _logger.Debug("New quality is a proper for existing quality, skipping delay"); + return true; + } + } + } + } + + //If quality meets or exceeds the best allowed quality in the profile accept it immediately + var bestQualityInProfile = new QualityModel(profile.Items.Last(q => q.Allowed).Quality); + var bestCompare = comparer.Compare(subject.ParsedEpisodeInfo.Quality, bestQualityInProfile); + + if (bestCompare >= 0) + { + _logger.Debug("Quality is highest in profile, will not delay"); + return true; + } + + if (profile.GrabDelayMode == GrabDelayMode.Cutoff) + { + var cutoff = new QualityModel(profile.Cutoff); + var cutoffCompare = comparer.Compare(subject.ParsedEpisodeInfo.Quality, cutoff); + + if (cutoffCompare >= 0) + { + _logger.Debug("Quality meets or exceeds the cutoff, will not delay"); + return true; + } + } + + if (profile.GrabDelayMode == GrabDelayMode.First) + { + var episodeIds = subject.Episodes.Select(e => e.Id); + + var oldest = _pendingReleaseService.GetPendingRemoteEpisodes(subject.Series.Id) + .Where(r => r.Episodes.Select(e => e.Id).Intersect(episodeIds).Any()) + .OrderByDescending(p => p.Release.AgeHours) + .FirstOrDefault(); + + if (oldest != null && oldest.Release.AgeHours > profile.GrabDelay) + { + return true; + } + } + + if (subject.Release.AgeHours < profile.GrabDelay) + { + _logger.Debug("Age ({0}) is less than delay {1}, delaying", subject.Release.AgeHours, profile.GrabDelay); + return false; + } + + return true; + } + } +} diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs index 9dd1fc5c4..d2e49d18c 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs @@ -34,6 +34,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { if (searchCriteria != null) @@ -63,11 +65,11 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync foreach (var episode in subject.Episodes) { - var bestQualityInHistory = _historyService.GetBestQualityInHistory(subject.Series.QualityProfile, episode.Id); + var bestQualityInHistory = _historyService.GetBestQualityInHistory(subject.Series.Profile, episode.Id); if (bestQualityInHistory != null) { _logger.Debug("Comparing history quality with report. History is {0}", bestQualityInHistory); - if (!_qualityUpgradableSpecification.IsUpgradable(subject.Series.QualityProfile, bestQualityInHistory, subject.ParsedEpisodeInfo.Quality)) + if (!_qualityUpgradableSpecification.IsUpgradable(subject.Series.Profile, bestQualityInHistory, subject.ParsedEpisodeInfo.Quality)) return false; } } diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs index a0709622f..62f21bceb 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs @@ -22,6 +22,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { if (searchCriteria != null) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs index 0346ab28a..a5ce14a84 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs @@ -28,6 +28,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { if (searchCriteria != null) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/DailyEpisodeMatchSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/DailyEpisodeMatchSpecification.cs index 4d089ce68..576deaa62 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/DailyEpisodeMatchSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/DailyEpisodeMatchSpecification.cs @@ -23,6 +23,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search return "Episode doesn't match"; } } + + public RejectionType Type { get { return RejectionType.Permanent; } } + public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria) { if (searchCriteria == null) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/EpisodeRequestedSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/EpisodeRequestedSpecification.cs index 6df94a6fc..506d0790e 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/EpisodeRequestedSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/EpisodeRequestedSpecification.cs @@ -23,6 +23,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria) { if (searchCriteria == null) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeasonMatchSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeasonMatchSpecification.cs index 211870221..2ce482905 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeasonMatchSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeasonMatchSpecification.cs @@ -21,6 +21,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria) { if (searchCriteria == null) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeriesSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeriesSpecification.cs index 6e6f146f8..abf15f4b4 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeriesSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeriesSpecification.cs @@ -21,6 +21,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria) { if (searchCriteria == null) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SingleEpisodeSearchMatchSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SingleEpisodeSearchMatchSpecification.cs index 3960a4e4d..c24dd8821 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SingleEpisodeSearchMatchSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/Search/SingleEpisodeSearchMatchSpecification.cs @@ -22,6 +22,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.Search } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase searchCriteria) { if (searchCriteria == null) diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs index 833f4b9a5..d71bc9225 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs @@ -24,13 +24,15 @@ namespace NzbDrone.Core.DecisionEngine.Specifications } } + public RejectionType Type { get { return RejectionType.Permanent; } } + public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) { foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value)) { _logger.Debug("Comparing file quality with report. Existing file is {0}", file.Quality); - if (!_qualityUpgradableSpecification.IsUpgradable(subject.Series.QualityProfile, file.Quality, subject.ParsedEpisodeInfo.Quality)) + if (!_qualityUpgradableSpecification.IsUpgradable(subject.Series.Profile, file.Quality, subject.ParsedEpisodeInfo.Quality)) { return false; } diff --git a/src/NzbDrone.Core/Download/DownloadApprovedReports.cs b/src/NzbDrone.Core/Download/DownloadApprovedReports.cs deleted file mode 100644 index c5dd7ef58..000000000 --- a/src/NzbDrone.Core/Download/DownloadApprovedReports.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using NLog; -using NzbDrone.Core.DecisionEngine; -using NzbDrone.Core.DecisionEngine.Specifications; -using NzbDrone.Core.Qualities; - -namespace NzbDrone.Core.Download -{ - public interface IDownloadApprovedReports - { - List DownloadApproved(List decisions); - } - - public class DownloadApprovedReports : IDownloadApprovedReports - { - private readonly IDownloadService _downloadService; - private readonly IPrioritizeDownloadDecision _prioritizeDownloadDecision; - private readonly Logger _logger; - - public DownloadApprovedReports(IDownloadService downloadService, IPrioritizeDownloadDecision prioritizeDownloadDecision, Logger logger) - { - _downloadService = downloadService; - _prioritizeDownloadDecision = prioritizeDownloadDecision; - _logger = logger; - } - - public List DownloadApproved(List decisions) - { - var qualifiedReports = GetQualifiedReports(decisions); - var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(qualifiedReports); - var downloadedReports = new List(); - - foreach (var report in prioritizedDecisions) - { - var remoteEpisode = report.RemoteEpisode; - - try - { - if (downloadedReports.SelectMany(r => r.RemoteEpisode.Episodes) - .Select(e => e.Id) - .ToList() - .Intersect(remoteEpisode.Episodes.Select(e => e.Id)) - .Any()) - { - continue; - } - - _downloadService.DownloadReport(remoteEpisode); - downloadedReports.Add(report); - } - catch (Exception e) - { - _logger.WarnException("Couldn't add report to download queue. " + remoteEpisode, e); - } - } - - return downloadedReports; - } - - public List GetQualifiedReports(IEnumerable decisions) - { - return decisions.Where(c => c.Approved && c.RemoteEpisode.Episodes.Any()).ToList(); - } - } -} diff --git a/src/NzbDrone.Core/Download/DownloadClientItem.cs b/src/NzbDrone.Core/Download/DownloadClientItem.cs index 8b9365c9c..3ef9ca2b2 100644 --- a/src/NzbDrone.Core/Download/DownloadClientItem.cs +++ b/src/NzbDrone.Core/Download/DownloadClientItem.cs @@ -1,8 +1,5 @@ using NzbDrone.Core.Parser.Model; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; namespace NzbDrone.Core.Download { diff --git a/src/NzbDrone.Core/Download/Pending/PendingRelease.cs b/src/NzbDrone.Core/Download/Pending/PendingRelease.cs new file mode 100644 index 000000000..c99e5ac6a --- /dev/null +++ b/src/NzbDrone.Core/Download/Pending/PendingRelease.cs @@ -0,0 +1,18 @@ +using System; +using NzbDrone.Core.Datastore; +using NzbDrone.Core.Parser.Model; + +namespace NzbDrone.Core.Download.Pending +{ + public class PendingRelease : ModelBase + { + public Int32 SeriesId { get; set; } + public String Title { get; set; } + public DateTime Added { get; set; } + public ParsedEpisodeInfo ParsedEpisodeInfo { get; set; } + public ReleaseInfo Release { get; set; } + + //Not persisted + public RemoteEpisode RemoteEpisode { get; set; } + } +} diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseRepository.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseRepository.cs new file mode 100644 index 000000000..26cfb1d39 --- /dev/null +++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseRepository.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using NzbDrone.Core.Datastore; +using NzbDrone.Core.Messaging.Events; + +namespace NzbDrone.Core.Download.Pending +{ + public interface IPendingReleaseRepository : IBasicRepository + { + void DeleteBySeriesId(Int32 seriesId); + List AllBySeriesId(Int32 seriesId); + } + + public class PendingReleaseRepository : BasicRepository, IPendingReleaseRepository + { + public PendingReleaseRepository(IDatabase database, IEventAggregator eventAggregator) + : base(database, eventAggregator) + { + } + + public void DeleteBySeriesId(Int32 seriesId) + { + Delete(r => r.SeriesId == seriesId); + } + + public List AllBySeriesId(Int32 seriesId) + { + return Query.Where(p => p.SeriesId == seriesId); + } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs new file mode 100644 index 000000000..d60e84e58 --- /dev/null +++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs @@ -0,0 +1,219 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using NLog; +using NzbDrone.Core.DecisionEngine; +using NzbDrone.Core.Messaging.Events; +using NzbDrone.Core.Parser; +using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; +using NzbDrone.Core.Qualities; +using NzbDrone.Core.Tv; +using NzbDrone.Core.Tv.Events; + +namespace NzbDrone.Core.Download.Pending +{ + public interface IPendingReleaseService + { + void Add(DownloadDecision decision); + void RemoveGrabbed(List grabbed); + void RemoveRejected(List rejected); + List GetPending(); + List GetPendingRemoteEpisodes(Int32 seriesId); + List GetPendingQueue(); + } + + public class PendingReleaseService : IPendingReleaseService, IHandle + { + private readonly IPendingReleaseRepository _repository; + private readonly ISeriesService _seriesService; + private readonly IParsingService _parsingService; + private readonly IDownloadService _downloadService; + private readonly IEventAggregator _eventAggregator; + private readonly Logger _logger; + + public PendingReleaseService(IPendingReleaseRepository repository, + ISeriesService seriesService, + IParsingService parsingService, + IDownloadService downloadService, + IEventAggregator eventAggregator, + Logger logger) + { + _repository = repository; + _seriesService = seriesService; + _parsingService = parsingService; + _downloadService = downloadService; + _eventAggregator = eventAggregator; + _logger = logger; + } + + public void Add(DownloadDecision decision) + { + var alreadyPending = GetPendingReleases(); + + var episodeIds = decision.RemoteEpisode.Episodes.Select(e => e.Id); + + var existingReports = alreadyPending.Where(r => r.RemoteEpisode.Episodes.Select(e => e.Id) + .Intersect(episodeIds) + .Any()); + + if (existingReports.Any(MatchingReleasePredicate(decision))) + { + _logger.Debug("This release is already pending, not adding again"); + return; + } + + _logger.Debug("Adding release to pending releases"); + Insert(decision); + } + + public void RemoveGrabbed(List grabbed) + { + _logger.Debug("Removing grabbed releases from pending"); + var alreadyPending = GetPendingReleases(); + + foreach (var decision in grabbed) + { + var decisionLocal = decision; + var episodeIds = decisionLocal.RemoteEpisode.Episodes.Select(e => e.Id); + + + var existingReports = alreadyPending.Where(r => r.RemoteEpisode.Episodes.Select(e => e.Id) + .Intersect(episodeIds) + .Any()); + + foreach (var existingReport in existingReports) + { + _logger.Debug("Removing previously pending release, as it was grabbed."); + Delete(existingReport); + } + } + } + + public void RemoveRejected(List rejected) + { + _logger.Debug("Removing failed releases from pending"); + var pending = GetPendingReleases(); + + foreach (var rejectedRelease in rejected) + { + var matching = pending.SingleOrDefault(MatchingReleasePredicate(rejectedRelease)); + + if (matching != null) + { + _logger.Debug("Removing previously pending release, as it has now been rejected."); + Delete(matching); + } + } + } + + public List GetPending() + { + return _repository.All().Select(p => p.Release).ToList(); + } + + public List GetPendingRemoteEpisodes(int seriesId) + { + return _repository.AllBySeriesId(seriesId).Select(GetRemoteEpisode).ToList(); + } + + public List GetPendingQueue() + { + var queued = new List(); + + foreach (var pendingRelease in GetPendingReleases()) + { + foreach (var episode in pendingRelease.RemoteEpisode.Episodes) + { + var queue = new Queue.Queue + { + Id = episode.Id ^ (pendingRelease.Id << 16), + Series = pendingRelease.RemoteEpisode.Series, + Episode = episode, + Quality = pendingRelease.RemoteEpisode.ParsedEpisodeInfo.Quality, + Title = pendingRelease.Title, + Size = pendingRelease.RemoteEpisode.Release.Size, + Sizeleft = pendingRelease.RemoteEpisode.Release.Size, + Timeleft = + pendingRelease.Release.PublishDate.AddHours( + pendingRelease.RemoteEpisode.Series.Profile.Value.GrabDelay) + .Subtract(DateTime.UtcNow), + Status = "Pending", + RemoteEpisode = pendingRelease.RemoteEpisode + }; + queued.Add(queue); + } + } + + return queued; + } + + private List GetPendingReleases() + { + var result = new List(); + + foreach (var release in _repository.All()) + { + var remoteEpisode = GetRemoteEpisode(release); + + if (remoteEpisode == null) continue; + + release.RemoteEpisode = remoteEpisode; + + result.Add(release); + } + + return result; + } + + private RemoteEpisode GetRemoteEpisode(PendingRelease release) + { + var series = _seriesService.GetSeries(release.SeriesId); + + //Just in case the series was removed, but wasn't cleaned up yet (housekeeper will clean it up) + if (series == null) return null; + + var episodes = _parsingService.GetEpisodes(release.ParsedEpisodeInfo, series, true); + + return new RemoteEpisode + { + Series = series, + Episodes = episodes, + ParsedEpisodeInfo = release.ParsedEpisodeInfo, + Release = release.Release + }; + } + + private void Insert(DownloadDecision decision) + { + _repository.Insert(new PendingRelease + { + SeriesId = decision.RemoteEpisode.Series.Id, + ParsedEpisodeInfo = decision.RemoteEpisode.ParsedEpisodeInfo, + Release = decision.RemoteEpisode.Release, + Title = decision.RemoteEpisode.Release.Title, + Added = DateTime.UtcNow + }); + + _eventAggregator.PublishEvent(new PendingReleasesUpdatedEvent()); + } + + private void Delete(PendingRelease pendingRelease) + { + _repository.Delete(pendingRelease); + _eventAggregator.PublishEvent(new PendingReleasesUpdatedEvent()); + } + + private Func MatchingReleasePredicate(DownloadDecision decision) + { + return p => p.Title == decision.RemoteEpisode.Release.Title && + p.Release.PublishDate == decision.RemoteEpisode.Release.PublishDate && + p.Release.Indexer == decision.RemoteEpisode.Release.Indexer; + } + + public void Handle(SeriesDeletedEvent message) + { + _repository.DeleteBySeriesId(message.Series.Id); + } + } +} diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleasesUpdatedEvent.cs b/src/NzbDrone.Core/Download/Pending/PendingReleasesUpdatedEvent.cs new file mode 100644 index 000000000..fd8c881f1 --- /dev/null +++ b/src/NzbDrone.Core/Download/Pending/PendingReleasesUpdatedEvent.cs @@ -0,0 +1,8 @@ +using NzbDrone.Common.Messaging; + +namespace NzbDrone.Core.Download.Pending +{ + public class PendingReleasesUpdatedEvent : IEvent + { + } +} diff --git a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs new file mode 100644 index 000000000..4dab30611 --- /dev/null +++ b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using NLog; +using NzbDrone.Core.DecisionEngine; +using NzbDrone.Core.Download.Pending; +using NzbDrone.Core.Parser.Model; + +namespace NzbDrone.Core.Download +{ + public interface IProcessDownloadDecisions + { + ProcessedDecisions ProcessDecisions(List decisions); + } + + public class ProcessDownloadDecisions : IProcessDownloadDecisions + { + private readonly IDownloadService _downloadService; + private readonly IPrioritizeDownloadDecision _prioritizeDownloadDecision; + private readonly IPendingReleaseService _pendingReleaseService; + private readonly Logger _logger; + + public ProcessDownloadDecisions(IDownloadService downloadService, + IPrioritizeDownloadDecision prioritizeDownloadDecision, + IPendingReleaseService pendingReleaseService, + Logger logger) + { + _downloadService = downloadService; + _prioritizeDownloadDecision = prioritizeDownloadDecision; + _pendingReleaseService = pendingReleaseService; + _logger = logger; + } + + public ProcessedDecisions ProcessDecisions(List decisions) + { + var qualifiedReports = GetQualifiedReports(decisions); + var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(qualifiedReports); + var downloadedReports = new List(); + var pendingReports = new List(); + + foreach (var report in prioritizedDecisions) + { + var remoteEpisode = report.RemoteEpisode; + + if (DownloadingOrPending(downloadedReports, pendingReports, remoteEpisode)) + { + continue; + } + + if (report.TemporarilyRejected) + { + _pendingReleaseService.Add(report); + pendingReports.Add(report); + continue; + } + + try + { + _downloadService.DownloadReport(remoteEpisode); + downloadedReports.Add(report); + } + catch (Exception e) + { + //TODO: support for store & forward + _logger.WarnException("Couldn't add report to download queue. " + remoteEpisode, e); + } + } + + return new ProcessedDecisions(downloadedReports, pendingReports); + } + + internal List GetQualifiedReports(IEnumerable decisions) + { + //Process both approved and temporarily rejected + return decisions.Where(c => (c.Approved || c.TemporarilyRejected) && c.RemoteEpisode.Episodes.Any()).ToList(); + } + + private bool DownloadingOrPending(List downloading, List pending, RemoteEpisode remoteEpisode) + { + var episodeIds = remoteEpisode.Episodes.Select(e => e.Id).ToList(); + + if (downloading.SelectMany(r => r.RemoteEpisode.Episodes) + .Select(e => e.Id) + .ToList() + .Intersect(episodeIds) + .Any()) + { + return true; + } + + if (pending.SelectMany(r => r.RemoteEpisode.Episodes) + .Select(e => e.Id) + .ToList() + .Intersect(episodeIds) + .Any()) + { + return true; + } + + return false; + } + } +} diff --git a/src/NzbDrone.Core/Download/ProcessedDecisions.cs b/src/NzbDrone.Core/Download/ProcessedDecisions.cs new file mode 100644 index 000000000..c274b931a --- /dev/null +++ b/src/NzbDrone.Core/Download/ProcessedDecisions.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; +using NzbDrone.Core.DecisionEngine; + +namespace NzbDrone.Core.Download +{ + public class ProcessedDecisions + { + public List Grabbed { get; set; } + public List Pending { get; set; } + + public ProcessedDecisions(List grabbed, List pending) + { + Grabbed = grabbed; + Pending = pending; + } + } +} diff --git a/src/NzbDrone.Core/History/HistoryService.cs b/src/NzbDrone.Core/History/HistoryService.cs index e2d359016..ca0fbf3bc 100644 --- a/src/NzbDrone.Core/History/HistoryService.cs +++ b/src/NzbDrone.Core/History/HistoryService.cs @@ -7,6 +7,7 @@ using NzbDrone.Core.Datastore; using NzbDrone.Core.Download; using NzbDrone.Core.MediaFiles.Events; using NzbDrone.Core.Messaging.Events; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; @@ -17,7 +18,7 @@ namespace NzbDrone.Core.History List All(); void Purge(); void Trim(); - QualityModel GetBestQualityInHistory(QualityProfile qualityProfile, int episodeId); + QualityModel GetBestQualityInHistory(Profile profile, int episodeId); PagingSpec Paged(PagingSpec pagingSpec); List BetweenDates(DateTime startDate, DateTime endDate, HistoryEventType eventType); List Failed(); @@ -95,9 +96,9 @@ namespace NzbDrone.Core.History _historyRepository.Trim(); } - public QualityModel GetBestQualityInHistory(QualityProfile qualityProfile, int episodeId) + public QualityModel GetBestQualityInHistory(Profile profile, int episodeId) { - var comparer = new QualityModelComparer(qualityProfile); + var comparer = new QualityModelComparer(profile); return _historyRepository.GetBestQualityInHistory(episodeId) .OrderByDescending(q => q, comparer) .FirstOrDefault(); diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedPendingReleases.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedPendingReleases.cs new file mode 100644 index 000000000..83a5e9fd0 --- /dev/null +++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedPendingReleases.cs @@ -0,0 +1,31 @@ +using NLog; +using NzbDrone.Core.Datastore; + +namespace NzbDrone.Core.Housekeeping.Housekeepers +{ + public class CleanupOrphanedPendingReleases : IHousekeepingTask + { + private readonly IDatabase _database; + private readonly Logger _logger; + + public CleanupOrphanedPendingReleases(IDatabase database, Logger logger) + { + _database = database; + _logger = logger; + } + + public void Clean() + { + _logger.Debug("Running orphaned pending releases cleanup"); + + var mapper = _database.GetDataMapper(); + + mapper.ExecuteNonQuery(@"DELETE FROM PendingReleases + WHERE Id IN ( + SELECT PendingReleases.Id FROM PendingReleases + LEFT OUTER JOIN Series + ON PendingReleases.SeriesId = Series.Id + WHERE Series.Id IS NULL)"); + } + } +} diff --git a/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs b/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs index 4bca174db..6a59c3f12 100644 --- a/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs @@ -21,19 +21,19 @@ namespace NzbDrone.Core.IndexerSearch public class MissingEpisodeSearchService : IEpisodeSearchService, IExecute, IExecute { private readonly ISearchForNzb _nzbSearchService; - private readonly IDownloadApprovedReports _downloadApprovedReports; + private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly IEpisodeService _episodeService; private readonly IQueueService _queueService; private readonly Logger _logger; public MissingEpisodeSearchService(ISearchForNzb nzbSearchService, - IDownloadApprovedReports downloadApprovedReports, + IProcessDownloadDecisions processDownloadDecisions, IEpisodeService episodeService, IQueueService queueService, Logger logger) { _nzbSearchService = nzbSearchService; - _downloadApprovedReports = downloadApprovedReports; + _processDownloadDecisions = processDownloadDecisions; _episodeService = episodeService; _queueService = queueService; _logger = logger; @@ -52,9 +52,10 @@ namespace NzbDrone.Core.IndexerSearch foreach (var episode in missing) { + //TODO: Add a flag to the search to state it is a "scheduled" search var decisions = _nzbSearchService.EpisodeSearch(episode); - var downloaded = _downloadApprovedReports.DownloadApproved(decisions); - downloadedCount += downloaded.Count; + var processed = _processDownloadDecisions.ProcessDecisions(decisions); + downloadedCount += processed.Grabbed.Count; } _logger.ProgressInfo("Completed search for {0} episodes. {1} reports downloaded.", missing.Count, downloadedCount); @@ -65,9 +66,9 @@ namespace NzbDrone.Core.IndexerSearch foreach (var episodeId in message.EpisodeIds) { var decisions = _nzbSearchService.EpisodeSearch(episodeId); - var downloaded = _downloadApprovedReports.DownloadApproved(decisions); + var processed = _processDownloadDecisions.ProcessDecisions(decisions); - _logger.ProgressInfo("Episode search completed. {0} reports downloaded.", downloaded.Count); + _logger.ProgressInfo("Episode search completed. {0} reports downloaded.", processed.Grabbed.Count); } } @@ -97,8 +98,8 @@ namespace NzbDrone.Core.IndexerSearch { rateGate.WaitToProceed(); var decisions = _nzbSearchService.EpisodeSearch(episode); - var downloaded = _downloadApprovedReports.DownloadApproved(decisions); - downloadedCount += downloaded.Count; + var processed = _processDownloadDecisions.ProcessDecisions(decisions); + downloadedCount += processed.Grabbed.Count; } } diff --git a/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs b/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs index 4c164ceef..85e849e01 100644 --- a/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs @@ -8,24 +8,24 @@ namespace NzbDrone.Core.IndexerSearch public class SeasonSearchService : IExecute { private readonly ISearchForNzb _nzbSearchService; - private readonly IDownloadApprovedReports _downloadApprovedReports; + private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly Logger _logger; public SeasonSearchService(ISearchForNzb nzbSearchService, - IDownloadApprovedReports downloadApprovedReports, + IProcessDownloadDecisions processDownloadDecisions, Logger logger) { _nzbSearchService = nzbSearchService; - _downloadApprovedReports = downloadApprovedReports; + _processDownloadDecisions = processDownloadDecisions; _logger = logger; } public void Execute(SeasonSearchCommand message) { var decisions = _nzbSearchService.SeasonSearch(message.SeriesId, message.SeasonNumber); - var downloaded = _downloadApprovedReports.DownloadApproved(decisions); + var processed = _processDownloadDecisions.ProcessDecisions(decisions); - _logger.ProgressInfo("Season search completed. {0} reports downloaded.", downloaded.Count); + _logger.ProgressInfo("Season search completed. {0} reports downloaded.", processed.Grabbed.Count); } } } diff --git a/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs b/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs index e80480ef0..d92675b78 100644 --- a/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs @@ -10,17 +10,17 @@ namespace NzbDrone.Core.IndexerSearch { private readonly ISeriesService _seriesService; private readonly ISearchForNzb _nzbSearchService; - private readonly IDownloadApprovedReports _downloadApprovedReports; + private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly Logger _logger; public SeriesSearchService(ISeriesService seriesService, ISearchForNzb nzbSearchService, - IDownloadApprovedReports downloadApprovedReports, + IProcessDownloadDecisions processDownloadDecisions, Logger logger) { _seriesService = seriesService; _nzbSearchService = nzbSearchService; - _downloadApprovedReports = downloadApprovedReports; + _processDownloadDecisions = processDownloadDecisions; _logger = logger; } @@ -39,7 +39,7 @@ namespace NzbDrone.Core.IndexerSearch } var decisions = _nzbSearchService.SeasonSearch(message.SeriesId, season.SeasonNumber); - downloadedCount += _downloadApprovedReports.DownloadApproved(decisions).Count; + downloadedCount += _processDownloadDecisions.ProcessDecisions(decisions).Grabbed.Count; } _logger.ProgressInfo("Series search completed. {0} reports downloaded.", downloadedCount); diff --git a/src/NzbDrone.Core/Indexers/RssSyncCompleteEvent.cs b/src/NzbDrone.Core/Indexers/RssSyncCompleteEvent.cs new file mode 100644 index 000000000..af4fef0ff --- /dev/null +++ b/src/NzbDrone.Core/Indexers/RssSyncCompleteEvent.cs @@ -0,0 +1,8 @@ +using NzbDrone.Common.Messaging; + +namespace NzbDrone.Core.Indexers +{ + public class RssSyncCompleteEvent : IEvent + { + } +} diff --git a/src/NzbDrone.Core/Indexers/RssSyncService.cs b/src/NzbDrone.Core/Indexers/RssSyncService.cs index 540b4e52e..9c9ed7f1f 100644 --- a/src/NzbDrone.Core/Indexers/RssSyncService.cs +++ b/src/NzbDrone.Core/Indexers/RssSyncService.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.Linq; using NLog; using NzbDrone.Core.DecisionEngine; -using NzbDrone.Core.DecisionEngine.Specifications; using NzbDrone.Core.Download; +using NzbDrone.Core.Download.Pending; using NzbDrone.Core.IndexerSearch; using NzbDrone.Core.Instrumentation.Extensions; using NzbDrone.Core.Messaging.Commands; +using NzbDrone.Core.Messaging.Events; namespace NzbDrone.Core.Indexers { @@ -20,20 +21,26 @@ namespace NzbDrone.Core.Indexers { private readonly IFetchAndParseRss _rssFetcherAndParser; private readonly IMakeDownloadDecision _downloadDecisionMaker; - private readonly IDownloadApprovedReports _downloadApprovedReports; + private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly IEpisodeSearchService _episodeSearchService; + private readonly IPendingReleaseService _pendingReleaseService; + private readonly IEventAggregator _eventAggregator; private readonly Logger _logger; public RssSyncService(IFetchAndParseRss rssFetcherAndParser, IMakeDownloadDecision downloadDecisionMaker, - IDownloadApprovedReports downloadApprovedReports, + IProcessDownloadDecisions processDownloadDecisions, IEpisodeSearchService episodeSearchService, + IPendingReleaseService pendingReleaseService, + IEventAggregator eventAggregator, Logger logger) { _rssFetcherAndParser = rssFetcherAndParser; _downloadDecisionMaker = downloadDecisionMaker; - _downloadApprovedReports = downloadApprovedReports; + _processDownloadDecisions = processDownloadDecisions; _episodeSearchService = episodeSearchService; + _pendingReleaseService = pendingReleaseService; + _eventAggregator = eventAggregator; _logger = logger; } @@ -42,24 +49,35 @@ namespace NzbDrone.Core.Indexers { _logger.ProgressInfo("Starting RSS Sync"); - var reports = _rssFetcherAndParser.Fetch(); + var reports = _rssFetcherAndParser.Fetch().Concat(_pendingReleaseService.GetPending()).ToList(); var decisions = _downloadDecisionMaker.GetRssDecision(reports); - var downloaded = _downloadApprovedReports.DownloadApproved(decisions); + var processed = _processDownloadDecisions.ProcessDecisions(decisions); + _pendingReleaseService.RemoveGrabbed(processed.Grabbed); + _pendingReleaseService.RemoveRejected(decisions.Where(d => d.Rejected).ToList()); - _logger.ProgressInfo("RSS Sync Completed. Reports found: {0}, Reports downloaded: {1}", reports.Count, downloaded.Count()); + var message = String.Format("RSS Sync Completed. Reports found: {0}, Reports grabbed: {1}", reports.Count, processed.Grabbed.Count); - return downloaded; + if (processed.Pending.Any()) + { + message += ", Reports pending: " + processed.Pending.Count; + } + + _logger.ProgressInfo(message); + + return processed.Grabbed.Concat(processed.Pending).ToList(); } public void Execute(RssSyncCommand message) { - var downloaded = Sync(); + var processed = Sync(); if (message.LastExecutionTime.HasValue && DateTime.UtcNow.Subtract(message.LastExecutionTime.Value).TotalHours > 3) { _logger.Info("RSS Sync hasn't run since: {0}. Searching for any missing episodes since then.", message.LastExecutionTime.Value); - _episodeSearchService.MissingEpisodesAiredAfter(message.LastExecutionTime.Value.AddDays(-1), downloaded.SelectMany(d => d.RemoteEpisode.Episodes).Select(e => e.Id)); + _episodeSearchService.MissingEpisodesAiredAfter(message.LastExecutionTime.Value.AddDays(-1), processed.SelectMany(d => d.RemoteEpisode.Episodes).Select(e => e.Id)); } + + _eventAggregator.PublishEvent(new RssSyncCompleteEvent()); } } } diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs index 598093ff7..e0e6c7263 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs @@ -44,7 +44,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport { var qualifiedImports = decisions.Where(c => c.Approved) .GroupBy(c => c.LocalEpisode.Series.Id, (i, s) => s - .OrderByDescending(c => c.LocalEpisode.Quality, new QualityModelComparer(s.First().LocalEpisode.Series.QualityProfile)) + .OrderByDescending(c => c.LocalEpisode.Quality, new QualityModelComparer(s.First().LocalEpisode.Series.Profile)) .ThenByDescending(c => c.LocalEpisode.Size)) .SelectMany(c => c) .ToList(); diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs index 3c96c66d5..3836c1ef0 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using NLog; -using NzbDrone.Common; using NzbDrone.Common.Disk; using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Parser; @@ -61,7 +60,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport if (parsedEpisode != null) { - if (quality != null && new QualityModelComparer(parsedEpisode.Series.QualityProfile).Compare(quality, parsedEpisode.Quality) > 0) + if (quality != null && new QualityModelComparer(parsedEpisode.Series.Profile).Compare(quality, parsedEpisode.Quality) > 0) { _logger.Debug("Using quality from folder: {0}", quality); parsedEpisode.Quality = quality; diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs index e8dfbeda9..3f91e7296 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs @@ -2,7 +2,6 @@ using NLog; using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Qualities; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications { @@ -19,7 +18,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications public bool IsSatisfiedBy(LocalEpisode localEpisode) { - var qualityComparer = new QualityModelComparer(localEpisode.Series.QualityProfile); + var qualityComparer = new QualityModelComparer(localEpisode.Series.Profile); if (localEpisode.Episodes.Any(e => e.EpisodeFileId != 0 && qualityComparer.Compare(e.EpisodeFile.Value.Quality, localEpisode.Quality) > 0)) { _logger.Debug("This file isn't an upgrade for all episodes. Skipping {0}", localEpisode.Path); diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index f85d0f043..0d87b71f6 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -205,6 +205,8 @@ + + @@ -222,15 +224,18 @@ + + + - + @@ -282,9 +287,14 @@ + + + + + - + @@ -311,6 +321,7 @@ + @@ -344,6 +355,7 @@ + @@ -458,6 +470,12 @@ + + + + + + @@ -562,7 +580,6 @@ - @@ -570,9 +587,7 @@ - - @@ -679,9 +694,6 @@ Code - - Code - Code @@ -705,7 +717,6 @@ - @@ -724,6 +735,7 @@ + diff --git a/src/NzbDrone.Core/Parser/Language.cs b/src/NzbDrone.Core/Parser/Language.cs index 564de13f2..a56766162 100644 --- a/src/NzbDrone.Core/Parser/Language.cs +++ b/src/NzbDrone.Core/Parser/Language.cs @@ -2,17 +2,17 @@ { public enum Language { - English = 0, - French = 1, - Spanish = 2, - German = 3, - Italian = 4, - Danish = 5, - Dutch = 6, - Japanese = 7, - Cantonese = 8, - Mandarin = 9, - Korean = 10, + Unknown = 0, + English = 1, + French = 2, + Spanish = 3, + German = 4, + Italian = 5, + Danish = 6, + Dutch = 7, + Japanese = 8, + Cantonese = 9, + Mandarin = 10, Russian = 11, Polish = 12, Vietnamese = 13, @@ -22,6 +22,7 @@ Turkish = 17, Portuguese = 18, Flemish = 19, - Greek = 20 + Greek = 20, + Korean = 21 } } diff --git a/src/NzbDrone.Core/Profiles/GrabDelayMode.cs b/src/NzbDrone.Core/Profiles/GrabDelayMode.cs new file mode 100644 index 000000000..146e68894 --- /dev/null +++ b/src/NzbDrone.Core/Profiles/GrabDelayMode.cs @@ -0,0 +1,9 @@ +namespace NzbDrone.Core.Profiles +{ + public enum GrabDelayMode + { + First = 0, + Cutoff = 1, + Always = 2 + } +} diff --git a/src/NzbDrone.Core/Profiles/Profile.cs b/src/NzbDrone.Core/Profiles/Profile.cs new file mode 100644 index 000000000..914f49815 --- /dev/null +++ b/src/NzbDrone.Core/Profiles/Profile.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using NzbDrone.Core.Datastore; +using NzbDrone.Core.Parser; +using NzbDrone.Core.Qualities; + +namespace NzbDrone.Core.Profiles +{ + public class Profile : ModelBase + { + public String Name { get; set; } + public Quality Cutoff { get; set; } + public List Items { get; set; } + public Language Language { get; set; } + public Int32 GrabDelay { get; set; } + public GrabDelayMode GrabDelayMode { get; set; } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Core/Profiles/ProfileInUseException.cs b/src/NzbDrone.Core/Profiles/ProfileInUseException.cs new file mode 100644 index 000000000..d55523d9a --- /dev/null +++ b/src/NzbDrone.Core/Profiles/ProfileInUseException.cs @@ -0,0 +1,13 @@ +using NzbDrone.Common.Exceptions; + +namespace NzbDrone.Core.Profiles +{ + public class ProfileInUseException : NzbDroneException + { + public ProfileInUseException(int profileId) + : base("Profile [{0}] is in use.", profileId) + { + + } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Core/Profiles/ProfileQualityItem.cs b/src/NzbDrone.Core/Profiles/ProfileQualityItem.cs new file mode 100644 index 000000000..35c9ce360 --- /dev/null +++ b/src/NzbDrone.Core/Profiles/ProfileQualityItem.cs @@ -0,0 +1,11 @@ +using NzbDrone.Core.Datastore; +using NzbDrone.Core.Qualities; + +namespace NzbDrone.Core.Profiles +{ + public class ProfileQualityItem : IEmbeddedDocument + { + public Quality Quality { get; set; } + public bool Allowed { get; set; } + } +} diff --git a/src/NzbDrone.Core/Profiles/ProfileRepository.cs b/src/NzbDrone.Core/Profiles/ProfileRepository.cs new file mode 100644 index 000000000..424875617 --- /dev/null +++ b/src/NzbDrone.Core/Profiles/ProfileRepository.cs @@ -0,0 +1,18 @@ +using NzbDrone.Core.Datastore; +using NzbDrone.Core.Messaging.Events; + +namespace NzbDrone.Core.Profiles +{ + public interface IProfileRepository : IBasicRepository + { + + } + + public class ProfileRepository : BasicRepository, IProfileRepository + { + public ProfileRepository(IDatabase database, IEventAggregator eventAggregator) + : base(database, eventAggregator) + { + } + } +} diff --git a/src/NzbDrone.Core/Profiles/ProfileService.cs b/src/NzbDrone.Core/Profiles/ProfileService.cs new file mode 100644 index 000000000..29fe14634 --- /dev/null +++ b/src/NzbDrone.Core/Profiles/ProfileService.cs @@ -0,0 +1,106 @@ +using System.Collections.Generic; +using System.Linq; +using NLog; +using NzbDrone.Core.Lifecycle; +using NzbDrone.Core.Messaging.Events; +using NzbDrone.Core.Parser; +using NzbDrone.Core.Qualities; +using NzbDrone.Core.Tv; + +namespace NzbDrone.Core.Profiles +{ + public interface IProfileService + { + Profile Add(Profile profile); + void Update(Profile profile); + void Delete(int id); + List All(); + Profile Get(int id); + } + + public class ProfileService : IProfileService, IHandle + { + private readonly IProfileRepository _profileRepository; + private readonly ISeriesService _seriesService; + private readonly Logger _logger; + + public ProfileService(IProfileRepository profileRepository, ISeriesService seriesService, Logger logger) + { + _profileRepository = profileRepository; + _seriesService = seriesService; + _logger = logger; + } + + public Profile Add(Profile profile) + { + return _profileRepository.Insert(profile); + } + + public void Update(Profile profile) + { + _profileRepository.Update(profile); + } + + public void Delete(int id) + { + if (_seriesService.GetAllSeries().Any(c => c.ProfileId == id)) + { + throw new ProfileInUseException(id); + } + + _profileRepository.Delete(id); + } + + public List All() + { + return _profileRepository.All().ToList(); + } + + public Profile Get(int id) + { + return _profileRepository.Get(id); + } + + private Profile AddDefaultProfile(string name, Quality cutoff, params Quality[] allowed) + { + var items = Quality.DefaultQualityDefinitions + .OrderBy(v => v.Weight) + .Select(v => new ProfileQualityItem { Quality = v.Quality, Allowed = allowed.Contains(v.Quality) }) + .ToList(); + + var profile = new Profile { Name = name, Cutoff = cutoff, Items = items, Language = Language.English }; + + return Add(profile); + } + + public void Handle(ApplicationStartedEvent message) + { + if (All().Any()) return; + + _logger.Info("Setting up default quality profiles"); + + AddDefaultProfile("SD", Quality.SDTV, + Quality.SDTV, + Quality.WEBDL480p, + Quality.DVD); + + AddDefaultProfile("HD-720p", Quality.HDTV720p, + Quality.HDTV720p, + Quality.WEBDL720p, + Quality.Bluray720p); + + AddDefaultProfile("HD-1080p", Quality.HDTV1080p, + Quality.HDTV1080p, + Quality.WEBDL1080p, + Quality.Bluray1080p); + + AddDefaultProfile("HD - All", Quality.HDTV720p, + Quality.HDTV720p, + Quality.HDTV1080p, + Quality.WEBDL720p, + Quality.WEBDL1080p, + Quality.Bluray720p, + Quality.Bluray1080p); + } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Core/Qualities/QualityModelComparer.cs b/src/NzbDrone.Core/Qualities/QualityModelComparer.cs index bb66dcd7f..ed392e229 100644 --- a/src/NzbDrone.Core/Qualities/QualityModelComparer.cs +++ b/src/NzbDrone.Core/Qualities/QualityModelComparer.cs @@ -1,28 +1,25 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NLog; +using System.Collections.Generic; using NzbDrone.Common.EnsureThat; +using NzbDrone.Core.Profiles; namespace NzbDrone.Core.Qualities { public class QualityModelComparer : IComparer, IComparer { - private readonly QualityProfile _qualityProfile; + private readonly Profile _profile; - public QualityModelComparer(QualityProfile qualityProfile) + public QualityModelComparer(Profile profile) { - Ensure.That(qualityProfile, () => qualityProfile).IsNotNull(); - Ensure.That(qualityProfile.Items, () => qualityProfile.Items).HasItems(); + Ensure.That(profile, () => profile).IsNotNull(); + Ensure.That(profile.Items, () => profile.Items).HasItems(); - _qualityProfile = qualityProfile; + _profile = profile; } public int Compare(Quality left, Quality right) { - int leftIndex = _qualityProfile.Items.FindIndex(v => v.Quality == left); - int rightIndex = _qualityProfile.Items.FindIndex(v => v.Quality == right); + int leftIndex = _profile.Items.FindIndex(v => v.Quality == left); + int rightIndex = _profile.Items.FindIndex(v => v.Quality == right); return leftIndex.CompareTo(rightIndex); } diff --git a/src/NzbDrone.Core/Qualities/QualityProfile.cs b/src/NzbDrone.Core/Qualities/QualityProfile.cs deleted file mode 100644 index b578d1962..000000000 --- a/src/NzbDrone.Core/Qualities/QualityProfile.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections.Generic; -using NzbDrone.Core.Datastore; - -namespace NzbDrone.Core.Qualities -{ - public class QualityProfile : ModelBase - { - public string Name { get; set; } - public Quality Cutoff { get; set; } - public List Items { get; set; } - } -} \ No newline at end of file diff --git a/src/NzbDrone.Core/Qualities/QualityProfileInUseException.cs b/src/NzbDrone.Core/Qualities/QualityProfileInUseException.cs deleted file mode 100644 index 24c50e7c6..000000000 --- a/src/NzbDrone.Core/Qualities/QualityProfileInUseException.cs +++ /dev/null @@ -1,13 +0,0 @@ -using NzbDrone.Common.Exceptions; - -namespace NzbDrone.Core.Qualities -{ - public class QualityProfileInUseException : NzbDroneException - { - public QualityProfileInUseException(int profileId) - : base("QualityProfile [{0}] is in use.", profileId) - { - - } - } -} \ No newline at end of file diff --git a/src/NzbDrone.Core/Qualities/QualityProfileItem.cs b/src/NzbDrone.Core/Qualities/QualityProfileItem.cs deleted file mode 100644 index 9d7d839d2..000000000 --- a/src/NzbDrone.Core/Qualities/QualityProfileItem.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; -using NzbDrone.Core.Datastore; - -namespace NzbDrone.Core.Qualities -{ - public class QualityProfileItem : IEmbeddedDocument - { - public Quality Quality { get; set; } - public bool Allowed { get; set; } - } -} diff --git a/src/NzbDrone.Core/Qualities/QualityProfileRepository.cs b/src/NzbDrone.Core/Qualities/QualityProfileRepository.cs deleted file mode 100644 index 408cc009e..000000000 --- a/src/NzbDrone.Core/Qualities/QualityProfileRepository.cs +++ /dev/null @@ -1,19 +0,0 @@ -using NzbDrone.Core.Datastore; -using NzbDrone.Core.Messaging.Events; - - -namespace NzbDrone.Core.Qualities -{ - public interface IQualityProfileRepository : IBasicRepository - { - - } - - public class QualityProfileRepository : BasicRepository, IQualityProfileRepository - { - public QualityProfileRepository(IDatabase database, IEventAggregator eventAggregator) - : base(database, eventAggregator) - { - } - } -} diff --git a/src/NzbDrone.Core/Qualities/QualityProfileService.cs b/src/NzbDrone.Core/Qualities/QualityProfileService.cs deleted file mode 100644 index 13b18afad..000000000 --- a/src/NzbDrone.Core/Qualities/QualityProfileService.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using NLog; -using NzbDrone.Core.Lifecycle; -using NzbDrone.Core.Messaging.Events; -using NzbDrone.Core.Tv; - - -namespace NzbDrone.Core.Qualities -{ - public interface IQualityProfileService - { - QualityProfile Add(QualityProfile profile); - void Update(QualityProfile profile); - void Delete(int id); - List All(); - QualityProfile Get(int id); - } - - public class QualityProfileService : IQualityProfileService, IHandle - { - private readonly IQualityProfileRepository _qualityProfileRepository; - private readonly ISeriesService _seriesService; - private readonly Logger _logger; - - public QualityProfileService(IQualityProfileRepository qualityProfileRepository, ISeriesService seriesService, Logger logger) - { - _qualityProfileRepository = qualityProfileRepository; - _seriesService = seriesService; - _logger = logger; - } - - public QualityProfile Add(QualityProfile profile) - { - return _qualityProfileRepository.Insert(profile); - } - - public void Update(QualityProfile profile) - { - _qualityProfileRepository.Update(profile); - } - - public void Delete(int id) - { - if (_seriesService.GetAllSeries().Any(c => c.QualityProfileId == id)) - { - throw new QualityProfileInUseException(id); - } - - _qualityProfileRepository.Delete(id); - } - - public List All() - { - return _qualityProfileRepository.All().ToList(); - } - - public QualityProfile Get(int id) - { - return _qualityProfileRepository.Get(id); - } - - private QualityProfile AddDefaultQualityProfile(string name, Quality cutoff, params Quality[] allowed) - { - var items = Quality.DefaultQualityDefinitions - .OrderBy(v => v.Weight) - .Select(v => new QualityProfileItem { Quality = v.Quality, Allowed = allowed.Contains(v.Quality) }) - .ToList(); - - var qualityProfile = new QualityProfile { Name = name, Cutoff = cutoff, Items = items }; - - return Add(qualityProfile); - } - - public void Handle(ApplicationStartedEvent message) - { - if (All().Any()) return; - - _logger.Info("Setting up default quality profiles"); - - AddDefaultQualityProfile("SD", Quality.SDTV, - Quality.SDTV, - Quality.WEBDL480p, - Quality.DVD); - - AddDefaultQualityProfile("HD-720p", Quality.HDTV720p, - Quality.HDTV720p, - Quality.WEBDL720p, - Quality.Bluray720p); - - AddDefaultQualityProfile("HD-1080p", Quality.HDTV1080p, - Quality.HDTV1080p, - Quality.WEBDL1080p, - Quality.Bluray1080p); - - AddDefaultQualityProfile("HD - All", Quality.HDTV720p, - Quality.HDTV720p, - Quality.HDTV1080p, - Quality.WEBDL720p, - Quality.WEBDL1080p, - Quality.Bluray720p, - Quality.Bluray1080p); - } - } -} \ No newline at end of file diff --git a/src/NzbDrone.Core/Queue/QueueService.cs b/src/NzbDrone.Core/Queue/QueueService.cs index 20b57db4a..f7dac3139 100644 --- a/src/NzbDrone.Core/Queue/QueueService.cs +++ b/src/NzbDrone.Core/Queue/QueueService.cs @@ -1,5 +1,4 @@ -using System; -using System.Linq; +using System.Linq; using System.Collections.Generic; using NLog; using NzbDrone.Core.Download; @@ -39,19 +38,21 @@ namespace NzbDrone.Core.Queue { foreach (var episode in queueItem.DownloadItem.RemoteEpisode.Episodes) { - var queue = new Queue(); - queue.Id = queueItem.DownloadItem.DownloadClientId.GetHashCode() + episode.Id; - queue.Series = queueItem.DownloadItem.RemoteEpisode.Series; - queue.Episode = episode; - queue.Quality = queueItem.DownloadItem.RemoteEpisode.ParsedEpisodeInfo.Quality; - queue.Title = queueItem.DownloadItem.Title; - queue.Size = queueItem.DownloadItem.TotalSize; - queue.Sizeleft = queueItem.DownloadItem.RemainingSize; - queue.Timeleft = queueItem.DownloadItem.RemainingTime; - queue.Status = queueItem.DownloadItem.Status.ToString(); - queue.RemoteEpisode = queueItem.DownloadItem.RemoteEpisode; + var queue = new Queue + { + Id = episode.Id ^ (queueItem.DownloadItem.DownloadClientId.GetHashCode().GetHashCode() << 16), + Series = queueItem.DownloadItem.RemoteEpisode.Series, + Episode = episode, + Quality = queueItem.DownloadItem.RemoteEpisode.ParsedEpisodeInfo.Quality, + Title = queueItem.DownloadItem.Title, + Size = queueItem.DownloadItem.TotalSize, + Sizeleft = queueItem.DownloadItem.RemainingSize, + Timeleft = queueItem.DownloadItem.RemainingTime, + Status = queueItem.DownloadItem.Status.ToString(), + RemoteEpisode = queueItem.DownloadItem.RemoteEpisode + }; - if (queueItem.HasError) + if (queueItem.HasError) { queue.ErrorMessage = queueItem.StatusMessage; } diff --git a/src/NzbDrone.Core/Tv/EpisodeCutoffService.cs b/src/NzbDrone.Core/Tv/EpisodeCutoffService.cs index f88dfc02e..6747aa87e 100644 --- a/src/NzbDrone.Core/Tv/EpisodeCutoffService.cs +++ b/src/NzbDrone.Core/Tv/EpisodeCutoffService.cs @@ -2,6 +2,7 @@ using System.Linq; using NLog; using NzbDrone.Core.Datastore; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; namespace NzbDrone.Core.Tv @@ -14,30 +15,30 @@ namespace NzbDrone.Core.Tv public class EpisodeCutoffService : IEpisodeCutoffService { private readonly IEpisodeRepository _episodeRepository; - private readonly IQualityProfileService _qualityProfileService; + private readonly IProfileService _profileService; private readonly Logger _logger; - public EpisodeCutoffService(IEpisodeRepository episodeRepository, IQualityProfileService qualityProfileService, Logger logger) + public EpisodeCutoffService(IEpisodeRepository episodeRepository, IProfileService profileService, Logger logger) { _episodeRepository = episodeRepository; - _qualityProfileService = qualityProfileService; + _profileService = profileService; _logger = logger; } public PagingSpec EpisodesWhereCutoffUnmet(PagingSpec pagingSpec) { var qualitiesBelowCutoff = new List(); - var qualityProfiles = _qualityProfileService.All(); + var profiles = _profileService.All(); //Get all items less than the cutoff - foreach (var qualityProfile in qualityProfiles) + foreach (var profile in profiles) { - var cutoffIndex = qualityProfile.Items.FindIndex(v => v.Quality == qualityProfile.Cutoff); - var belowCutoff = qualityProfile.Items.Take(cutoffIndex).ToList(); + var cutoffIndex = profile.Items.FindIndex(v => v.Quality == profile.Cutoff); + var belowCutoff = profile.Items.Take(cutoffIndex).ToList(); if (belowCutoff.Any()) { - qualitiesBelowCutoff.Add(new QualitiesBelowCutoff(qualityProfile.Id, belowCutoff.Select(i => i.Quality.Id))); + qualitiesBelowCutoff.Add(new QualitiesBelowCutoff(profile.Id, belowCutoff.Select(i => i.Quality.Id))); } } diff --git a/src/NzbDrone.Core/Tv/EpisodeRepository.cs b/src/NzbDrone.Core/Tv/EpisodeRepository.cs index 5ebb8c71d..65f92bf8b 100644 --- a/src/NzbDrone.Core/Tv/EpisodeRepository.cs +++ b/src/NzbDrone.Core/Tv/EpisodeRepository.cs @@ -224,7 +224,7 @@ namespace NzbDrone.Core.Tv { foreach (var belowCutoff in profile.QualityIds) { - clauses.Add(String.Format("([t1].[QualityProfileId] = {0} AND [t2].[Quality] LIKE '%_quality_: {1},%')", profile.ProfileId, belowCutoff)); + clauses.Add(String.Format("([t1].[ProfileId] = {0} AND [t2].[Quality] LIKE '%_quality_: {1},%')", profile.ProfileId, belowCutoff)); } } diff --git a/src/NzbDrone.Core/Tv/Series.cs b/src/NzbDrone.Core/Tv/Series.cs index 2d81a305b..7baf9fb80 100644 --- a/src/NzbDrone.Core/Tv/Series.cs +++ b/src/NzbDrone.Core/Tv/Series.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Marr.Data; using NzbDrone.Core.Datastore; -using NzbDrone.Core.Qualities; +using NzbDrone.Core.Profiles; using NzbDrone.Common; @@ -27,7 +27,7 @@ namespace NzbDrone.Core.Tv public string Overview { get; set; } public String AirTime { get; set; } public bool Monitored { get; set; } - public int QualityProfileId { get; set; } + public int ProfileId { get; set; } public bool SeasonFolder { get; set; } public DateTime? LastInfoSync { get; set; } public int Runtime { get; set; } @@ -46,7 +46,7 @@ namespace NzbDrone.Core.Tv public string RootFolderPath { get; set; } public DateTime? FirstAired { get; set; } - public LazyLoaded QualityProfile { get; set; } + public LazyLoaded Profile { get; set; } public List Seasons { get; set; } diff --git a/src/NzbDrone.Core/Validation/LangaugeValidator.cs b/src/NzbDrone.Core/Validation/LangaugeValidator.cs new file mode 100644 index 000000000..678245f36 --- /dev/null +++ b/src/NzbDrone.Core/Validation/LangaugeValidator.cs @@ -0,0 +1,21 @@ +using FluentValidation.Validators; + +namespace NzbDrone.Core.Validation +{ + public class LangaugeValidator : PropertyValidator + { + public LangaugeValidator() + : base("Unknown Language") + { + } + + protected override bool IsValid(PropertyValidatorContext context) + { + if (context.PropertyValue == null) return false; + + if ((int) context.PropertyValue == 0) return false; + + return true; + } + } +} diff --git a/src/NzbDrone.Core/Validation/RuleBuilderExtensions.cs b/src/NzbDrone.Core/Validation/RuleBuilderExtensions.cs index 9bcc7e18a..39a3826d3 100644 --- a/src/NzbDrone.Core/Validation/RuleBuilderExtensions.cs +++ b/src/NzbDrone.Core/Validation/RuleBuilderExtensions.cs @@ -1,6 +1,7 @@ using System.Text.RegularExpressions; using FluentValidation; using FluentValidation.Validators; +using NzbDrone.Core.Parser; namespace NzbDrone.Core.Validation { @@ -31,5 +32,10 @@ namespace NzbDrone.Core.Validation { return ruleBuilder.SetValidator(new InclusiveBetweenValidator(0, 65535)); } + + public static IRuleBuilderOptions ValidLanguage(this IRuleBuilder ruleBuilder) + { + return ruleBuilder.SetValidator(new LangaugeValidator()); + } } } \ No newline at end of file diff --git a/src/NzbDrone.Integration.Test/EpisodeIntegrationTests.cs b/src/NzbDrone.Integration.Test/EpisodeIntegrationTests.cs index 610d6f8bf..39f267679 100644 --- a/src/NzbDrone.Integration.Test/EpisodeIntegrationTests.cs +++ b/src/NzbDrone.Integration.Test/EpisodeIntegrationTests.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Integration.Test { var newSeries = Series.Lookup("archer").First(); - newSeries.QualityProfileId = 1; + newSeries.ProfileId = 1; newSeries.Path = @"C:\Test\Archer".AsOsAgnostic(); newSeries = Series.Post(newSeries); diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj index 837beaf72..eb1ca6f15 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -104,7 +104,6 @@ - diff --git a/src/NzbDrone.Integration.Test/QualityProfileIntegrationTest.cs b/src/NzbDrone.Integration.Test/QualityProfileIntegrationTest.cs deleted file mode 100644 index 2fff89a73..000000000 --- a/src/NzbDrone.Integration.Test/QualityProfileIntegrationTest.cs +++ /dev/null @@ -1,10 +0,0 @@ -using NUnit.Framework; - -namespace NzbDrone.Integration.Test -{ - [TestFixture] - public class QualityProfileIntegrationTest : IntegrationTest - { - - } -} \ No newline at end of file diff --git a/src/NzbDrone.Integration.Test/SeriesEditorIntegrationTest.cs b/src/NzbDrone.Integration.Test/SeriesEditorIntegrationTest.cs index c0634ea0c..3667a2247 100644 --- a/src/NzbDrone.Integration.Test/SeriesEditorIntegrationTest.cs +++ b/src/NzbDrone.Integration.Test/SeriesEditorIntegrationTest.cs @@ -17,7 +17,7 @@ namespace NzbDrone.Integration.Test { var newSeries = Series.Lookup(title).First(); - newSeries.QualityProfileId = 1; + newSeries.ProfileId = 1; newSeries.Path = String.Format(@"C:\Test\{0}", title).AsOsAgnostic(); Series.Post(newSeries); @@ -33,13 +33,13 @@ namespace NzbDrone.Integration.Test foreach (var s in series) { - s.QualityProfileId = 2; + s.ProfileId = 2; } var result = Series.Editor(series); result.Should().HaveCount(2); - result.TrueForAll(s => s.QualityProfileId == 2).Should().BeTrue(); + result.TrueForAll(s => s.ProfileId == 2).Should().BeTrue(); } } } \ No newline at end of file diff --git a/src/NzbDrone.Integration.Test/SeriesIntegrationTest.cs b/src/NzbDrone.Integration.Test/SeriesIntegrationTest.cs index eef706a78..9700b898f 100644 --- a/src/NzbDrone.Integration.Test/SeriesIntegrationTest.cs +++ b/src/NzbDrone.Integration.Test/SeriesIntegrationTest.cs @@ -31,7 +31,7 @@ namespace NzbDrone.Integration.Test { var series = Series.Lookup("archer").First(); - series.QualityProfileId = 1; + series.ProfileId = 1; series.Path = @"C:\Test\Archer".AsOsAgnostic(); series = Series.Post(series); @@ -50,7 +50,7 @@ namespace NzbDrone.Integration.Test { var series = Series.Lookup("90210").First(); - series.QualityProfileId = 1; + series.ProfileId = 1; series.Path = @"C:\Test\90210".AsOsAgnostic(); series = Series.Post(series); diff --git a/src/UI/AddSeries/AddSeriesLayout.js b/src/UI/AddSeries/AddSeriesLayout.js index b51245d3a..52e29e070 100644 --- a/src/UI/AddSeries/AddSeriesLayout.js +++ b/src/UI/AddSeries/AddSeriesLayout.js @@ -7,7 +7,7 @@ define( 'AddSeries/RootFolders/RootFolderLayout', 'AddSeries/Existing/AddExistingSeriesCollectionView', 'AddSeries/AddSeriesView', - 'Quality/QualityProfileCollection', + 'Profile/ProfileCollection', 'AddSeries/RootFolders/RootFolderCollection', 'Series/SeriesCollection' ], function (vent, @@ -16,7 +16,7 @@ define( RootFolderLayout, ExistingSeriesCollectionView, AddSeriesView, - QualityProfileCollection, + ProfileCollection, RootFolderCollection) { return Marionette.Layout.extend({ @@ -36,7 +36,7 @@ define( }, initialize: function () { - QualityProfileCollection.fetch(); + ProfileCollection.fetch(); RootFolderCollection.fetch() .done(function () { RootFolderCollection.synced = true; diff --git a/src/UI/AddSeries/SearchResultView.js b/src/UI/AddSeries/SearchResultView.js index cb9e80612..685182b5d 100644 --- a/src/UI/AddSeries/SearchResultView.js +++ b/src/UI/AddSeries/SearchResultView.js @@ -6,7 +6,7 @@ define( 'AppLayout', 'backbone', 'marionette', - 'Quality/QualityProfileCollection', + 'Profile/ProfileCollection', 'AddSeries/RootFolders/RootFolderCollection', 'AddSeries/RootFolders/RootFolderLayout', 'Series/SeriesCollection', @@ -19,7 +19,7 @@ define( AppLayout, Backbone, Marionette, - QualityProfiles, + Profiles, RootFolders, RootFolderLayout, SeriesCollection, @@ -32,7 +32,7 @@ define( template: 'AddSeries/SearchResultViewTemplate', ui: { - qualityProfile : '.x-quality-profile', + profile : '.x-profile', rootFolder : '.x-root-folder', seasonFolder : '.x-season-folder', seriesType : '.x-series-type', @@ -42,11 +42,11 @@ define( }, events: { - 'click .x-add' : '_addSeries', - 'change .x-quality-profile' : '_qualityProfileChanged', - 'change .x-root-folder' : '_rootFolderChanged', - 'change .x-season-folder' : '_seasonFolderChanged', - 'change .x-series-type' : '_seriesTypeChanged' + 'click .x-add' : '_addSeries', + 'change .x-profile' : '_profileChanged', + 'change .x-root-folder' : '_rootFolderChanged', + 'change .x-season-folder' : '_seasonFolderChanged', + 'change .x-series-type' : '_seriesTypeChanged' }, initialize: function () { @@ -65,13 +65,13 @@ define( onRender: function () { - var defaultQuality = Config.getValue(Config.Keys.DefaultQualityProfileId); + var defaultProfile = Config.getValue(Config.Keys.DefaultProfileId); var defaultRoot = Config.getValue(Config.Keys.DefaultRootFolderId); var useSeasonFolder = Config.getValueBoolean(Config.Keys.UseSeasonFolder, true); var defaultSeriesType = Config.getValueBoolean(Config.Keys.DefaultSeriesType, true); - if (QualityProfiles.get(defaultQuality)) { - this.ui.qualityProfile.val(defaultQuality); + if (Profiles.get(defaultProfile)) { + this.ui.profile.val(defaultProfile); } if (RootFolders.get(defaultRoot)) { @@ -101,7 +101,7 @@ define( this.templateHelpers.existing = existingSeries[0].toJSON(); } - this.templateHelpers.qualityProfiles = QualityProfiles.toJSON(); + this.templateHelpers.profiles = Profiles.toJSON(); if (!this.model.get('isExisting')) { this.templateHelpers.rootFolders = RootFolders.toJSON(); @@ -109,8 +109,8 @@ define( }, _onConfigUpdated: function (options) { - if (options.key === Config.Keys.DefaultQualityProfileId) { - this.ui.qualityProfile.val(options.value); + if (options.key === Config.Keys.DefaultProfileId) { + this.ui.profile.val(options.value); } else if (options.key === Config.Keys.DefaultRootFolderId) { @@ -126,8 +126,8 @@ define( } }, - _qualityProfileChanged: function () { - Config.setValue(Config.Keys.DefaultQualityProfileId, this.ui.qualityProfile.val()); + _profileChanged: function () { + Config.setValue(Config.Keys.DefaultProfileId, this.ui.profile.val()); }, _seasonFolderChanged: function () { @@ -160,14 +160,14 @@ define( var icon = this.ui.addButton.find('icon'); icon.removeClass('icon-plus').addClass('icon-spin icon-spinner disabled'); - var quality = this.ui.qualityProfile.val(); + var profile = this.ui.profile.val(); var rootFolderPath = this.ui.rootFolder.children(':selected').text(); var startingSeason = this.ui.startingSeason.val(); var seriesType = this.ui.seriesType.val(); var seasonFolder = this.ui.seasonFolder.prop('checked'); this.model.set({ - qualityProfileId: quality, + profileId: profile, rootFolderPath: rootFolderPath, seasonFolder: seasonFolder, seriesType: seriesType diff --git a/src/UI/AddSeries/SearchResultViewTemplate.html b/src/UI/AddSeries/SearchResultViewTemplate.html index bb56b167d..b60ebcb62 100644 --- a/src/UI/AddSeries/SearchResultViewTemplate.html +++ b/src/UI/AddSeries/SearchResultViewTemplate.html @@ -40,8 +40,8 @@
- - {{> QualityProfileSelectionPartial qualityProfiles}} + + {{> ProfileSelectionPartial profiles}}
diff --git a/src/UI/Cells/Edit/QualityCellEditor.js b/src/UI/Cells/Edit/QualityCellEditor.js index e676df24a..475f0108d 100644 --- a/src/UI/Cells/Edit/QualityCellEditor.js +++ b/src/UI/Cells/Edit/QualityCellEditor.js @@ -4,8 +4,8 @@ define( 'backgrid', 'marionette', 'underscore', - 'Settings/Quality/Profile/QualityProfileSchemaCollection', - ], function (Backgrid, Marionette, _, QualityProfileSchemaCollection) { + 'Settings/Profile/ProfileSchemaCollection' + ], function (Backgrid, Marionette, _, ProfileSchemaCollection) { return Backgrid.CellEditor.extend({ className: 'quality-cell-editor', @@ -21,12 +21,12 @@ define( render: function () { var self = this; - var qualityProfileSchemaCollection = new QualityProfileSchemaCollection(); - var promise = qualityProfileSchemaCollection.fetch(); + var profileSchemaCollection = new ProfileSchemaCollection(); + var promise = profileSchemaCollection.fetch(); promise.done(function () { var templateName = self.template; - self.schema = qualityProfileSchemaCollection.first(); + self.schema = profileSchemaCollection.first(); var selected = _.find(self.schema.get('items'), function (model) { return model.quality.id === self.model.get(self.column.get('name')).quality.id; @@ -50,13 +50,13 @@ define( var column = this.column; var selected = parseInt(this.$el.val(), 10); - var qualityProfileItem = _.find(this.schema.get('items'), function(model) { + var profileItem = _.find(this.schema.get('items'), function(model) { return model.quality.id === selected; }); var newQuality = { proper : false, - quality: qualityProfileItem.quality + quality: profileItem.quality }; model.set(column.get('name'), newQuality); diff --git a/src/UI/Cells/QualityProfileCell.js b/src/UI/Cells/ProfileCell.js similarity index 51% rename from src/UI/Cells/QualityProfileCell.js rename to src/UI/Cells/ProfileCell.js index 7cd6efd88..d63cb9701 100644 --- a/src/UI/Cells/QualityProfileCell.js +++ b/src/UI/Cells/ProfileCell.js @@ -2,18 +2,18 @@ define( [ 'backgrid', - 'Quality/QualityProfileCollection', + 'Profile/ProfileCollection', 'underscore' - ], function (Backgrid, QualityProfileCollection,_) { + ], function (Backgrid, ProfileCollection,_) { return Backgrid.Cell.extend({ - className: 'quality-profile-cell', + className: 'profile-cell', render: function () { this.$el.empty(); - var qualityProfileId = this.model.get(this.column.get('name')); + var profileId = this.model.get(this.column.get('name')); - var profile = _.findWhere(QualityProfileCollection.models, { id: qualityProfileId }); + var profile = _.findWhere(ProfileCollection.models, { id: profileId }); if (profile) { this.$el.html(profile.get('name')); diff --git a/src/UI/Config.js b/src/UI/Config.js index 245ac59ae..7a0b03862 100644 --- a/src/UI/Config.js +++ b/src/UI/Config.js @@ -8,7 +8,7 @@ define( ConfigUpdatedEvent: 'ConfigUpdatedEvent' }, Keys : { - DefaultQualityProfileId : 'DefaultQualityProfileId', + DefaultProfileId : 'DefaultProfileId', DefaultRootFolderId : 'DefaultRootFolderId', UseSeasonFolder : 'UseSeasonFolder', DefaultSeriesType : 'DefaultSeriesType', diff --git a/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.html b/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.html index 1263ad98e..87e4b838b 100644 --- a/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.html +++ b/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.html @@ -1,6 +1,6 @@ 
{{#with series}} - {{qualityProfile qualityProfileId}} + {{profile profileId}} {{network}} {{/with}} {{StartTime airDateUtc}} diff --git a/src/UI/Handlebars/Helpers/Quality.js b/src/UI/Handlebars/Helpers/Quality.js index 292c04937..6d9a579cd 100644 --- a/src/UI/Handlebars/Helpers/Quality.js +++ b/src/UI/Handlebars/Helpers/Quality.js @@ -2,15 +2,15 @@ define( [ 'handlebars', - 'Quality/QualityProfileCollection' - ], function (Handlebars, QualityProfileCollection) { + 'Profile/ProfileCollection' + ], function (Handlebars, ProfileCollection) { - Handlebars.registerHelper('qualityProfile', function (profileId) { + Handlebars.registerHelper('profile', function (profileId) { - var profile = QualityProfileCollection.get(profileId); + var profile = ProfileCollection.get(profileId); if (profile) { - return new Handlebars.SafeString('' + profile.get('name') + ''); + return new Handlebars.SafeString('' + profile.get("name") + ''); } return undefined; diff --git a/src/UI/Handlebars/Helpers/String.js b/src/UI/Handlebars/Helpers/String.js new file mode 100644 index 000000000..93b5715fc --- /dev/null +++ b/src/UI/Handlebars/Helpers/String.js @@ -0,0 +1,9 @@ +'use strict'; +define( + [ + 'handlebars' + ], function (Handlebars) { + Handlebars.registerHelper('TitleCase', function (input) { + return new Handlebars.SafeString(input.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();})); + }); + }); diff --git a/src/UI/Handlebars/backbone.marionette.templates.js b/src/UI/Handlebars/backbone.marionette.templates.js index 8778df684..69d72c4ed 100644 --- a/src/UI/Handlebars/backbone.marionette.templates.js +++ b/src/UI/Handlebars/backbone.marionette.templates.js @@ -11,7 +11,7 @@ define( 'Handlebars/Helpers/Quality', 'Handlebars/Helpers/System', 'Handlebars/Helpers/EachReverse', - 'Handlebars/Helpers/EachReverse', + 'Handlebars/Helpers/String', 'Handlebars/Handlebars.Debug' ], function (Templates) { return function () { diff --git a/src/UI/History/Queue/QueueStatusCell.js b/src/UI/History/Queue/QueueStatusCell.js index 580d904ce..2fda4b6ea 100644 --- a/src/UI/History/Queue/QueueStatusCell.js +++ b/src/UI/History/Queue/QueueStatusCell.js @@ -31,6 +31,11 @@ define( icon = 'icon-inbox'; title = 'Downloaded'; } + + if (status === 'pending') { + icon = 'icon-time'; + title = 'Pending'; + } if (errorMessage !== '') { if (status === 'completed') { diff --git a/src/UI/History/Queue/TimeleftCell.js b/src/UI/History/Queue/TimeleftCell.js index cea11f12f..043efdf52 100644 --- a/src/UI/History/Queue/TimeleftCell.js +++ b/src/UI/History/Queue/TimeleftCell.js @@ -14,12 +14,21 @@ define( if (this.cellValue) { + //If the release is pending we want to use the timeleft as the time it will be processed at + if (this.cellValue.get('status').toLowerCase() === 'pending') { + this.$el.html('-'); + this.$el.attr('title', 'Will be processed again in: {0}'.format(this.cellValue.get('timeleft'))); + this.$el.attr('data-container', 'body'); + + return this; + } + var timeleft = this.cellValue.get('timeleft'); var totalSize = fileSize(this.cellValue.get('size'), 1, false); var remainingSize = fileSize(this.cellValue.get('sizeleft'), 1, false); if (timeleft === undefined) { - this.$el.html("-"); + this.$el.html('-'); } else { this.$el.html('{0}'.format(timeleft, remainingSize, totalSize)); diff --git a/src/UI/Profile/ProfileCollection.js b/src/UI/Profile/ProfileCollection.js new file mode 100644 index 000000000..2b0844cd1 --- /dev/null +++ b/src/UI/Profile/ProfileCollection.js @@ -0,0 +1,18 @@ +'use strict'; +define( + [ + 'backbone', + 'Profile/ProfileModel' + ], function (Backbone, ProfileModel) { + + var ProfileCollection = Backbone.Collection.extend({ + model: ProfileModel, + url : window.NzbDrone.ApiRoot + '/profile' + }); + + var profiles = new ProfileCollection(); + + profiles.fetch(); + + return profiles; + }); diff --git a/src/UI/Quality/QualityProfileModel.js b/src/UI/Profile/ProfileModel.js similarity index 100% rename from src/UI/Quality/QualityProfileModel.js rename to src/UI/Profile/ProfileModel.js diff --git a/src/UI/Quality/QualityProfileSelectionPartial.html b/src/UI/Profile/ProfileSelectionPartial.html similarity index 53% rename from src/UI/Quality/QualityProfileSelectionPartial.html rename to src/UI/Profile/ProfileSelectionPartial.html index 688d1b276..6d979b88a 100644 --- a/src/UI/Quality/QualityProfileSelectionPartial.html +++ b/src/UI/Profile/ProfileSelectionPartial.html @@ -1,4 +1,4 @@ - {{#each this}} {{/each}} diff --git a/src/UI/Quality/QualityProfileCollection.js b/src/UI/Quality/QualityProfileCollection.js deleted file mode 100644 index f9a33b99e..000000000 --- a/src/UI/Quality/QualityProfileCollection.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; -define( - [ - 'backbone', - 'Quality/QualityProfileModel' - ], function (Backbone, QualityProfileModel) { - - var QualityProfileCollection = Backbone.Collection.extend({ - model: QualityProfileModel, - url : window.NzbDrone.ApiRoot + '/qualityprofile' - }); - - var profiles = new QualityProfileCollection(); - - profiles.fetch(); - - return profiles; - }); diff --git a/src/UI/Series/Details/InfoViewTemplate.html b/src/UI/Series/Details/InfoViewTemplate.html index 5c962352c..9a5f81071 100644 --- a/src/UI/Series/Details/InfoViewTemplate.html +++ b/src/UI/Series/Details/InfoViewTemplate.html @@ -1,6 +1,6 @@ 
- {{qualityProfile qualityProfileId}} + {{profile profileId}} {{network}} {{runtime}} minutes {{path}} diff --git a/src/UI/Series/Edit/EditSeriesView.js b/src/UI/Series/Edit/EditSeriesView.js index 76801c137..18522f6bd 100644 --- a/src/UI/Series/Edit/EditSeriesView.js +++ b/src/UI/Series/Edit/EditSeriesView.js @@ -3,17 +3,17 @@ define( [ 'vent', 'marionette', - 'Quality/QualityProfileCollection', + 'Profile/ProfileCollection', 'Mixins/AsModelBoundView', 'Mixins/AsValidatedView', 'Mixins/AutoComplete' - ], function (vent, Marionette, QualityProfiles, AsModelBoundView, AsValidatedView) { + ], function (vent, Marionette, Profiles, AsModelBoundView, AsValidatedView) { var view = Marionette.ItemView.extend({ template: 'Series/Edit/EditSeriesViewTemplate', ui: { - qualityProfile: '.x-quality-profile', + profile: '.x-profile', path : '.x-path' }, @@ -24,14 +24,14 @@ define( initialize: function () { - this.model.set('qualityProfiles', QualityProfiles); + this.model.set('profiles', Profiles); }, _saveSeries: function () { var self = this; - var qualityProfileId = this.ui.qualityProfile.val(); - this.model.set({ qualityProfileId: qualityProfileId}); + var profileId = this.ui.profile.val(); + this.model.set({ profileId: profileId}); this.model.save().done(function () { self.trigger('saved'); diff --git a/src/UI/Series/Edit/EditSeriesViewTemplate.html b/src/UI/Series/Edit/EditSeriesViewTemplate.html index d619ecbc5..4b8d3f3cd 100644 --- a/src/UI/Series/Edit/EditSeriesViewTemplate.html +++ b/src/UI/Series/Edit/EditSeriesViewTemplate.html @@ -58,11 +58,11 @@
- +
- + {{#each profiles.models}} {{/each}} diff --git a/src/UI/Series/Editor/SeriesEditorFooterView.js b/src/UI/Series/Editor/SeriesEditorFooterView.js index a111be913..d37e4e485 100644 --- a/src/UI/Series/Editor/SeriesEditorFooterView.js +++ b/src/UI/Series/Editor/SeriesEditorFooterView.js @@ -5,7 +5,7 @@ define( 'marionette', 'backgrid', 'vent', - 'Quality/QualityProfileCollection', + 'Profile/ProfileCollection', 'AddSeries/RootFolders/RootFolderCollection', 'Shared/Toolbar/ToolbarLayout', 'AddSeries/RootFolders/RootFolderLayout', @@ -15,7 +15,7 @@ define( Marionette, Backgrid, vent, - QualityProfiles, + Profiles, RootFolders, ToolbarLayout, RootFolderLayout, @@ -26,7 +26,7 @@ define( ui: { monitored : '.x-monitored', - qualityProfile : '.x-quality-profiles', + profile : '.x-profiles', seasonFolder : '.x-season-folder', rootFolder : '.x-root-folder', selectedCount : '.x-selected-count', @@ -43,8 +43,8 @@ define( templateHelpers: function () { return { - qualityProfiles: QualityProfiles, - rootFolders : RootFolders.toJSON() + profiles : Profiles, + rootFolders: RootFolders.toJSON() }; }, @@ -68,7 +68,7 @@ define( var selected = this.editorGrid.getSelectedModels(); var monitored = this.ui.monitored.val(); - var profile = this.ui.qualityProfile.val(); + var profile = this.ui.profile.val(); var seasonFolder = this.ui.seasonFolder.val(); var rootFolder = this.ui.rootFolder.val(); @@ -82,7 +82,7 @@ define( } if (profile !== 'noChange') { - model.set('qualityProfileId', parseInt(profile, 10)); + model.set('profileId', parseInt(profile, 10)); } if (seasonFolder === 'true') { @@ -113,7 +113,7 @@ define( if (selectedCount === 0) { this.ui.monitored.attr('disabled', ''); - this.ui.qualityProfile.attr('disabled', ''); + this.ui.profile.attr('disabled', ''); this.ui.seasonFolder.attr('disabled', ''); this.ui.rootFolder.attr('disabled', ''); this.ui.saveButton.attr('disabled', ''); @@ -122,7 +122,7 @@ define( else { this.ui.monitored.removeAttr('disabled', ''); - this.ui.qualityProfile.removeAttr('disabled', ''); + this.ui.profile.removeAttr('disabled', ''); this.ui.seasonFolder.removeAttr('disabled', ''); this.ui.rootFolder.removeAttr('disabled', ''); this.ui.saveButton.removeAttr('disabled', ''); diff --git a/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.html b/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.html index 3ff399d6a..8d30bb969 100644 --- a/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.html +++ b/src/UI/Series/Editor/SeriesEditorFooterViewTemplate.html @@ -21,11 +21,11 @@
- + - - {{#each qualityProfiles.models}} + {{#each profiles.models}} {{/each}} diff --git a/src/UI/Series/Editor/SeriesEditorLayout.js b/src/UI/Series/Editor/SeriesEditorLayout.js index 1983444fb..38257a593 100644 --- a/src/UI/Series/Editor/SeriesEditorLayout.js +++ b/src/UI/Series/Editor/SeriesEditorLayout.js @@ -7,7 +7,7 @@ define( 'Series/Index/EmptyView', 'Series/SeriesCollection', 'Cells/SeriesTitleCell', - 'Cells/QualityProfileCell', + 'Cells/ProfileCell', 'Cells/SeriesStatusCell', 'Cells/SeasonFolderCell', 'Shared/Toolbar/ToolbarLayout', @@ -19,7 +19,7 @@ define( EmptyView, SeriesCollection, SeriesTitleCell, - QualityProfileCell, + ProfileCell, SeriesStatusCell, SeasonFolderCell, ToolbarLayout, @@ -33,10 +33,10 @@ define( }, ui: { - monitored : '.x-monitored', - qualityProfiles: '.x-quality-profiles', - rootFolder : '.x-root-folder', - selectedCount : '.x-selected-count' + monitored : '.x-monitored', + profiles : '.x-profiles', + rootFolder : '.x-root-folder', + selectedCount : '.x-selected-count' }, events: { @@ -47,36 +47,36 @@ define( columns: [ { - name : '', - cell : 'select-row', - headerCell: 'select-all', - sortable : false + name : '', + cell : 'select-row', + headerCell : 'select-all', + sortable : false }, { - name : 'statusWeight', - label : '', - cell : SeriesStatusCell + name : 'statusWeight', + label : '', + cell : SeriesStatusCell }, { - name : 'title', - label : 'Title', - cell : SeriesTitleCell, - cellValue : 'this' + name : 'title', + label : 'Title', + cell : SeriesTitleCell, + cellValue : 'this' }, { - name : 'qualityProfileId', - label : 'Quality', - cell : QualityProfileCell + name : 'profileId', + label : 'Profile', + cell : ProfileCell }, { - name : 'seasonFolder', - label : 'Season Folder', - cell : SeasonFolderCell + name : 'seasonFolder', + label : 'Season Folder', + cell : SeasonFolderCell }, { - name : 'path', - label : 'Path', - cell : 'string' + name : 'path', + label : 'Path', + cell : 'string' } ], diff --git a/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.html b/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.html index 3b9ddf3c1..1eb317ace 100644 --- a/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.html +++ b/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.html @@ -45,7 +45,7 @@ {{seasonCountHelper}} - {{qualityProfile qualityProfileId}} + {{profile profileId}}
{{> EpisodeProgressPartial }} diff --git a/src/UI/Series/Index/SeriesIndexLayout.js b/src/UI/Series/Index/SeriesIndexLayout.js index f0f773d58..d66c79bdf 100644 --- a/src/UI/Series/Index/SeriesIndexLayout.js +++ b/src/UI/Series/Index/SeriesIndexLayout.js @@ -11,7 +11,7 @@ define( 'Cells/RelativeDateCell', 'Cells/SeriesTitleCell', 'Cells/TemplatedCell', - 'Cells/QualityProfileCell', + 'Cells/ProfileCell', 'Cells/EpisodeProgressCell', 'Cells/SeriesActionsCell', 'Cells/SeriesStatusCell', @@ -29,7 +29,7 @@ define( RelativeDateCell, SeriesTitleCell, TemplatedCell, - QualityProfileCell, + ProfileCell, EpisodeProgressCell, SeriesActionsCell, SeriesStatusCell, @@ -65,9 +65,9 @@ define( cell : 'integer' }, { - name : 'qualityProfileId', - label : 'Quality', - cell : QualityProfileCell + name : 'profileId', + label: 'Profile', + cell : ProfileCell }, { name : 'network', @@ -165,7 +165,7 @@ define( }, { title: 'Quality', - name : 'qualityProfileId' + name : 'profileId' }, { title: 'Network', diff --git a/src/UI/Settings/Quality/Profile/AllowedLabeler.js b/src/UI/Settings/Profile/AllowedLabeler.js similarity index 99% rename from src/UI/Settings/Quality/Profile/AllowedLabeler.js rename to src/UI/Settings/Profile/AllowedLabeler.js index dbad67498..667859345 100644 --- a/src/UI/Settings/Quality/Profile/AllowedLabeler.js +++ b/src/UI/Settings/Profile/AllowedLabeler.js @@ -7,6 +7,7 @@ define( Handlebars.registerHelper('allowedLabeler', function () { var ret = ''; var cutoff = this.cutoff; + _.each(this.items, function (item) { if (item.allowed) { if (item.quality.id === cutoff.id) { diff --git a/src/UI/Settings/Quality/Profile/DeleteQualityProfileView.js b/src/UI/Settings/Profile/DeleteProfileView.js similarity index 86% rename from src/UI/Settings/Quality/Profile/DeleteQualityProfileView.js rename to src/UI/Settings/Profile/DeleteProfileView.js index 0aee00971..e685132f5 100644 --- a/src/UI/Settings/Quality/Profile/DeleteQualityProfileView.js +++ b/src/UI/Settings/Profile/DeleteProfileView.js @@ -6,7 +6,7 @@ define( ], function (vent, Marionette) { return Marionette.ItemView.extend({ - template: 'Settings/Quality/Profile/DeleteQualityProfileViewTemplate', + template: 'Settings/Profile/DeleteProfileViewTemplate', events: { 'click .x-confirm-delete': '_removeProfile' diff --git a/src/UI/Settings/Quality/Profile/DeleteQualityProfileViewTemplate.html b/src/UI/Settings/Profile/DeleteProfileViewTemplate.html similarity index 100% rename from src/UI/Settings/Quality/Profile/DeleteQualityProfileViewTemplate.html rename to src/UI/Settings/Profile/DeleteProfileViewTemplate.html diff --git a/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileItemView.js b/src/UI/Settings/Profile/Edit/EditProfileItemView.js similarity index 61% rename from src/UI/Settings/Quality/Profile/Edit/EditQualityProfileItemView.js rename to src/UI/Settings/Profile/Edit/EditProfileItemView.js index dbd101a84..5898f6649 100644 --- a/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileItemView.js +++ b/src/UI/Settings/Profile/Edit/EditProfileItemView.js @@ -4,6 +4,6 @@ define( 'marionette' ], function (Marionette) { return Marionette.ItemView.extend({ - template : 'Settings/Quality/Profile/Edit/EditQualityProfileItemViewTemplate' + template : 'Settings/Profile/Edit/EditProfileItemViewTemplate' }); }); diff --git a/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileItemViewTemplate.html b/src/UI/Settings/Profile/Edit/EditProfileItemViewTemplate.html similarity index 100% rename from src/UI/Settings/Quality/Profile/Edit/EditQualityProfileItemViewTemplate.html rename to src/UI/Settings/Profile/Edit/EditProfileItemViewTemplate.html diff --git a/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileLayout.js b/src/UI/Settings/Profile/Edit/EditProfileLayout.js similarity index 83% rename from src/UI/Settings/Quality/Profile/Edit/EditQualityProfileLayout.js rename to src/UI/Settings/Profile/Edit/EditProfileLayout.js index 2a5ea7586..e41bbe591 100644 --- a/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileLayout.js +++ b/src/UI/Settings/Profile/Edit/EditProfileLayout.js @@ -6,10 +6,10 @@ define( 'AppLayout', 'marionette', 'backbone', - 'Settings/Quality/Profile/Edit/EditQualityProfileItemView', - 'Settings/Quality/Profile/Edit/QualitySortableCollectionView', - 'Settings/Quality/Profile/Edit/EditQualityProfileView', - 'Settings/Quality/Profile/DeleteQualityProfileView', + 'Settings/Profile/Edit/EditProfileItemView', + 'Settings/Profile/Edit/QualitySortableCollectionView', + 'Settings/Profile/Edit/EditProfileView', + 'Settings/Profile/DeleteProfileView', 'Series/SeriesCollection', 'Config' ], function (_, @@ -17,15 +17,15 @@ define( AppLayout, Marionette, Backbone, - EditQualityProfileItemView, + EditProfileItemView, QualitySortableCollectionView, - EditQualityProfileView, + EditProfileView, DeleteView, SeriesCollection, Config) { return Marionette.Layout.extend({ - template: 'Settings/Quality/Profile/Edit/EditQualityProfileLayoutTemplate', + template: 'Settings/Profile/Edit/EditProfileLayoutTemplate', regions: { fields : '#x-fields', @@ -37,8 +37,8 @@ define( }, events: { - 'click .x-save' : '_saveQualityProfile', - 'click .x-cancel' : '_cancelQualityProfile', + 'click .x-save' : '_saveProfile', + 'click .x-cancel' : '_cancelProfile', 'click .x-delete' : '_delete' }, @@ -53,7 +53,7 @@ define( }, onShow: function () { - this.fieldsView = new EditQualityProfileView({ model: this.model }); + this.fieldsView = new EditProfileView({ model: this.model }); this._showFieldsView(); this.sortableListView = new QualitySortableCollectionView({ @@ -94,7 +94,7 @@ define( this._showFieldsView(); }, - _saveQualityProfile: function () { + _saveProfile: function () { var self = this; var cutoff = this.fieldsView.getCutoff(); this.model.set('cutoff', cutoff); @@ -109,7 +109,7 @@ define( } }, - _cancelQualityProfile: function () { + _cancelProfile: function () { if (!this.model.has('id')) { vent.trigger(vent.Commands.CloseModalCommand); return; @@ -136,7 +136,7 @@ define( _updateDisableStatus: function () { if (this._isQualityInUse()) { this.ui.deleteButton.addClass('disabled'); - this.ui.deleteButton.attr('title', 'Can\'t delete quality profiles attached to a series.'); + this.ui.deleteButton.attr('title', 'Can\'t delete a profile that is attached to a series.'); } else { this.ui.deleteButton.removeClass('disabled'); @@ -144,7 +144,7 @@ define( }, _isQualityInUse: function () { - return SeriesCollection.where({'qualityProfileId': this.model.id}).length !== 0; + return SeriesCollection.where({'profileId': this.model.id}).length !== 0; } }); }); diff --git a/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileLayoutTemplate.html b/src/UI/Settings/Profile/Edit/EditProfileLayoutTemplate.html similarity index 100% rename from src/UI/Settings/Quality/Profile/Edit/EditQualityProfileLayoutTemplate.html rename to src/UI/Settings/Profile/Edit/EditProfileLayoutTemplate.html diff --git a/src/UI/Settings/Profile/Edit/EditProfileView.js b/src/UI/Settings/Profile/Edit/EditProfileView.js new file mode 100644 index 000000000..046534358 --- /dev/null +++ b/src/UI/Settings/Profile/Edit/EditProfileView.js @@ -0,0 +1,61 @@ +'use strict'; +define( + [ + 'underscore', + 'marionette', + 'Settings/Profile/Language/LanguageCollection', + 'Config', + 'Mixins/AsModelBoundView', + 'Mixins/AsValidatedView' + ], function (_, Marionette, LanguageCollection, Config, AsModelBoundView, AsValidatedView) { + + var view = Marionette.ItemView.extend({ + template: 'Settings/Profile/Edit/EditProfileViewTemplate', + + ui: { + cutoff : '.x-cutoff', + delay : '.x-delay', + delayMode : '.x-delay-mode' + }, + + events: { + 'change .x-delay': 'toggleDelayMode', + 'keyup .x-delay': 'toggleDelayMode' + }, + + templateHelpers: function () { + return { + languages : LanguageCollection.toJSON() + }; + }, + + onShow: function () { + this.toggleDelayMode(); + }, + + getCutoff: function () { + var self = this; + + return _.findWhere(_.pluck(this.model.get('items'), 'quality'), { id: parseInt(self.ui.cutoff.val(), 10)}); + }, + + toggleDelayMode: function () { + var delay = parseInt(this.ui.delay.val(), 10); + + if (isNaN(delay)) { + return; + } + + if (delay > 0 && Config.getValueBoolean(Config.Keys.AdvancedSettings)) { + this.ui.delayMode.show(); + } + + else { + this.ui.delayMode.hide(); + } + } + }); + + AsValidatedView.call(view); + return AsModelBoundView.call(view); + }); diff --git a/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.html b/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.html new file mode 100644 index 000000000..1aef89d07 --- /dev/null +++ b/src/UI/Settings/Profile/Edit/EditProfileViewTemplate.html @@ -0,0 +1,71 @@ +
+ + +
+ +
+
+ +
+ + +
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ +
+ +
+
\ No newline at end of file diff --git a/src/UI/Settings/Profile/Edit/QualitySortableCollectionView.js b/src/UI/Settings/Profile/Edit/QualitySortableCollectionView.js new file mode 100644 index 000000000..9c9041de0 --- /dev/null +++ b/src/UI/Settings/Profile/Edit/QualitySortableCollectionView.js @@ -0,0 +1,22 @@ +'use strict'; +define( + [ + 'backbone.collectionview', + 'Settings/Profile/Edit/EditProfileItemView' + ], function (BackboneSortableCollectionView, EditProfileItemView) { + return BackboneSortableCollectionView.extend({ + + className: 'qualities', + modelView: EditProfileItemView, + + attributes: { + 'validation-name': 'items' + }, + + events: { + 'click li, td' : '_listItem_onMousedown', + 'dblclick li, td' : '_listItem_onDoubleClick', + 'keydown' : '_onKeydown' + } + }); + }); diff --git a/src/UI/Settings/Profile/Language/LanguageCollection.js b/src/UI/Settings/Profile/Language/LanguageCollection.js new file mode 100644 index 000000000..d190024b1 --- /dev/null +++ b/src/UI/Settings/Profile/Language/LanguageCollection.js @@ -0,0 +1,18 @@ +'use strict'; +define( + [ + 'backbone', + 'Settings/Profile/Language/LanguageModel' + ], function (Backbone, LanguageModel) { + + var LanuageCollection = Backbone.Collection.extend({ + model: LanguageModel, + url : window.NzbDrone.ApiRoot + '/language' + }); + + var languages = new LanuageCollection(); + + languages.fetch(); + + return languages; + }); diff --git a/src/UI/Settings/Profile/Language/LanguageModel.js b/src/UI/Settings/Profile/Language/LanguageModel.js new file mode 100644 index 000000000..ad6b13e3e --- /dev/null +++ b/src/UI/Settings/Profile/Language/LanguageModel.js @@ -0,0 +1,10 @@ +'use strict'; +define( + [ + 'backbone' + ], function (Backbone) { + return Backbone.Model.extend({ + + }); + }); + diff --git a/src/UI/Settings/Profile/LanguageLabel.js b/src/UI/Settings/Profile/LanguageLabel.js new file mode 100644 index 000000000..c72abda5a --- /dev/null +++ b/src/UI/Settings/Profile/LanguageLabel.js @@ -0,0 +1,20 @@ +'use strict'; +define( + [ + 'underscore', + 'handlebars', + 'Settings/Profile/Language/LanguageCollection' + ], function (_, Handlebars, LanguageCollection) { + Handlebars.registerHelper('languageLabel', function () { + + var wantedLanguage = this.language; + + var language = LanguageCollection.find(function (lang) { + return lang.get('nameLower') === wantedLanguage; + }); + + var result = '' + language.get('name') + ''; + + return new Handlebars.SafeString(result); + }); + }); diff --git a/src/UI/Settings/Quality/Profile/QualityProfileCollectionTemplate.html b/src/UI/Settings/Profile/ProfileCollectionTemplate.html similarity index 64% rename from src/UI/Settings/Quality/Profile/QualityProfileCollectionTemplate.html rename to src/UI/Settings/Profile/ProfileCollectionTemplate.html index 88182fda8..11e0047ad 100644 --- a/src/UI/Settings/Quality/Profile/QualityProfileCollectionTemplate.html +++ b/src/UI/Settings/Profile/ProfileCollectionTemplate.html @@ -1,10 +1,10 @@ 
- Quality Profiles + Profiles
-
    +
    • -
      +
      diff --git a/src/UI/Settings/Quality/Profile/QualityProfileCollectionView.js b/src/UI/Settings/Profile/ProfileCollectionView.js similarity index 69% rename from src/UI/Settings/Quality/Profile/QualityProfileCollectionView.js rename to src/UI/Settings/Profile/ProfileCollectionView.js index b3f5e12af..f4403c144 100644 --- a/src/UI/Settings/Quality/Profile/QualityProfileCollectionView.js +++ b/src/UI/Settings/Profile/ProfileCollectionView.js @@ -2,16 +2,16 @@ define(['AppLayout', 'marionette', - 'Settings/Quality/Profile/QualityProfileView', - 'Settings/Quality/Profile/Edit/EditQualityProfileLayout', - 'Settings/Quality/Profile/QualityProfileSchemaCollection', + 'Settings/Profile/ProfileView', + 'Settings/Profile/Edit/EditProfileLayout', + 'Settings/Profile/ProfileSchemaCollection', 'underscore' -], function (AppLayout, Marionette, QualityProfileView, EditProfileView, ProfileCollection, _) { +], function (AppLayout, Marionette, ProfileView, EditProfileView, ProfileCollection, _) { return Marionette.CompositeView.extend({ - itemView : QualityProfileView, - itemViewContainer: '.quality-profiles', - template : 'Settings/Quality/Profile/QualityProfileCollectionTemplate', + itemView : ProfileView, + itemViewContainer: '.profiles', + template : 'Settings/Profile/ProfileCollectionTemplate', ui: { 'addCard': '.x-add-card' diff --git a/src/UI/Settings/Profile/ProfileLayout.js b/src/UI/Settings/Profile/ProfileLayout.js new file mode 100644 index 000000000..16822f4f9 --- /dev/null +++ b/src/UI/Settings/Profile/ProfileLayout.js @@ -0,0 +1,27 @@ +'use strict'; + +define( + [ + 'marionette', + 'Profile/ProfileCollection', + 'Settings/Profile/ProfileCollectionView', + 'Settings/Profile/Language/LanguageCollection' + ], function (Marionette, ProfileCollection, ProfileCollectionView, LanguageCollection) { + return Marionette.Layout.extend({ + template: 'Settings/Profile/ProfileLayoutTemplate', + + regions: { + profile : '#profile' + }, + + initialize: function (options) { + this.settings = options.settings; + ProfileCollection.fetch(); + }, + + onShow: function () { + this.profile.show(new ProfileCollectionView({collection: ProfileCollection})); + } + }); + }); + diff --git a/src/UI/Settings/Profile/ProfileLayoutTemplate.html b/src/UI/Settings/Profile/ProfileLayoutTemplate.html new file mode 100644 index 000000000..1e812f24b --- /dev/null +++ b/src/UI/Settings/Profile/ProfileLayoutTemplate.html @@ -0,0 +1,3 @@ +
      +
      +
      diff --git a/src/UI/Settings/Profile/ProfileSchemaCollection.js b/src/UI/Settings/Profile/ProfileSchemaCollection.js new file mode 100644 index 000000000..79101a506 --- /dev/null +++ b/src/UI/Settings/Profile/ProfileSchemaCollection.js @@ -0,0 +1,13 @@ +'use strict'; + +define( + [ + 'backbone', + 'Profile/ProfileModel' + ], function (Backbone, ProfileModel) { + + return Backbone.Collection.extend({ + model: ProfileModel, + url : window.NzbDrone.ApiRoot + '/profile/schema' + }); + }); diff --git a/src/UI/Settings/Quality/Profile/QualityProfileView.js b/src/UI/Settings/Profile/ProfileView.js similarity index 81% rename from src/UI/Settings/Quality/Profile/QualityProfileView.js rename to src/UI/Settings/Profile/ProfileView.js index 45a5ede8e..45d9005cf 100644 --- a/src/UI/Settings/Quality/Profile/QualityProfileView.js +++ b/src/UI/Settings/Profile/ProfileView.js @@ -4,14 +4,15 @@ define( [ 'AppLayout', 'marionette', - 'Settings/Quality/Profile/Edit/EditQualityProfileLayout', + 'Settings/Profile/Edit/EditProfileLayout', 'Mixins/AsModelBoundView', - 'Settings/Quality/Profile/AllowedLabeler', + 'Settings/Profile/AllowedLabeler', + 'Settings/Profile/LanguageLabel', 'bootstrap' ], function (AppLayout, Marionette, EditProfileView, AsModelBoundView) { var view = Marionette.ItemView.extend({ - template: 'Settings/Quality/Profile/QualityProfileViewTemplate', + template: 'Settings/Profile/ProfileViewTemplate', tagName : 'li', ui: { diff --git a/src/UI/Settings/Profile/ProfileViewTemplate.html b/src/UI/Settings/Profile/ProfileViewTemplate.html new file mode 100644 index 000000000..dece04aa6 --- /dev/null +++ b/src/UI/Settings/Profile/ProfileViewTemplate.html @@ -0,0 +1,16 @@ +
      +
      +

      +
      + +
      + {{languageLabel}} + + {{#if_gt grabDelay compare="0"}} + + {{/if_gt}} +
      +
        + {{allowedLabeler}} +
      +
      \ No newline at end of file diff --git a/src/UI/Settings/Profile/profile.less b/src/UI/Settings/Profile/profile.less new file mode 100644 index 000000000..185ec469d --- /dev/null +++ b/src/UI/Settings/Profile/profile.less @@ -0,0 +1,31 @@ +@import "../../Content/Bootstrap/mixins"; +@import "../../Content/FontAwesome/font-awesome"; +@import "../../Shared/Styles/clickable.less"; + +.profile-item { + .clickable; + + width: 300px; + height: 158px; + padding: 10px 15px; + + &.add-card { + .center { + margin-top: 10px; + } + } + + .allowed-qualities { + + padding-left: 0px; + + li { + list-style-type : none; + margin: 1px; + } + } + + .language { + margin-bottom: 3px; + } +} diff --git a/src/UI/Settings/Quality/Definition/QualityDefinitionView.js b/src/UI/Settings/Quality/Definition/QualityDefinitionView.js index d5a3f9d1a..e08bf41c0 100644 --- a/src/UI/Settings/Quality/Definition/QualityDefinitionView.js +++ b/src/UI/Settings/Quality/Definition/QualityDefinitionView.js @@ -25,7 +25,7 @@ define( }, initialize: function (options) { - this.qualityProfileCollection = options.qualityProfiles; + this.profileCollection = options.profiles; this.filesize = fileSize; }, diff --git a/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileView.js b/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileView.js deleted file mode 100644 index 1365de61c..000000000 --- a/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileView.js +++ /dev/null @@ -1,26 +0,0 @@ -'use strict'; -define( - [ - 'underscore', - 'marionette', - 'Mixins/AsModelBoundView', - 'Mixins/AsValidatedView' - ], function (_, Marionette, AsModelBoundView, AsValidatedView) { - - var view = Marionette.ItemView.extend({ - template: 'Settings/Quality/Profile/Edit/EditQualityProfileViewTemplate', - - ui: { - cutoff : '.x-cutoff' - }, - - getCutoff: function () { - var self = this; - - return _.findWhere(_.pluck(this.model.get('items'), 'quality'), { id: parseInt(self.ui.cutoff.val(), 10)}); - } - }); - - AsValidatedView.call(view); - return AsModelBoundView.call(view); - }); diff --git a/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileViewTemplate.html b/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileViewTemplate.html deleted file mode 100644 index ef0da0ef3..000000000 --- a/src/UI/Settings/Quality/Profile/Edit/EditQualityProfileViewTemplate.html +++ /dev/null @@ -1,23 +0,0 @@ -
      - -
      - -
      -
      -
      - - -
      - -
      - -
      - -
      -
      \ No newline at end of file diff --git a/src/UI/Settings/Quality/Profile/Edit/QualitySortableCollectionView.js b/src/UI/Settings/Quality/Profile/Edit/QualitySortableCollectionView.js deleted file mode 100644 index 03693ec29..000000000 --- a/src/UI/Settings/Quality/Profile/Edit/QualitySortableCollectionView.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict'; -define( - [ - 'backbone.collectionview', - 'Settings/Quality/Profile/Edit/EditQualityProfileItemView' - ], function (BackboneSortableCollectionView, EditQualityProfileItemView) { - return BackboneSortableCollectionView.extend({ - - className: 'qualities', - modelView: EditQualityProfileItemView, - - attributes: { - 'validation-name': 'items' - }, - - events: { - 'click li, td' : '_listItem_onMousedown', - 'dblclick li, td' : '_listItem_onDoubleClick', - 'keydown' : '_onKeydown' - } - }); - }); diff --git a/src/UI/Settings/Quality/Profile/QualityProfileSchemaCollection.js b/src/UI/Settings/Quality/Profile/QualityProfileSchemaCollection.js deleted file mode 100644 index 46cc94027..000000000 --- a/src/UI/Settings/Quality/Profile/QualityProfileSchemaCollection.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; - -define( - [ - 'backbone', - 'Quality/QualityProfileModel' - ], function (Backbone, QualityProfileModel) { - - return Backbone.Collection.extend({ - model: QualityProfileModel, - url : window.NzbDrone.ApiRoot + '/qualityprofile/schema' - }); - }); diff --git a/src/UI/Settings/Quality/Profile/QualityProfileViewTemplate.html b/src/UI/Settings/Quality/Profile/QualityProfileViewTemplate.html deleted file mode 100644 index 6dfc5d3ac..000000000 --- a/src/UI/Settings/Quality/Profile/QualityProfileViewTemplate.html +++ /dev/null @@ -1,9 +0,0 @@ -
      -
      -

      -
      - -
        - {{allowedLabeler}} -
      -
      \ No newline at end of file diff --git a/src/UI/Settings/Quality/QualityLayout.js b/src/UI/Settings/Quality/QualityLayout.js index c80486209..67dcc2f9c 100644 --- a/src/UI/Settings/Quality/QualityLayout.js +++ b/src/UI/Settings/Quality/QualityLayout.js @@ -3,28 +3,23 @@ define( [ 'marionette', - 'Quality/QualityProfileCollection', - 'Settings/Quality/Profile/QualityProfileCollectionView', 'Quality/QualityDefinitionCollection', 'Settings/Quality/Definition/QualityDefinitionCollectionView' - ], function (Marionette, QualityProfileCollection, QualityProfileCollectionView, QualityDefinitionCollection, QualityDefinitionCollectionView) { + ], function (Marionette, QualityDefinitionCollection, QualityDefinitionCollectionView) { return Marionette.Layout.extend({ template: 'Settings/Quality/QualityLayoutTemplate', regions: { - qualityProfile : '#quality-profile', qualityDefinition : '#quality-definition' }, initialize: function (options) { this.settings = options.settings; - QualityProfileCollection.fetch(); this.qualityDefinitionCollection = new QualityDefinitionCollection(); this.qualityDefinitionCollection.fetch(); }, onShow: function () { - this.qualityProfile.show(new QualityProfileCollectionView({collection: QualityProfileCollection})); this.qualityDefinition.show(new QualityDefinitionCollectionView({collection: this.qualityDefinitionCollection})); } }); diff --git a/src/UI/Settings/Quality/QualityLayoutTemplate.html b/src/UI/Settings/Quality/QualityLayoutTemplate.html index 1684faf98..8db6f83ee 100644 --- a/src/UI/Settings/Quality/QualityLayoutTemplate.html +++ b/src/UI/Settings/Quality/QualityLayoutTemplate.html @@ -1,9 +1,3 @@ 
      -
      -
      - -
      - -
      diff --git a/src/UI/Settings/Quality/quality.less b/src/UI/Settings/Quality/quality.less index 0376373b4..ad9f69c55 100644 --- a/src/UI/Settings/Quality/quality.less +++ b/src/UI/Settings/Quality/quality.less @@ -2,30 +2,6 @@ @import "../../Content/FontAwesome/font-awesome"; @import "../../Shared/Styles/clickable.less"; -.quality-profile-item { - .clickable; - - width: 300px; - height: 120px; - padding: 10px 15px; - - &.add-card { - .center { - margin-top: 10px; - } - } - - .allowed-qualities { - - padding-left: 0px; - - li { - list-style-type : none; - margin: 1px; - } - } -} - ul.qualities { .user-select(none); diff --git a/src/UI/Settings/SettingsLayout.js b/src/UI/Settings/SettingsLayout.js index eddb56ecc..acd7fbc33 100644 --- a/src/UI/Settings/SettingsLayout.js +++ b/src/UI/Settings/SettingsLayout.js @@ -10,6 +10,7 @@ define( 'Settings/MediaManagement/Naming/NamingModel', 'Settings/MediaManagement/MediaManagementLayout', 'Settings/MediaManagement/MediaManagementSettingsModel', + 'Settings/Profile/ProfileLayout', 'Settings/Quality/QualityLayout', 'Settings/Indexers/IndexerLayout', 'Settings/Indexers/IndexerCollection', @@ -31,6 +32,7 @@ define( NamingModel, MediaManagementLayout, MediaManagementSettingsModel, + ProfileLayout, QualityLayout, IndexerLayout, IndexerCollection, @@ -48,6 +50,7 @@ define( regions: { mediaManagement : '#media-management', + profiles : '#profiles', quality : '#quality', indexers : '#indexers', downloadClient : '#download-client', @@ -59,6 +62,7 @@ define( ui: { mediaManagementTab : '.x-media-management-tab', + profilesTab : '.x-profiles-tab', qualityTab : '.x-quality-tab', indexersTab : '.x-indexers-tab', downloadClientTab : '.x-download-client-tab', @@ -70,6 +74,7 @@ define( events: { 'click .x-media-management-tab' : '_showMediaManagement', + 'click .x-profiles-tab' : '_showProfiles', 'click .x-quality-tab' : '_showQuality', 'click .x-indexers-tab' : '_showIndexers', 'click .x-download-client-tab' : '_showDownloadClient', @@ -109,6 +114,7 @@ define( { self.loading.$el.hide(); self.mediaManagement.show(new MediaManagementLayout({ settings: self.mediaManagementSettings, namingSettings: self.namingSettings })); + self.profiles.show(new ProfileLayout()); self.quality.show(new QualityLayout()); self.indexers.show(new IndexerLayout({ model: self.indexerSettings })); self.downloadClient.show(new DownloadClientLayout({ model: self.downloadClientSettings })); @@ -123,6 +129,9 @@ define( onShow: function () { switch (this.action) { + case 'profiles': + this._showProfiles(); + break; case 'quality': this._showQuality(); break; @@ -158,6 +167,15 @@ define( this._navigate('settings/mediamanagement'); }, + _showProfiles: function (e) { + if (e) { + e.preventDefault(); + } + + this.ui.profilesTab.tab('show'); + this._navigate('settings/profiles'); + }, + _showQuality: function (e) { if (e) { e.preventDefault(); diff --git a/src/UI/Settings/SettingsLayoutTemplate.html b/src/UI/Settings/SettingsLayoutTemplate.html index 84a826ecb..a1deab4da 100644 --- a/src/UI/Settings/SettingsLayoutTemplate.html +++ b/src/UI/Settings/SettingsLayoutTemplate.html @@ -1,5 +1,6 @@ 
      • Media Management
        • +
      • Profiles
      • Quality
      • Indexers
      • Download Client
        • @@ -34,6 +35,7 @@
        +
        diff --git a/src/UI/Settings/settings.less b/src/UI/Settings/settings.less index 831d3d763..b98c25401 100644 --- a/src/UI/Settings/settings.less +++ b/src/UI/Settings/settings.less @@ -2,6 +2,7 @@ @import "../Shared/Styles/clickable.less"; @import "Indexers/indexers"; @import "Quality/quality"; +@import "Profile/profile"; @import "Notifications/notifications"; @import "Metadata/metadata"; @import "DownloadClient/downloadclient"; From 4b53cc7e5296ab49ea12a098193ba8401d61dd89 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Mon, 21 Jul 2014 22:56:13 +0200 Subject: [PATCH 011/105] Fixed: Manually marking a grabbed release failed will now mark all episodes in that release failed instead of only one. --- .../Download/FailedDownloadServiceFixture.cs | 25 +++++++++++++++++++ .../Download/FailedDownloadService.cs | 14 +++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs index 44e563718..f293bcdbd 100644 --- a/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs @@ -9,6 +9,7 @@ using NzbDrone.Core.Download; using NzbDrone.Core.History; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Test.Framework; +using NzbDrone.Test.Common; namespace NzbDrone.Core.Test.Download { @@ -379,6 +380,30 @@ namespace NzbDrone.Core.Test.Download Subject.Execute(new CheckForFinishedDownloadCommand()); VerifyNoFailedDownloads(); + + ExceptionVerification.IgnoreWarns(); + } + + [Test] + public void should_manual_mark_all_episodes_of_release_as_failed() + { + var historyFailed = Builder.CreateListOfSize(2) + .All() + .With(v => v.EventType == HistoryEventType.Grabbed) + .Do(v => v.Data.Add("downloadClient", "SabnzbdClient")) + .Do(v => v.Data.Add("downloadClientId", "test")) + .Build() + .ToList(); + + GivenGrabbedHistory(historyFailed); + + Mocker.GetMock() + .Setup(s => s.Get(It.IsAny())) + .Returns(i => historyFailed.FirstOrDefault(v => v.Id == i)); + + Subject.MarkAsFailed(1); + + VerifyFailedDownloads(2); } } } diff --git a/src/NzbDrone.Core/Download/FailedDownloadService.cs b/src/NzbDrone.Core/Download/FailedDownloadService.cs index b0137c663..c104897bd 100644 --- a/src/NzbDrone.Core/Download/FailedDownloadService.cs +++ b/src/NzbDrone.Core/Download/FailedDownloadService.cs @@ -35,14 +35,24 @@ namespace NzbDrone.Core.Download _logger = logger; } - public void MarkAsFailed(TrackedDownload trackedDownload, History.History grabbedHistory) + public void MarkAsFailed(TrackedDownload trackedDownload, History.History history) { if (trackedDownload != null && trackedDownload.State == TrackedDownloadState.Downloading) { trackedDownload.State = TrackedDownloadState.DownloadFailed; } - PublishDownloadFailedEvent(new List { grabbedHistory }, "Manually marked as failed"); + var downloadClientId = history.Data.GetValueOrDefault(DownloadTrackingService.DOWNLOAD_CLIENT_ID); + if (downloadClientId.IsNullOrWhiteSpace()) + { + PublishDownloadFailedEvent(new List { history }, "Manually marked as failed"); + } + else + { + var grabbedHistory = GetHistoryItems(_historyService.Grabbed(), downloadClientId); + + PublishDownloadFailedEvent(grabbedHistory, "Manually marked as failed"); + } } public void CheckForFailedItem(IDownloadClient downloadClient, TrackedDownload trackedDownload, List grabbedHistory, List failedHistory) From 5450170718abeeef4adb5ce645628f621ed8ba76 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Sat, 26 Jul 2014 14:16:02 +0200 Subject: [PATCH 012/105] Cleanup, sorted project files. --- .../NzbDrone.Api.Test.csproj | 20 +- src/NzbDrone.Api/NzbDrone.Api.csproj | 148 ++-- .../NzbDrone.Host.Test.csproj | 12 +- .../NzbDrone.Automation.Test.csproj | 24 +- .../NzbDrone.Common.Test.csproj | 32 +- src/NzbDrone.Common/NzbDrone.Common.csproj | 96 +-- .../NzbDrone.Core.Test.csproj | 254 +++---- src/NzbDrone.Core/NzbDrone.Core.csproj | 716 +++++++++--------- src/NzbDrone.Host/NzbDrone.Host.csproj | 34 +- .../NzbDrone.Integration.Test.csproj | 40 +- .../NzbDrone.Libraries.Test.csproj | 12 +- .../NzbDrone.Mono.Test.csproj | 22 +- src/NzbDrone.Mono/NzbDrone.Mono.csproj | 14 +- .../NzbDrone.Test.Common.csproj | 28 +- .../NzbDrone.Test.Dummy.csproj | 6 +- .../NzbDrone.Update.Test.csproj | 18 +- src/NzbDrone.Update/NzbDrone.Update.csproj | 4 +- .../NzbDrone.Windows.Test.csproj | 22 +- src/NzbDrone.Windows/NzbDrone.Windows.csproj | 14 +- src/NzbDrone/NzbDrone.csproj | 4 +- 20 files changed, 757 insertions(+), 763 deletions(-) diff --git a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj index 661e3279d..3e355f4ac 100644 --- a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj @@ -38,9 +38,19 @@ 4 + + + + + + + ..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll + + ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll @@ -50,16 +60,6 @@ ..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll - - - - - - - - - ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll - diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index 80bb065fb..a10896797 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -40,22 +40,20 @@ 4 + + + + ..\packages\DDay.iCal.1.0.2.575\lib\DDay.iCal.dll + + ..\packages\FluentValidation.5.0.0.1\lib\Net40\FluentValidation.dll + False ..\packages\Microsoft.AspNet.SignalR.Core.1.1.3\lib\net40\Microsoft.AspNet.SignalR.Core.dll - - ..\packages\ValueInjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll - - - - - - ..\packages\FluentValidation.5.0.0.1\lib\Net40\FluentValidation.dll - ..\packages\Nancy.0.21.1\lib\net40\Nancy.dll @@ -71,10 +69,6 @@ ..\packages\ValueInjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll - - - - False ..\Libraries\Sqlite\System.Data.SQLite.dll @@ -89,131 +83,131 @@ - - - + + + - - - - - - + - - - - - - + + + + + + - + + + + + + + - + + + + + + + - + + - + - + - - + - - - - - - - - - - - + - - + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - + + - - - - - - - - - - - - - - - + + + + + + + + diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj index 0b00efb90..a7ddd84f0 100644 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj @@ -37,20 +37,20 @@ 4 - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - + ..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll @@ -60,10 +60,10 @@ - - + + diff --git a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj index c09932bcb..9410073dd 100644 --- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj @@ -38,23 +38,23 @@ 4 + + + + + + + + + + ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll ..\packages\NUnit.2.6.2\lib\nunit.framework.dll - - - - - - - - - - ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll - False ..\packages\Selenium.WebDriver.2.41.0\lib\net40\WebDriver.dll @@ -65,8 +65,8 @@ - + diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj index 5b9259033..d813e54f9 100644 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj @@ -37,20 +37,20 @@ 4 - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - - - + + + + ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll @@ -59,21 +59,21 @@ - + + - + + - - - + @@ -97,6 +97,10 @@ {95C11A9E-56ED-456A-8447-2C89C1139266} NzbDrone.Host + + {D12F7F2F-8A3C-415F-88FA-6DD061A84869} + NzbDrone + {CADDFCE0-7509-4430-8364-2074E1EEFCA2} NzbDrone.Test.Common @@ -105,10 +109,6 @@ {FAFB5948-A222-4CF6-AD14-026BE7564802} NzbDrone.Test.Dummy - - {D12F7F2F-8A3C-415F-88FA-6DD061A84869} - NzbDrone - diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index e5ef0d4e7..ad6f21b9a 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -39,19 +39,15 @@ 4 - - ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - - - False - ..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll - + + + ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + ..\packages\loggly-csharp.2.3\lib\net35\Loggly.dll @@ -61,18 +57,24 @@ ..\packages\NLog.2.1.0\lib\net40\NLog.dll + + False + ..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll + - - + + + + @@ -91,62 +93,60 @@ + + - - + + - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + Component + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index b04fdc1b6..0c0179034 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -40,17 +40,14 @@ OnBuildSuccess - - ..\packages\AutoMoq.1.6.1\lib\AutoMoq.dll - - - - ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll - + + + ..\packages\AutoMoq.1.6.1\lib\AutoMoq.dll + ..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll @@ -72,6 +69,9 @@ ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll + + ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll @@ -92,58 +92,73 @@ - + + + - + - + - + + + + + + + + + + + + - - + + - - - - - + + + + + + - - - + + + + @@ -154,34 +169,38 @@ + - + - - + + + + + + - - - - - + + + + @@ -193,83 +212,64 @@ + - - - - - - - + + + + - - - - - - + - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + @@ -299,32 +299,38 @@ sqlite3.dll Always + + App.config + + + Always + Always Always - - Always - Always - - Always - - + Always Always - - App.config - - + + Always + + + Always + + + Always + + Always @@ -333,7 +339,13 @@ Always - + + Always + + + Always + + Always @@ -342,42 +354,18 @@ Always + + Always + + + Always + Always Designer - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - Always @@ -387,6 +375,18 @@ Always + + Always + + + Always + + + Always + + + Always + diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 0d87b71f6..0c7652dea 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -52,30 +52,15 @@ 4 - - ..\packages\Growl.0.6\lib\Growl.Connector.dll - - - ..\packages\Growl.0.6\lib\Growl.CoreLibrary.dll - - - ..\packages\MediaInfoNet.0.3\lib\MediaInfoDotNet.dll - - - - ..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll - - - False - ..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll - + + ..\packages\FluentMigrator.1.1.1.0\lib\40\FluentMigrator.dll @@ -85,19 +70,34 @@ ..\packages\FluentValidation.5.0.0.1\lib\Net40\FluentValidation.dll + + ..\packages\Growl.0.6\lib\Growl.Connector.dll + + + ..\packages\Growl.0.6\lib\Growl.CoreLibrary.dll + + + ..\packages\MediaInfoNet.0.3\lib\MediaInfoDotNet.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll ..\packages\NLog.2.1.0\lib\net40\NLog.dll + + ..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll + ..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll + + False + ..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll + ..\Libraries\Sqlite\System.Data.SQLite.dll - @@ -114,6 +114,9 @@ + + Code + @@ -123,9 +126,9 @@ - + @@ -133,22 +136,24 @@ + + + + - - - + @@ -172,16 +177,15 @@ - + Code - - + @@ -189,14 +193,15 @@ - + Code + @@ -210,9 +215,8 @@ - - + @@ -220,127 +224,151 @@ - + + + + + + - - + - - + + - - - - - - - - - - - - + + Code + + + + + + + + + + - + + + + + + - - - - - + + + + + + + + - + + Code + + + + + + + + + + + - - - - - - - + + - + + + + Code + + + + + + Code + - - - - - - + + + - - + + + + + + + + Code + + + + + - - - + - - - - - - - - - - - - + @@ -348,106 +376,237 @@ + + + + Code + + + Code + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + Code + + + Code + + + + + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + - - - - + + + - - - + - - + + - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + + Code + + + Code + + + + Code + + + Code + + + + + Code + + + + + - - - - - - - - - + + Code + + + + + + + + + + + + + Code + + + + Code + + + + + + + + + + + + + + + + + + + @@ -458,18 +617,37 @@ - + + Code + + + Code + + - + + + - - + + + + + + + + + + + + + @@ -478,274 +656,96 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + Code + + + + + + + + + + + Code + + + + + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - + + Code - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - - Code - + + + + + + + + + + + + + + + + Code - - Code - - - Code - - - - - - - - - - - - + + + - - + + + + + + - - - - - - diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index 8aba54433..67d954511 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -57,13 +57,13 @@ OnOutputUpdated + + + ..\Libraries\Interop.NetFwTypeLib.dll True - - - ..\packages\Microsoft.Owin.1.1.0-beta2\lib\net40\Microsoft.Owin.dll @@ -93,34 +93,34 @@ Properties\SharedAssemblyInfo.cs + + + Component - - + - - - + + + + + + + - - - - - - - - - + + + diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj index eb1ca6f15..d86f1890c 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -38,23 +38,13 @@ 4 - - ..\packages\Microsoft.Owin.1.1.0-beta2\lib\net40\Microsoft.Owin.dll - - - ..\packages\NUnit.2.6.2\lib\nunit.framework.dll - - - False - ..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll - - - - + + + ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll @@ -64,6 +54,9 @@ ..\packages\Microsoft.AspNet.SignalR.Client.1.1.3\lib\net40\Microsoft.AspNet.SignalR.Client.dll + + ..\packages\Microsoft.Owin.1.1.0-beta2\lib\net40\Microsoft.Owin.dll + ..\packages\Microsoft.Owin.Host.HttpListener.1.1.0-beta2\lib\net40\Microsoft.Owin.Host.HttpListener.dll @@ -85,29 +78,36 @@ ..\packages\NLog.2.1.0\lib\net40\NLog.dll + + ..\packages\NUnit.2.6.2\lib\nunit.framework.dll + ..\packages\Owin.1.0\lib\net40\Owin.dll + + False + ..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll + - + - - - - + - - + + + + + diff --git a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj index ca67bc8f8..9795e646f 100644 --- a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj @@ -38,22 +38,22 @@ 4 - - ..\packages\NUnit.2.6.2\lib\nunit.framework.dll - - - - + + + ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll + + ..\packages\NUnit.2.6.2\lib\nunit.framework.dll + diff --git a/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj b/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj index c69ab2d68..11b859a9a 100644 --- a/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj @@ -50,6 +50,13 @@ MinimumRecommendedRules.ruleset + + + + + + + False ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll @@ -57,13 +64,6 @@ ..\packages\NUnit.2.6.2\lib\nunit.framework.dll - - - - - - - @@ -75,14 +75,14 @@ - - {bec74619-ddbb-4fba-b517-d3e20afc9997} - NzbDrone.Common.Test - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} NzbDrone.Common + + {bec74619-ddbb-4fba-b517-d3e20afc9997} + NzbDrone.Common.Test + {ff5ee3b6-913b-47ce-9ceb-11c51b4e1205} NzbDrone.Core diff --git a/src/NzbDrone.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj index fa37ac15e..27a0788da 100644 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ b/src/NzbDrone.Mono/NzbDrone.Mono.csproj @@ -51,6 +51,13 @@ MinimumRecommendedRules.ruleset + + + + + + + False ..\Libraries\Mono.Posix.dll @@ -59,13 +66,6 @@ False ..\packages\NLog.2.1.0\lib\net40\NLog.dll - - - - - - - diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj index 017ace6e1..ad1812390 100644 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj @@ -37,32 +37,28 @@ 4 - - ..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll - - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - False - ..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll - - - - + + + ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll + + ..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll + ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.dll ..\packages\Unity.2.1.505.2\lib\NET35\Microsoft.Practices.Unity.Configuration.dll + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + ..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll @@ -72,15 +68,19 @@ ..\packages\NUnit.2.6.2\lib\nunit.framework.dll + + False + ..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll + + - diff --git a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj index 7d6a56fa8..0c445bc4c 100644 --- a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj +++ b/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj @@ -39,11 +39,11 @@ - - - + + + diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj index a5cd2def6..0c67a4344 100644 --- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj @@ -37,22 +37,22 @@ 4 - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - - - - + + + ..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll + + ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + ..\packages\NLog.2.1.0\lib\net40\NLog.dll @@ -61,11 +61,11 @@ - - - + + + diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj index 399a39203..343da2d2f 100644 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ b/src/NzbDrone.Update/NzbDrone.Update.csproj @@ -51,9 +51,8 @@ Properties\SharedAssemblyInfo.cs - - + @@ -61,6 +60,7 @@ + diff --git a/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj b/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj index 7a1f8826a..2743876e1 100644 --- a/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj +++ b/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj @@ -50,6 +50,13 @@ MinimumRecommendedRules.ruleset + + + + + + + False ..\packages\FluentAssertions.2.1.0.0\lib\net40\FluentAssertions.dll @@ -58,13 +65,6 @@ False ..\packages\NUnit.2.6.2\lib\nunit.framework.dll - - - - - - - @@ -73,14 +73,14 @@ - - {bec74619-ddbb-4fba-b517-d3e20afc9997} - NzbDrone.Common.Test - {f2be0fdf-6e47-4827-a420-dd4ef82407f8} NzbDrone.Common + + {bec74619-ddbb-4fba-b517-d3e20afc9997} + NzbDrone.Common.Test + {ff5ee3b6-913b-47ce-9ceb-11c51b4e1205} NzbDrone.Core diff --git a/src/NzbDrone.Windows/NzbDrone.Windows.csproj b/src/NzbDrone.Windows/NzbDrone.Windows.csproj index 4c3d83721..207e4b315 100644 --- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj +++ b/src/NzbDrone.Windows/NzbDrone.Windows.csproj @@ -50,16 +50,16 @@ MinimumRecommendedRules.ruleset + + + + + + + ..\packages\NLog.2.1.0\lib\net40\NLog.dll - - - - - - - diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj index 5437239ca..2fd732f12 100644 --- a/src/NzbDrone/NzbDrone.csproj +++ b/src/NzbDrone/NzbDrone.csproj @@ -88,16 +88,16 @@ Properties\SharedAssemblyInfo.cs + True True Resources.resx - - Form + From 9410e01c92bee543b3b43feba57bfd40a17ef692 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 26 Jul 2014 17:39:28 -0700 Subject: [PATCH 013/105] Improve decision processing and deleting of pending releases --- .../DownloadApprovedFixture.cs | 43 +++++ .../{ProcessFixture.cs => AddFixture.cs} | 6 +- .../RemoveGrabbedFixture.cs | 143 ++++++++++++++++ .../RemoveRejectedFixture.cs | 155 ++++++++++++++++++ .../NzbDrone.Core.Test.csproj | 4 +- .../Download/Pending/PendingReleaseService.cs | 24 ++- .../Download/ProcessDownloadDecisions.cs | 54 +++--- 7 files changed, 389 insertions(+), 40 deletions(-) rename src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/{ProcessFixture.cs => AddFixture.cs} (97%) create mode 100644 src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs create mode 100644 src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs diff --git a/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs index 529c1e355..76d22d669 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs @@ -6,6 +6,7 @@ using Moq; using NUnit.Framework; using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Download; +using NzbDrone.Core.Download.Pending; using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Profiles; using NzbDrone.Core.Qualities; @@ -182,5 +183,47 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests Subject.GetQualifiedReports(decisions).Should().BeEmpty(); } + + [Test] + public void should_not_grab_if_pending() + { + var episodes = new List { GetEpisode(1) }; + var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p)); + + var decisions = new List(); + decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary))); + decisions.Add(new DownloadDecision(remoteEpisode)); + + Subject.ProcessDecisions(decisions); + Mocker.GetMock().Verify(v => v.DownloadReport(It.IsAny()), Times.Never()); + } + + [Test] + public void should_not_add_to_pending_if_episode_was_grabbed() + { + var episodes = new List { GetEpisode(1) }; + var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p)); + + var decisions = new List(); + decisions.Add(new DownloadDecision(remoteEpisode)); + decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary))); + + Subject.ProcessDecisions(decisions); + Mocker.GetMock().Verify(v => v.Add(It.IsAny()), Times.Never()); + } + + [Test] + public void should_add_to_pending_even_if_already_added_to_pending() + { + var episodes = new List { GetEpisode(1) }; + var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p)); + + var decisions = new List(); + decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary))); + decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary))); + + Subject.ProcessDecisions(decisions); + Mocker.GetMock().Verify(v => v.Add(It.IsAny()), Times.Exactly(2)); + } } } diff --git a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/ProcessFixture.cs b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs similarity index 97% rename from src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/ProcessFixture.cs rename to src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs index a913b62b1..e7b95035d 100644 --- a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/ProcessFixture.cs +++ b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs @@ -1,9 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using FizzWare.NBuilder; -using FluentAssertions; using Marr.Data; using Moq; using NUnit.Framework; @@ -20,7 +17,7 @@ using NzbDrone.Test.Common; namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests { [TestFixture] - public class ProcessFixture : CoreTest + public class AddFixture : CoreTest { private DownloadDecision _temporarilyRejected; private Series _series; @@ -140,6 +137,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests VerifyInsert(); } + [Test] public void should_add_if_publish_date_is_different() { diff --git a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs new file mode 100644 index 000000000..424f61241 --- /dev/null +++ b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs @@ -0,0 +1,143 @@ +using System; +using System.Collections.Generic; +using FizzWare.NBuilder; +using Marr.Data; +using Moq; +using NUnit.Framework; +using NzbDrone.Core.DecisionEngine; +using NzbDrone.Core.Download.Pending; +using NzbDrone.Core.Parser; +using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; +using NzbDrone.Core.Qualities; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Tv; +using NzbDrone.Test.Common; + +namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests +{ + [TestFixture] + public class RemoveGrabbedFixture : CoreTest + { + private DownloadDecision _temporarilyRejected; + private Series _series; + private Episode _episode; + private Profile _profile; + private ReleaseInfo _release; + private ParsedEpisodeInfo _parsedEpisodeInfo; + private RemoteEpisode _remoteEpisode; + + [SetUp] + public void Setup() + { + _series = Builder.CreateNew() + .Build(); + + _episode = Builder.CreateNew() + .Build(); + + _profile = new Profile + { + Name = "Test", + Cutoff = Quality.HDTV720p, + GrabDelay = 1, + Items = new List + { + new ProfileQualityItem { Allowed = true, Quality = Quality.HDTV720p }, + new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL720p }, + new ProfileQualityItem { Allowed = true, Quality = Quality.Bluray720p } + }, + }; + + _series.Profile = new LazyLoaded(_profile); + + _release = Builder.CreateNew().Build(); + + _parsedEpisodeInfo = Builder.CreateNew().Build(); + _parsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p); + + _remoteEpisode = new RemoteEpisode(); + _remoteEpisode.Episodes = new List{ _episode }; + _remoteEpisode.Series = _series; + _remoteEpisode.ParsedEpisodeInfo = _parsedEpisodeInfo; + _remoteEpisode.Release = _release; + + _temporarilyRejected = new DownloadDecision(_remoteEpisode, new Rejection("Temp Rejected", RejectionType.Temporary)); + + Mocker.GetMock() + .Setup(s => s.All()) + .Returns(new List()); + + Mocker.GetMock() + .Setup(s => s.GetSeries(It.IsAny())) + .Returns(_series); + + Mocker.GetMock() + .Setup(s => s.GetEpisodes(It.IsAny(), _series, true, null)) + .Returns(new List {_episode}); + + Mocker.GetMock() + .Setup(s => s.PrioritizeDecisions(It.IsAny>())) + .Returns((List d) => d); + } + + private void GivenHeldRelease(QualityModel quality) + { + var parsedEpisodeInfo = _parsedEpisodeInfo.JsonClone(); + parsedEpisodeInfo.Quality = quality; + + var heldReleases = Builder.CreateListOfSize(1) + .All() + .With(h => h.SeriesId = _series.Id) + .With(h => h.Release = _release.JsonClone()) + .With(h => h.ParsedEpisodeInfo = parsedEpisodeInfo) + .Build(); + + Mocker.GetMock() + .Setup(s => s.All()) + .Returns(heldReleases); + } + + [Test] + public void should_delete_if_the_grabbed_quality_is_the_same() + { + GivenHeldRelease(_parsedEpisodeInfo.Quality); + + Subject.RemoveGrabbed(new List { _temporarilyRejected }); + + VerifyDelete(); + } + + [Test] + public void should_delete_if_the_grabbed_quality_is_the_higher() + { + GivenHeldRelease(new QualityModel(Quality.SDTV)); + + Subject.RemoveGrabbed(new List { _temporarilyRejected }); + + VerifyDelete(); + } + + [Test] + public void should_not_delete_if_the_grabbed_quality_is_the_lower() + { + GivenHeldRelease(new QualityModel(Quality.Bluray720p)); + + Subject.RemoveGrabbed(new List { _temporarilyRejected }); + + VerifyNoDelete(); + } + + private void VerifyDelete() + { + Mocker.GetMock() + .Verify(v => v.Delete(It.IsAny()), Times.Once()); + } + + private void VerifyNoDelete() + { + Mocker.GetMock() + .Verify(v => v.Delete(It.IsAny()), Times.Never()); + } + } +} diff --git a/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs new file mode 100644 index 000000000..fa7560422 --- /dev/null +++ b/src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs @@ -0,0 +1,155 @@ +using System; +using System.Collections.Generic; +using FizzWare.NBuilder; +using Marr.Data; +using Moq; +using NUnit.Framework; +using NzbDrone.Core.DecisionEngine; +using NzbDrone.Core.Download.Pending; +using NzbDrone.Core.Parser; +using NzbDrone.Core.Parser.Model; +using NzbDrone.Core.Profiles; +using NzbDrone.Core.Qualities; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Tv; +using NzbDrone.Test.Common; + +namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests +{ + [TestFixture] + public class RemoveRejectedFixture : CoreTest + { + private DownloadDecision _temporarilyRejected; + private Series _series; + private Episode _episode; + private Profile _profile; + private ReleaseInfo _release; + private ParsedEpisodeInfo _parsedEpisodeInfo; + private RemoteEpisode _remoteEpisode; + + [SetUp] + public void Setup() + { + _series = Builder.CreateNew() + .Build(); + + _episode = Builder.CreateNew() + .Build(); + + _profile = new Profile + { + Name = "Test", + Cutoff = Quality.HDTV720p, + GrabDelay = 1, + Items = new List + { + new ProfileQualityItem { Allowed = true, Quality = Quality.HDTV720p }, + new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL720p }, + new ProfileQualityItem { Allowed = true, Quality = Quality.Bluray720p } + }, + }; + + _series.Profile = new LazyLoaded(_profile); + + _release = Builder.CreateNew().Build(); + + _parsedEpisodeInfo = Builder.CreateNew().Build(); + _parsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p); + + _remoteEpisode = new RemoteEpisode(); + _remoteEpisode.Episodes = new List{ _episode }; + _remoteEpisode.Series = _series; + _remoteEpisode.ParsedEpisodeInfo = _parsedEpisodeInfo; + _remoteEpisode.Release = _release; + + _temporarilyRejected = new DownloadDecision(_remoteEpisode, new Rejection("Temp Rejected", RejectionType.Temporary)); + + Mocker.GetMock() + .Setup(s => s.All()) + .Returns(new List()); + + Mocker.GetMock() + .Setup(s => s.GetSeries(It.IsAny())) + .Returns(_series); + + Mocker.GetMock() + .Setup(s => s.GetEpisodes(It.IsAny(), _series, true, null)) + .Returns(new List {_episode}); + + Mocker.GetMock() + .Setup(s => s.PrioritizeDecisions(It.IsAny>())) + .Returns((List d) => d); + } + + private void GivenHeldRelease(String title, String indexer, DateTime publishDate) + { + var release = _release.JsonClone(); + release.Indexer = indexer; + release.PublishDate = publishDate; + + + var heldReleases = Builder.CreateListOfSize(1) + .All() + .With(h => h.SeriesId = _series.Id) + .With(h => h.Title = title) + .With(h => h.Release = release) + .Build(); + + Mocker.GetMock() + .Setup(s => s.All()) + .Returns(heldReleases); + } + + [Test] + public void should_remove_if_it_is_the_same_release_from_the_same_indexer() + { + GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate); + + Subject.RemoveRejected(new List { _temporarilyRejected }); + + VerifyDelete(); + } + + [Test] + public void should_not_remove_if_title_is_different() + { + GivenHeldRelease(_release.Title + "-RP", _release.Indexer, _release.PublishDate); + + Subject.RemoveRejected(new List { _temporarilyRejected }); + + VerifyNoDelete(); + } + + [Test] + public void should_not_remove_if_indexer_is_different() + { + GivenHeldRelease(_release.Title, "AnotherIndexer", _release.PublishDate); + + Subject.RemoveRejected(new List { _temporarilyRejected }); + + VerifyNoDelete(); + } + + [Test] + public void should_not_remove_if_publish_date_is_different() + { + GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate.AddHours(1)); + + Subject.RemoveRejected(new List { _temporarilyRejected }); + + VerifyNoDelete(); + } + + private void VerifyDelete() + { + Mocker.GetMock() + .Verify(v => v.Delete(It.IsAny()), Times.Once()); + } + + private void VerifyNoDelete() + { + Mocker.GetMock() + .Verify(v => v.Delete(It.IsAny()), Times.Never()); + } + } +} diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 0c0179034..a60c289e9 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -135,7 +135,9 @@ - + + + diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs index d60e84e58..9be579624 100644 --- a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs +++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using NLog; +using NzbDrone.Common; using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Parser; @@ -77,15 +78,30 @@ namespace NzbDrone.Core.Download.Pending var decisionLocal = decision; var episodeIds = decisionLocal.RemoteEpisode.Episodes.Select(e => e.Id); - var existingReports = alreadyPending.Where(r => r.RemoteEpisode.Episodes.Select(e => e.Id) .Intersect(episodeIds) - .Any()); + .Any()) + .ToList(); + if (existingReports.Empty()) + { + continue; + } + + var profile = decisionLocal.RemoteEpisode.Series.Profile.Value; + foreach (var existingReport in existingReports) { - _logger.Debug("Removing previously pending release, as it was grabbed."); - Delete(existingReport); + var compare = new QualityModelComparer(profile).Compare(decision.RemoteEpisode.ParsedEpisodeInfo.Quality, + existingReport.RemoteEpisode.ParsedEpisodeInfo.Quality); + + //Only remove lower/equal quality pending releases + //It is safer to retry these releases on the next round than remove it and try to re-add it (if its still in the feed) + if (compare >= 0) + { + _logger.Debug("Removing previously pending release, as it was grabbed."); + Delete(existingReport); + } } } } diff --git a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs index 4dab30611..e1250e798 100644 --- a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs +++ b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs @@ -35,14 +35,21 @@ namespace NzbDrone.Core.Download { var qualifiedReports = GetQualifiedReports(decisions); var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(qualifiedReports); - var downloadedReports = new List(); - var pendingReports = new List(); + var grabbed = new List(); + var pending = new List(); foreach (var report in prioritizedDecisions) { var remoteEpisode = report.RemoteEpisode; - if (DownloadingOrPending(downloadedReports, pendingReports, remoteEpisode)) + var episodeIds = remoteEpisode.Episodes.Select(e => e.Id).ToList(); + + //Skip if already grabbed + if (grabbed.SelectMany(r => r.RemoteEpisode.Episodes) + .Select(e => e.Id) + .ToList() + .Intersect(episodeIds) + .Any()) { continue; } @@ -50,23 +57,33 @@ namespace NzbDrone.Core.Download if (report.TemporarilyRejected) { _pendingReleaseService.Add(report); - pendingReports.Add(report); + pending.Add(report); + continue; + } + + if (pending.SelectMany(r => r.RemoteEpisode.Episodes) + .Select(e => e.Id) + .ToList() + .Intersect(episodeIds) + .Any()) + { continue; } try { _downloadService.DownloadReport(remoteEpisode); - downloadedReports.Add(report); + grabbed.Add(report); } catch (Exception e) { //TODO: support for store & forward + //We'll need to differentiate between a download client error and an indexer error _logger.WarnException("Couldn't add report to download queue. " + remoteEpisode, e); } } - return new ProcessedDecisions(downloadedReports, pendingReports); + return new ProcessedDecisions(grabbed, pending); } internal List GetQualifiedReports(IEnumerable decisions) @@ -74,30 +91,5 @@ namespace NzbDrone.Core.Download //Process both approved and temporarily rejected return decisions.Where(c => (c.Approved || c.TemporarilyRejected) && c.RemoteEpisode.Episodes.Any()).ToList(); } - - private bool DownloadingOrPending(List downloading, List pending, RemoteEpisode remoteEpisode) - { - var episodeIds = remoteEpisode.Episodes.Select(e => e.Id).ToList(); - - if (downloading.SelectMany(r => r.RemoteEpisode.Episodes) - .Select(e => e.Id) - .ToList() - .Intersect(episodeIds) - .Any()) - { - return true; - } - - if (pending.SelectMany(r => r.RemoteEpisode.Episodes) - .Select(e => e.Id) - .ToList() - .Intersect(episodeIds) - .Any()) - { - return true; - } - - return false; - } } } From 7febd71fd9771cb60ee054c39849c56e8a855c06 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 27 Jul 2014 00:17:48 -0700 Subject: [PATCH 014/105] Title must be included for 6 digit air date --- src/NzbDrone.Core/Parser/Parser.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs index 6c9e74532..f34afafdc 100644 --- a/src/NzbDrone.Core/Parser/Parser.cs +++ b/src/NzbDrone.Core/Parser/Parser.cs @@ -132,7 +132,7 @@ namespace NzbDrone.Core.Parser private static readonly Regex AirDateRegex = new Regex(@"^(.*?)(?\d{4})[_.-](?[0-1][0-9])[_.-](?[0-3][0-9])|(?[0-1][0-9])[_.-](?[0-3][0-9])[_.-](?\d{4}))(?!\d)", RegexOptions.IgnoreCase | RegexOptions.Compiled); - private static readonly Regex SixDigitAirDateRegex = new Regex(@"^(?:.*?)(?(?\d{2})(?[0-1][0-9])(?[0-3][0-9]))", + private static readonly Regex SixDigitAirDateRegex = new Regex(@"^(?:.+?)(?(?\d{2})(?[0-1][0-9])(?[0-3][0-9]))", RegexOptions.IgnoreCase | RegexOptions.Compiled); private static readonly Regex ReleaseGroupRegex = new Regex(@"-(?[a-z0-9]+)\b(? Date: Sun, 27 Jul 2014 11:42:51 -0700 Subject: [PATCH 015/105] Fixed: display of search results on series details pages --- src/UI/Content/navbar.less | 5 +++-- src/UI/Series/series.less | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/UI/Content/navbar.less b/src/UI/Content/navbar.less index 19bf8327b..906bd6c0c 100644 --- a/src/UI/Content/navbar.less +++ b/src/UI/Content/navbar.less @@ -5,9 +5,10 @@ .backdrop { .navbar-nzbdrone { - background-color : #000000; .opacity(0.85); + background-color : #000000; padding-bottom: 10px; + z-index: 10; } } @@ -176,7 +177,7 @@ background-color: #333333; color: #cccccc; - opacity: .95; + .opacity(0.95); .tt-suggestion { color: #cccccc; diff --git a/src/UI/Series/series.less b/src/UI/Series/series.less index 139d92d65..e4e05f63d 100644 --- a/src/UI/Series/series.less +++ b/src/UI/Series/series.less @@ -45,18 +45,18 @@ .series-page-header { .card(black); + .opacity(0.9); background : #000000; color : #ffffff; - .opacity(0.9); padding : 30px 30px; margin : 50px 10px; } .series-season { .card; + .opacity(0.9); margin : 30px 10px; padding : 10px 25px; - .opacity(0.9); .show-hide-episodes { .clickable(); From b63eb4efd788cfd08674df5682ccb019976dce10 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 27 Jul 2014 11:56:04 -0700 Subject: [PATCH 016/105] Log trace message when handling exceptions in the API --- src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs b/src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs index c7f5cbd36..36348de47 100644 --- a/src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs +++ b/src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs @@ -20,6 +20,7 @@ namespace NzbDrone.Api.ErrorManagement public Response HandleException(NancyContext context, Exception exception) { + _logger.Trace("Handling Exception"); var apiException = exception as ApiException; @@ -49,7 +50,6 @@ namespace NzbDrone.Api.ErrorManagement }.AsResponse((HttpStatusCode)clientException.StatusCode); } - if (context.Request.Method == "PUT" || context.Request.Method == "POST") { var sqLiteException = exception as SQLiteException; From 174a209c66e3f6a90707e52c3e2911381f1d0e00 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 27 Jul 2014 12:12:55 -0700 Subject: [PATCH 017/105] Update series test --- .../UpdateMultipleSeriesFixture.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateMultipleSeriesFixture.cs b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateMultipleSeriesFixture.cs index f0585131d..0fa33a68f 100644 --- a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateMultipleSeriesFixture.cs +++ b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/UpdateMultipleSeriesFixture.cs @@ -54,5 +54,20 @@ namespace NzbDrone.Core.Test.TvTests.SeriesServiceTests s.Path.Should().Be(expectedPath); }); } + + [Test] + public void should_be_able_to_update_many_series() + { + var series = Builder.CreateListOfSize(50) + .All() + .With(s => s.Path = (@"C:\Test\TV\" + s.Path).AsOsAgnostic()) + .Build() + .ToList(); + + var newRoot = @"C:\Test\TV2".AsOsAgnostic(); + series.ForEach(s => s.RootFolderPath = newRoot); + + Subject.UpdateSeries(series); + } } } \ No newline at end of file From e867548ec303b9b7a70a01aa925c1c5fefbed7ff Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Mon, 28 Jul 2014 01:13:39 +0200 Subject: [PATCH 018/105] Fixed: Some timing issues in Sabnzbd RetryDownload logic. --- .../Download/Clients/Sabnzbd/Sabnzbd.cs | 24 +++++++++++++++---- .../Download/DownloadTrackingService.cs | 4 ++-- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs index 9dbd60a8f..514bcbee8 100644 --- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs +++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs @@ -239,17 +239,31 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd if (history.Count() != 1) { + _logger.Debug("History item missing. Couldn't get the new nzoid."); return id; } - var queue = GetQueue().Where(v => v.Category == history.First().Category && v.Title == history.First().Title).ToList(); - - if (queue.Count() != 1) + var queue = new List(); + for (int i = 0; i < 3; i++) { - return id; + queue = GetQueue().Where(v => v.Category == history.First().Category && v.Title == history.First().Title).ToList(); + + if (queue.Count() == 1) + { + return queue.First().DownloadClientId; + } + + if (queue.Count() > 2) + { + _logger.Debug("Multiple items with the correct title. Couldn't get the new nzoid."); + return id; + } + + System.Threading.Thread.Sleep(500); } - return queue.First().DownloadClientId; + _logger.Debug("No items with the correct title. Couldn't get the new nzoid."); + return id; } protected IEnumerable GetCategories(SabnzbdConfig config) diff --git a/src/NzbDrone.Core/Download/DownloadTrackingService.cs b/src/NzbDrone.Core/Download/DownloadTrackingService.cs index 557c61cb5..3dc255219 100644 --- a/src/NzbDrone.Core/Download/DownloadTrackingService.cs +++ b/src/NzbDrone.Core/Download/DownloadTrackingService.cs @@ -147,7 +147,7 @@ namespace NzbDrone.Core.Download State = TrackedDownloadState.Unknown }; - _logger.Trace("Started tracking download from history: {0}: {1}", trackedDownload.TrackingId, downloadItem.Title); + _logger.Debug("Started tracking download from history: {0}: {1}", trackedDownload.TrackingId, downloadItem.Title); stateChanged = true; } @@ -167,7 +167,7 @@ namespace NzbDrone.Core.Download _logger.Debug("Item removed from download client by user: {0}: {1}", downloadItem.TrackingId, downloadItem.DownloadItem.Title); } - _logger.Trace("Stopped tracking download: {0}: {1}", downloadItem.TrackingId, downloadItem.DownloadItem.Title); + _logger.Debug("Stopped tracking download: {0}: {1}", downloadItem.TrackingId, downloadItem.DownloadItem.Title); } _trackedDownloadCache.Set("tracked", newTrackedDownloads.Values.ToArray()); From 0200e3fa5961ac34cef1d503d9b1c4123020aea2 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 28 Jul 2014 07:31:31 -0700 Subject: [PATCH 019/105] Fixed: series remembered when adding --- src/UI/AddSeries/SearchResultView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UI/AddSeries/SearchResultView.js b/src/UI/AddSeries/SearchResultView.js index 685182b5d..6be1dd2de 100644 --- a/src/UI/AddSeries/SearchResultView.js +++ b/src/UI/AddSeries/SearchResultView.js @@ -68,7 +68,7 @@ define( var defaultProfile = Config.getValue(Config.Keys.DefaultProfileId); var defaultRoot = Config.getValue(Config.Keys.DefaultRootFolderId); var useSeasonFolder = Config.getValueBoolean(Config.Keys.UseSeasonFolder, true); - var defaultSeriesType = Config.getValueBoolean(Config.Keys.DefaultSeriesType, true); + var defaultSeriesType = Config.getValue(Config.Keys.DefaultSeriesType, 'standard'); if (Profiles.get(defaultProfile)) { this.ui.profile.val(defaultProfile); @@ -79,7 +79,7 @@ define( } this.ui.seasonFolder.prop('checked', useSeasonFolder); - this.ui.rootFolder.val(defaultSeriesType); + this.ui.seriesType.val(defaultSeriesType); var minSeasonNotZero = _.min(_.reject(this.model.get('seasons'), { seasonNumber: 0 }), 'seasonNumber'); From 7fc3b971f622ac95539a77415f44bdb3cd1aef8b Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 28 Jul 2014 07:50:28 -0700 Subject: [PATCH 020/105] Fixed: Womble's publish date will be treated as UTC instead of local --- src/NzbDrone.Core/Indexers/Wombles/WomblesParser.cs | 10 +++++++++- src/NzbDrone.Core/Indexers/XElementExtensions.cs | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/Indexers/Wombles/WomblesParser.cs b/src/NzbDrone.Core/Indexers/Wombles/WomblesParser.cs index 2b67dfe97..2372cac5c 100644 --- a/src/NzbDrone.Core/Indexers/Wombles/WomblesParser.cs +++ b/src/NzbDrone.Core/Indexers/Wombles/WomblesParser.cs @@ -1,4 +1,5 @@ -using System.Xml.Linq; +using System; +using System.Xml.Linq; namespace NzbDrone.Core.Indexers.Wombles { @@ -13,5 +14,12 @@ namespace NzbDrone.Core.Indexers.Wombles { return 0; } + + protected override DateTime GetPublishDate(XElement item) + { + var dateString = item.TryGetValue("pubDate") + " +0000"; + + return XElementExtensions.ParseDate(dateString); + } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/Indexers/XElementExtensions.cs b/src/NzbDrone.Core/Indexers/XElementExtensions.cs index ba9a072af..e423a25f5 100644 --- a/src/NzbDrone.Core/Indexers/XElementExtensions.cs +++ b/src/NzbDrone.Core/Indexers/XElementExtensions.cs @@ -57,7 +57,7 @@ namespace NzbDrone.Core.Indexers public static DateTime PublishDate(this XElement item) { - string dateString = item.TryGetValue("pubDate"); + var dateString = item.TryGetValue("pubDate"); return ParseDate(dateString); } From e71de9cc2982474e5bb42f34ef9162b5f45c1c30 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 29 Jul 2014 00:10:07 -0700 Subject: [PATCH 021/105] Keyboard shortcut legend New: Show keybaord shortcuts with '?' New: ctrl+s will save settings --- src/UI/Config.js | 1 + src/UI/Content/theme.less | 8 +++++ src/UI/Hotkeys/Hotkeys.js | 37 +++++++++++++++++++ src/UI/Hotkeys/HotkeysView.js | 11 ++++++ src/UI/Hotkeys/HotkeysViewTemplate.html | 47 +++++++++++++++++++++++++ src/UI/Hotkeys/hotkeys.less | 23 ++++++++++++ src/UI/Navbar/Search.js | 17 +++------ src/UI/Settings/SettingsLayout.js | 2 ++ src/UI/app.js | 3 +- src/UI/vent.js | 6 ++++ 10 files changed, 141 insertions(+), 14 deletions(-) create mode 100644 src/UI/Hotkeys/Hotkeys.js create mode 100644 src/UI/Hotkeys/HotkeysView.js create mode 100644 src/UI/Hotkeys/HotkeysViewTemplate.html create mode 100644 src/UI/Hotkeys/hotkeys.less diff --git a/src/UI/Config.js b/src/UI/Config.js index 7a0b03862..7c83f527f 100644 --- a/src/UI/Config.js +++ b/src/UI/Config.js @@ -7,6 +7,7 @@ define( Events: { ConfigUpdatedEvent: 'ConfigUpdatedEvent' }, + Keys : { DefaultProfileId : 'DefaultProfileId', DefaultRootFolderId : 'DefaultRootFolderId', diff --git a/src/UI/Content/theme.less b/src/UI/Content/theme.less index 6c13b071b..7a45d851a 100644 --- a/src/UI/Content/theme.less +++ b/src/UI/Content/theme.less @@ -16,6 +16,7 @@ @import "../Rename/rename"; @import "typeahead"; @import "utilities"; +@import "../Hotkeys/hotkeys"; .main-region { @media (min-width: @screen-lg-min) { @@ -239,3 +240,10 @@ body { padding-top: 10px; } } + +.modal-header { + h3 { + margin-top : 0px; + margin-bottom : 0px; + } +} diff --git a/src/UI/Hotkeys/Hotkeys.js b/src/UI/Hotkeys/Hotkeys.js new file mode 100644 index 000000000..272307ee0 --- /dev/null +++ b/src/UI/Hotkeys/Hotkeys.js @@ -0,0 +1,37 @@ +'use strict'; + +define( + [ + 'jquery', + 'vent', + 'Hotkeys/HotkeysView' + ], function ($, vent, HotkeysView) { + $(document).on('keydown', function (e) { + if (e.ctrlKey && e.keyCode === 83) { + vent.trigger(vent.Hotkeys.SaveSettings); + e.preventDefault(); + return; + } + + if (e.shiftKey && e.keyCode === 191) { + vent.trigger(vent.Commands.OpenModalCommand, new HotkeysView()); +// vent.trigger(vent.Hotkeys.ShowHotkeys); + e.preventDefault(); + return; + } + + if ($(e.target).is('input') || $(e.target).is('textarea')) { + return; + } + + if (e.ctrlKey || e.metaKey || e.altKey) { + return; + } + + if (e.keyCode === 84) { + vent.trigger(vent.Hotkeys.NavbarSearch); + e.preventDefault(); + } + }); + + }); diff --git a/src/UI/Hotkeys/HotkeysView.js b/src/UI/Hotkeys/HotkeysView.js new file mode 100644 index 000000000..affbc9f60 --- /dev/null +++ b/src/UI/Hotkeys/HotkeysView.js @@ -0,0 +1,11 @@ +'use strict'; +define( + [ + 'vent', + 'marionette' + ], function (vent, Marionette) { + + return Marionette.ItemView.extend({ + template: 'Hotkeys/HotkeysViewTemplate' + }); + }); diff --git a/src/UI/Hotkeys/HotkeysViewTemplate.html b/src/UI/Hotkeys/HotkeysViewTemplate.html new file mode 100644 index 000000000..aeae692b1 --- /dev/null +++ b/src/UI/Hotkeys/HotkeysViewTemplate.html @@ -0,0 +1,47 @@ +
        +
        +
        + +

        Keyboard Shortcuts

        +
        +
        +
        +
        +
        +
        +

        Focus Search Box

        +
        +
        + t +
        +
        +
        +
        + Pressing 't' puts the cursor in the search box below the navigation links +
        +
        +
        +
        +
        +
        +
        +
        +

        Save Settings

        +
        +
        + ctrl + s +
        +
        +
        +
        + Pressing ctrl + 's' saves your settings (only in settings) +
        +
        +
        +
        +
        +
        + +
        +
        +
        diff --git a/src/UI/Hotkeys/hotkeys.less b/src/UI/Hotkeys/hotkeys.less new file mode 100644 index 000000000..b3213825d --- /dev/null +++ b/src/UI/Hotkeys/hotkeys.less @@ -0,0 +1,23 @@ +.hotkeys-modal { + h3 { + margin-top : 0px; + margin-botton : 0px; + } + + .hotkey-group { + &:first-of-type { + margin-top : 0px; + } + + &:last-of-type { + margin-bottom : 0px; + } + + margin-top : 25px; + margin-bottom : 25px; + + .hotkey { + font-size : 22px; + } + } +} \ No newline at end of file diff --git a/src/UI/Navbar/Search.js b/src/UI/Navbar/Search.js index d92bbfcad..ea8b04d7e 100644 --- a/src/UI/Navbar/Search.js +++ b/src/UI/Navbar/Search.js @@ -3,23 +3,14 @@ define( [ 'underscore', 'jquery', + 'vent', 'backbone', 'Series/SeriesCollection', 'typeahead' - ], function (_, $, Backbone, SeriesCollection) { - $(document).on('keydown', function (e) { - if ($(e.target).is('input') || $(e.target).is('textarea')) { - return; - } + ], function (_, $, vent, Backbone, SeriesCollection) { - if (e.ctrlKey || e.metaKey || e.altKey) { - return; - } - - if (e.keyCode === 84) { - $('.x-series-search').focus(); - e.preventDefault(); - } + vent.on(vent.Hotkeys.NavbarSearch, function () { + $('.x-series-search').focus(); }); $.fn.bindSearch = function () { diff --git a/src/UI/Settings/SettingsLayout.js b/src/UI/Settings/SettingsLayout.js index acd7fbc33..a346e915a 100644 --- a/src/UI/Settings/SettingsLayout.js +++ b/src/UI/Settings/SettingsLayout.js @@ -89,6 +89,8 @@ define( if (options.action) { this.action = options.action.toLowerCase(); } + + this.listenTo(vent, vent.Hotkeys.SaveSettings, this._save); }, onRender: function () { diff --git a/src/UI/app.js b/src/UI/app.js index 016761351..a0878855c 100644 --- a/src/UI/app.js +++ b/src/UI/app.js @@ -245,7 +245,8 @@ define( 'System/StatusModel', 'Shared/Tooltip', 'Instrumentation/StringFormat', - 'LifeCycle' + 'LifeCycle', + 'Hotkeys/Hotkeys' ], function ($, Backbone, Marionette, RouteBinder, SignalRBroadcaster, NavbarView, AppLayout, SeriesController, Router, ModalController, ControlPanelController, serverStatusModel, Tooltip) { new SeriesController(); diff --git a/src/UI/vent.js b/src/UI/vent.js index c50fc358d..7292a3742 100644 --- a/src/UI/vent.js +++ b/src/UI/vent.js @@ -30,5 +30,11 @@ define( CloseControlPanelCommand : 'CloseControlPanelCommand' }; + vent.Hotkeys = { + NavbarSearch : 'navbar:search', + SaveSettings : 'settings:save', + ShowHotkeys : 'hotkeys:show' + }; + return vent; }); From 705d4a3d021734c096ba0346f1663f25434d4b70 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 29 Jul 2014 23:23:43 -0700 Subject: [PATCH 022/105] New: show mono version on System -> Info --- .../Mappers/StaticResourceMapperBase.cs | 2 +- src/NzbDrone.Api/NancyBootstrapper.cs | 2 +- src/NzbDrone.Api/System/SystemModule.cs | 8 ++-- .../EnvironmentProviderTest.cs | 2 +- .../EnvironmentInfo/IRuntimeInfo.cs | 16 ++++++++ .../{RuntimeInfo.cs => RuntimeInfoBase.cs} | 31 ++++++++------- .../Instrumentation/ExceptronTarget.cs | 2 +- .../Instrumentation/LogTargets.cs | 4 +- .../Instrumentation/LogglyTarget.cs | 2 +- src/NzbDrone.Common/NzbDrone.Common.csproj | 4 +- .../Processes/IRuntimeProvider.cs | 9 ----- .../HealthCheck/Checks/MonoVersionCheck.cs | 9 ++--- .../Housekeeping/HousekeepingService.cs | 2 +- src/NzbDrone.Mono/MonoRuntimeProvider.cs | 38 ++++++++++--------- src/NzbDrone.Windows/DotNetRuntimeProvider.cs | 17 +++++++-- .../System/Info/About/AboutViewTemplate.html | 7 ++++ 16 files changed, 91 insertions(+), 64 deletions(-) create mode 100644 src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs rename src/NzbDrone.Common/EnvironmentInfo/{RuntimeInfo.cs => RuntimeInfoBase.cs} (85%) delete mode 100644 src/NzbDrone.Common/Processes/IRuntimeProvider.cs diff --git a/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapperBase.cs b/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapperBase.cs index 1dd542692..75cd56180 100644 --- a/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapperBase.cs +++ b/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapperBase.cs @@ -21,7 +21,7 @@ namespace NzbDrone.Api.Frontend.Mappers _diskProvider = diskProvider; _logger = logger; - if (!RuntimeInfo.IsProduction) + if (!RuntimeInfoBase.IsProduction) { _caseSensitive = true; } diff --git a/src/NzbDrone.Api/NancyBootstrapper.cs b/src/NzbDrone.Api/NancyBootstrapper.cs index 0f5e89721..cd9809a9e 100644 --- a/src/NzbDrone.Api/NancyBootstrapper.cs +++ b/src/NzbDrone.Api/NancyBootstrapper.cs @@ -27,7 +27,7 @@ namespace NzbDrone.Api { _logger.Info("Starting NzbDrone API"); - if (RuntimeInfo.IsProduction) + if (RuntimeInfoBase.IsProduction) { DiagnosticsHook.Disable(pipelines); } diff --git a/src/NzbDrone.Api/System/SystemModule.cs b/src/NzbDrone.Api/System/SystemModule.cs index e951a8da0..ca1bab855 100644 --- a/src/NzbDrone.Api/System/SystemModule.cs +++ b/src/NzbDrone.Api/System/SystemModule.cs @@ -3,6 +3,7 @@ using Nancy.Routing; using NzbDrone.Common; using NzbDrone.Api.Extensions; using NzbDrone.Common.EnvironmentInfo; +using NzbDrone.Common.Processes; using NzbDrone.Core.Configuration; using NzbDrone.Core.Datastore; using NzbDrone.Core.Lifecycle; @@ -46,9 +47,9 @@ namespace NzbDrone.Api.System Version = BuildInfo.Version.ToString(), BuildTime = BuildInfo.BuildDateTime, IsDebug = BuildInfo.IsDebug, - IsProduction = RuntimeInfo.IsProduction, + IsProduction = RuntimeInfoBase.IsProduction, IsAdmin = _runtimeInfo.IsAdmin, - IsUserInteractive = _runtimeInfo.IsUserInteractive, + IsUserInteractive = RuntimeInfoBase.IsUserInteractive, StartupPath = _appFolderInfo.StartUpFolder, AppData = _appFolderInfo.GetAppDataPath(), OsVersion = OsInfo.Version.ToString(), @@ -61,7 +62,8 @@ namespace NzbDrone.Api.System Authentication = _configFileProvider.AuthenticationEnabled, StartOfWeek = (int)OsInfo.FirstDayOfWeek, SqliteVersion = _database.Version, - UrlBase = _configFileProvider.UrlBase + UrlBase = _configFileProvider.UrlBase, + RuntimeVersion = OsInfo.IsMono ? _runtimeInfo.RuntimeVersion : null }.AsResponse(); } diff --git a/src/NzbDrone.Common.Test/EnvironmentProviderTest.cs b/src/NzbDrone.Common.Test/EnvironmentProviderTest.cs index 920064f70..98f6d862b 100644 --- a/src/NzbDrone.Common.Test/EnvironmentProviderTest.cs +++ b/src/NzbDrone.Common.Test/EnvironmentProviderTest.cs @@ -29,7 +29,7 @@ namespace NzbDrone.Common.Test [Test] public void IsProduction_should_return_false_when_run_within_nunit() { - RuntimeInfo.IsProduction.Should().BeFalse("Process name is " + Process.GetCurrentProcess().ProcessName + " Folder is " + Directory.GetCurrentDirectory()); + RuntimeInfoBase.IsProduction.Should().BeFalse("Process name is " + Process.GetCurrentProcess().ProcessName + " Folder is " + Directory.GetCurrentDirectory()); } [Test] diff --git a/src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs new file mode 100644 index 000000000..fbcc600d4 --- /dev/null +++ b/src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs @@ -0,0 +1,16 @@ +using System; + +namespace NzbDrone.Common.EnvironmentInfo +{ + public interface IRuntimeInfo + { + Boolean IsUserInteractive { get; } + Boolean IsAdmin { get; } + Boolean IsWindowsService { get; } + Boolean IsConsole { get; } + Boolean IsRunning { get; set; } + Boolean RestartPending { get; set; } + String ExecutingApplication { get; } + String RuntimeVersion { get; } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfoBase.cs similarity index 85% rename from src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs rename to src/NzbDrone.Common/EnvironmentInfo/RuntimeInfoBase.cs index 679fe2f1c..6f8de3f9a 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfoBase.cs @@ -9,23 +9,12 @@ using NzbDrone.Common.Processes; namespace NzbDrone.Common.EnvironmentInfo { - public interface IRuntimeInfo - { - bool IsUserInteractive { get; } - bool IsAdmin { get; } - bool IsWindowsService { get; } - bool IsConsole { get; } - bool IsRunning { get; set; } - bool RestartPending { get; set; } - string ExecutingApplication { get; } - } - - public class RuntimeInfo : IRuntimeInfo + public abstract class RuntimeInfoBase : IRuntimeInfo { private readonly Logger _logger; private static readonly string ProcessName = Process.GetCurrentProcess().ProcessName.ToLower(); - public RuntimeInfo(Logger logger, IServiceProvider serviceProvider) + public RuntimeInfoBase(IServiceProvider serviceProvider, Logger logger) { _logger = logger; @@ -43,16 +32,24 @@ namespace NzbDrone.Common.EnvironmentInfo } } - static RuntimeInfo() + static RuntimeInfoBase() { IsProduction = InternalIsProduction(); } - public bool IsUserInteractive + public static bool IsUserInteractive { get { return Environment.UserInteractive; } } + bool IRuntimeInfo.IsUserInteractive + { + get + { + return IsUserInteractive; + } + } + public bool IsAdmin { get @@ -79,7 +76,7 @@ namespace NzbDrone.Common.EnvironmentInfo return (OsInfo.IsWindows && IsUserInteractive && ProcessName.Equals(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME, StringComparison.InvariantCultureIgnoreCase)) || - OsInfo.IsMono; + OsInfo.IsMono; } } @@ -87,6 +84,8 @@ namespace NzbDrone.Common.EnvironmentInfo public bool RestartPending { get; set; } public string ExecutingApplication { get; private set; } + public abstract string RuntimeVersion { get; } + public static bool IsProduction { get; private set; } private static bool InternalIsProduction() diff --git a/src/NzbDrone.Common/Instrumentation/ExceptronTarget.cs b/src/NzbDrone.Common/Instrumentation/ExceptronTarget.cs index b45b76a00..09efb03e3 100644 --- a/src/NzbDrone.Common/Instrumentation/ExceptronTarget.cs +++ b/src/NzbDrone.Common/Instrumentation/ExceptronTarget.cs @@ -30,7 +30,7 @@ namespace NzbDrone.Common.Instrumentation IncludeMachineName = true, }; - if (RuntimeInfo.IsProduction) + if (RuntimeInfoBase.IsProduction) { config.ApiKey = "cc4728a35aa9414f9a0baa8eed56bc67"; } diff --git a/src/NzbDrone.Common/Instrumentation/LogTargets.cs b/src/NzbDrone.Common/Instrumentation/LogTargets.cs index 099dd71bc..4628540af 100644 --- a/src/NzbDrone.Common/Instrumentation/LogTargets.cs +++ b/src/NzbDrone.Common/Instrumentation/LogTargets.cs @@ -32,7 +32,7 @@ namespace NzbDrone.Common.Instrumentation } else { - if (inConsole && (OsInfo.IsMono || new RuntimeInfo(null, new ServiceProvider(new ProcessProvider())).IsUserInteractive)) + if (inConsole && (OsInfo.IsMono || RuntimeInfoBase.IsUserInteractive)) { RegisterConsole(); } @@ -59,7 +59,7 @@ namespace NzbDrone.Common.Instrumentation { var level = LogLevel.Trace; - if (RuntimeInfo.IsProduction) + if (RuntimeInfoBase.IsProduction) { level = LogLevel.Info; } diff --git a/src/NzbDrone.Common/Instrumentation/LogglyTarget.cs b/src/NzbDrone.Common/Instrumentation/LogglyTarget.cs index ae246eb41..ba4f0b984 100644 --- a/src/NzbDrone.Common/Instrumentation/LogglyTarget.cs +++ b/src/NzbDrone.Common/Instrumentation/LogglyTarget.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Common.Instrumentation { string apiKey = string.Empty; - if (RuntimeInfo.IsProduction) + if (RuntimeInfoBase.IsProduction) { apiKey = "4c4ecb69-d1b9-4e2a-b54b-b0c4cc143a95"; } diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index ad6f21b9a..8d4a98d3d 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -98,7 +98,8 @@ - + + @@ -130,7 +131,6 @@ - diff --git a/src/NzbDrone.Common/Processes/IRuntimeProvider.cs b/src/NzbDrone.Common/Processes/IRuntimeProvider.cs deleted file mode 100644 index 96f7a1e62..000000000 --- a/src/NzbDrone.Common/Processes/IRuntimeProvider.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace NzbDrone.Common.Processes -{ - public interface IRuntimeProvider - { - String GetVersion(); - } -} diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs index 43f385e8e..048c90e1c 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs @@ -2,19 +2,18 @@ using System.Text.RegularExpressions; using NLog; using NzbDrone.Common.EnvironmentInfo; -using NzbDrone.Common.Processes; namespace NzbDrone.Core.HealthCheck.Checks { public class MonoVersionCheck : HealthCheckBase { - private readonly IRuntimeProvider _runtimeProvider; + private readonly IRuntimeInfo _runtimeInfo; private readonly Logger _logger; private static readonly Regex VersionRegex = new Regex(@"(?<=\W|^)(?\d+\.\d+\.\d+(\.\d+)?)(?=\W)", RegexOptions.Compiled | RegexOptions.IgnoreCase); - public MonoVersionCheck(IRuntimeProvider runtimeProvider, Logger logger) + public MonoVersionCheck(IRuntimeInfo runtimeInfo, Logger logger) { - _runtimeProvider = runtimeProvider; + _runtimeInfo = runtimeInfo; _logger = logger; } @@ -25,7 +24,7 @@ namespace NzbDrone.Core.HealthCheck.Checks return new HealthCheck(GetType()); } - var versionString = _runtimeProvider.GetVersion(); + var versionString = _runtimeInfo.RuntimeVersion; var versionMatch = VersionRegex.Match(versionString); if (versionMatch.Success) diff --git a/src/NzbDrone.Core/Housekeeping/HousekeepingService.cs b/src/NzbDrone.Core/Housekeeping/HousekeepingService.cs index 9199fea9d..a059aa8f6 100644 --- a/src/NzbDrone.Core/Housekeeping/HousekeepingService.cs +++ b/src/NzbDrone.Core/Housekeeping/HousekeepingService.cs @@ -39,7 +39,7 @@ namespace NzbDrone.Core.Housekeeping } //Only Vaccuum the DB in production - if (RuntimeInfo.IsProduction) + if (RuntimeInfoBase.IsProduction) { // Vacuuming the log db isn't needed since that's done hourly at the TrimLogCommand. _logger.Debug("Compressing main database after housekeeping"); diff --git a/src/NzbDrone.Mono/MonoRuntimeProvider.cs b/src/NzbDrone.Mono/MonoRuntimeProvider.cs index af0fe4115..b7a97d288 100644 --- a/src/NzbDrone.Mono/MonoRuntimeProvider.cs +++ b/src/NzbDrone.Mono/MonoRuntimeProvider.cs @@ -1,41 +1,45 @@ using System; using System.Reflection; using NLog; -using NzbDrone.Common.Processes; +using NzbDrone.Common.EnvironmentInfo; namespace NzbDrone.Mono { - public class MonoRuntimeProvider : IRuntimeProvider + public class MonoRuntimeProvider : RuntimeInfoBase { private readonly Logger _logger; - public MonoRuntimeProvider(Logger logger) + public MonoRuntimeProvider(Common.IServiceProvider serviceProvider, Logger logger) + :base(serviceProvider, logger) { _logger = logger; } - public String GetVersion() + public override String RuntimeVersion { - try + get { - var type = Type.GetType("Mono.Runtime"); - - if (type != null) + try { - var displayName = type.GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static); + var type = Type.GetType("Mono.Runtime"); - if (displayName != null) + if (type != null) { - return displayName.Invoke(null, null).ToString(); + var displayName = type.GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static); + + if (displayName != null) + { + return displayName.Invoke(null, null).ToString(); + } } } - } - catch (Exception ex) - { - _logger.ErrorException("Unable to get mono version: " + ex.Message, ex); - } + catch (Exception ex) + { + _logger.ErrorException("Unable to get mono version: " + ex.Message, ex); + } - return String.Empty; + return String.Empty; + } } } } diff --git a/src/NzbDrone.Windows/DotNetRuntimeProvider.cs b/src/NzbDrone.Windows/DotNetRuntimeProvider.cs index 40203278d..6f1a82733 100644 --- a/src/NzbDrone.Windows/DotNetRuntimeProvider.cs +++ b/src/NzbDrone.Windows/DotNetRuntimeProvider.cs @@ -1,13 +1,22 @@ using System; -using NzbDrone.Common.Processes; +using NLog; +using NzbDrone.Common.EnvironmentInfo; namespace NzbDrone.Windows { - public class DotNetRuntimeProvider : IRuntimeProvider + public class DotNetRuntimeProvider : RuntimeInfoBase { - public String GetVersion() + public DotNetRuntimeProvider(Common.IServiceProvider serviceProvider, Logger logger) + : base(serviceProvider, logger) { - return Environment.Version.ToString(); + } + + public override string RuntimeVersion + { + get + { + return Environment.Version.ToString(); + } } } } diff --git a/src/UI/System/Info/About/AboutViewTemplate.html b/src/UI/System/Info/About/AboutViewTemplate.html index 57c32bc4e..02bd9b7dd 100644 --- a/src/UI/System/Info/About/AboutViewTemplate.html +++ b/src/UI/System/Info/About/AboutViewTemplate.html @@ -4,8 +4,15 @@
        Version
        {{version}}
        + + {{#if isMono}} +
        Mono Version
        +
        {{runtimeVersion}}
        + {{/if}} +
        AppData directory
        {{appData}}
        +
        Startup directory
        {{startupPath}}
        From 043ca57e1e7702a8dacbb05f14c93b4950f6033b Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 30 Jul 2014 07:31:02 -0700 Subject: [PATCH 023/105] Fixed: no longer logging finished searching messages when search did not occur on that indexer --- .../Checks/MonoVersionCheckFixture.cs | 6 +-- .../Indexers/IndexerFetchService.cs | 42 +++++++++++++------ 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs index 3184496ef..0aa8881d0 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/MonoVersionCheckFixture.cs @@ -1,6 +1,6 @@ using System; using NUnit.Framework; -using NzbDrone.Common.Processes; +using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Core.HealthCheck.Checks; using NzbDrone.Core.Test.Framework; @@ -17,8 +17,8 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks private void GivenOutput(string version) { - Mocker.GetMock() - .Setup(s => s.GetVersion()) + Mocker.GetMock() + .SetupGet(s => s.RuntimeVersion) .Returns(String.Format("{0} (tarball Wed Sep 25 16:35:44 CDT 2013)", version)); } diff --git a/src/NzbDrone.Core/Indexers/IndexerFetchService.cs b/src/NzbDrone.Core/Indexers/IndexerFetchService.cs index 22255865a..8caa132c6 100644 --- a/src/NzbDrone.Core/Indexers/IndexerFetchService.cs +++ b/src/NzbDrone.Core/Indexers/IndexerFetchService.cs @@ -59,10 +59,10 @@ namespace NzbDrone.Core.Indexers { _logger.Debug("Searching for {0} offset: {1}", searchCriteria, offset); - var searchUrls = indexer.GetSeasonSearchUrls(searchCriteria.QueryTitles, searchCriteria.Series.TvRageId, searchCriteria.SeasonNumber, offset); + var searchUrls = indexer.GetSeasonSearchUrls(searchCriteria.QueryTitles, searchCriteria.Series.TvRageId, searchCriteria.SeasonNumber, offset).ToList(); var result = Fetch(indexer, searchUrls); - _logger.Info("{0} offset {1}. Found {2}", indexer, searchCriteria, result.Count); + _logger.Info("{0} offset {1}. Found {2}", indexer, offset, result.Count); if (indexer.SupportsPaging && result.Count >= indexer.SupportedPageSize && offset < 900) { @@ -76,9 +76,13 @@ namespace NzbDrone.Core.Indexers { _logger.Debug("Searching for {0}", searchCriteria); - var searchUrls = indexer.GetEpisodeSearchUrls(searchCriteria.QueryTitles, searchCriteria.Series.TvRageId, searchCriteria.SeasonNumber, searchCriteria.EpisodeNumber); + var searchUrls = indexer.GetEpisodeSearchUrls(searchCriteria.QueryTitles, searchCriteria.Series.TvRageId, searchCriteria.SeasonNumber, searchCriteria.EpisodeNumber).ToList(); var result = Fetch(indexer, searchUrls); - _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); + + if (searchUrls.Any()) + { + _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); + } return result; } @@ -87,10 +91,14 @@ namespace NzbDrone.Core.Indexers { _logger.Debug("Searching for {0}", searchCriteria); - var searchUrls = indexer.GetDailyEpisodeSearchUrls(searchCriteria.QueryTitles, searchCriteria.Series.TvRageId, searchCriteria.AirDate); + var searchUrls = indexer.GetDailyEpisodeSearchUrls(searchCriteria.QueryTitles, searchCriteria.Series.TvRageId, searchCriteria.AirDate).ToList(); var result = Fetch(indexer, searchUrls); - _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); + if (searchUrls.Any()) + { + _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); + } + return result; } @@ -98,24 +106,34 @@ namespace NzbDrone.Core.Indexers { _logger.Debug("Searching for {0}", searchCriteria); - var searchUrls = indexer.GetAnimeEpisodeSearchUrls(searchCriteria.SceneTitles, searchCriteria.Series.TvRageId, searchCriteria.AbsoluteEpisodeNumber); + var searchUrls = indexer.GetAnimeEpisodeSearchUrls(searchCriteria.SceneTitles, searchCriteria.Series.TvRageId, searchCriteria.AbsoluteEpisodeNumber).ToList(); var result = Fetch(indexer, searchUrls); - _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); + + if (searchUrls.Any()) + { + _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); + } return result; } public IList Fetch(IIndexer indexer, SpecialEpisodeSearchCriteria searchCriteria) { - var queryUrls = new List(); + var searchUrls = new List(); + foreach (var episodeQueryTitle in searchCriteria.EpisodeQueryTitles) { _logger.Debug("Performing query of {0} for {1}", indexer, episodeQueryTitle); - queryUrls.AddRange(indexer.GetSearchUrls(episodeQueryTitle)); + searchUrls.AddRange(indexer.GetSearchUrls(episodeQueryTitle)); + } + + var result = Fetch(indexer, searchUrls); + + if (searchUrls.Any()) + { + _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); } - var result = Fetch(indexer, queryUrls); - _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); return result; } From b841d2e9b42c5bcc98aa7b61a6c198e48d171662 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 30 Jul 2014 07:56:43 -0700 Subject: [PATCH 024/105] Fixed: VOSTFR will be treated as French --- src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs | 1 + src/NzbDrone.Core/Parser/Parser.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs index 5eea42c15..9aabfa820 100644 --- a/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs @@ -41,6 +41,7 @@ namespace NzbDrone.Core.Test.ParserTests [TestCase("True.Detective.S01E01.1080p.WEB-DL.Rus.Eng.TVKlondike", Language.Russian)] [TestCase("The.Trip.To.Italy.S02E01.720p.HDTV.x264-TLA", Language.English)] [TestCase("Revolution S01E03 No Quarter 2012 WEB-DL 720p Nordic-philipo mkv", Language.Norwegian)] + [TestCase("Extant.S01E01.VOSTFR.HDTV.x264-RiDERS", Language.French)] public void should_parse_language(string postTitle, Language language) { var result = Parser.Parser.ParseTitle(postTitle); diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs index f34afafdc..303f8518e 100644 --- a/src/NzbDrone.Core/Parser/Parser.cs +++ b/src/NzbDrone.Core/Parser/Parser.cs @@ -140,7 +140,7 @@ namespace NzbDrone.Core.Parser private static readonly Regex MultiPartCleanupRegex = new Regex(@"\(\d+\)$", RegexOptions.Compiled); - private static readonly Regex LanguageRegex = new Regex(@"(?:\W|_)(?\bita\b|italian)|(?german\b)|(?flemish)|(?greek)|(?(?:\W|_)FR)(?:\W|_)|(?\brus\b)", + private static readonly Regex LanguageRegex = new Regex(@"(?:\W|_)(?\bita\b|italian)|(?german\b)|(?flemish)|(?greek)|(?(?:\W|_)(?:FR|VOSTFR)(?:\W|_))|(?\brus\b)", RegexOptions.IgnoreCase | RegexOptions.Compiled); private static readonly Regex YearInTitleRegex = new Regex(@"^(?.+?)(?:\W|_)?(?<year>\d{4})", From b5607b79bc10cd51bab9068da576cf920e594bee Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Wed, 30 Jul 2014 12:39:07 -0700 Subject: [PATCH 025/105] Fixed: Update logs won't log an error if there are no update logs --- src/NzbDrone.Api/Logs/UpdateLogFileModule.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/NzbDrone.Api/Logs/UpdateLogFileModule.cs b/src/NzbDrone.Api/Logs/UpdateLogFileModule.cs index 3c91173ce..1f1d73db4 100644 --- a/src/NzbDrone.Api/Logs/UpdateLogFileModule.cs +++ b/src/NzbDrone.Api/Logs/UpdateLogFileModule.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; @@ -26,6 +27,8 @@ namespace NzbDrone.Api.Logs protected override IEnumerable<String> GetLogFiles() { + if (!_diskProvider.FolderExists(_appFolderInfo.GetUpdateLogFolder())) return Enumerable.Empty<String>(); + return _diskProvider.GetFiles(_appFolderInfo.GetUpdateLogFolder(), SearchOption.TopDirectoryOnly) .Where(f => Regex.IsMatch(Path.GetFileName(f), LOGFILE_ROUTE.TrimStart('/'), RegexOptions.IgnoreCase)) .ToList(); From 9ecbf8773e48b474ebeba54132ab68f4700ef3e7 Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Wed, 30 Jul 2014 16:36:37 -0700 Subject: [PATCH 026/105] Better handling of ? for hotkey legend --- src/UI/Hotkeys/Hotkeys.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/UI/Hotkeys/Hotkeys.js b/src/UI/Hotkeys/Hotkeys.js index 272307ee0..6a13fd29d 100644 --- a/src/UI/Hotkeys/Hotkeys.js +++ b/src/UI/Hotkeys/Hotkeys.js @@ -6,16 +6,20 @@ define( 'vent', 'Hotkeys/HotkeysView' ], function ($, vent, HotkeysView) { - $(document).on('keydown', function (e) { - if (e.ctrlKey && e.keyCode === 83) { - vent.trigger(vent.Hotkeys.SaveSettings); - e.preventDefault(); + + $(document).on('keypress', function (e) { + if ($(e.target).is('input') || $(e.target).is('textarea')) { return; } - if (e.shiftKey && e.keyCode === 191) { + if (e.charCode === 63) { vent.trigger(vent.Commands.OpenModalCommand, new HotkeysView()); -// vent.trigger(vent.Hotkeys.ShowHotkeys); + } + }); + + $(document).on('keydown', function (e) { + if (e.ctrlKey && e.keyCode === 83) { + vent.trigger(vent.Hotkeys.SaveSettings); e.preventDefault(); return; } From 125e69da6d99f6f8a9d3eb8e06e0ab063b1e4a92 Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Wed, 30 Jul 2014 21:41:35 -0700 Subject: [PATCH 027/105] Log error if gzip fails during response --- .../Extensions/Pipelines/GZipPipeline.cs | 60 ++++++++++++------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/src/NzbDrone.Api/Extensions/Pipelines/GZipPipeline.cs b/src/NzbDrone.Api/Extensions/Pipelines/GZipPipeline.cs index 6a2e93e84..29fb1a7de 100644 --- a/src/NzbDrone.Api/Extensions/Pipelines/GZipPipeline.cs +++ b/src/NzbDrone.Api/Extensions/Pipelines/GZipPipeline.cs @@ -1,13 +1,22 @@ -using System.IO; +using System; +using System.IO; using System.IO.Compression; using System.Linq; using Nancy; using Nancy.Bootstrapper; +using NLog; namespace NzbDrone.Api.Extensions.Pipelines { public class GzipCompressionPipeline : IRegisterNancyPipeline { + private readonly Logger _logger; + + public GzipCompressionPipeline(Logger logger) + { + _logger = logger; + } + public void Register(IPipelines pipelines) { pipelines.AfterRequest.AddItemToEndOfPipeline(c => CompressResponse(c.Request, c.Response)); @@ -15,34 +24,43 @@ namespace NzbDrone.Api.Extensions.Pipelines private Response CompressResponse(Request request, Response response) { - if (!response.ContentType.Contains("image") + try + { + if (!response.ContentType.Contains("image") && request.Headers.AcceptEncoding.Any(x => x.Contains("gzip")) && (!response.Headers.ContainsKey("Content-Encoding") || response.Headers["Content-Encoding"] != "gzip")) - { - var data = new MemoryStream(); - response.Contents.Invoke(data); - data.Position = 0; - if (data.Length < 1024) { - response.Contents = stream => + var data = new MemoryStream(); + response.Contents.Invoke(data); + data.Position = 0; + if (data.Length < 1024) { - data.CopyTo(stream); - stream.Flush(); - }; - } - else - { - response.Headers["Content-Encoding"] = "gzip"; - response.Contents = s => + response.Contents = stream => + { + data.CopyTo(stream); + stream.Flush(); + }; + } + else { - var gzip = new GZipStream(s, CompressionMode.Compress, true); - data.CopyTo(gzip); - gzip.Close(); - }; + response.Headers["Content-Encoding"] = "gzip"; + response.Contents = s => + { + var gzip = new GZipStream(s, CompressionMode.Compress, true); + data.CopyTo(gzip); + gzip.Close(); + }; + } } + + return response; } - return response; + catch (Exception ex) + { + _logger.ErrorException("Unable to gzip response", ex); + throw; + } } } } \ No newline at end of file From e5e00fd346f3ad5c23fa980a246711830b84ff64 Mon Sep 17 00:00:00 2001 From: Taloth Saldono <Taloth@users.noreply.github.com> Date: Thu, 31 Jul 2014 00:00:55 +0200 Subject: [PATCH 028/105] Fixed: Renaming Episodes will never overwrite existing files. --- .../DiskProviderFixtureBase.cs | 6 +++--- src/NzbDrone.Common/Disk/DiskProviderBase.cs | 6 +++--- src/NzbDrone.Common/Disk/IDiskProvider.cs | 2 +- .../DeleteFileFixture.cs | 18 +++++++++++++++++- .../MediaFiles/RecycleBinProvider.cs | 19 +++++++++++++++++-- 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixtureBase.cs b/src/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixtureBase.cs index 493914c12..a35f3e068 100644 --- a/src/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixtureBase.cs +++ b/src/NzbDrone.Common.Test/DiskProviderTests/DiskProviderFixtureBase.cs @@ -63,7 +63,7 @@ namespace NzbDrone.Common.Test.DiskProviderTests File.WriteAllText(source2, "SourceFile2"); Subject.MoveFile(source1, destination); - Subject.MoveFile(source2, destination); + Subject.MoveFile(source2, destination, true); File.Exists(destination).Should().BeTrue(); } @@ -75,7 +75,7 @@ namespace NzbDrone.Common.Test.DiskProviderTests File.WriteAllText(source, "SourceFile1"); - Subject.MoveFile(source, source); + Subject.MoveFile(source, source, true); File.Exists(source).Should().BeTrue(); ExceptionVerification.ExpectedWarns(1); @@ -148,7 +148,7 @@ namespace NzbDrone.Common.Test.DiskProviderTests File.SetAttributes(source, FileAttributes.ReadOnly); File.SetAttributes(destination, FileAttributes.ReadOnly); - Subject.MoveFile(source, destination); + Subject.MoveFile(source, destination, true); } [Test] diff --git a/src/NzbDrone.Common/Disk/DiskProviderBase.cs b/src/NzbDrone.Common/Disk/DiskProviderBase.cs index 540c694cd..1a07168e2 100644 --- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs +++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs @@ -220,7 +220,7 @@ namespace NzbDrone.Common.Disk } case TransferAction.Move: { - MoveFile(sourceFile.FullName, destFile); + MoveFile(sourceFile.FullName, destFile, true); break; } } @@ -251,7 +251,7 @@ namespace NzbDrone.Common.Disk File.Copy(source, destination, overwrite); } - public void MoveFile(string source, string destination) + public void MoveFile(string source, string destination, bool overwrite = false) { Ensure.That(source, () => source).IsValidPath(); Ensure.That(destination, () => destination).IsValidPath(); @@ -262,7 +262,7 @@ namespace NzbDrone.Common.Disk return; } - if (FileExists(destination)) + if (FileExists(destination) && overwrite) { DeleteFile(destination); } diff --git a/src/NzbDrone.Common/Disk/IDiskProvider.cs b/src/NzbDrone.Common/Disk/IDiskProvider.cs index 473a0211d..e325484f6 100644 --- a/src/NzbDrone.Common/Disk/IDiskProvider.cs +++ b/src/NzbDrone.Common/Disk/IDiskProvider.cs @@ -29,7 +29,7 @@ namespace NzbDrone.Common.Disk void MoveFolder(string source, string destination); void DeleteFile(string path); void CopyFile(string source, string destination, bool overwrite = false); - void MoveFile(string source, string destination); + void MoveFile(string source, string destination, bool overwrite = false); void DeleteFolder(string path, bool recursive); string ReadAllText(string filePath); void WriteAllText(string filename, string contents); diff --git a/src/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs b/src/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs index f9f6c44d5..d0f206718 100644 --- a/src/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs +++ b/src/NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs @@ -47,7 +47,23 @@ namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests Mocker.Resolve<RecycleBinProvider>().DeleteFile(path); - Mocker.GetMock<IDiskProvider>().Verify(v => v.MoveFile(path, @"C:\Test\Recycle Bin\S01E01.avi".AsOsAgnostic()), Times.Once()); + Mocker.GetMock<IDiskProvider>().Verify(v => v.MoveFile(path, @"C:\Test\Recycle Bin\S01E01.avi".AsOsAgnostic(), true), Times.Once()); + } + + [Test] + public void should_use_alternative_name_if_already_exists() + { + WithRecycleBin(); + + var path = @"C:\Test\TV\30 Rock\S01E01.avi".AsOsAgnostic(); + + Mocker.GetMock<IDiskProvider>() + .Setup(v => v.FileExists(@"C:\Test\Recycle Bin\S01E01.avi".AsOsAgnostic())) + .Returns(true); + + Mocker.Resolve<RecycleBinProvider>().DeleteFile(path); + + Mocker.GetMock<IDiskProvider>().Verify(v => v.MoveFile(path, @"C:\Test\Recycle Bin\S01E01_2.avi".AsOsAgnostic(), true), Times.Once()); } [Test] diff --git a/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs b/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs index b8fad1a47..b3dd60cce 100644 --- a/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs +++ b/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs @@ -84,10 +84,25 @@ namespace NzbDrone.Core.MediaFiles else { - var destination = Path.Combine(recyclingBin, new FileInfo(path).Name); + var fileInfo = new FileInfo(path); + var destination = Path.Combine(recyclingBin, fileInfo.Name); + + var index = 1; + while (_diskProvider.FileExists(destination)) + { + index++; + if (fileInfo.Extension.IsNullOrWhiteSpace()) + { + destination = Path.Combine(recyclingBin, fileInfo.Name + "_" + index); + } + else + { + destination = Path.Combine(recyclingBin, Path.GetFileNameWithoutExtension(fileInfo.Name) + "_" + index + fileInfo.Extension); + } + } logger.Debug("Moving '{0}' to '{1}'", path, destination); - _diskProvider.MoveFile(path, destination); + _diskProvider.MoveFile(path, destination, true); _diskProvider.FileSetLastWriteTimeUtc(destination, DateTime.UtcNow); logger.Debug("File has been moved to the recycling bin: {0}", destination); } From 6ee4b6d428c2cfbeb7bb24675bf3f3ba0a5cba51 Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Thu, 31 Jul 2014 12:33:56 -0700 Subject: [PATCH 029/105] Fixed: Checking for an existing file will respect the OSes case-sensitivity --- src/NzbDrone.Common/Disk/DiskProviderBase.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/NzbDrone.Common/Disk/DiskProviderBase.cs b/src/NzbDrone.Common/Disk/DiskProviderBase.cs index 1a07168e2..91bf3ae30 100644 --- a/src/NzbDrone.Common/Disk/DiskProviderBase.cs +++ b/src/NzbDrone.Common/Disk/DiskProviderBase.cs @@ -5,7 +5,7 @@ using System.Security.AccessControl; using System.Security.Principal; using NLog; using NzbDrone.Common.EnsureThat; -using NzbDrone.Common.Exceptions; +using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Instrumentation; namespace NzbDrone.Common.Disk @@ -106,17 +106,19 @@ namespace NzbDrone.Common.Disk public bool FileExists(string path) { Ensure.That(path, () => path).IsValidPath(); - return File.Exists(path); + return FileExists(path, OsInfo.IsMono); } public bool FileExists(string path, bool caseSensitive) { + Ensure.That(path, () => path).IsValidPath(); + if (caseSensitive) { - return FileExists(path) && path == path.GetActualCasing(); + return File.Exists(path) && path == path.GetActualCasing(); } - return FileExists(path); + return File.Exists(path); } public string[] GetDirectories(string path) @@ -315,6 +317,7 @@ namespace NzbDrone.Common.Disk File.SetLastWriteTime(path, dateTime); } + public void FileSetLastAccessTime(string path, DateTime dateTime) { Ensure.That(path, () => path).IsValidPath(); From fc46018c9a50a1515aca368275696312e207e2fa Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Thu, 31 Jul 2014 23:30:30 -0700 Subject: [PATCH 030/105] Fixed: Connecting to XBMC when user name and password are configured --- .../Xbmc/GetJsonVersionFixture.cs | 44 ++--- .../Xbmc/Json/ActivePlayersFixture.cs | 120 -------------- .../Xbmc/Json/CheckForErrorFixture.cs | 36 ----- .../Xbmc/Json/GetSeriesPathFixture.cs | 51 +++--- .../Xbmc/Json/UpdateFixture.cs | 92 ++++------- .../NzbDrone.Core.Test.csproj | 2 - .../Notifications/Xbmc/HttpApiProvider.cs | 58 +++---- .../Notifications/Xbmc/IApiProvider.cs | 6 +- .../Notifications/Xbmc/JsonApiProvider.cs | 143 ++--------------- .../Notifications/Xbmc/XbmcJsonApiProxy.cs | 151 ++++++++++++++++++ .../Notifications/Xbmc/XbmcJsonException.cs | 16 ++ .../Notifications/Xbmc/XbmcService.cs | 15 +- src/NzbDrone.Core/NzbDrone.Core.csproj | 2 + 13 files changed, 284 insertions(+), 452 deletions(-) delete mode 100644 src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/ActivePlayersFixture.cs delete mode 100644 src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/CheckForErrorFixture.cs create mode 100644 src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonApiProxy.cs create mode 100644 src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonException.cs diff --git a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs index 1f92a27ec..e101942f9 100644 --- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs +++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/GetJsonVersionFixture.cs @@ -1,8 +1,7 @@ -using FluentAssertions; -using Moq; +using System; +using FizzWare.NBuilder; +using FluentAssertions; using NUnit.Framework; -using NzbDrone.Common; -using NzbDrone.Common.Http; using NzbDrone.Core.Notifications.Xbmc; using NzbDrone.Core.Notifications.Xbmc.Model; using NzbDrone.Core.Test.Framework; @@ -17,16 +16,15 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc [SetUp] public void Setup() { - _settings = new XbmcSettings - { - Host = "localhost", - Port = 8080, - Username = "xbmc", - Password = "xbmc", - AlwaysUpdate = false, - CleanLibrary = false, - UpdateLibrary = true - }; + _settings = Builder<XbmcSettings>.CreateNew() + .Build(); + } + + private void GivenVersionResponse(String response) + { + Mocker.GetMock<IXbmcJsonApiProxy>() + .Setup(s => s.GetJsonVersion(_settings)) + .Returns(response); } [TestCase(3)] @@ -34,11 +32,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc [TestCase(0)] public void should_get_version_from_major_only(int number) { - var message = "{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"version\":" + number + "}}"; - - var fakeHttp = Mocker.GetMock<IHttpProvider>(); - fakeHttp.Setup(s => s.PostCommand("localhost:8080", "xbmc", "xbmc", It.IsAny<string>())) - .Returns(message); + GivenVersionResponse("{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"version\":" + number + "}}"); Subject.GetJsonVersion(_settings).Should().Be(new XbmcVersion(number)); } @@ -50,11 +44,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc [TestCase(0, 0, 0)] public void should_get_version_from_semantic_version(int major, int minor, int patch) { - var message = "{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"version\":{\"major\":" + major + ",\"minor\":" + minor + ",\"patch\":" + patch + "}}}"; - - var fakeHttp = Mocker.GetMock<IHttpProvider>(); - fakeHttp.Setup(s => s.PostCommand("localhost:8080", "xbmc", "xbmc", It.IsAny<string>())) - .Returns(message); + GivenVersionResponse("{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"version\":{\"major\":" + major + ",\"minor\":" + minor + ",\"patch\":" + patch + "}}}"); Subject.GetJsonVersion(_settings).Should().Be(new XbmcVersion(major, minor, patch)); } @@ -62,11 +52,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc [Test] public void should_get_version_zero_when_an_error_is_received() { - var message = "{\"error\":{\"code\":-32601,\"message\":\"Method not found.\"},\"id\":10,\"jsonrpc\":\"2.0\"}"; - - var fakeHttp = Mocker.GetMock<IHttpProvider>(); - fakeHttp.Setup(s => s.PostCommand("localhost:8080", "xbmc", "xbmc", It.IsAny<string>())) - .Returns(message); + GivenVersionResponse("{\"error\":{\"code\":-32601,\"message\":\"Method not found.\"},\"id\":10,\"jsonrpc\":\"2.0\"}"); Subject.GetJsonVersion(_settings).Should().Be(new XbmcVersion(0)); } diff --git a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/ActivePlayersFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/ActivePlayersFixture.cs deleted file mode 100644 index 7047ffe5d..000000000 --- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/ActivePlayersFixture.cs +++ /dev/null @@ -1,120 +0,0 @@ -using System.Linq; -using FluentAssertions; -using Moq; -using NUnit.Framework; -using NzbDrone.Common; -using NzbDrone.Common.Http; -using NzbDrone.Core.Notifications.Xbmc; -using NzbDrone.Core.Test.Framework; - -namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json -{ - [TestFixture] - public class ActivePlayersFixture : CoreTest<JsonApiProvider> - { - private XbmcSettings _settings; - - private void WithNoActivePlayers() - { - Mocker.GetMock<IHttpProvider>() - .Setup(s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, It.IsAny<string>())) - .Returns("{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":[]}"); - } - - private void WithVideoPlayerActive() - { - Mocker.GetMock<IHttpProvider>() - .Setup(s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, It.IsAny<string>())) - .Returns("{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":[{\"playerid\":1,\"type\":\"video\"}]}"); - } - - private void WithAudioPlayerActive() - { - Mocker.GetMock<IHttpProvider>() - .Setup(s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, It.IsAny<string>())) - .Returns("{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":[{\"playerid\":1,\"type\":\"audio\"}]}"); - } - - private void WithPicturePlayerActive() - { - Mocker.GetMock<IHttpProvider>() - .Setup(s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, It.IsAny<string>())) - .Returns("{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":[{\"playerid\":1,\"type\":\"picture\"}]}"); - } - - private void WithAllPlayersActive() - { - Mocker.GetMock<IHttpProvider>() - .Setup(s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, It.IsAny<string>())) - .Returns("{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":[{\"playerid\":1,\"type\":\"audio\"},{\"playerid\":2,\"type\":\"picture\"},{\"playerid\":3,\"type\":\"video\"}]}"); - } - - [SetUp] - public void Setup() - { - _settings = new XbmcSettings - { - Host = "localhost", - Port = 8080, - Username = "xbmc", - Password = "xbmc", - AlwaysUpdate = false, - CleanLibrary = false, - UpdateLibrary = true - }; - } - - [Test] - public void _should_be_empty_when_no_active_players() - { - WithNoActivePlayers(); - - Subject.GetActivePlayers(_settings).Should().BeEmpty(); - } - - [Test] - public void should_have_active_video_player() - { - WithVideoPlayerActive(); - - var result = Subject.GetActivePlayers(_settings); - - result.Should().HaveCount(1); - result.First().Type.Should().Be("video"); - } - - [Test] - public void should_have_active_audio_player() - { - WithAudioPlayerActive(); - - var result = Subject.GetActivePlayers(_settings); - - result.Should().HaveCount(1); - result.First().Type.Should().Be("audio"); - } - - [Test] - public void should_have_active_picture_player() - { - WithPicturePlayerActive(); - - var result = Subject.GetActivePlayers(_settings); - - result.Should().HaveCount(1); - result.First().Type.Should().Be("picture"); - } - - [Test] - public void should_have_all_players_active() - { - WithAllPlayersActive(); - - var result = Subject.GetActivePlayers(_settings); - - result.Should().HaveCount(3); - result.Select(a => a.PlayerId).Distinct().Should().HaveCount(3); - result.Select(a => a.Type).Distinct().Should().HaveCount(3); - } - } -} diff --git a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/CheckForErrorFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/CheckForErrorFixture.cs deleted file mode 100644 index b7f0810c7..000000000 --- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/CheckForErrorFixture.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using FluentAssertions; -using NUnit.Framework; -using NzbDrone.Core.Notifications.Xbmc; -using NzbDrone.Core.Test.Framework; - -namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json -{ - [TestFixture] - public class CheckForErrorFixture : CoreTest<JsonApiProvider> - { - [Test] - public void should_be_true_when_the_response_contains_an_error() - { - const string response = "{\"error\":{\"code\":-32601,\"message\":\"Method not found.\"},\"id\":10,\"jsonrpc\":\"2.0\"}"; - - Subject.CheckForError(response).Should().BeTrue(); - } - - [Test] - public void JsonError_true_empty_response() - { - var response = String.Empty; - - Subject.CheckForError(response).Should().BeTrue(); - } - - [Test] - public void JsonError_false() - { - const string response = "{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"version\":3}}"; - - Subject.CheckForError(response).Should().BeFalse(); - } - } -} diff --git a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs index 19c846c07..f7ff7e153 100644 --- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs +++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs @@ -1,9 +1,14 @@ -using FluentAssertions; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using FizzWare.NBuilder; +using FluentAssertions; using Moq; using NUnit.Framework; using NzbDrone.Common; using NzbDrone.Common.Http; using NzbDrone.Core.Notifications.Xbmc; +using NzbDrone.Core.Notifications.Xbmc.Model; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -15,42 +20,28 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json private XbmcSettings _settings; private Series _series; private string _response; + private List<TvShow> _xbmcSeries; [SetUp] public void Setup() { - _settings = new XbmcSettings - { - Host = "localhost", - Port = 8080, - Username = "xbmc", - Password = "xbmc", - AlwaysUpdate = false, - CleanLibrary = false, - UpdateLibrary = true - }; + _settings = Builder<XbmcSettings>.CreateNew() + .Build(); - _response = "{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"limits\":" + - "{\"end\":5,\"start\":0,\"total\":5},\"tvshows\":[{\"file\"" + - ":\"smb://HOMESERVER/TV/7th Heaven/\",\"imdbnumber\":\"73928\"," + - "\"label\":\"7th Heaven\",\"tvshowid\":3},{\"file\":\"smb://HOMESERVER/TV/8 Simple Rules/\"" + - ",\"imdbnumber\":\"78461\",\"label\":\"8 Simple Rules\",\"tvshowid\":4},{\"file\":" + - "\"smb://HOMESERVER/TV/24-7 Penguins-Capitals- Road to the NHL Winter Classic/\",\"imdbnumber\"" + - ":\"213041\",\"label\":\"24/7 Penguins/Capitals: Road to the NHL Winter Classic\",\"tvshowid\":1}," + - "{\"file\":\"smb://HOMESERVER/TV/30 Rock/\",\"imdbnumber\":\"79488\",\"label\":\"30 Rock\",\"tvshowid\":2}" + - ",{\"file\":\"smb://HOMESERVER/TV/90210/\",\"imdbnumber\":\"82716\",\"label\":\"90210\",\"tvshowid\":5}]}}"; + _xbmcSeries = Builder<TvShow>.CreateListOfSize(3) + .Build() + .ToList(); - Mocker.GetMock<IHttpProvider>() - .Setup( - s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, It.IsAny<string>())) - .Returns(_response); + Mocker.GetMock<IXbmcJsonApiProxy>() + .Setup(s => s.GetSeries(_settings)) + .Returns(_xbmcSeries); } private void WithMatchingTvdbId() { _series = new Series { - TvdbId = 78461, + TvdbId = _xbmcSeries.First().ImdbNumber, Title = "TV Show" }; } @@ -59,8 +50,8 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json { _series = new Series { - TvdbId = 1, - Title = "30 Rock" + TvdbId = 1000, + Title = _xbmcSeries.First().Label }; } @@ -68,7 +59,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json { _series = new Series { - TvdbId = 1, + TvdbId = 1000, Title = "Does not exist" }; } @@ -86,7 +77,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json { WithMatchingTvdbId(); - Subject.GetSeriesPath(_settings, _series).Should().Be("smb://HOMESERVER/TV/8 Simple Rules/"); + Subject.GetSeriesPath(_settings, _series).Should().Be(_xbmcSeries.First().File); } [Test] @@ -94,7 +85,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json { WithMatchingTitle(); - Subject.GetSeriesPath(_settings, _series).Should().Be("smb://HOMESERVER/TV/30 Rock/"); + Subject.GetSeriesPath(_settings, _series).Should().Be(_xbmcSeries.First().File); } } } diff --git a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs index e58aa6bc2..9cfb3a457 100644 --- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs +++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs @@ -1,10 +1,11 @@ using System; +using System.Collections.Generic; +using System.Linq; using FizzWare.NBuilder; using Moq; using NUnit.Framework; -using NzbDrone.Common; -using NzbDrone.Common.Http; using NzbDrone.Core.Notifications.Xbmc; +using NzbDrone.Core.Notifications.Xbmc.Model; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -14,88 +15,53 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json public class UpdateFixture : CoreTest<JsonApiProvider> { private XbmcSettings _settings; - const string _expectedJson = "{\"jsonrpc\":\"2.0\",\"method\":\"VideoLibrary.GetTvShows\",\"params\":{\"properties\":[\"file\",\"imdbnumber\"]},\"id\":"; - - private const string _tvshowsResponse = "{\"id\":10,\"jsonrpc\":\"2.0\",\"result\":{\"limits\":" + - "{\"end\":5,\"start\":0,\"total\":5},\"tvshows\":[{\"file\"" + - ":\"smb://HOMESERVER/TV/7th Heaven/\",\"imdbnumber\":\"73928\"," + - "\"label\":\"7th Heaven\",\"tvshowid\":3},{\"file\":\"smb://HOMESERVER/TV/8 Simple Rules/\"" + - ",\"imdbnumber\":\"78461\",\"label\":\"8 Simple Rules\",\"tvshowid\":4},{\"file\":" + - "\"smb://HOMESERVER/TV/24-7 Penguins-Capitals- Road to the NHL Winter Classic/\",\"imdbnumber\"" + - ":\"213041\",\"label\":\"24/7 Penguins/Capitals: Road to the NHL Winter Classic\",\"tvshowid\":1}," + - "{\"file\":\"smb://HOMESERVER/TV/30 Rock/\",\"imdbnumber\":\"79488\",\"label\":\"30 Rock\",\"tvshowid\":2}" + - ",{\"file\":\"smb://HOMESERVER/TV/90210/\",\"imdbnumber\":\"82716\",\"label\":\"90210\",\"tvshowid\":5}]}}"; + private Series _series; + private List<TvShow> _xbmcSeries; [SetUp] public void Setup() { - _settings = new XbmcSettings - { - Host = "localhost", - Port = 8080, - Username = "xbmc", - Password = "xbmc", - AlwaysUpdate = false, - CleanLibrary = false, - UpdateLibrary = true - }; + _settings = Builder<XbmcSettings>.CreateNew() + .Build(); - Mocker.GetMock<IHttpProvider>() - .Setup(s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, - It.Is<string>(e => e.Replace(" ", "").Replace("\r\n", "").Replace("\t", "").Contains(_expectedJson.Replace(" ", ""))))) - .Returns(_tvshowsResponse); + _xbmcSeries = Builder<TvShow>.CreateListOfSize(3) + .Build() + .ToList(); + + Mocker.GetMock<IXbmcJsonApiProxy>() + .Setup(s => s.GetSeries(_settings)) + .Returns(_xbmcSeries); + + Mocker.GetMock<IXbmcJsonApiProxy>() + .Setup(s => s.GetActivePlayers(_settings)) + .Returns(new List<ActivePlayer>()); } [Test] public void should_update_using_series_path() { - var fakeSeries = Builder<Series>.CreateNew() - .With(s => s.TvdbId = 79488) - .With(s => s.Title = "30 Rock") - .Build(); + var series = Builder<Series>.CreateNew() + .With(s => s.TvdbId = _xbmcSeries.First().ImdbNumber) + .Build(); - Mocker.GetMock<IHttpProvider>() - .Setup(s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, It.Is<String>( - e => e.Replace(" ", "") - .Replace("\r\n", "") - .Replace("\t", "") - .Contains("\"params\":{\"directory\":\"smb://HOMESERVER/TV/30Rock/\"}")))) - .Returns("{\"id\":55,\"jsonrpc\":\"2.0\",\"result\":\"OK\"}"); + Subject.Update(_settings, series); - Subject.Update(_settings, fakeSeries); - - Mocker.GetMock<IHttpProvider>() - .Verify(s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, It.Is<String>( - e => e.Replace(" ", "") - .Replace("\r\n", "") - .Replace("\t", "") - .Contains("\"params\":{\"directory\":\"smb://HOMESERVER/TV/30Rock/\"}"))), Times.Once()); + Mocker.GetMock<IXbmcJsonApiProxy>() + .Verify(v => v.UpdateLibrary(_settings, It.IsAny<String>()), Times.Once()); } [Test] public void should_update_all_paths_when_series_path_not_found() { var fakeSeries = Builder<Series>.CreateNew() - .With(s => s.TvdbId = 1) - .With(s => s.Title = "Not 30 Rock") - .Build(); - - Mocker.GetMock<IHttpProvider>() - .Setup(s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, It.Is<String>( - e => !e.Replace(" ", "") - .Replace("\r\n", "") - .Replace("\t", "") - .Contains("\"params\":{\"directory\":\"smb://HOMESERVER/TV/30Rock/\"}")))) - .Returns("{\"id\":55,\"jsonrpc\":\"2.0\",\"result\":\"OK\"}"); + .With(s => s.TvdbId = 1000) + .With(s => s.Title = "Not 30 Rock") + .Build(); Subject.Update(_settings, fakeSeries); - Mocker.GetMock<IHttpProvider>() - .Verify(s => s.PostCommand(_settings.Address, _settings.Username, _settings.Password, It.Is<String>( - e => e.Replace(" ", "") - .Replace("\r\n", "") - .Replace("\t", "") - .Contains("\"params\":{\"directory\":\"smb://HOMESERVER/TV/30Rock/\"}"))), Times.Never()); + Mocker.GetMock<IXbmcJsonApiProxy>() + .Verify(v => v.UpdateLibrary(_settings, null), Times.Once()); } } } diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index a60c289e9..9d137cfde 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -208,8 +208,6 @@ <Compile Include="NotificationTests\Xbmc\Http\CheckForErrorFixture.cs" /> <Compile Include="NotificationTests\Xbmc\Http\GetSeriesPathFixture.cs" /> <Compile Include="NotificationTests\Xbmc\Http\UpdateFixture.cs" /> - <Compile Include="NotificationTests\Xbmc\Json\ActivePlayersFixture.cs" /> - <Compile Include="NotificationTests\Xbmc\Json\CheckForErrorFixture.cs" /> <Compile Include="NotificationTests\Xbmc\Json\GetSeriesPathFixture.cs" /> <Compile Include="NotificationTests\Xbmc\Json\UpdateFixture.cs" /> <Compile Include="NotificationTests\Xbmc\OnDownloadFixture.cs" /> diff --git a/src/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs b/src/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs index 048778bed..142aa0def 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs @@ -22,6 +22,11 @@ namespace NzbDrone.Core.Notifications.Xbmc _logger = logger; } + public bool CanHandle(XbmcVersion version) + { + return version < new XbmcVersion(5); + } + public void Notify(XbmcSettings settings, string title, string message) { var notification = String.Format("Notification({0},{1},{2},{3})", title, message, settings.DisplayTime * 1000, "https://raw.github.com/NzbDrone/NzbDrone/develop/Logo/64.png"); @@ -55,7 +60,7 @@ namespace NzbDrone.Core.Notifications.Xbmc SendCommand(settings, command); } - public List<ActivePlayer> GetActivePlayers(XbmcSettings settings) + internal List<ActivePlayer> GetActivePlayers(XbmcSettings settings) { try { @@ -75,32 +80,8 @@ namespace NzbDrone.Core.Notifications.Xbmc return new List<ActivePlayer>(); } - - public bool CheckForError(string response) - { - _logger.Debug("Looking for error in response: {0}", response); - - if (String.IsNullOrWhiteSpace(response)) - { - _logger.Debug("Invalid response from XBMC, the response is not valid JSON"); - return true; - } - - var errorIndex = response.IndexOf("Error", StringComparison.InvariantCultureIgnoreCase); - - if (errorIndex > -1) - { - var errorMessage = response.Substring(errorIndex + 6); - errorMessage = errorMessage.Substring(0, errorMessage.IndexOfAny(new char[] { '<', ';' })); - - _logger.Debug("Error found in response: {0}", errorMessage); - return true; - } - - return false; - } - - public string GetSeriesPath(XbmcSettings settings, Series series) + + internal string GetSeriesPath(XbmcSettings settings, Series series) { var query = String.Format( @@ -133,9 +114,28 @@ namespace NzbDrone.Core.Notifications.Xbmc return field.Value; } - public bool CanHandle(XbmcVersion version) + internal bool CheckForError(string response) { - return version < new XbmcVersion(5); + _logger.Debug("Looking for error in response: {0}", response); + + if (String.IsNullOrWhiteSpace(response)) + { + _logger.Debug("Invalid response from XBMC, the response is not valid JSON"); + return true; + } + + var errorIndex = response.IndexOf("Error", StringComparison.InvariantCultureIgnoreCase); + + if (errorIndex > -1) + { + var errorMessage = response.Substring(errorIndex + 6); + errorMessage = errorMessage.Substring(0, errorMessage.IndexOfAny(new char[] { '<', ';' })); + + _logger.Debug("Error found in response: {0}", errorMessage); + return true; + } + + return false; } private void UpdateLibrary(XbmcSettings settings, Series series) diff --git a/src/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs b/src/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs index 28456249a..bf250edc3 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/IApiProvider.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using NzbDrone.Core.Notifications.Xbmc.Model; +using NzbDrone.Core.Notifications.Xbmc.Model; using NzbDrone.Core.Tv; namespace NzbDrone.Core.Notifications.Xbmc @@ -9,9 +8,6 @@ namespace NzbDrone.Core.Notifications.Xbmc void Notify(XbmcSettings settings, string title, string message); void Update(XbmcSettings settings, Series series); void Clean(XbmcSettings settings); - List<ActivePlayer> GetActivePlayers(XbmcSettings settings); - bool CheckForError(string response); - string GetSeriesPath(XbmcSettings settings, Series series); bool CanHandle(XbmcVersion version); } } diff --git a/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs b/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs index 0f933b570..6b0b7bb01 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs @@ -13,26 +13,23 @@ namespace NzbDrone.Core.Notifications.Xbmc { public class JsonApiProvider : IApiProvider { - private readonly IHttpProvider _httpProvider; + private readonly IXbmcJsonApiProxy _proxy; private readonly Logger _logger; - public JsonApiProvider(IHttpProvider httpProvider, Logger logger) + public JsonApiProvider(IXbmcJsonApiProxy proxy, Logger logger) { - _httpProvider = httpProvider; + _proxy = proxy; _logger = logger; } + public bool CanHandle(XbmcVersion version) + { + return version >= new XbmcVersion(5); + } + public void Notify(XbmcSettings settings, string title, string message) { - var parameters = new JObject( - new JProperty("title", title), - new JProperty("message", message), - new JProperty("image", "https://raw.github.com/NzbDrone/NzbDrone/develop/Logo/64.png"), - new JProperty("displaytime", settings.DisplayTime * 1000)); - - var postJson = BuildJsonRequest("GUI.ShowNotification", parameters); - - _httpProvider.PostCommand(settings.Address, settings.Username, settings.Password, postJson.ToString()); + _proxy.Notify(settings, title, message); } public void Update(XbmcSettings settings, Series series) @@ -40,7 +37,7 @@ namespace NzbDrone.Core.Notifications.Xbmc if (!settings.AlwaysUpdate) { _logger.Debug("Determining if there are any active players on XBMC host: {0}", settings.Address); - var activePlayers = GetActivePlayers(settings); + var activePlayers = _proxy.GetActivePlayers(settings); if (activePlayers.Any(a => a.Type.Equals("video"))) { @@ -54,64 +51,17 @@ namespace NzbDrone.Core.Notifications.Xbmc public void Clean(XbmcSettings settings) { - var postJson = BuildJsonRequest("VideoLibrary.Clean"); - - _httpProvider.PostCommand(settings.Address, settings.Username, settings.Password, postJson.ToString()); + _proxy.CleanLibrary(settings); } public List<ActivePlayer> GetActivePlayers(XbmcSettings settings) { - try - { - var postJson = new JObject(); - postJson.Add(new JProperty("jsonrpc", "2.0")); - postJson.Add(new JProperty("method", "Player.GetActivePlayers")); - postJson.Add(new JProperty("id", 10)); - - var response = _httpProvider.PostCommand(settings.Address, settings.Username, settings.Password, postJson.ToString()); - - if (CheckForError(response)) - return new List<ActivePlayer>(); - - var result = Json.Deserialize<ActivePlayersEdenResult>(response); - - return result.Result; - } - - catch (Exception ex) - { - _logger.DebugException(ex.Message, ex); - } - - return new List<ActivePlayer>(); + return _proxy.GetActivePlayers(settings); } - public bool CheckForError(string response) + public String GetSeriesPath(XbmcSettings settings, Series series) { - _logger.Debug("Looking for error in response: {0}", response); - - if (String.IsNullOrWhiteSpace(response)) - { - _logger.Debug("Invalid response from XBMC, the response is not valid JSON"); - return true; - } - - if (response.StartsWith("{\"error\"")) - { - var error = Json.Deserialize<ErrorResult>(response); - var code = error.Error["code"]; - var message = error.Error["message"]; - - _logger.Debug("XBMC Json Error. Code = {0}, Message: {1}", code, message); - return true; - } - - return false; - } - - public string GetSeriesPath(XbmcSettings settings, Series series) - { - var allSeries = GetSeries(settings); + var allSeries = _proxy.GetSeries(settings); if (!allSeries.Any()) { @@ -126,11 +76,6 @@ namespace NzbDrone.Core.Notifications.Xbmc return null; } - public bool CanHandle(XbmcVersion version) - { - return version >= new XbmcVersion(5); - } - private void UpdateLibrary(XbmcSettings settings, Series series) { try @@ -142,27 +87,17 @@ namespace NzbDrone.Core.Notifications.Xbmc if (seriesPath != null) { _logger.Debug("Updating series {0} (Path: {1}) on XBMC host: {2}", series, seriesPath, settings.Address); - - var parameters = new JObject(new JObject(new JProperty("directory", seriesPath))); - postJson = BuildJsonRequest("VideoLibrary.Scan", parameters); } else { _logger.Debug("Series {0} doesn't exist on XBMC host: {1}, Updating Entire Library", series, settings.Address); - - postJson = BuildJsonRequest("VideoLibrary.Scan"); } - var response = _httpProvider.PostCommand(settings.Address, settings.Username, settings.Password, postJson.ToString()); + var response = _proxy.UpdateLibrary(settings, null); - if (CheckForError(response)) return; - - _logger.Debug(" from response"); - var result = Json.Deserialize<XbmcJsonResult<String>>(response); - - if (!result.Result.Equals("OK", StringComparison.InvariantCultureIgnoreCase)) + if (!response.Equals("OK", StringComparison.InvariantCultureIgnoreCase)) { _logger.Debug("Failed to update library for: {0}", settings.Address); } @@ -173,51 +108,5 @@ namespace NzbDrone.Core.Notifications.Xbmc _logger.DebugException(ex.Message, ex); } } - - private List<TvShow> GetSeries(XbmcSettings settings) - { - try - { - var properties = new JObject { new JProperty("properties", new[] { "file", "imdbnumber" }) }; - var postJson = BuildJsonRequest("VideoLibrary.GetTvShows", properties); - - var response = _httpProvider.PostCommand(settings.Address, settings.Username, settings.Password, postJson.ToString()); - - if (CheckForError(response)) - return new List<TvShow>(); - - var result = Json.Deserialize<TvShowResponse>(response); - var shows = result.Result.TvShows; - - return shows; - } - catch (Exception ex) - { - _logger.DebugException(ex.Message, ex); - } - - return new List<TvShow>(); - } - - private JObject BuildJsonRequest(string method) - { - return BuildJsonRequest(method, null); - } - - private JObject BuildJsonRequest(string method, JObject parameters) - { - var postJson = new JObject(); - postJson.Add(new JProperty("jsonrpc", "2.0")); - postJson.Add(new JProperty("method", method)); - - if (parameters != null) - { - postJson.Add(new JProperty("params", parameters)); - } - - postJson.Add(new JProperty("id", 2)); - - return postJson; - } } } diff --git a/src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonApiProxy.cs b/src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonApiProxy.cs new file mode 100644 index 000000000..a5186bcba --- /dev/null +++ b/src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonApiProxy.cs @@ -0,0 +1,151 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using Newtonsoft.Json.Linq; +using NLog; +using NzbDrone.Common; +using NzbDrone.Common.Serializer; +using NzbDrone.Core.Notifications.Xbmc.Model; +using NzbDrone.Core.Rest; +using NzbDrone.Core.Tv; +using RestSharp; + +namespace NzbDrone.Core.Notifications.Xbmc +{ + public interface IXbmcJsonApiProxy + { + String GetJsonVersion(XbmcSettings settings); + void Notify(XbmcSettings settings, String title, String message); + String UpdateLibrary(XbmcSettings settings, String path); + void CleanLibrary(XbmcSettings settings); + List<ActivePlayer> GetActivePlayers(XbmcSettings settings); + List<TvShow> GetSeries(XbmcSettings settings); + } + + public class XbmcJsonApiProxy : IXbmcJsonApiProxy + { + private readonly Logger _logger; + + public XbmcJsonApiProxy(Logger logger) + { + _logger = logger; + } + + public String GetJsonVersion(XbmcSettings settings) + { + var request = new RestRequest(); + return ProcessRequest(request, settings, "JSONRPC.Version"); + } + + public void Notify(XbmcSettings settings, String title, String message) + { + var request = new RestRequest(); + + var parameters = new Dictionary<String, Object>(); + parameters.Add("title", title); + parameters.Add("message", message); + parameters.Add("image", "https://raw.github.com/NzbDrone/NzbDrone/develop/Logo/64.png"); + parameters.Add("displaytime", settings.DisplayTime * 1000); + + ProcessRequest(request, settings, "GUI.ShowNotification", parameters); + } + + public String UpdateLibrary(XbmcSettings settings, String path) + { + var request = new RestRequest(); + var parameters = new Dictionary<String, Object>(); + parameters.Add("directory", path ); + + if (path.IsNullOrWhiteSpace()) + { + parameters = null; + } + + var response = ProcessRequest(request, settings, "VideoLibrary.Scan", parameters); + + return Json.Deserialize<XbmcJsonResult<String>>(response).Result; + } + + public void CleanLibrary(XbmcSettings settings) + { + var request = new RestRequest(); + + ProcessRequest(request, settings, "VideoLibrary.Clean"); + } + + public List<ActivePlayer> GetActivePlayers(XbmcSettings settings) + { + var request = new RestRequest(); + + var response = ProcessRequest(request, settings, "Player.GetActivePlayers"); + + return Json.Deserialize<ActivePlayersEdenResult>(response).Result; + } + + public List<TvShow> GetSeries(XbmcSettings settings) + { + var request = new RestRequest(); + var parameters = new Dictionary<String, Object>(); + parameters.Add("properties", new[] { "file", "imdbnumber" }); + + var response = ProcessRequest(request, settings, "VideoLibrary.GetTvShows", parameters); + + return Json.Deserialize<TvShowResponse>(response).Result.TvShows; + } + + private String ProcessRequest(IRestRequest request, XbmcSettings settings, String method, Dictionary<String, Object> parameters = null) + { + var client = BuildClient(settings); + + request.Method = Method.POST; + request.RequestFormat = DataFormat.Json; + request.JsonSerializer = new JsonNetSerializer(); + request.AddBody(new { jsonrpc = "2.0", method = method, id = 10, @params = parameters }); + + var response = client.ExecuteAndValidate(request); + _logger.Trace("Response: {0}", response.Content); + + CheckForError(response); + + return response.Content; + } + + private IRestClient BuildClient(XbmcSettings settings) + { + var url = string.Format(@"http://{0}/jsonrpc", settings.Address); + + _logger.Debug("Url: " + url); + + var client = RestClientFactory.BuildClient(url); + + if (!settings.Username.IsNullOrWhiteSpace()) + { + client.Authenticator = new HttpBasicAuthenticator(settings.Username, settings.Password); + } + + return client; + } + + private void CheckForError(IRestResponse response) + { + _logger.Debug("Looking for error in response: {0}", response); + + if (String.IsNullOrWhiteSpace(response.Content)) + { + throw new XbmcJsonException("Invalid response from XBMC, the response is not valid JSON"); + } + + if (response.Content.StartsWith("{\"error\"")) + { + var error = Json.Deserialize<ErrorResult>(response.Content); + var code = error.Error["code"]; + var message = error.Error["message"]; + + var errorMessage = String.Format("XBMC Json Error. Code = {0}, Message: {1}", code, message); + throw new XbmcJsonException(errorMessage); + } + } + } +} diff --git a/src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonException.cs b/src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonException.cs new file mode 100644 index 000000000..95e5bbcf4 --- /dev/null +++ b/src/NzbDrone.Core/Notifications/Xbmc/XbmcJsonException.cs @@ -0,0 +1,16 @@ +using System; + +namespace NzbDrone.Core.Notifications.Xbmc +{ + public class XbmcJsonException : Exception + { + public XbmcJsonException() + { + } + + public XbmcJsonException(string message) + : base(message) + { + } + } +} diff --git a/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs b/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs index de38e5fed..4d2e3d5da 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs @@ -4,8 +4,6 @@ using System.Linq; using FluentValidation.Results; using Newtonsoft.Json.Linq; using NLog; -using NzbDrone.Common.Http; -using NzbDrone.Common.Instrumentation; using NzbDrone.Common.Serializer; using NzbDrone.Core.Notifications.Xbmc.Model; using NzbDrone.Core.Tv; @@ -23,13 +21,13 @@ namespace NzbDrone.Core.Notifications.Xbmc public class XbmcService : IXbmcService { - private readonly IHttpProvider _httpProvider; + private readonly IXbmcJsonApiProxy _proxy; private readonly IEnumerable<IApiProvider> _apiProviders; private readonly Logger _logger; - public XbmcService(IHttpProvider httpProvider, IEnumerable<IApiProvider> apiProviders, Logger logger) + public XbmcService(IXbmcJsonApiProxy proxy, IEnumerable<IApiProvider> apiProviders, Logger logger) { - _httpProvider = httpProvider; + _proxy = proxy; _apiProviders = apiProviders; _logger = logger; } @@ -56,12 +54,7 @@ namespace NzbDrone.Core.Notifications.Xbmc { try { - var postJson = new JObject(); - postJson.Add(new JProperty("jsonrpc", "2.0")); - postJson.Add(new JProperty("method", "JSONRPC.Version")); - postJson.Add(new JProperty("id", 1)); - - var response = _httpProvider.PostCommand(settings.Address, settings.Username, settings.Password, postJson.ToString()); + var response = _proxy.GetJsonVersion(settings); _logger.Debug("Getting version from response: " + response); var result = Json.Deserialize<XbmcJsonResult<JObject>>(response); diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 0c7652dea..6ea6013bd 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -603,6 +603,7 @@ <Compile Include="Notifications\Pushover\PushoverPriority.cs" /> <Compile Include="Notifications\Pushover\PushoverService.cs" /> <Compile Include="Notifications\Pushover\PushoverSettings.cs" /> + <Compile Include="Notifications\Xbmc\XbmcJsonException.cs" /> <Compile Include="Notifications\Xbmc\HttpApiProvider.cs" /> <Compile Include="Notifications\Xbmc\IApiProvider.cs" /> <Compile Include="Notifications\Xbmc\InvalidXbmcVersionException.cs" /> @@ -620,6 +621,7 @@ <Compile Include="Notifications\Xbmc\Xbmc.cs"> <SubType>Code</SubType> </Compile> + <Compile Include="Notifications\Xbmc\XbmcJsonApiProxy.cs" /> <Compile Include="Notifications\Xbmc\XbmcService.cs"> <SubType>Code</SubType> </Compile> From ff99c383da8e8c697fdd0e9d235ea1cf6feb8abb Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Thu, 31 Jul 2014 23:51:34 -0700 Subject: [PATCH 031/105] XBMC version is cached by host & port Cache is cleared on test Version is cached for 12 hours --- .../Notifications/Xbmc/XbmcService.cs | 32 +++++++++++++------ .../Notifications/Xbmc/XbmcSettings.cs | 5 +++ 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs b/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs index 4d2e3d5da..a6f335eda 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs @@ -4,6 +4,7 @@ using System.Linq; using FluentValidation.Results; using Newtonsoft.Json.Linq; using NLog; +using NzbDrone.Common.Cache; using NzbDrone.Common.Serializer; using NzbDrone.Core.Notifications.Xbmc.Model; using NzbDrone.Core.Tv; @@ -25,11 +26,18 @@ namespace NzbDrone.Core.Notifications.Xbmc private readonly IEnumerable<IApiProvider> _apiProviders; private readonly Logger _logger; - public XbmcService(IXbmcJsonApiProxy proxy, IEnumerable<IApiProvider> apiProviders, Logger logger) + private readonly ICached<XbmcVersion> _xbmcVersionCache; + + public XbmcService(IXbmcJsonApiProxy proxy, + IEnumerable<IApiProvider> apiProviders, + ICacheManager cacheManager, + Logger logger) { _proxy = proxy; _apiProviders = apiProviders; _logger = logger; + + _xbmcVersionCache = cacheManager.GetCache<XbmcVersion>(GetType()); } public void Notify(XbmcSettings settings, string title, string message) @@ -54,20 +62,22 @@ namespace NzbDrone.Core.Notifications.Xbmc { try { - var response = _proxy.GetJsonVersion(settings); + return _xbmcVersionCache.Get(settings.Address, () => + { - _logger.Debug("Getting version from response: " + response); - var result = Json.Deserialize<XbmcJsonResult<JObject>>(response); + var response = _proxy.GetJsonVersion(settings); - var versionObject = result.Result.Property("version"); + _logger.Debug("Getting version from response: " + response); + var result = Json.Deserialize<XbmcJsonResult<JObject>>(response); - if (versionObject.Value.Type == JTokenType.Integer) - return new XbmcVersion((int)versionObject.Value); + var versionObject = result.Result.Property("version"); - if (versionObject.Value.Type == JTokenType.Object) - return Json.Deserialize<XbmcVersion>(versionObject.Value.ToString()); + if (versionObject.Value.Type == JTokenType.Integer) return new XbmcVersion((int) versionObject.Value); - throw new InvalidCastException("Unknown Version structure!: " + versionObject); + if (versionObject.Value.Type == JTokenType.Object) return Json.Deserialize<XbmcVersion>(versionObject.Value.ToString()); + + throw new InvalidCastException("Unknown Version structure!: " + versionObject); + }, TimeSpan.FromHours(12)); } catch (Exception ex) @@ -94,6 +104,8 @@ namespace NzbDrone.Core.Notifications.Xbmc public ValidationFailure Test(XbmcSettings settings) { + _xbmcVersionCache.Clear(); + try { _logger.Debug("Determining version of XBMC Host: {0}", settings.Address); diff --git a/src/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs b/src/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs index 055e02af8..edce3ac06 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs @@ -70,5 +70,10 @@ namespace NzbDrone.Core.Notifications.Xbmc { return Validator.Validate(this); } + + public override int GetHashCode() + { + return base.GetHashCode(); + } } } From f657afc4241f4519e365bbd36c53701ba0c0ae86 Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Thu, 31 Jul 2014 23:57:17 -0700 Subject: [PATCH 032/105] Fixed: don't try to delete series folder if it doesn't exist --- src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs | 5 ++++- src/NzbDrone.Core/Tv/Events/SeriesDeletedEvent.cs | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs b/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs index b3dd60cce..bc12c543f 100644 --- a/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs +++ b/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs @@ -170,7 +170,10 @@ namespace NzbDrone.Core.MediaFiles { if (message.DeleteFiles) { - DeleteFolder(message.Series.Path); + if (_diskProvider.FolderExists(message.Series.Path)) + { + DeleteFolder(message.Series.Path); + } } } diff --git a/src/NzbDrone.Core/Tv/Events/SeriesDeletedEvent.cs b/src/NzbDrone.Core/Tv/Events/SeriesDeletedEvent.cs index e04d8f60e..865edd442 100644 --- a/src/NzbDrone.Core/Tv/Events/SeriesDeletedEvent.cs +++ b/src/NzbDrone.Core/Tv/Events/SeriesDeletedEvent.cs @@ -1,13 +1,14 @@ -using NzbDrone.Common.Messaging; +using System; +using NzbDrone.Common.Messaging; namespace NzbDrone.Core.Tv.Events { public class SeriesDeletedEvent : IEvent { public Series Series { get; private set; } - public bool DeleteFiles { get; private set; } + public Boolean DeleteFiles { get; private set; } - public SeriesDeletedEvent(Series series, bool deleteFiles) + public SeriesDeletedEvent(Series series, Boolean deleteFiles) { Series = series; DeleteFiles = deleteFiles; From c11c2c831d8a1463a70c155fd212e3867c3c0b5a Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Fri, 1 Aug 2014 00:17:20 -0700 Subject: [PATCH 033/105] Don't set folder write time on Mono --- .../MediaFiles/EpisodeFileMovingService.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs index 24f1ab54e..44bec3fbe 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs @@ -130,15 +130,13 @@ namespace NzbDrone.Core.MediaFiles try { - _logger.Debug("Setting last write time on series folder: {0}", series.Path); - _diskProvider.FolderSetLastWriteTimeUtc(series.Path, episodeFile.DateAdded); + SetFolderLastWriteTime(series.Path, episodeFile.DateAdded); if (series.SeasonFolder) { var seasonFolder = Path.GetDirectoryName(destinationFilename); - _logger.Debug("Setting last write time on season folder: {0}", seasonFolder); - _diskProvider.FolderSetLastWriteTimeUtc(seasonFolder, episodeFile.DateAdded); + SetFolderLastWriteTime(seasonFolder, episodeFile.DateAdded); } } @@ -202,5 +200,13 @@ namespace NzbDrone.Core.MediaFiles { SetPermissions(path, _configService.FolderChmod); } + + private void SetFolderLastWriteTime(String path, DateTime time) + { + if (OsInfo.IsMono) return; + + _logger.Debug("Setting last write time on series folder: {0}", path); + _diskProvider.FolderSetLastWriteTimeUtc(path, time); + } } } \ No newline at end of file From 3b26e826445e773321ccc4b6189c4c9dff98621d Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Fri, 1 Aug 2014 18:08:02 -0700 Subject: [PATCH 034/105] Much better logging for searching --- .../Indexers/IndexerFetchService.cs | 96 +++++++++---------- src/NzbDrone.Core/Jobs/TaskManager.cs | 6 +- 2 files changed, 48 insertions(+), 54 deletions(-) diff --git a/src/NzbDrone.Core/Indexers/IndexerFetchService.cs b/src/NzbDrone.Core/Indexers/IndexerFetchService.cs index 8caa132c6..1bf6626d3 100644 --- a/src/NzbDrone.Core/Indexers/IndexerFetchService.cs +++ b/src/NzbDrone.Core/Indexers/IndexerFetchService.cs @@ -6,7 +6,6 @@ using NzbDrone.Common; using NzbDrone.Common.Http; using NzbDrone.Core.Indexers.Exceptions; using NzbDrone.Core.IndexerSearch.Definitions; -using NzbDrone.Core.Instrumentation.Extensions; using NzbDrone.Core.Parser.Model; using System.Linq; @@ -46,75 +45,54 @@ namespace NzbDrone.Core.Indexers public IList<ReleaseInfo> Fetch(IIndexer indexer, SeasonSearchCriteria searchCriteria) { - _logger.Debug("Searching for {0}", searchCriteria); - - var result = Fetch(indexer, searchCriteria, 0).DistinctBy(c => c.DownloadUrl).ToList(); - - _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); - - return result; + return Fetch(indexer, searchCriteria, 0).DistinctBy(c => c.DownloadUrl).ToList(); } private IList<ReleaseInfo> Fetch(IIndexer indexer, SeasonSearchCriteria searchCriteria, int offset) { - _logger.Debug("Searching for {0} offset: {1}", searchCriteria, offset); - var searchUrls = indexer.GetSeasonSearchUrls(searchCriteria.QueryTitles, searchCriteria.Series.TvRageId, searchCriteria.SeasonNumber, offset).ToList(); - var result = Fetch(indexer, searchUrls); - _logger.Info("{0} offset {1}. Found {2}", indexer, offset, result.Count); - - if (indexer.SupportsPaging && result.Count >= indexer.SupportedPageSize && offset < 900) + if (searchUrls.Any()) { - result.AddRange(Fetch(indexer, searchCriteria, offset + indexer.SupportedPageSize)); + _logger.Debug("Searching for {0} offset: {1}", searchCriteria, offset); + + var result = Fetch(indexer, searchUrls); + + _logger.Info("{0} offset {1}. Found {2}", indexer, offset, result.Count); + + if (indexer.SupportsPaging && result.Count >= indexer.SupportedPageSize && offset < 900) + { + result.AddRange(Fetch(indexer, searchCriteria, offset + indexer.SupportedPageSize)); + } + + //Only log finish for the first call to this recursive method + if (offset == 0) + { + _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); + } + + return result; } - return result; + return new List<ReleaseInfo>(); } public IList<ReleaseInfo> Fetch(IIndexer indexer, SingleEpisodeSearchCriteria searchCriteria) { - _logger.Debug("Searching for {0}", searchCriteria); - var searchUrls = indexer.GetEpisodeSearchUrls(searchCriteria.QueryTitles, searchCriteria.Series.TvRageId, searchCriteria.SeasonNumber, searchCriteria.EpisodeNumber).ToList(); - var result = Fetch(indexer, searchUrls); - - if (searchUrls.Any()) - { - _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); - } - - return result; + return Fetch(indexer, searchUrls, searchCriteria); } public IList<ReleaseInfo> Fetch(IIndexer indexer, DailyEpisodeSearchCriteria searchCriteria) { - _logger.Debug("Searching for {0}", searchCriteria); - var searchUrls = indexer.GetDailyEpisodeSearchUrls(searchCriteria.QueryTitles, searchCriteria.Series.TvRageId, searchCriteria.AirDate).ToList(); - var result = Fetch(indexer, searchUrls); - - if (searchUrls.Any()) - { - _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); - } - - return result; + return Fetch(indexer, searchUrls, searchCriteria); } public IList<ReleaseInfo> Fetch(IIndexer indexer, AnimeEpisodeSearchCriteria searchCriteria) { - _logger.Debug("Searching for {0}", searchCriteria); - var searchUrls = indexer.GetAnimeEpisodeSearchUrls(searchCriteria.SceneTitles, searchCriteria.Series.TvRageId, searchCriteria.AbsoluteEpisodeNumber).ToList(); - var result = Fetch(indexer, searchUrls); - - if (searchUrls.Any()) - { - _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); - } - - return result; + return Fetch(indexer, searchUrls, searchCriteria); } public IList<ReleaseInfo> Fetch(IIndexer indexer, SpecialEpisodeSearchCriteria searchCriteria) @@ -123,17 +101,33 @@ namespace NzbDrone.Core.Indexers foreach (var episodeQueryTitle in searchCriteria.EpisodeQueryTitles) { - _logger.Debug("Performing query of {0} for {1}", indexer, episodeQueryTitle); - searchUrls.AddRange(indexer.GetSearchUrls(episodeQueryTitle)); + var urls = indexer.GetSearchUrls(episodeQueryTitle).ToList(); + + if (urls.Any()) + { + _logger.Debug("Performing query of {0} for {1}", indexer, episodeQueryTitle); + searchUrls.AddRange(urls); + } } - var result = Fetch(indexer, searchUrls); + return Fetch(indexer, searchUrls, searchCriteria); + } - if (searchUrls.Any()) + private List<ReleaseInfo> Fetch(IIndexer indexer, IEnumerable<string> urls, SearchCriteriaBase searchCriteria) + { + var urlList = urls.ToList(); + + if (urlList.Empty()) { - _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); + return new List<ReleaseInfo>(); } + _logger.Debug("Searching for {0}", searchCriteria); + + var result = Fetch(indexer, urlList); + + _logger.Info("Finished searching {0} for {1}. Found {2}", indexer, searchCriteria, result.Count); + return result; } diff --git a/src/NzbDrone.Core/Jobs/TaskManager.cs b/src/NzbDrone.Core/Jobs/TaskManager.cs index 4656f3a76..51275c91f 100644 --- a/src/NzbDrone.Core/Jobs/TaskManager.cs +++ b/src/NzbDrone.Core/Jobs/TaskManager.cs @@ -74,13 +74,13 @@ namespace NzbDrone.Core.Jobs var currentTasks = _scheduledTaskRepository.All().ToList(); - _logger.Debug("Initializing jobs. Available: {0} Existing: {1}", defaultTasks.Count(), currentTasks.Count()); + _logger.Trace("Initializing jobs. Available: {0} Existing: {1}", defaultTasks.Count(), currentTasks.Count()); foreach (var job in currentTasks) { if (!defaultTasks.Any(c => c.TypeName == job.TypeName)) { - _logger.Debug("Removing job from database '{0}'", job.TypeName); + _logger.Trace("Removing job from database '{0}'", job.TypeName); _scheduledTaskRepository.Delete(job.Id); } } @@ -109,7 +109,7 @@ namespace NzbDrone.Core.Jobs if (scheduledTask != null) { - _logger.Debug("Updating last run time for: {0}", scheduledTask.TypeName); + _logger.Trace("Updating last run time for: {0}", scheduledTask.TypeName); _scheduledTaskRepository.SetLastExecutionTime(scheduledTask.Id, DateTime.UtcNow); } } From c21ffcb5e4038c8cfa5cb116a4b26f8d53752a48 Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Fri, 1 Aug 2014 18:08:32 -0700 Subject: [PATCH 035/105] New: Show processing time for pending items on Calendar and Queue --- src/NzbDrone.Api/Queue/QueueResource.cs | 2 +- .../Download/Pending/PendingReleaseService.cs | 12 ++++----- src/NzbDrone.Core/Queue/Queue.cs | 1 + src/NzbDrone.Core/Queue/QueueService.cs | 10 ++++++-- src/UI/Calendar/CalendarView.js | 25 ++++++++++++++++++- src/UI/Calendar/calendar.less | 4 +++ src/UI/History/Queue/TimeleftCell.js | 7 +++--- 7 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/NzbDrone.Api/Queue/QueueResource.cs b/src/NzbDrone.Api/Queue/QueueResource.cs index 72df87f84..0cc002347 100644 --- a/src/NzbDrone.Api/Queue/QueueResource.cs +++ b/src/NzbDrone.Api/Queue/QueueResource.cs @@ -1,7 +1,6 @@ using System; using NzbDrone.Api.REST; using NzbDrone.Core.Qualities; -using NzbDrone.Core.Tv; using NzbDrone.Api.Series; using NzbDrone.Api.Episodes; @@ -16,6 +15,7 @@ namespace NzbDrone.Api.Queue public String Title { get; set; } public Decimal Sizeleft { get; set; } public TimeSpan? Timeleft { get; set; } + public DateTime? EstimatedCompletionTime { get; set; } public String Status { get; set; } public String ErrorMessage { get; set; } } diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs index 9be579624..a800bfe84 100644 --- a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs +++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs @@ -29,21 +29,18 @@ namespace NzbDrone.Core.Download.Pending private readonly IPendingReleaseRepository _repository; private readonly ISeriesService _seriesService; private readonly IParsingService _parsingService; - private readonly IDownloadService _downloadService; private readonly IEventAggregator _eventAggregator; private readonly Logger _logger; public PendingReleaseService(IPendingReleaseRepository repository, ISeriesService seriesService, IParsingService parsingService, - IDownloadService downloadService, IEventAggregator eventAggregator, Logger logger) { _repository = repository; _seriesService = seriesService; _parsingService = parsingService; - _downloadService = downloadService; _eventAggregator = eventAggregator; _logger = logger; } @@ -141,6 +138,9 @@ namespace NzbDrone.Core.Download.Pending { foreach (var episode in pendingRelease.RemoteEpisode.Episodes) { + var ect = pendingRelease.Release.PublishDate.AddHours( + pendingRelease.RemoteEpisode.Series.Profile.Value.GrabDelay); + var queue = new Queue.Queue { Id = episode.Id ^ (pendingRelease.Id << 16), @@ -150,10 +150,8 @@ namespace NzbDrone.Core.Download.Pending Title = pendingRelease.Title, Size = pendingRelease.RemoteEpisode.Release.Size, Sizeleft = pendingRelease.RemoteEpisode.Release.Size, - Timeleft = - pendingRelease.Release.PublishDate.AddHours( - pendingRelease.RemoteEpisode.Series.Profile.Value.GrabDelay) - .Subtract(DateTime.UtcNow), + Timeleft = ect.Subtract(DateTime.UtcNow), + EstimatedCompletionTime = ect, Status = "Pending", RemoteEpisode = pendingRelease.RemoteEpisode }; diff --git a/src/NzbDrone.Core/Queue/Queue.cs b/src/NzbDrone.Core/Queue/Queue.cs index 0cc67c2dc..de889939e 100644 --- a/src/NzbDrone.Core/Queue/Queue.cs +++ b/src/NzbDrone.Core/Queue/Queue.cs @@ -15,6 +15,7 @@ namespace NzbDrone.Core.Queue public String Title { get; set; } public Decimal Sizeleft { get; set; } public TimeSpan? Timeleft { get; set; } + public DateTime? EstimatedCompletionTime { get; set; } public String Status { get; set; } public String ErrorMessage { get; set; } public RemoteEpisode RemoteEpisode { get; set; } diff --git a/src/NzbDrone.Core/Queue/QueueService.cs b/src/NzbDrone.Core/Queue/QueueService.cs index f7dac3139..bf36068de 100644 --- a/src/NzbDrone.Core/Queue/QueueService.cs +++ b/src/NzbDrone.Core/Queue/QueueService.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; using System.Collections.Generic; using NLog; using NzbDrone.Core.Download; @@ -52,11 +53,16 @@ namespace NzbDrone.Core.Queue RemoteEpisode = queueItem.DownloadItem.RemoteEpisode }; - if (queueItem.HasError) + if (queueItem.HasError) { queue.ErrorMessage = queueItem.StatusMessage; } + if (queue.Timeleft.HasValue) + { + queue.EstimatedCompletionTime = DateTime.UtcNow.Add(queue.Timeleft.Value); + } + queued.Add(queue); } } diff --git a/src/UI/Calendar/CalendarView.js b/src/UI/Calendar/CalendarView.js index c6dc6de65..3378da240 100644 --- a/src/UI/Calendar/CalendarView.js +++ b/src/UI/Calendar/CalendarView.js @@ -10,10 +10,11 @@ define( 'System/StatusModel', 'History/Queue/QueueCollection', 'Config', + 'Shared/FormatHelpers', 'Mixins/backbone.signalr.mixin', 'fullcalendar', 'jquery.easypiechart' - ], function ($, vent, Marionette, moment, CalendarCollection, StatusModel, QueueCollection, Config) { + ], function ($, vent, Marionette, moment, CalendarCollection, StatusModel, QueueCollection, Config, FormatHelpers) { return Marionette.ItemView.extend({ storageKey: 'calendar.view', @@ -62,6 +63,16 @@ define( container: 'body' }); } + + if (event.pending) { + this.$(element).find('.fc-event-time') + .after('<span class="pending pull-right"><i class="icon-time"></i></span>'); + + this.$(element).find('.pending').tooltip({ + title: 'Release will be processed {0}'.format(event.pending), + container: 'body' + }); + } }, _getEvents: function (view) { @@ -94,7 +105,9 @@ define( allDay : false, statusLevel : self._getStatusLevel(model, end), progress : self._getDownloadProgress(model), + pending : self._getPendingInfo(model), releaseTitle: self._getReleaseTitle(model), + downloading : QueueCollection.findEpisode(model.get('id')), model : model }; @@ -151,6 +164,16 @@ define( return 100 - (downloading.get('sizeleft') / downloading.get('size') * 100); }, + _getPendingInfo: function (element) { + var pending = QueueCollection.findEpisode(element.get('id')); + + if (!pending || pending.get('status').toLocaleLowerCase() !== 'pending') { + return undefined; + } + + return new moment(pending.get('estimatedCompletionTime')).fromNow(); + }, + _getReleaseTitle: function (element) { var downloading = QueueCollection.findEpisode(element.get('id')); diff --git a/src/UI/Calendar/calendar.less b/src/UI/Calendar/calendar.less index 865206cb8..82525175c 100644 --- a/src/UI/Calendar/calendar.less +++ b/src/UI/Calendar/calendar.less @@ -21,6 +21,10 @@ .fc-event { .clickable; + + .pending { + margin-right : 4px; + } } th { diff --git a/src/UI/History/Queue/TimeleftCell.js b/src/UI/History/Queue/TimeleftCell.js index 043efdf52..892ed690d 100644 --- a/src/UI/History/Queue/TimeleftCell.js +++ b/src/UI/History/Queue/TimeleftCell.js @@ -3,8 +3,9 @@ define( [ 'Cells/NzbDroneCell', - 'filesize' - ], function (NzbDroneCell, fileSize) { + 'filesize', + 'moment' + ], function (NzbDroneCell, fileSize, Moment) { return NzbDroneCell.extend({ className: 'timeleft-cell', @@ -17,7 +18,7 @@ define( //If the release is pending we want to use the timeleft as the time it will be processed at if (this.cellValue.get('status').toLowerCase() === 'pending') { this.$el.html('-'); - this.$el.attr('title', 'Will be processed again in: {0}'.format(this.cellValue.get('timeleft'))); + this.$el.attr('title', 'Will be processed {0}'.format(new Moment(this.cellValue.get('estimatedCompletionTime')).calendar())); this.$el.attr('data-container', 'body'); return this; From 64bbba90b0c046e99a1dfe08a3033e92bda380fe Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Fri, 1 Aug 2014 18:14:20 -0700 Subject: [PATCH 036/105] FIxed jshint issue --- src/UI/Calendar/CalendarView.js | 5 ++--- src/UI/History/Queue/TimeleftCell.js | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/UI/Calendar/CalendarView.js b/src/UI/Calendar/CalendarView.js index 3378da240..14dc6f3f9 100644 --- a/src/UI/Calendar/CalendarView.js +++ b/src/UI/Calendar/CalendarView.js @@ -10,11 +10,10 @@ define( 'System/StatusModel', 'History/Queue/QueueCollection', 'Config', - 'Shared/FormatHelpers', 'Mixins/backbone.signalr.mixin', 'fullcalendar', 'jquery.easypiechart' - ], function ($, vent, Marionette, moment, CalendarCollection, StatusModel, QueueCollection, Config, FormatHelpers) { + ], function ($, vent, Marionette, moment, CalendarCollection, StatusModel, QueueCollection, Config) { return Marionette.ItemView.extend({ storageKey: 'calendar.view', @@ -171,7 +170,7 @@ define( return undefined; } - return new moment(pending.get('estimatedCompletionTime')).fromNow(); + return moment(pending.get('estimatedCompletionTime')).fromNow(); }, _getReleaseTitle: function (element) { diff --git a/src/UI/History/Queue/TimeleftCell.js b/src/UI/History/Queue/TimeleftCell.js index 892ed690d..cd592615b 100644 --- a/src/UI/History/Queue/TimeleftCell.js +++ b/src/UI/History/Queue/TimeleftCell.js @@ -5,7 +5,7 @@ define( 'Cells/NzbDroneCell', 'filesize', 'moment' - ], function (NzbDroneCell, fileSize, Moment) { + ], function (NzbDroneCell, fileSize, moment) { return NzbDroneCell.extend({ className: 'timeleft-cell', @@ -18,7 +18,7 @@ define( //If the release is pending we want to use the timeleft as the time it will be processed at if (this.cellValue.get('status').toLowerCase() === 'pending') { this.$el.html('-'); - this.$el.attr('title', 'Will be processed {0}'.format(new Moment(this.cellValue.get('estimatedCompletionTime')).calendar())); + this.$el.attr('title', 'Will be processed {0}'.format(moment(this.cellValue.get('estimatedCompletionTime')).calendar())); this.$el.attr('data-container', 'body'); return this; From 1ed45625df3d60aa21402cbb519e40008b3bccf0 Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Fri, 1 Aug 2014 23:09:59 -0700 Subject: [PATCH 037/105] Better logging if SQLite exception is thrown during API call --- .../ErrorManagement/NzbDroneErrorPipeline.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs b/src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs index 36348de47..96b199935 100644 --- a/src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs +++ b/src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs @@ -50,11 +50,11 @@ namespace NzbDrone.Api.ErrorManagement }.AsResponse((HttpStatusCode)clientException.StatusCode); } - if (context.Request.Method == "PUT" || context.Request.Method == "POST") - { - var sqLiteException = exception as SQLiteException; + var sqLiteException = exception as SQLiteException; - if (sqLiteException != null) + if (sqLiteException != null) + { + if (context.Request.Method == "PUT" || context.Request.Method == "POST") { if (sqLiteException.Message.Contains("constraint failed")) return new ErrorModel @@ -62,8 +62,12 @@ namespace NzbDrone.Api.ErrorManagement Message = exception.Message, }.AsResponse(HttpStatusCode.Conflict); } - } + var sqlErrorMessage = String.Format("[{0} {1}?{2}]", context.Request.Method, context.Request.Path, context.Request.Query); + + _logger.ErrorException(sqlErrorMessage, sqLiteException); + } + _logger.FatalException("Request Failed", exception); return new ErrorModel From d9445eab846b90fad213b5815c52c3eec359f97a Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Sat, 2 Aug 2014 20:05:21 -0700 Subject: [PATCH 038/105] New: show indicator when testing indexers, connections and download clients --- .../Edit/DownloadClientEditView.js | 23 ++++++++++- .../Edit/DownloadClientEditViewTemplate.html | 1 + .../Settings/Indexers/Edit/IndexerEditView.js | 39 ++++++++++++++----- .../Edit/IndexerEditViewTemplate.html | 2 +- .../Edit/NotificationEditView.js | 27 +++++++++++-- .../Edit/NotificationEditViewTemplate.html | 1 + src/UI/Settings/ProviderSettingsModelBase.js | 2 + src/UI/Settings/settings.less | 5 +++ 8 files changed, 84 insertions(+), 16 deletions(-) diff --git a/src/UI/Settings/DownloadClient/Edit/DownloadClientEditView.js b/src/UI/Settings/DownloadClient/Edit/DownloadClientEditView.js index 31bd5f194..8363edf3b 100644 --- a/src/UI/Settings/DownloadClient/Edit/DownloadClientEditView.js +++ b/src/UI/Settings/DownloadClient/Edit/DownloadClientEditView.js @@ -19,7 +19,8 @@ define([ ui: { path : '.x-path', - modalBody : '.modal-body' + modalBody : '.modal-body', + indicator : '.x-indicator' }, events: { @@ -44,6 +45,8 @@ define([ }, _save: function () { + this.ui.indicator.show(); + var self = this; var promise = this.model.save(); @@ -52,10 +55,16 @@ define([ self.targetCollection.add(self.model, { merge: true }); vent.trigger(vent.Commands.CloseModalCommand); }); + + promise.fail(function () { + self.ui.indicator.hide(); + }); } }, _saveAndAdd: function () { + this.ui.indicator.show(); + var self = this; var promise = this.model.save(); @@ -65,6 +74,10 @@ define([ require('Settings/DownloadClient/Add/DownloadClientSchemaModal').open(self.targetCollection); }); + + promise.fail(function () { + self.ui.indicator.hide(); + }); } }, @@ -78,7 +91,13 @@ define([ }, _test: function () { - this.model.test(); + var self = this; + + this.ui.indicator.show(); + + this.model.test().always(function () { + self.ui.indicator.hide(); + }); } }); diff --git a/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.html b/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.html index 27032ead8..5cabb1502 100644 --- a/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.html +++ b/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.html @@ -46,6 +46,7 @@ <button class="btn pull-left x-back">back</button> {{/if}} + <span class="indicator x-indicator"><i class="icon-spinner icon-spin"></i></span> <button class="btn x-test">test <i class="x-test-icon icon-nd-test"/></button> <button class="btn" data-dismiss="modal">cancel</button> diff --git a/src/UI/Settings/Indexers/Edit/IndexerEditView.js b/src/UI/Settings/Indexers/Edit/IndexerEditView.js index c67fb9260..22541585b 100644 --- a/src/UI/Settings/Indexers/Edit/IndexerEditView.js +++ b/src/UI/Settings/Indexers/Edit/IndexerEditView.js @@ -8,22 +8,25 @@ define([ 'Commands/CommandController', 'Mixins/AsModelBoundView', 'Mixins/AsValidatedView', - 'underscore', 'Form/FormBuilder', 'Mixins/AutoComplete', 'bootstrap' -], function (vent, AppLayout, Marionette, DeleteView, CommandController, AsModelBoundView, AsValidatedView, _) { +], function (vent, AppLayout, Marionette, DeleteView, CommandController, AsModelBoundView, AsValidatedView) { var view = Marionette.ItemView.extend({ template: 'Settings/Indexers/Edit/IndexerEditViewTemplate', + ui: { + indicator : '.x-indicator' + }, + events: { - 'click .x-save' : '_save', - 'click .x-save-and-add': '_saveAndAdd', - 'click .x-delete' : '_delete', - 'click .x-back' : '_back', - 'click .x-close' : '_close', - 'click .x-test' : '_test' + 'click .x-save' : '_save', + 'click .x-save-and-add' : '_saveAndAdd', + 'click .x-delete' : '_delete', + 'click .x-back' : '_back', + 'click .x-close' : '_close', + 'click .x-test' : '_test' }, initialize: function (options) { @@ -31,6 +34,8 @@ define([ }, _save: function () { + this.ui.indicator.show(); + var self = this; var promise = this.model.save(); @@ -39,10 +44,16 @@ define([ self.targetCollection.add(self.model, { merge: true }); vent.trigger(vent.Commands.CloseModalCommand); }); + + promise.fail(function () { + self.ui.indicator.hide(); + }); } }, _saveAndAdd: function () { + this.ui.indicator.show(); + var self = this; var promise = this.model.save(); @@ -52,6 +63,10 @@ define([ require('Settings/Indexers/Add/IndexerSchemaModal').open(self.targetCollection); }); + + promise.fail(function () { + self.ui.indicator.hide(); + }); } }, @@ -82,7 +97,13 @@ define([ }, _test: function () { - this.model.test(); + var self = this; + + this.ui.indicator.show(); + + this.model.test().always(function () { + self.ui.indicator.hide(); + }); } }); diff --git a/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.html b/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.html index 3dc1f3eda..2a0683f7c 100644 --- a/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.html +++ b/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.html @@ -45,7 +45,7 @@ {{else}} <button class="btn pull-left x-back">back</button> {{/if}} - + <span class="indicator x-indicator"><i class="icon-spinner icon-spin"></i></span> <button class="btn x-test">test <i class="x-test-icon icon-nd-test"/></button> <button class="btn x-close">cancel</button> diff --git a/src/UI/Settings/Notifications/Edit/NotificationEditView.js b/src/UI/Settings/Notifications/Edit/NotificationEditView.js index cb5ff873c..c905c89b5 100644 --- a/src/UI/Settings/Notifications/Edit/NotificationEditView.js +++ b/src/UI/Settings/Notifications/Edit/NotificationEditView.js @@ -16,9 +16,10 @@ define([ template: 'Settings/Notifications/Edit/NotificationEditViewTemplate', ui: { - onDownloadToggle: '.x-on-download', - onUpgradeSection: '.x-on-upgrade' - }, + onDownloadToggle : '.x-on-download', + onUpgradeSection : '.x-on-upgrade', + indicator : '.x-indicator' + }, events: { 'click .x-save' : '_save', @@ -39,6 +40,8 @@ define([ }, _save: function () { + this.ui.indicator.show(); + var self = this; var promise = this.model.save(); @@ -47,10 +50,16 @@ define([ self.targetCollection.add(self.model, { merge: true }); vent.trigger(vent.Commands.CloseModalCommand); }); + + promise.fail(function () { + self.ui.indicator.hide(); + }); } }, _saveAndAdd: function () { + this.ui.indicator.show(); + var self = this; var promise = this.model.save(); @@ -60,6 +69,10 @@ define([ require('Settings/Notifications/Add/NotificationSchemaModal').open(self.targetCollection); }); + + promise.fail(function () { + self.ui.indicator.hide(); + }); } }, @@ -83,7 +96,13 @@ define([ }, _test: function () { - this.model.test(); + var self = this; + + this.ui.indicator.show(); + + this.model.test().always(function () { + self.ui.indicator.hide(); + }); }, _onDownloadChanged: function () { diff --git a/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.html b/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.html index 79a4f4ba7..ccb44476e 100644 --- a/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.html +++ b/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.html @@ -94,6 +94,7 @@ <button class="btn pull-left x-back">back</button> {{/if}} + <span class="indicator x-indicator"><i class="icon-spinner icon-spin"></i></span> <button class="btn x-test">test <i class="x-test-icon icon-nd-test"/></button> <button class="btn x-cancel" data-dismiss="modal">cancel</button> diff --git a/src/UI/Settings/ProviderSettingsModelBase.js b/src/UI/Settings/ProviderSettingsModelBase.js index 256caef80..123a673fc 100644 --- a/src/UI/Settings/ProviderSettingsModelBase.js +++ b/src/UI/Settings/ProviderSettingsModelBase.js @@ -31,6 +31,8 @@ define([ promise.fail(function (response) { self.trigger('validation:failed', response); }); + + return promise; } }); }); diff --git a/src/UI/Settings/settings.less b/src/UI/Settings/settings.less index b98c25401..fdaab3e3d 100644 --- a/src/UI/Settings/settings.less +++ b/src/UI/Settings/settings.less @@ -118,3 +118,8 @@ li.save-and-add:hover { } } } + +.indicator { + display : none; + padding-right : 5px; +} From 0ba19f0cd757654d0d32b42bdd47bcd2cdfbeb6a Mon Sep 17 00:00:00 2001 From: Mark McDowall <markus.mcd5@gmail.com> Date: Sun, 3 Aug 2014 16:05:15 -0700 Subject: [PATCH 039/105] New: Add to Homescreen for mobile support --- .../DecisionEngine/DownloadDecisionPriorizationService.cs | 2 -- src/UI/index.html | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs index f9fa820b3..dbc83efdd 100644 --- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs +++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionPriorizationService.cs @@ -1,9 +1,7 @@ using System; using System.Linq; -using System.Text; using System.Collections.Generic; using NzbDrone.Core.Qualities; -using NzbDrone.Core.DecisionEngine.Specifications; namespace NzbDrone.Core.DecisionEngine { diff --git a/src/UI/index.html b/src/UI/index.html index 2dcdd72c8..6ced33e35 100644 --- a/src/UI/index.html +++ b/src/UI/index.html @@ -4,6 +4,9 @@ <title>NzbDrone + + + From 18874e2c79312135caf2edc2ff23cf6c86920e6f Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 4 Aug 2014 22:44:09 -0700 Subject: [PATCH 040/105] Calendar/Date localization New: Choose calendar starting day of week New: Choose prefered date/time formats New: Option to disable relative dates and show absolute dates instead --- src/NzbDrone.Api/Config/UiConfigModule.cs | 45 + src/NzbDrone.Api/Config/UiConfigResource.cs | 18 + src/NzbDrone.Api/NzbDrone.Api.csproj | 2 + src/NzbDrone.Api/System/SystemModule.cs | 3 - .../Configuration/ConfigService.cs | 43 + .../Configuration/IConfigService.cs | 10 +- src/UI/Calendar/CalendarView.js | 134 +- src/UI/Calendar/UpcomingCollection.js | 6 +- src/UI/Calendar/UpcomingItemView.js | 4 +- src/UI/Cells/EpisodeStatusCell.js | 4 +- src/UI/Cells/RelativeDateCell.js | 24 +- src/UI/Content/fullcalendar.css | 42 +- .../Summary/EpisodeSummaryLayoutTemplate.html | 2 +- src/UI/Handlebars/Helpers/DateTime.js | 35 +- src/UI/Handlebars/Helpers/Episode.js | 10 +- src/UI/JsLibraries/fullcalendar.js | 3673 +++++++++++------ src/UI/JsLibraries/moment.js | 1548 +++++-- src/UI/Series/Details/SeasonLayout.js | 10 +- .../SeriesOverviewItemViewTemplate.html | 2 +- .../SeriesPostersItemViewTemplate.html | 2 +- src/UI/Series/Index/SeriesIndexLayout.js | 6 +- src/UI/Series/SeriesCollection.js | 6 +- src/UI/Settings/SettingsLayout.js | 24 +- src/UI/Settings/SettingsLayoutTemplate.html | 2 + src/UI/Settings/UI/UiSettingsModel.js | 12 + src/UI/Settings/UI/UiView.js | 27 + src/UI/Settings/UI/UiViewTemplate.html | 95 + src/UI/Settings/settings.less | 4 + src/UI/Shared/FormatHelpers.js | 18 +- src/UI/Shared/UiSettingsModel.js | 22 + src/UI/System/Logs/Table/LogTimeCell.js | 9 +- src/UI/app.js | 15 +- 32 files changed, 4049 insertions(+), 1808 deletions(-) create mode 100644 src/NzbDrone.Api/Config/UiConfigModule.cs create mode 100644 src/NzbDrone.Api/Config/UiConfigResource.cs create mode 100644 src/UI/Settings/UI/UiSettingsModel.js create mode 100644 src/UI/Settings/UI/UiView.js create mode 100644 src/UI/Settings/UI/UiViewTemplate.html create mode 100644 src/UI/Shared/UiSettingsModel.js diff --git a/src/NzbDrone.Api/Config/UiConfigModule.cs b/src/NzbDrone.Api/Config/UiConfigModule.cs new file mode 100644 index 000000000..782e4ebf7 --- /dev/null +++ b/src/NzbDrone.Api/Config/UiConfigModule.cs @@ -0,0 +1,45 @@ +using System.Linq; +using System.Reflection; +using NzbDrone.Core.Configuration; +using Omu.ValueInjecter; + +namespace NzbDrone.Api.Config +{ + public class UiConfigModule : NzbDroneRestModule + { + private readonly IConfigService _configService; + + public UiConfigModule(IConfigService configService) + : base("/config/ui") + { + _configService = configService; + + GetResourceSingle = GetUiConfig; + GetResourceById = GetUiConfig; + UpdateResource = SaveUiConfig; + } + + private UiConfigResource GetUiConfig() + { + var resource = new UiConfigResource(); + resource.InjectFrom(_configService); + resource.Id = 1; + + return resource; + } + + private UiConfigResource GetUiConfig(int id) + { + return GetUiConfig(); + } + + private void SaveUiConfig(UiConfigResource resource) + { + var dictionary = resource.GetType() + .GetProperties(BindingFlags.Instance | BindingFlags.Public) + .ToDictionary(prop => prop.Name, prop => prop.GetValue(resource, null)); + + _configService.SaveConfigDictionary(dictionary); + } + } +} \ No newline at end of file diff --git a/src/NzbDrone.Api/Config/UiConfigResource.cs b/src/NzbDrone.Api/Config/UiConfigResource.cs new file mode 100644 index 000000000..6912cd668 --- /dev/null +++ b/src/NzbDrone.Api/Config/UiConfigResource.cs @@ -0,0 +1,18 @@ +using System; +using NzbDrone.Api.REST; + +namespace NzbDrone.Api.Config +{ + public class UiConfigResource : RestResource + { + //Calendar + public Int32 FirstDayOfWeek { get; set; } + public String CalendarWeekColumnHeader { get; set; } + + //Dates + public String ShortDateFormat { get; set; } + public String LongDateFormat { get; set; } + public String TimeFormat { get; set; } + public Boolean ShowRelativeDates { get; set; } + } +} diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index a10896797..deacaca17 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -92,6 +92,8 @@ + + diff --git a/src/NzbDrone.Api/System/SystemModule.cs b/src/NzbDrone.Api/System/SystemModule.cs index ca1bab855..702a60ee4 100644 --- a/src/NzbDrone.Api/System/SystemModule.cs +++ b/src/NzbDrone.Api/System/SystemModule.cs @@ -3,11 +3,9 @@ using Nancy.Routing; using NzbDrone.Common; using NzbDrone.Api.Extensions; using NzbDrone.Common.EnvironmentInfo; -using NzbDrone.Common.Processes; using NzbDrone.Core.Configuration; using NzbDrone.Core.Datastore; using NzbDrone.Core.Lifecycle; -using NzbDrone.Core.Lifecycle.Commands; namespace NzbDrone.Api.System { @@ -60,7 +58,6 @@ namespace NzbDrone.Api.System IsWindows = OsInfo.IsWindows, Branch = _configFileProvider.Branch, Authentication = _configFileProvider.AuthenticationEnabled, - StartOfWeek = (int)OsInfo.FirstDayOfWeek, SqliteVersion = _database.Version, UrlBase = _configFileProvider.UrlBase, RuntimeVersion = OsInfo.IsMono ? _runtimeInfo.RuntimeVersion : null diff --git a/src/NzbDrone.Core/Configuration/ConfigService.cs b/src/NzbDrone.Core/Configuration/ConfigService.cs index e1462a561..06068e5db 100644 --- a/src/NzbDrone.Core/Configuration/ConfigService.cs +++ b/src/NzbDrone.Core/Configuration/ConfigService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using NLog; using NzbDrone.Common.EnsureThat; +using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Core.Configuration.Events; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Messaging.Events; @@ -254,6 +255,48 @@ namespace NzbDrone.Core.Configuration set { SetValue("ChownGroup", value); } } + public Int32 FirstDayOfWeek + { + get { return GetValueInt("FirstDayOfWeek", (int)OsInfo.FirstDayOfWeek); } + + set { SetValue("FirstDayOfWeek", value); } + } + + public String CalendarWeekColumnHeader + { + get { return GetValue("CalendarWeekColumnHeader", "ddd M/D"); } + + set { SetValue("CalendarWeekColumnHeader", value); } + } + + public String ShortDateFormat + { + get { return GetValue("ShortDateFormat", "MMM D YYYY"); } + + set { SetValue("ShortDateFormat", value); } + } + + public String LongDateFormat + { + get { return GetValue("LongDateFormat", "dddd, MMMM D YYYY"); } + + set { SetValue("LongDateFormat", value); } + } + + public String TimeFormat + { + get { return GetValue("TimeFormat", "h(:mm)a"); } + + set { SetValue("TimeFormat", value); } + } + + public Boolean ShowRelativeDates + { + get { return GetValueBoolean("ShowRelativeDates", true); } + + set { SetValue("ShowRelativeDates", value); } + } + private string GetValue(string key) { return GetValue(key, String.Empty); diff --git a/src/NzbDrone.Core/Configuration/IConfigService.cs b/src/NzbDrone.Core/Configuration/IConfigService.cs index f471762c5..e21185bb7 100644 --- a/src/NzbDrone.Core/Configuration/IConfigService.cs +++ b/src/NzbDrone.Core/Configuration/IConfigService.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using NzbDrone.Core.MediaFiles; -using NzbDrone.Core.Update; namespace NzbDrone.Core.Configuration { @@ -49,5 +48,14 @@ namespace NzbDrone.Core.Configuration Int32 Retention { get; set; } Int32 RssSyncInterval { get; set; } String ReleaseRestrictions { get; set; } + + //UI + Int32 FirstDayOfWeek { get; set; } + String CalendarWeekColumnHeader { get; set; } + + String ShortDateFormat { get; set; } + String LongDateFormat { get; set; } + String TimeFormat { get; set; } + Boolean ShowRelativeDates { get; set; } } } diff --git a/src/UI/Calendar/CalendarView.js b/src/UI/Calendar/CalendarView.js index 14dc6f3f9..1c26d1908 100644 --- a/src/UI/Calendar/CalendarView.js +++ b/src/UI/Calendar/CalendarView.js @@ -7,13 +7,13 @@ define( 'marionette', 'moment', 'Calendar/Collection', - 'System/StatusModel', + 'Shared/UiSettingsModel', 'History/Queue/QueueCollection', 'Config', 'Mixins/backbone.signalr.mixin', 'fullcalendar', 'jquery.easypiechart' - ], function ($, vent, Marionette, moment, CalendarCollection, StatusModel, QueueCollection, Config) { + ], function ($, vent, Marionette, moment, CalendarCollection, UiSettings, QueueCollection, Config) { return Marionette.ItemView.extend({ storageKey: 'calendar.view', @@ -44,39 +44,45 @@ define( this.$(element).addClass(event.statusLevel); this.$(element).children('.fc-event-inner').addClass(event.statusLevel); - if (event.progress > 0) { - this.$(element).find('.fc-event-time') - .after(''.format(event.progress)); + if (event.downloading) { + var progress = 100 - (event.downloading.get('sizeleft') / event.downloading.get('size') * 100); + var releaseTitle = event.downloading.get('title'); + var estimatedCompletionTime = moment(event.downloading.get('estimatedCompletionTime')).fromNow(); - this.$(element).find('.chart').easyPieChart({ - barColor : '#ffffff', - trackColor: false, - scaleColor: false, - lineWidth : 2, - size : 14, - animate : false - }); + if (event.downloading.get('status').toLocaleLowerCase() === 'pending') { + this.$(element).find('.fc-event-time') + .after(''); - this.$(element).find('.chart').tooltip({ - title: 'Episode is downloading - {0}% {1}'.format(event.progress.toFixed(1), event.releaseTitle), - container: 'body' - }); - } + this.$(element).find('.pending').tooltip({ + title: 'Release will be processed {0}'.format(estimatedCompletionTime), + container: 'body' + }); + } - if (event.pending) { - this.$(element).find('.fc-event-time') - .after(''); + else { + this.$(element).find('.fc-event-time') + .after(''.format(progress)); - this.$(element).find('.pending').tooltip({ - title: 'Release will be processed {0}'.format(event.pending), - container: 'body' - }); + this.$(element).find('.chart').easyPieChart({ + barColor : '#ffffff', + trackColor: false, + scaleColor: false, + lineWidth : 2, + size : 14, + animate : false + }); + + this.$(element).find('.chart').tooltip({ + title: 'Episode is downloading - {0}% {1}'.format(progress.toFixed(1), releaseTitle), + container: 'body' + }); + } } }, _getEvents: function (view) { - var start = moment(view.visStart).toISOString(); - var end = moment(view.visEnd).toISOString(); + var start = view.start.toISOString(); + var end = view.end.toISOString(); this.$el.fullCalendar('removeEvents'); @@ -99,13 +105,10 @@ define( var event = { title : seriesTitle, - start : start, - end : end, + start : moment(start), + end : moment(end), allDay : false, statusLevel : self._getStatusLevel(model, end), - progress : self._getDownloadProgress(model), - pending : self._getPendingInfo(model), - releaseTitle: self._getReleaseTitle(model), downloading : QueueCollection.findEpisode(model.get('id')), model : model }; @@ -153,47 +156,12 @@ define( this._setEventData(this.collection); }, - _getDownloadProgress: function (element) { - var downloading = QueueCollection.findEpisode(element.get('id')); - - if (!downloading) { - return 0; - } - - return 100 - (downloading.get('sizeleft') / downloading.get('size') * 100); - }, - - _getPendingInfo: function (element) { - var pending = QueueCollection.findEpisode(element.get('id')); - - if (!pending || pending.get('status').toLocaleLowerCase() !== 'pending') { - return undefined; - } - - return moment(pending.get('estimatedCompletionTime')).fromNow(); - }, - - _getReleaseTitle: function (element) { - var downloading = QueueCollection.findEpisode(element.get('id')); - - if (!downloading) { - return ''; - } - - return downloading.get('title'); - }, - _getOptions: function () { var options = { allDayDefault : false, - ignoreTimezone: false, weekMode : 'variable', - firstDay : StatusModel.get('startOfWeek'), - timeFormat : 'h(:mm)tt', - buttonText : { - prev: '', - next: '' - }, + firstDay : UiSettings.get('firstDayOfWeek'), + timeFormat : 'h(:mm)a', viewRender : this._viewRender.bind(this), eventRender : this._eventRender.bind(this), eventClick : function (event) { @@ -204,12 +172,6 @@ define( if ($(window).width() < 768) { options.defaultView = Config.getValue(this.storageKey, 'basicDay'); - options.titleFormat = { - month: 'MMM yyyy', // September 2009 - week: 'MMM d[ yyyy]{ \'—\'[ MMM] d yyyy}', // Sep 7 - 13 2009 - day: 'ddd, MMM d, yyyy' // Tuesday, Sep 8, 2009 - }; - options.header = { left : 'prev,next today', center: 'title', @@ -220,12 +182,6 @@ define( else { options.defaultView = Config.getValue(this.storageKey, 'basicWeek'); - options.titleFormat = { - month: 'MMM yyyy', // September 2009 - week: 'MMM d[ yyyy]{ \'—\'[ MMM] d yyyy}', // Sep 7 - 13 2009 - day: 'dddd, MMM d, yyyy' // Tues, Sep 8, 2009 - }; - options.header = { left : 'prev,next today', center: 'title', @@ -233,6 +189,22 @@ define( }; } + options.titleFormat = { + month : 'MMMM YYYY', + week : UiSettings.get('shortDateFormat'), + day : UiSettings.get('longDateFormat') + }; + + options.columnFormat = { + month : 'ddd', // Mon + week : UiSettings.get('calendarWeekColumnHeader'), + day : 'dddd' // Monday + }; + + options.timeFormat = { + 'default': UiSettings.get('timeFormat') + }; + return options; } }); diff --git a/src/UI/Calendar/UpcomingCollection.js b/src/UI/Calendar/UpcomingCollection.js index 2429e3744..7ccafbbd5 100644 --- a/src/UI/Calendar/UpcomingCollection.js +++ b/src/UI/Calendar/UpcomingCollection.js @@ -4,18 +4,18 @@ define( 'backbone', 'moment', 'Series/EpisodeModel' - ], function (Backbone, Moment, EpisodeModel) { + ], function (Backbone, moment, EpisodeModel) { return Backbone.Collection.extend({ url : window.NzbDrone.ApiRoot + '/calendar', model: EpisodeModel, comparator: function (model1, model2) { var airDate1 = model1.get('airDateUtc'); - var date1 = Moment(airDate1); + var date1 = moment(airDate1); var time1 = date1.unix(); var airDate2 = model2.get('airDateUtc'); - var date2 = Moment(airDate2); + var date2 = moment(airDate2); var time2 = date2.unix(); if (time1 < time2){ diff --git a/src/UI/Calendar/UpcomingItemView.js b/src/UI/Calendar/UpcomingItemView.js index dcfc64562..feddd958d 100644 --- a/src/UI/Calendar/UpcomingItemView.js +++ b/src/UI/Calendar/UpcomingItemView.js @@ -5,7 +5,7 @@ define( 'vent', 'marionette', 'moment' - ], function (vent, Marionette, Moment) { + ], function (vent, Marionette, moment) { return Marionette.ItemView.extend({ template: 'Calendar/UpcomingItemViewTemplate', tagName : 'div', @@ -17,7 +17,7 @@ define( initialize: function () { var start = this.model.get('airDateUtc'); var runtime = this.model.get('series').runtime; - var end = Moment(start).add('minutes', runtime); + var end = moment(start).add('minutes', runtime); this.model.set({ end: end.toISOString() diff --git a/src/UI/Cells/EpisodeStatusCell.js b/src/UI/Cells/EpisodeStatusCell.js index c8cd57510..34a492b5e 100644 --- a/src/UI/Cells/EpisodeStatusCell.js +++ b/src/UI/Cells/EpisodeStatusCell.js @@ -8,7 +8,7 @@ define( 'History/Queue/QueueCollection', 'moment', 'Shared/FormatHelpers' - ], function (reqres, Backbone, NzbDroneCell, QueueCollection, Moment, FormatHelpers) { + ], function (reqres, Backbone, NzbDroneCell, QueueCollection, moment, FormatHelpers) { return NzbDroneCell.extend({ className: 'episode-status-cell', @@ -29,7 +29,7 @@ define( var icon; var tooltip; - var hasAired = Moment(this.model.get('airDateUtc')).isBefore(Moment()); + var hasAired = moment(this.model.get('airDateUtc')).isBefore(moment()); var hasFile = this.model.get('hasFile'); if (hasFile) { diff --git a/src/UI/Cells/RelativeDateCell.js b/src/UI/Cells/RelativeDateCell.js index 0ffb11d76..8174e6b09 100644 --- a/src/UI/Cells/RelativeDateCell.js +++ b/src/UI/Cells/RelativeDateCell.js @@ -3,18 +3,32 @@ define( [ 'Cells/NzbDroneCell', 'moment', - 'Shared/FormatHelpers' - ], function (NzbDroneCell, Moment, FormatHelpers) { + 'Shared/FormatHelpers', + 'Shared/UiSettingsModel' + ], function (NzbDroneCell, moment, FormatHelpers, UiSettings) { return NzbDroneCell.extend({ className: 'relative-date-cell', render: function () { - var date = this.model.get(this.column.get('name')); + var dateStr = this.model.get(this.column.get('name')); - if (date) { - this.$el.html('' + FormatHelpers.dateHelper(date) + ''); + if (dateStr) { + var date = moment(dateStr); + var result = '{1}'; + var tooltip = date.format(UiSettings.longDateTime()); + var text; + + if (UiSettings.get('showRelativeDates')) { + text = FormatHelpers.relativeDate(dateStr); + } + + else { + text = date.format(UiSettings.get('shortDateFormat')); + } + + this.$el.html(result.format(tooltip, text)); } return this; diff --git a/src/UI/Content/fullcalendar.css b/src/UI/Content/fullcalendar.css index 92fe47f20..a31ce83da 100644 --- a/src/UI/Content/fullcalendar.css +++ b/src/UI/Content/fullcalendar.css @@ -1,5 +1,5 @@ /*! - * FullCalendar v1.6.4 Stylesheet + * FullCalendar v2.0.2 Stylesheet * Docs & License: http://arshaw.com/fullcalendar/ * (c) 2013 Adam Shaw */ @@ -101,11 +101,14 @@ html .fc, ------------------------------------------------------------------------*/ .fc-content { + position: relative; + z-index: 1; /* scopes all other z-index's to be inside this container */ clear: both; zoom: 1; /* for IE7, gives accurate coordinates for [un]freezeContentHeight */ } .fc-view { + position: relative; width: 100%; overflow: hidden; } @@ -165,32 +168,38 @@ html .fc, and we'll try to make them look good cross-browser. */ -.fc-text-arrow { +.fc-button .fc-icon { margin: 0 .1em; font-size: 2em; font-family: "Courier New", Courier, monospace; vertical-align: baseline; /* for IE7 */ } -.fc-button-prev .fc-text-arrow, -.fc-button-next .fc-text-arrow { /* for ‹ › */ +.fc-icon-left-single-arrow:after { + content: "\02039"; font-weight: bold; } + +.fc-icon-right-single-arrow:after { + content: "\0203A"; + font-weight: bold; + } + +.fc-icon-left-double-arrow:after { + content: "\000AB"; + } + +.fc-icon-right-double-arrow:after { + content: "\000BB"; + } /* icon (for jquery ui) */ - -.fc-button .fc-icon-wrap { - position: relative; - float: left; - top: 50%; - } - + .fc-button .ui-icon { position: relative; + top: 50%; float: left; - margin-top: -50%; - *margin-top: 0; - *top: -50%; + margin-top: -8px; /* we know jqui icons are always 16px tall */ } /* @@ -447,10 +456,13 @@ table.fc-border-separate { padding: 0 4px; vertical-align: middle; text-align: right; - white-space: nowrap; font-weight: normal; } +.fc-agenda-slots .fc-agenda-axis { + white-space: nowrap; + } + .fc-agenda .fc-week-number { font-weight: bold; } diff --git a/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.html b/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.html index 87e4b838b..28367800e 100644 --- a/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.html +++ b/src/UI/Episode/Summary/EpisodeSummaryLayoutTemplate.html @@ -4,7 +4,7 @@ {{network}} {{/with}} {{StartTime airDateUtc}} - {{NextAiring airDateUtc}} + {{RelativeDate airDateUtc}}
        diff --git a/src/UI/Handlebars/Helpers/DateTime.js b/src/UI/Handlebars/Helpers/DateTime.js index 0f8082ccb..28b8fdf49 100644 --- a/src/UI/Handlebars/Helpers/DateTime.js +++ b/src/UI/Handlebars/Helpers/DateTime.js @@ -3,26 +3,39 @@ define( [ 'handlebars', 'moment', - 'Shared/FormatHelpers' - ], function (Handlebars, Moment, FormatHelpers) { + 'Shared/FormatHelpers', + 'Shared/UiSettingsModel' + ], function (Handlebars, moment, FormatHelpers, UiSettings) { Handlebars.registerHelper('ShortDate', function (input) { if (!input) { return ''; } - var date = Moment(input); - var result = '' + date.format('LL') + ''; + var date = moment(input); + var result = '' + date.format(UiSettings.get('shortDateFormat')) + ''; return new Handlebars.SafeString(result); }); - Handlebars.registerHelper('NextAiring', function (input) { + Handlebars.registerHelper('RelativeDate', function (input) { if (!input) { return ''; } - var date = Moment(input); - var result = '' + FormatHelpers.dateHelper(input) + ''; + var date = moment(input); + var result = '{1}'; + var tooltip = date.format(UiSettings.longDateTime()); + var text; + + if (UiSettings.get('showRelativeDates')) { + text = FormatHelpers.relativeDate(input); + } + + else { + text = date.format(UiSettings.get('shortDateFormat')); + } + + result = result.format(tooltip, text); return new Handlebars.SafeString(result); }); @@ -32,7 +45,7 @@ define( return ''; } - return Moment(input).format('DD'); + return moment(input).format('DD'); }); Handlebars.registerHelper('Month', function (input) { @@ -40,7 +53,7 @@ define( return ''; } - return Moment(input).format('MMM'); + return moment(input).format('MMM'); }); Handlebars.registerHelper('StartTime', function (input) { @@ -48,11 +61,11 @@ define( return ''; } - var date = Moment(input); + var date = moment(input); if (date.format('mm') === '00') { return date.format('ha'); } - return date.format('h.mma'); + return date.format('h:mma'); }); }); diff --git a/src/UI/Handlebars/Helpers/Episode.js b/src/UI/Handlebars/Helpers/Episode.js index dbe5ac499..9e277a50d 100644 --- a/src/UI/Handlebars/Helpers/Episode.js +++ b/src/UI/Handlebars/Helpers/Episode.js @@ -4,11 +4,11 @@ define( 'handlebars', 'Shared/FormatHelpers', 'moment' - ], function (Handlebars, FormatHelpers, Moment) { + ], function (Handlebars, FormatHelpers, moment) { Handlebars.registerHelper('EpisodeNumber', function () { if (this.series.seriesType === 'daily') { - return Moment(this.airDate).format('L'); + return moment(this.airDate).format('L'); } else { @@ -21,9 +21,9 @@ define( var hasFile = this.hasFile; var downloading = require('History/Queue/QueueCollection').findEpisode(this.id) || this.downloading; - var currentTime = Moment(); - var start = Moment(this.airDateUtc); - var end = Moment(this.end); + var currentTime = moment(); + var start = moment(this.airDateUtc); + var end = moment(this.end); if (hasFile) { return 'success'; diff --git a/src/UI/JsLibraries/fullcalendar.js b/src/UI/JsLibraries/fullcalendar.js index 28f2a04c9..57b2a0362 100644 --- a/src/UI/JsLibraries/fullcalendar.js +++ b/src/UI/JsLibraries/fullcalendar.js @@ -1,22 +1,29 @@ /*! - * FullCalendar v1.6.4 + * FullCalendar v2.0.2 * Docs & License: http://arshaw.com/fullcalendar/ * (c) 2013 Adam Shaw */ -/* - * Use fullcalendar.css for basic styling. - * For event drag & drop, requires jQuery UI draggable. - * For event resizing, requires jQuery UI resizable. - */ - -(function($, undefined) { - +(function(factory) { + if (typeof define === 'function' && define.amd) { + define([ 'jquery', 'moment' ], factory); + } + else { + factory(jQuery, moment); + } +})(function($, moment) { ;; var defaults = { + lang: 'en', + + defaultTimedEventDuration: '02:00:00', + defaultAllDayEventDuration: { days: 1 }, + forceEventDuration: false, + nextDayThreshold: '09:00:00', // 9am + // display defaultView: 'month', aspectRatio: 1.35, @@ -27,60 +34,70 @@ var defaults = { }, weekends: true, weekNumbers: false, - weekNumberCalculation: 'iso', + weekNumberTitle: 'W', + weekNumberCalculation: 'local', - // editing //editable: false, - //disableDragging: false, - //disableResizing: false, - - allDayDefault: true, - ignoreTimezone: true, // event ajax lazyFetching: true, startParam: 'start', endParam: 'end', + timezoneParam: 'timezone', + + timezone: false, + + //allDayDefault: undefined, // time formats titleFormat: { - month: 'MMMM yyyy', - week: "MMM d[ yyyy]{ '—'[ MMM] d yyyy}", - day: 'dddd, MMM d, yyyy' + month: 'MMMM YYYY', // like "September 1986". each language will override this + week: 'll', // like "Sep 4 1986" + day: 'LL' // like "September 4 1986" }, columnFormat: { - month: 'ddd', - week: 'ddd M/d', - day: 'dddd M/d' + month: 'ddd', // like "Sat" + week: generateWeekColumnFormat, + day: 'dddd' // like "Saturday" }, timeFormat: { // for event elements - '': 'h(:mm)t' // default + 'default': generateShortTimeFormat + }, + + displayEventEnd: { + month: false, + basicWeek: false, + 'default': true }, // locale isRTL: false, - firstDay: 0, - monthNames: ['January','February','March','April','May','June','July','August','September','October','November','December'], - monthNamesShort: ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'], - dayNames: ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'], - dayNamesShort: ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'], - buttonText: { - prev: "‹", - next: "›", - prevYear: "«", - nextYear: "»", + defaultButtonText: { + prev: "prev", + next: "next", + prevYear: "prev year", + nextYear: "next year", today: 'today', month: 'month', week: 'week', day: 'day' }, + + buttonIcons: { + prev: 'left-single-arrow', + next: 'right-single-arrow', + prevYear: 'left-double-arrow', + nextYear: 'right-double-arrow' + }, // jquery-ui theming theme: false, - buttonIcons: { + themeButtonIcons: { prev: 'circle-triangle-w', - next: 'circle-triangle-e' + next: 'circle-triangle-e', + prevYear: 'seek-prev', + nextYear: 'seek-next' }, //selectable: false, @@ -88,10 +105,42 @@ var defaults = { dropAccept: '*', - handleWindowResize: true + handleWindowResize: true, + windowResizeDelay: 200 // milliseconds before a rerender happens }; + +function generateShortTimeFormat(options, langData) { + return langData.longDateFormat('LT') + .replace(':mm', '(:mm)') + .replace(/(\Wmm)$/, '($1)') // like above, but for foreign langs + .replace(/\s*a$/i, 't'); // convert to AM/PM/am/pm to lowercase one-letter. remove any spaces beforehand +} + + +function generateWeekColumnFormat(options, langData) { + var format = langData.longDateFormat('L'); // for the format like "MM/DD/YYYY" + format = format.replace(/^Y+[^\w\s]*|[^\w\s]*Y+$/g, ''); // strip the year off the edge, as well as other misc non-whitespace chars + if (options.isRTL) { + format += ' ddd'; // for RTL, add day-of-week to end + } + else { + format = 'ddd ' + format; // for LTR, add day-of-week to beginning + } + return format; +} + + +var langOptionHash = { + en: { + columnFormat: { + week: 'ddd M/D' // override for english. different from the generated default, which is MM/DD + } + } +}; + + // right-to-left defaults var rtlDefaults = { header: { @@ -99,15 +148,17 @@ var rtlDefaults = { center: '', right: 'title' }, - buttonText: { - prev: "›", - next: "‹", - prevYear: "»", - nextYear: "«" - }, buttonIcons: { + prev: 'right-single-arrow', + next: 'left-single-arrow', + prevYear: 'right-double-arrow', + nextYear: 'left-double-arrow' + }, + themeButtonIcons: { prev: 'circle-triangle-e', - next: 'circle-triangle-w' + next: 'circle-triangle-w', + nextYear: 'seek-prev', + prevYear: 'seek-next' } }; @@ -115,81 +166,195 @@ var rtlDefaults = { ;; -var fc = $.fullCalendar = { version: "1.6.4" }; +var fc = $.fullCalendar = { version: "2.0.2" }; var fcViews = fc.views = {}; $.fn.fullCalendar = function(options) { + var args = Array.prototype.slice.call(arguments, 1); // for a possible method call + var res = this; // what this function will return (this jQuery object by default) + this.each(function(i, _element) { // loop each DOM element involved + var element = $(_element); + var calendar = element.data('fullCalendar'); // get the existing calendar object (if any) + var singleRes; // the returned value of this single method call - // method calling - if (typeof options == 'string') { - var args = Array.prototype.slice.call(arguments, 1); - var res; - this.each(function() { - var calendar = $.data(this, 'fullCalendar'); + // a method call + if (typeof options === 'string') { if (calendar && $.isFunction(calendar[options])) { - var r = calendar[options].apply(calendar, args); - if (res === undefined) { - res = r; + singleRes = calendar[options].apply(calendar, args); + if (!i) { + res = singleRes; // record the first method call result } - if (options == 'destroy') { - $.removeData(this, 'fullCalendar'); + if (options === 'destroy') { // for the destroy method, must remove Calendar object data + element.removeData('fullCalendar'); } } - }); - if (res !== undefined) { - return res; } - return this; - } - - options = options || {}; - - // would like to have this logic in EventManager, but needs to happen before options are recursively extended - var eventSources = options.eventSources || []; - delete options.eventSources; - if (options.events) { - eventSources.push(options.events); - delete options.events; - } - - - options = $.extend(true, {}, - defaults, - (options.isRTL || options.isRTL===undefined && defaults.isRTL) ? rtlDefaults : {}, - options - ); - - - this.each(function(i, _element) { - var element = $(_element); - var calendar = new Calendar(element, options, eventSources); - element.data('fullCalendar', calendar); // TODO: look into memory leak implications - calendar.render(); + // a new calendar initialization + else if (!calendar) { // don't initialize twice + calendar = new Calendar(element, options); + element.data('fullCalendar', calendar); + calendar.render(); + } }); - - return this; - + return res; }; // function for adding/overriding defaults function setDefaults(d) { - $.extend(true, defaults, d); + mergeOptions(defaults, d); } +// Recursively combines option hash-objects. +// Better than `$.extend(true, ...)` because arrays are not traversed/copied. +// +// called like: +// mergeOptions(target, obj1, obj2, ...) +// +function mergeOptions(target) { + + function mergeIntoTarget(name, value) { + if ($.isPlainObject(value) && $.isPlainObject(target[name]) && !isForcedAtomicOption(name)) { + // merge into a new object to avoid destruction + target[name] = mergeOptions({}, target[name], value); // combine. `value` object takes precedence + } + else if (value !== undefined) { // only use values that are set and not undefined + target[name] = value; + } + } + + for (var i=1; i") + content = $("
        ") .prependTo(element); header = new Header(t, options); @@ -312,9 +653,19 @@ function Calendar(element, options, eventSources) { $(window).unbind('resize', windowResize); + if (options.droppable) { + $(document) + .off('dragstart', droppableDragStart) + .off('dragstop', droppableDragStop); + } + + if (currentView.selectionManagerDestroy) { + currentView.selectionManagerDestroy(); + } + header.destroy(); content.remove(); - element.removeClass('fc fc-rtl ui-widget'); + element.removeClass('fc fc-ltr fc-rtl ui-widget'); } @@ -328,9 +679,9 @@ function Calendar(element, options, eventSources) { } - - /* View Rendering - -----------------------------------------------------------------------------*/ + + // View Rendering + // ----------------------------------------------------------------------------------- function changeView(newViewName) { @@ -355,7 +706,7 @@ function Calendar(element, options, eventSources) { header.activateButton(newViewName); currentView = new fcViews[newViewName]( - $("
        ") + $("
        ") .appendTo(content), t // the calendar object ); @@ -370,7 +721,8 @@ function Calendar(element, options, eventSources) { function renderView(inc) { if ( !currentView.start || // never rendered before - inc || date < currentView.start || date >= currentView.end // or new date range + inc || // explicit date window change + !date.isWithin(currentView.intervalStart, currentView.intervalEnd) // implicit date window change ) { if (elementVisible()) { _renderView(inc); @@ -389,7 +741,10 @@ function Calendar(element, options, eventSources) { } freezeContentHeight(); - currentView.render(date, inc || 0); // the view's render method ONLY renders the skeleton, nothing else + if (inc) { + date = currentView.incrementDate(date, inc); + } + currentView.render(date.clone()); // the view's render method ONLY renders the skeleton, nothing else setSize(); unfreezeContentHeight(); (currentView.afterRender || noop)(); @@ -398,7 +753,6 @@ function Calendar(element, options, eventSources) { updateTodayButton(); trigger('viewRender', currentView, currentView, currentView.element); - currentView.trigger('viewDisplay', _element); // deprecated ignoreWindowResize--; @@ -407,8 +761,8 @@ function Calendar(element, options, eventSources) { - /* Resizing - -----------------------------------------------------------------------------*/ + // Resizing + // ----------------------------------------------------------------------------------- function updateSize() { @@ -452,8 +806,11 @@ function Calendar(element, options, eventSources) { } - function windowResize() { - if (!ignoreWindowResize) { + function windowResize(ev) { + if ( + !ignoreWindowResize && + ev.target === window // so we don't process jqui "resize" events that have bubbled up + ) { if (currentView.start) { // view has already been rendered var uid = ++resizeUID; setTimeout(function() { // add a delay @@ -465,7 +822,7 @@ function Calendar(element, options, eventSources) { ignoreWindowResize--; } } - }, 200); + }, options.windowResizeDelay); }else{ // calendar must have been initialized in a 0x0 iframe that has just been resized lateRender(); @@ -494,7 +851,6 @@ function Calendar(element, options, eventSources) { function renderEvents(modifiedEventID) { // TODO: remove modifiedEventID hack if (elementVisible()) { - currentView.setEventData(events); // for View.js, TODO: unify with renderEvents currentView.renderEvents(events, modifiedEventID); // actually render the DOM elements currentView.trigger('eventAfterAllRender'); } @@ -509,7 +865,7 @@ function Calendar(element, options, eventSources) { function getAndRenderEvents() { - if (!options.lazyFetching || isFetchNeeded(currentView.visStart, currentView.visEnd)) { + if (!options.lazyFetching || isFetchNeeded(currentView.start, currentView.end)) { fetchAndRenderEvents(); } else { @@ -519,7 +875,7 @@ function Calendar(element, options, eventSources) { function fetchAndRenderEvents() { - fetchEvents(currentView.visStart, currentView.visEnd); + fetchEvents(currentView.start, currentView.end); // ... will call reportEvents // ... which will call renderEvents } @@ -549,8 +905,8 @@ function Calendar(element, options, eventSources) { function updateTodayButton() { - var today = new Date(); - if (today >= currentView.start && today < currentView.end) { + var now = t.getNow(); + if (now.isWithin(currentView.intervalStart, currentView.intervalEnd)) { header.disableButton('today'); } else { @@ -564,8 +920,8 @@ function Calendar(element, options, eventSources) { -----------------------------------------------------------------------------*/ - function select(start, end, allDay) { - currentView.select(start, end, allDay===undefined ? true : allDay); + function select(start, end) { + currentView.select(start, end); } @@ -592,49 +948,37 @@ function Calendar(element, options, eventSources) { function prevYear() { - addYears(date, -1); + date.add('years', -1); renderView(); } function nextYear() { - addYears(date, 1); + date.add('years', 1); renderView(); } function today() { - date = new Date(); + date = t.getNow(); renderView(); } - function gotoDate(year, month, dateOfMonth) { - if (year instanceof Date) { - date = cloneDate(year); // provided 1 argument, a Date - }else{ - setYMD(date, year, month, dateOfMonth); - } + function gotoDate(dateInput) { + date = t.moment(dateInput); renderView(); } - function incrementDate(years, months, days) { - if (years !== undefined) { - addYears(date, years); - } - if (months !== undefined) { - addMonths(date, months); - } - if (days !== undefined) { - addDays(date, days); - } + function incrementDate(delta) { + date.add(moment.duration(delta)); renderView(); } function getDate() { - return cloneDate(date); + return date.clone(); } @@ -665,6 +1009,11 @@ function Calendar(element, options, eventSources) { /* Misc -----------------------------------------------------------------------------*/ + + function getCalendar() { + return t; + } + function getView() { return currentView; @@ -697,24 +1046,30 @@ function Calendar(element, options, eventSources) { ------------------------------------------------------------------------*/ if (options.droppable) { + // TODO: unbind on destroy $(document) - .bind('dragstart', function(ev, ui) { - var _e = ev.target; - var e = $(_e); - if (!e.parents('.fc').length) { // not already inside a calendar - var accept = options.dropAccept; - if ($.isFunction(accept) ? accept.call(_e, e) : e.is(accept)) { - _dragElement = _e; - currentView.dragStart(_dragElement, ev, ui); - } - } - }) - .bind('dragstop', function(ev, ui) { - if (_dragElement) { - currentView.dragStop(_dragElement, ev, ui); - _dragElement = null; - } - }); + .on('dragstart', droppableDragStart) + .on('dragstop', droppableDragStop); + // this is undone in destroy + } + + function droppableDragStart(ev, ui) { + var _e = ev.target; + var e = $(_e); + if (!e.parents('.fc').length) { // not already inside a calendar + var accept = options.dropAccept; + if ($.isFunction(accept) ? accept.call(_e, e) : e.is(accept)) { + _dragElement = _e; + currentView.dragStart(_dragElement, ev, ui); + } + } + } + + function droppableDragStop(ev, ui) { + if (_dragElement) { + currentView.dragStop(_dragElement, ev, ui); + _dragElement = null; + } } @@ -791,16 +1146,30 @@ function Header(calendar, options) { }; } if (buttonClick) { - var icon = options.theme ? smartProperty(options.buttonIcons, buttonName) : null; // why are we using smartProperty here? - var text = smartProperty(options.buttonText, buttonName); // why are we using smartProperty here? + + // smartProperty allows different text per view button (ex: "Agenda Week" vs "Basic Week") + var themeIcon = smartProperty(options.themeButtonIcons, buttonName); + var normalIcon = smartProperty(options.buttonIcons, buttonName); + var defaultText = smartProperty(options.defaultButtonText, buttonName); + var customText = smartProperty(options.buttonText, buttonName); + var html; + + if (customText) { + html = htmlEscape(customText); + } + else if (themeIcon && options.theme) { + html = ""; + } + else if (normalIcon && !options.theme) { + html = ""; + } + else { + html = htmlEscape(defaultText || buttonName); + } + var button = $( "" + - (icon ? - "" + - "" + - "" : - text - ) + + html + "" ) .click(function() { @@ -893,7 +1262,7 @@ var ajaxDefaults = { var eventGUID = 1; -function EventManager(options, _sources) { +function EventManager(options) { // assumed to be a calendar var t = this; @@ -906,13 +1275,14 @@ function EventManager(options, _sources) { t.renderEvent = renderEvent; t.removeEvents = removeEvents; t.clientEvents = clientEvents; - t.normalizeEvent = normalizeEvent; + t.mutateEvent = mutateEvent; // imports var trigger = t.trigger; var getView = t.getView; var reportEvents = t.reportEvents; + var getEventEnd = t.getEventEnd; // locals @@ -923,11 +1293,17 @@ function EventManager(options, _sources) { var pendingSourceCnt = 0; var loadingLevel = 0; var cache = []; - - - for (var i=0; i<_sources.length; i++) { - _addEventSource(_sources[i]); - } + + + $.each( + (options.events ? [ options.events ] : []).concat(options.eventSources || []), + function(i, sourceInput) { + var source = buildEventSource(sourceInput); + if (source) { + sources.push(source); + } + } + ); @@ -936,7 +1312,10 @@ function EventManager(options, _sources) { function isFetchNeeded(start, end) { - return !rangeStart || start < rangeStart || end > rangeEnd; + return !rangeStart || // nothing has been fetched yet? + // or, a part of the new range is outside of the old range? (after normalizing) + start.clone().stripZone() < rangeStart.clone().stripZone() || + end.clone().stripZone() > rangeEnd.clone().stripZone(); } @@ -955,24 +1334,27 @@ function EventManager(options, _sources) { function fetchEventSource(source, fetchID) { _fetchEventSource(source, function(events) { - if (fetchID == currentFetchID) { - if (events) { + var isArraySource = $.isArray(source.events); + var i; + var event; - if (options.eventDataTransform) { - events = $.map(events, options.eventDataTransform); + if (fetchID == currentFetchID) { + + if (events) { + for (i=0; i)), return null instead - return null; -} - - -function parseISO8601(s, ignoreTimezone) { // ignoreTimezone defaults to false - // derived from http://delete.me.uk/2005/03/iso8601.html - // TODO: for a know glitch/feature, read tests/issue_206_parseDate_dst.html - var m = s.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/); - if (!m) { - return null; - } - var date = new Date(m[1], 0, 1); - if (ignoreTimezone || !m[13]) { - var check = new Date(m[1], 0, 1, 9, 0); - if (m[3]) { - date.setMonth(m[3] - 1); - check.setMonth(m[3] - 1); - } - if (m[5]) { - date.setDate(m[5]); - check.setDate(m[5]); - } - fixDate(date, check); - if (m[7]) { - date.setHours(m[7]); - } - if (m[8]) { - date.setMinutes(m[8]); - } - if (m[10]) { - date.setSeconds(m[10]); - } - if (m[12]) { - date.setMilliseconds(Number("0." + m[12]) * 1000); - } - fixDate(date, check); - }else{ - date.setUTCFullYear( - m[1], - m[3] ? m[3] - 1 : 0, - m[5] || 1 - ); - date.setUTCHours( - m[7] || 0, - m[8] || 0, - m[10] || 0, - m[12] ? Number("0." + m[12]) * 1000 : 0 - ); - if (m[14]) { - var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0); - offset *= m[15] == '-' ? 1 : -1; - date = new Date(+date + (offset * 60 * 1000)); - } - } - return date; -} - - -function parseTime(s) { // returns minutes since start of day - if (typeof s == 'number') { // an hour - return s * 60; - } - if (typeof s == 'object') { // a Date object - return s.getHours() * 60 + s.getMinutes(); - } - var m = s.match(/(\d+)(?::(\d+))?\s*(\w+)?/); - if (m) { - var h = parseInt(m[1], 10); - if (m[3]) { - h %= 12; - if (m[3].toLowerCase().charAt(0) == 'p') { - h += 12; + end = null; + if (data.end) { + end = t.moment(data.end); + if (!end.isValid()) { + return; } } - return h * 60 + (m[2] ? parseInt(m[2], 10) : 0); - } -} - - -/* Date Formatting ------------------------------------------------------------------------------*/ -// TODO: use same function formatDate(date, [date2], format, [options]) - - -function formatDate(date, format, options) { - return formatDates(date, null, format, options); -} - - -function formatDates(date1, date2, format, options) { - options = options || defaults; - var date = date1, - otherDate = date2, - i, len = format.length, c, - i2, formatter, - res = ''; - for (i=0; ii; i2--) { - if (formatter = dateFormatters[format.substring(i, i2)]) { - if (date) { - res += formatter(date, options); + // force a time/zone up the dates + if (!start.hasTime()) { + start = t.rezoneDate(start); + } + if (end && !end.hasTime()) { + end = t.rezoneDate(end); + } + } + + // Copy all properties over to the resulting object. + // The special-case properties will be copied over afterwards. + $.extend(out, data); + + if (source) { + out.source = source; + } + + out._id = data._id || (data.id === undefined ? '_fc' + eventGUID++ : data.id + ''); + + if (data.className) { + if (typeof data.className == 'string') { + out.className = data.className.split(/\s+/); + } + else { // assumed to be an array + out.className = data.className; + } + } + else { + out.className = []; + } + + out.allDay = allDay; + out.start = start; + out.end = end; + + if (options.forceEventDuration && !out.end) { + out.end = getEventEnd(out); + } + + backupEventDates(out); + + return out; + } + + + + /* Event Modification Math + -----------------------------------------------------------------------------------------*/ + + + // Modify the date(s) of an event and make this change propagate to all other events with + // the same ID (related repeating events). + // + // If `newStart`/`newEnd` are not specified, the "new" dates are assumed to be `event.start` and `event.end`. + // The "old" dates to be compare against are always `event._start` and `event._end` (set by EventManager). + // + // Returns an object with delta information and a function to undo all operations. + // + function mutateEvent(event, newStart, newEnd) { + var oldAllDay = event._allDay; + var oldStart = event._start; + var oldEnd = event._end; + var clearEnd = false; + var newAllDay; + var dateDelta; + var durationDelta; + var undoFunc; + + // if no new dates were passed in, compare against the event's existing dates + if (!newStart && !newEnd) { + newStart = event.start; + newEnd = event.end; + } + + // NOTE: throughout this function, the initial values of `newStart` and `newEnd` are + // preserved. These values may be undefined. + + // detect new allDay + if (event.allDay != oldAllDay) { // if value has changed, use it + newAllDay = event.allDay; + } + else { // otherwise, see if any of the new dates are allDay + newAllDay = !(newStart || newEnd).hasTime(); + } + + // normalize the new dates based on allDay + if (newAllDay) { + if (newStart) { + newStart = newStart.clone().stripTime(); + } + if (newEnd) { + newEnd = newEnd.clone().stripTime(); + } + } + + // compute dateDelta + if (newStart) { + if (newAllDay) { + dateDelta = dayishDiff(newStart, oldStart.clone().stripTime()); // treat oldStart as allDay + } + else { + dateDelta = dayishDiff(newStart, oldStart); + } + } + + if (newAllDay != oldAllDay) { + // if allDay has changed, always throw away the end + clearEnd = true; + } + else if (newEnd) { + durationDelta = dayishDiff( + // new duration + newEnd || t.getDefaultEventEnd(newAllDay, newStart || oldStart), + newStart || oldStart + ).subtract(dayishDiff( + // subtract old duration + oldEnd || t.getDefaultEventEnd(oldAllDay, oldStart), + oldStart + )); + } + + undoFunc = mutateEvents( + clientEvents(event._id), // get events with this ID + clearEnd, + newAllDay, + dateDelta, + durationDelta + ); + + return { + dateDelta: dateDelta, + durationDelta: durationDelta, + undo: undoFunc + }; + } + + + // Modifies an array of events in the following ways (operations are in order): + // - clear the event's `end` + // - convert the event to allDay + // - add `dateDelta` to the start and end + // - add `durationDelta` to the event's duration + // + // Returns a function that can be called to undo all the operations. + // + function mutateEvents(events, clearEnd, forceAllDay, dateDelta, durationDelta) { + var isAmbigTimezone = t.getIsAmbigTimezone(); + var undoFunctions = []; + + $.each(events, function(i, event) { + var oldAllDay = event._allDay; + var oldStart = event._start; + var oldEnd = event._end; + var newAllDay = forceAllDay != null ? forceAllDay : oldAllDay; + var newStart = oldStart.clone(); + var newEnd = (!clearEnd && oldEnd) ? oldEnd.clone() : null; + + // NOTE: this function is responsible for transforming `newStart` and `newEnd`, + // which were initialized to the OLD values first. `newEnd` may be null. + + // normlize newStart/newEnd to be consistent with newAllDay + if (newAllDay) { + newStart.stripTime(); + if (newEnd) { + newEnd.stripTime(); + } + } + else { + if (!newStart.hasTime()) { + newStart = t.rezoneDate(newStart); + } + if (newEnd && !newEnd.hasTime()) { + newEnd = t.rezoneDate(newEnd); + } + } + + // ensure we have an end date if necessary + if (!newEnd && (options.forceEventDuration || +durationDelta)) { + newEnd = t.getDefaultEventEnd(newAllDay, newStart); + } + + // translate the dates + newStart.add(dateDelta); + if (newEnd) { + newEnd.add(dateDelta).add(durationDelta); + } + + // if the dates have changed, and we know it is impossible to recompute the + // timezone offsets, strip the zone. + if (isAmbigTimezone) { + if (+dateDelta || +durationDelta) { + newStart.stripZone(); + if (newEnd) { + newEnd.stripZone(); } - i = i2 - 1; - break; } } - if (i2 == i) { - if (date) { - res += c; - } + + event.allDay = newAllDay; + event.start = newStart; + event.end = newEnd; + backupEventDates(event); + + undoFunctions.push(function() { + event.allDay = oldAllDay; + event.start = oldStart; + event.end = oldEnd; + backupEventDates(event); + }); + }); + + return function() { + for (var i=0; i 10 && date < 20) { - return 'th'; - } - return ['st', 'nd', 'rd'][date%10-1] || 'th'; - }, - w : function(d, o) { // local - return o.weekNumberCalculation(d); - }, - W : function(d) { // ISO - return iso8601Week(d); - } -}; -fc.dateFormatters = dateFormatters; - - -/* thanks jQuery UI (https://github.com/jquery/jquery-ui/blob/master/ui/jquery.ui.datepicker.js) - * - * Set as calculateWeek to determine the week of the year based on the ISO 8601 definition. - * `date` - the date to get the week for - * `number` - the number of the week within the year that contains this date - */ -function iso8601Week(date) { - var time; - var checkDate = new Date(date.getTime()); - - // Find Thursday of this week starting on Monday - checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7)); - - time = checkDate.getTime(); - checkDate.setMonth(0); // Compare with Jan 1 - checkDate.setDate(1); - return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1; } +// updates the "backup" properties, which are preserved in order to compute diffs later on. +function backupEventDates(event) { + event._allDay = event.allDay; + event._start = event.start.clone(); + event._end = event.end ? event.end.clone() : null; +} + ;; fc.applyAll = applyAll; -/* Event Date Math ------------------------------------------------------------------------------*/ +// Create an object that has the given prototype. +// Just like Object.create +function createObject(proto) { + var f = function() {}; + f.prototype = proto; + return new f(); +} -function exclEndDay(event) { - if (event.end) { - return _exclEndDay(event.end, event.allDay); - }else{ - return addDays(cloneDate(event.start), 1); +// Copies specifically-owned (non-protoype) properties of `b` onto `a`. +// FYI, $.extend would copy *all* properties of `b` onto `a`. +function extend(a, b) { + for (var i in b) { + if (b.hasOwnProperty(i)) { + a[i] = b[i]; + } } } -function _exclEndDay(end, allDay) { - end = cloneDate(end); - return allDay || end.getHours() || end.getMinutes() ? addDays(end, 1) : clearTime(end); - // why don't we check for seconds/ms too? + +/* Date +-----------------------------------------------------------------------------*/ + + +var dayIDs = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']; + + +// diffs the two moments into a Duration where full-days are recorded first, +// then the remaining time. +function dayishDiff(d1, d0) { + return moment.duration({ + days: d1.clone().stripTime().diff(d0.clone().stripTime(), 'days'), + ms: d1.time() - d0.time() + }); +} + + +function isNativeDate(input) { + return Object.prototype.toString.call(input) === '[object Date]' || + input instanceof Date; } @@ -1802,7 +2116,7 @@ function vborders(element) { function noop() { } -function dateCompare(a, b) { +function dateCompare(a, b) { // works with moments too return a - b; } @@ -1812,12 +2126,8 @@ function arrayMax(a) { } -function zeroPad(n) { - return (n < 10 ? '0' : '') + n; -} - - function smartProperty(obj, name) { // get a camel-cased/namespaced property of an object + obj = obj || {}; if (obj[name] !== undefined) { return obj[name]; } @@ -1829,12 +2139,12 @@ function smartProperty(obj, name) { // get a camel-cased/namespaced property of return res; } } - return obj['']; + return obj['default']; } function htmlEscape(s) { - return s.replace(/&/g, '&') + return (s + '').replace(/&/g, '&') .replace(//g, '>') .replace(/'/g, ''') @@ -1843,6 +2153,11 @@ function htmlEscape(s) { } +function stripHTMLEntities(text) { + return text.replace(/&.*?;/g, ''); +} + + function disableTextSelection(element) { element .attr('unselectable', 'on') @@ -1861,7 +2176,7 @@ function enableTextSelection(element) { */ -function markFirstLast(e) { +function markFirstLast(e) { // TODO: use CSS selectors instead e.children() .removeClass('fc-first fc-last') .filter(':first-child') @@ -1872,14 +2187,6 @@ function markFirstLast(e) { } -function setDayID(cell, date) { - cell.each(function(i, _cell) { - _cell.className = _cell.className.replace(/^fc-\w*/, 'fc-' + dayIDs[date.getDay()]); - // TODO: make a way that doesn't rely on order of classes - }); -} - - function getSkinCss(event, opt) { var source = event.source || {}; var eventColor = event.color; @@ -1941,6 +2248,599 @@ function firstDefined() { } +;; + +var ambigDateOfMonthRegex = /^\s*\d{4}-\d\d$/; +var ambigTimeOrZoneRegex = /^\s*\d{4}-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?)?$/; + + +// Creating +// ------------------------------------------------------------------------------------------------- + +// Creates a new moment, similar to the vanilla moment(...) constructor, but with +// extra features (ambiguous time, enhanced formatting). When gived an existing moment, +// it will function as a clone (and retain the zone of the moment). Anything else will +// result in a moment in the local zone. +fc.moment = function() { + return makeMoment(arguments); +}; + +// Sames as fc.moment, but forces the resulting moment to be in the UTC timezone. +fc.moment.utc = function() { + var mom = makeMoment(arguments, true); + + // Force it into UTC because makeMoment doesn't guarantee it. + if (mom.hasTime()) { // don't give ambiguously-timed moments a UTC zone + mom.utc(); + } + + return mom; +}; + +// Same as fc.moment, but when given an ISO8601 string, the timezone offset is preserved. +// ISO8601 strings with no timezone offset will become ambiguously zoned. +fc.moment.parseZone = function() { + return makeMoment(arguments, true, true); +}; + +// Builds an FCMoment from args. When given an existing moment, it clones. When given a native +// Date, or called with no arguments (the current time), the resulting moment will be local. +// Anything else needs to be "parsed" (a string or an array), and will be affected by: +// parseAsUTC - if there is no zone information, should we parse the input in UTC? +// parseZone - if there is zone information, should we force the zone of the moment? +function makeMoment(args, parseAsUTC, parseZone) { + var input = args[0]; + var isSingleString = args.length == 1 && typeof input === 'string'; + var isAmbigTime; + var isAmbigZone; + var ambigMatch; + var output; // an object with fields for the new FCMoment object + + if (moment.isMoment(input)) { + output = moment.apply(null, args); // clone it + + // the ambig properties have not been preserved in the clone, so reassign them + if (input._ambigTime) { + output._ambigTime = true; + } + if (input._ambigZone) { + output._ambigZone = true; + } + } + else if (isNativeDate(input) || input === undefined) { + output = moment.apply(null, args); // will be local + } + else { // "parsing" is required + isAmbigTime = false; + isAmbigZone = false; + + if (isSingleString) { + if (ambigDateOfMonthRegex.test(input)) { + // accept strings like '2014-05', but convert to the first of the month + input += '-01'; + args = [ input ]; // for when we pass it on to moment's constructor + isAmbigTime = true; + isAmbigZone = true; + } + else if ((ambigMatch = ambigTimeOrZoneRegex.exec(input))) { + isAmbigTime = !ambigMatch[5]; // no time part? + isAmbigZone = true; + } + } + else if ($.isArray(input)) { + // arrays have no timezone information, so assume ambiguous zone + isAmbigZone = true; + } + // otherwise, probably a string with a format + + if (parseAsUTC) { + output = moment.utc.apply(moment, args); + } + else { + output = moment.apply(null, args); + } + + if (isAmbigTime) { + output._ambigTime = true; + output._ambigZone = true; // ambiguous time always means ambiguous zone + } + else if (parseZone) { // let's record the inputted zone somehow + if (isAmbigZone) { + output._ambigZone = true; + } + else if (isSingleString) { + output.zone(input); // if not a valid zone, will assign UTC + } + } + } + + return new FCMoment(output); +} + +// Our subclass of Moment. +// Accepts an object with the internal Moment properties that should be copied over to +// `this` object (most likely another Moment object). The values in this data must not +// be referenced by anything else (two moments sharing a Date object for example). +function FCMoment(internalData) { + extend(this, internalData); +} + +// Chain the prototype to Moment's +FCMoment.prototype = createObject(moment.fn); + +// We need this because Moment's implementation won't create an FCMoment, +// nor will it copy over the ambig flags. +FCMoment.prototype.clone = function() { + return makeMoment([ this ]); +}; + + +// Time-of-day +// ------------------------------------------------------------------------------------------------- + +// GETTER +// Returns a Duration with the hours/minutes/seconds/ms values of the moment. +// If the moment has an ambiguous time, a duration of 00:00 will be returned. +// +// SETTER +// You can supply a Duration, a Moment, or a Duration-like argument. +// When setting the time, and the moment has an ambiguous time, it then becomes unambiguous. +FCMoment.prototype.time = function(time) { + if (time == null) { // getter + return moment.duration({ + hours: this.hours(), + minutes: this.minutes(), + seconds: this.seconds(), + milliseconds: this.milliseconds() + }); + } + else { // setter + + delete this._ambigTime; // mark that the moment now has a time + + if (!moment.isDuration(time) && !moment.isMoment(time)) { + time = moment.duration(time); + } + + // The day value should cause overflow (so 24 hours becomes 00:00:00 of next day). + // Only for Duration times, not Moment times. + var dayHours = 0; + if (moment.isDuration(time)) { + dayHours = Math.floor(time.asDays()) * 24; + } + + // We need to set the individual fields. + // Can't use startOf('day') then add duration. In case of DST at start of day. + return this.hours(dayHours + time.hours()) + .minutes(time.minutes()) + .seconds(time.seconds()) + .milliseconds(time.milliseconds()); + } +}; + +// Converts the moment to UTC, stripping out its time-of-day and timezone offset, +// but preserving its YMD. A moment with a stripped time will display no time +// nor timezone offset when .format() is called. +FCMoment.prototype.stripTime = function() { + var a = this.toArray(); // year,month,date,hours,minutes,seconds as an array + + // set the internal UTC flag + moment.fn.utc.call(this); // call the original method, because we don't want to affect _ambigZone + + this.year(a[0]) // TODO: find a way to do this in one shot + .month(a[1]) + .date(a[2]) + .hours(0) + .minutes(0) + .seconds(0) + .milliseconds(0); + + // Mark the time as ambiguous. This needs to happen after the .utc() call, which calls .zone(), which + // clears all ambig flags. Same concept with the .year/month/date calls in the case of moment-timezone. + this._ambigTime = true; + this._ambigZone = true; // if ambiguous time, also ambiguous timezone offset + + return this; // for chaining +}; + +// Returns if the moment has a non-ambiguous time (boolean) +FCMoment.prototype.hasTime = function() { + return !this._ambigTime; +}; + + +// Timezone +// ------------------------------------------------------------------------------------------------- + +// Converts the moment to UTC, stripping out its timezone offset, but preserving its +// YMD and time-of-day. A moment with a stripped timezone offset will display no +// timezone offset when .format() is called. +FCMoment.prototype.stripZone = function() { + var a = this.toArray(); // year,month,date,hours,minutes,seconds as an array + var wasAmbigTime = this._ambigTime; + + moment.fn.utc.call(this); // set the internal UTC flag + + this.year(a[0]) // TODO: find a way to do this in one shot + .month(a[1]) + .date(a[2]) + .hours(a[3]) + .minutes(a[4]) + .seconds(a[5]) + .milliseconds(a[6]); + + if (wasAmbigTime) { + // the above call to .utc()/.zone() unfortunately clears the ambig flags, so reassign + this._ambigTime = true; + } + + // Mark the zone as ambiguous. This needs to happen after the .utc() call, which calls .zone(), which + // clears all ambig flags. Same concept with the .year/month/date calls in the case of moment-timezone. + this._ambigZone = true; + + return this; // for chaining +}; + +// Returns of the moment has a non-ambiguous timezone offset (boolean) +FCMoment.prototype.hasZone = function() { + return !this._ambigZone; +}; + +// this method implicitly marks a zone +FCMoment.prototype.zone = function(tzo) { + + if (tzo != null) { + // FYI, the delete statements need to be before the .zone() call or else chaos ensues + // for reasons I don't understand. + delete this._ambigTime; + delete this._ambigZone; + } + + return moment.fn.zone.apply(this, arguments); +}; + +// this method implicitly marks a zone +FCMoment.prototype.local = function() { + var a = this.toArray(); // year,month,date,hours,minutes,seconds as an array + var wasAmbigZone = this._ambigZone; + + // will happen anyway via .local()/.zone(), but don't want to rely on internal implementation + delete this._ambigTime; + delete this._ambigZone; + + moment.fn.local.apply(this, arguments); + + if (wasAmbigZone) { + // If the moment was ambiguously zoned, the date fields were stored as UTC. + // We want to preserve these, but in local time. + this.year(a[0]) // TODO: find a way to do this in one shot + .month(a[1]) + .date(a[2]) + .hours(a[3]) + .minutes(a[4]) + .seconds(a[5]) + .milliseconds(a[6]); + } + + return this; // for chaining +}; + +// this method implicitly marks a zone +FCMoment.prototype.utc = function() { + + // will happen anyway via .local()/.zone(), but don't want to rely on internal implementation + delete this._ambigTime; + delete this._ambigZone; + + return moment.fn.utc.apply(this, arguments); +}; + + +// Formatting +// ------------------------------------------------------------------------------------------------- + +FCMoment.prototype.format = function() { + if (arguments[0]) { + return formatDate(this, arguments[0]); // our extended formatting + } + if (this._ambigTime) { + return momentFormat(this, 'YYYY-MM-DD'); + } + if (this._ambigZone) { + return momentFormat(this, 'YYYY-MM-DD[T]HH:mm:ss'); + } + return momentFormat(this); // default moment original formatting +}; + +FCMoment.prototype.toISOString = function() { + if (this._ambigTime) { + return momentFormat(this, 'YYYY-MM-DD'); + } + if (this._ambigZone) { + return momentFormat(this, 'YYYY-MM-DD[T]HH:mm:ss'); + } + return moment.fn.toISOString.apply(this, arguments); +}; + + +// Querying +// ------------------------------------------------------------------------------------------------- + +// Is the moment within the specified range? `end` is exclusive. +FCMoment.prototype.isWithin = function(start, end) { + var a = commonlyAmbiguate([ this, start, end ]); + return a[0] >= a[1] && a[0] < a[2]; +}; + +// Make these query methods work with ambiguous moments +$.each([ + 'isBefore', + 'isAfter', + 'isSame' +], function(i, methodName) { + FCMoment.prototype[methodName] = function(input, units) { + var a = commonlyAmbiguate([ this, input ]); + return moment.fn[methodName].call(a[0], a[1], units); + }; +}); + + +// Misc Internals +// ------------------------------------------------------------------------------------------------- + +// given an array of moment-like inputs, return a parallel array w/ moments similarly ambiguated. +// for example, of one moment has ambig time, but not others, all moments will have their time stripped. +function commonlyAmbiguate(inputs) { + var outputs = []; + var anyAmbigTime = false; + var anyAmbigZone = false; + var i; + + for (i=0; i "MMMM D YYYY" + formatStr = date1.lang().longDateFormat(formatStr) || formatStr; + // BTW, this is not important for `formatDate` because it is impossible to put custom tokens + // or non-zero areas in Moment's localized format strings. + + separator = separator || ' - '; + + return formatRangeWithChunks( + date1, + date2, + getFormatStringChunks(formatStr), + separator, + isRTL + ); +} +fc.formatRange = formatRange; // expose + + +function formatRangeWithChunks(date1, date2, chunks, separator, isRTL) { + var chunkStr; // the rendering of the chunk + var leftI; + var leftStr = ''; + var rightI; + var rightStr = ''; + var middleI; + var middleStr1 = ''; + var middleStr2 = ''; + var middleStr = ''; + + // Start at the leftmost side of the formatting string and continue until you hit a token + // that is not the same between dates. + for (leftI=0; leftIleftI; rightI--) { + chunkStr = formatSimilarChunk(date1, date2, chunks[rightI]); + if (chunkStr === false) { + break; + } + rightStr = chunkStr + rightStr; + } + + // The area in the middle is different for both of the dates. + // Collect them distinctly so we can jam them together later. + for (middleI=leftI; middleI<=rightI; middleI++) { + middleStr1 += formatDateWithChunk(date1, chunks[middleI]); + middleStr2 += formatDateWithChunk(date2, chunks[middleI]); + } + + if (middleStr1 || middleStr2) { + if (isRTL) { + middleStr = middleStr2 + separator + middleStr1; + } + else { + middleStr = middleStr1 + separator + middleStr2; + } + } + + return leftStr + middleStr + rightStr; +} + + +var similarUnitMap = { + Y: 'year', + M: 'month', + D: 'day', // day of month + d: 'day', // day of week + // prevents a separator between anything time-related... + A: 'second', // AM/PM + a: 'second', // am/pm + T: 'second', // A/P + t: 'second', // a/p + H: 'second', // hour (24) + h: 'second', // hour (12) + m: 'second', // minute + s: 'second' // second +}; +// TODO: week maybe? + + +// Given a formatting chunk, and given that both dates are similar in the regard the +// formatting chunk is concerned, format date1 against `chunk`. Otherwise, return `false`. +function formatSimilarChunk(date1, date2, chunk) { + var token; + var unit; + + if (typeof chunk === 'string') { // a literal string + return chunk; + } + else if ((token = chunk.token)) { + unit = similarUnitMap[token.charAt(0)]; + // are the dates the same for this unit of measurement? + if (unit && date1.isSame(date2, unit)) { + return momentFormat(date1, token); // would be the same if we used `date2` + // BTW, don't support custom tokens + } + } + + return false; // the chunk is NOT the same for the two dates + // BTW, don't support splitting on non-zero areas +} + + +// Chunking Utils +// ------------------------------------------------------------------------------------------------- + + +var formatStringChunkCache = {}; + + +function getFormatStringChunks(formatStr) { + if (formatStr in formatStringChunkCache) { + return formatStringChunkCache[formatStr]; + } + return (formatStringChunkCache[formatStr] = chunkFormatString(formatStr)); +} + + +// Break the formatting string into an array of chunks +function chunkFormatString(formatStr) { + var chunks = []; + var chunker = /\[([^\]]*)\]|\(([^\)]*)\)|(LT|(\w)\4*o?)|([^\w\[\(]+)/g; // TODO: more descrimination + var match; + + while ((match = chunker.exec(formatStr))) { + if (match[1]) { // a literal string inside [ ... ] + chunks.push(match[1]); + } + else if (match[2]) { // non-zero formatting inside ( ... ) + chunks.push({ maybe: chunkFormatString(match[2]) }); + } + else if (match[3]) { // a formatting token + chunks.push({ token: match[3] }); + } + else if (match[5]) { // an unenclosed literal string + chunks.push(match[5]); + } + } + + return chunks; +} + ;; fcViews.month = MonthView; @@ -1950,56 +2850,45 @@ function MonthView(element, calendar) { // exports + t.incrementDate = incrementDate; t.render = render; // imports BasicView.call(t, element, calendar, 'month'); - var opt = t.opt; - var renderBasic = t.renderBasic; - var skipHiddenDays = t.skipHiddenDays; - var getCellsPerWeek = t.getCellsPerWeek; - var formatDate = calendar.formatDate; - - - function render(date, delta) { - if (delta) { - addMonths(date, delta); - date.setDate(1); - } - var firstDay = opt('firstDay'); + function incrementDate(date, delta) { + return date.clone().stripTime().add('months', delta).startOf('month'); + } - var start = cloneDate(date, true); - start.setDate(1); - var end = addMonths(cloneDate(start), 1); + function render(date) { - var visStart = cloneDate(start); - addDays(visStart, -((visStart.getDay() - firstDay + 7) % 7)); - skipHiddenDays(visStart); + t.intervalStart = date.clone().stripTime().startOf('month'); + t.intervalEnd = t.intervalStart.clone().add('months', 1); - var visEnd = cloneDate(end); - addDays(visEnd, (7 - visEnd.getDay() + firstDay) % 7); - skipHiddenDays(visEnd, -1, true); + t.start = t.intervalStart.clone(); + t.start = t.skipHiddenDays(t.start); // move past the first week if no visible days + t.start.startOf('week'); + t.start = t.skipHiddenDays(t.start); // move past the first invisible days of the week - var colCnt = getCellsPerWeek(); - var rowCnt = Math.round(dayDiff(visEnd, visStart) / 7); // should be no need for Math.round + t.end = t.intervalEnd.clone(); + t.end = t.skipHiddenDays(t.end, -1, true); // move in from the last week if no visible days + t.end.add('days', (7 - t.end.weekday()) % 7); // move to end of week if not already + t.end = t.skipHiddenDays(t.end, -1, true); // move in from the last invisible days of the week - if (opt('weekMode') == 'fixed') { - addDays(visEnd, (6 - rowCnt) * 7); // add weeks to make up for it + var rowCnt = Math.ceil( // need to ceil in case there are hidden days + t.end.diff(t.start, 'weeks', true) // returnfloat=true + ); + if (t.opt('weekMode') == 'fixed') { + t.end.add('weeks', 6 - rowCnt); rowCnt = 6; } - t.title = formatDate(start, opt('titleFormat')); + t.title = calendar.formatDate(t.intervalStart, t.opt('titleFormat')); - t.start = start; - t.end = end; - t.visStart = visStart; - t.visEnd = visEnd; - - renderBasic(rowCnt, colCnt, true); + t.renderBasic(rowCnt, t.getCellsPerWeek(), true); } @@ -2009,52 +2898,40 @@ function MonthView(element, calendar) { fcViews.basicWeek = BasicWeekView; -function BasicWeekView(element, calendar) { +function BasicWeekView(element, calendar) { // TODO: do a WeekView mixin var t = this; // exports + t.incrementDate = incrementDate; t.render = render; // imports BasicView.call(t, element, calendar, 'basicWeek'); - var opt = t.opt; - var renderBasic = t.renderBasic; - var skipHiddenDays = t.skipHiddenDays; - var getCellsPerWeek = t.getCellsPerWeek; - var formatDates = calendar.formatDates; - - - function render(date, delta) { - if (delta) { - addDays(date, delta * 7); - } - var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7)); - var end = addDays(cloneDate(start), 7); + function incrementDate(date, delta) { + return date.clone().stripTime().add('weeks', delta).startOf('week'); + } - var visStart = cloneDate(start); - skipHiddenDays(visStart); - var visEnd = cloneDate(end); - skipHiddenDays(visEnd, -1, true); + function render(date) { - var colCnt = getCellsPerWeek(); + t.intervalStart = date.clone().stripTime().startOf('week'); + t.intervalEnd = t.intervalStart.clone().add('weeks', 1); - t.start = start; - t.end = end; - t.visStart = visStart; - t.visEnd = visEnd; + t.start = t.skipHiddenDays(t.intervalStart); + t.end = t.skipHiddenDays(t.intervalEnd, -1, true); - t.title = formatDates( - visStart, - addDays(cloneDate(visEnd), -1), - opt('titleFormat') + t.title = calendar.formatRange( + t.start, + t.end.clone().subtract(1), // make inclusive by subtracting 1 ms + t.opt('titleFormat'), + ' \u2014 ' // emphasized dash ); - renderBasic(1, colCnt, false); + t.renderBasic(1, t.getCellsPerWeek(), false); } @@ -2064,39 +2941,34 @@ function BasicWeekView(element, calendar) { fcViews.basicDay = BasicDayView; - -function BasicDayView(element, calendar) { +function BasicDayView(element, calendar) { // TODO: make a DayView mixin var t = this; // exports + t.incrementDate = incrementDate; t.render = render; // imports BasicView.call(t, element, calendar, 'basicDay'); - var opt = t.opt; - var renderBasic = t.renderBasic; - var skipHiddenDays = t.skipHiddenDays; - var formatDate = calendar.formatDate; - - - function render(date, delta) { - if (delta) { - addDays(date, delta); - } - skipHiddenDays(date, delta < 0 ? -1 : 1); - var start = cloneDate(date, true); - var end = addDays(cloneDate(start), 1); + function incrementDate(date, delta) { + var out = date.clone().stripTime().add('days', delta); + out = t.skipHiddenDays(out, delta < 0 ? -1 : 1); + return out; + } - t.title = formatDate(date, opt('titleFormat')); - t.start = t.visStart = start; - t.end = t.visEnd = end; + function render(date) { - renderBasic(1, 1, false); + t.start = t.intervalStart = date.clone().stripTime(); + t.end = t.intervalEnd = t.start.clone().add('days', 1); + + t.title = calendar.formatDate(t.start, t.opt('titleFormat')); + + t.renderBasic(1, 1, false); } @@ -2124,18 +2996,17 @@ function BasicView(element, calendar, viewName) { t.reportDayClick = reportDayClick; // for selection (kinda hacky) t.dragStart = dragStart; t.dragStop = dragStop; - t.defaultEventEnd = defaultEventEnd; - t.getHoverListener = function() { return hoverListener }; + t.getHoverListener = function() { return hoverListener; }; t.colLeft = colLeft; t.colRight = colRight; t.colContentLeft = colContentLeft; t.colContentRight = colContentRight; - t.getIsCellAllDay = function() { return true }; + t.getIsCellAllDay = function() { return true; }; t.allDayRow = allDayRow; - t.getRowCnt = function() { return rowCnt }; - t.getColCnt = function() { return colCnt }; - t.getColWidth = function() { return colWidth }; - t.getDaySegmentContainer = function() { return daySegmentContainer }; + t.getRowCnt = function() { return rowCnt; }; + t.getColCnt = function() { return colCnt; }; + t.getColWidth = function() { return colWidth; }; + t.getDaySegmentContainer = function() { return daySegmentContainer; }; // imports @@ -2152,6 +3023,7 @@ function BasicView(element, calendar, viewName) { var dateToCell = t.dateToCell; var rangeToSegments = t.rangeToSegments; var formatDate = calendar.formatDate; + var calculateWeekNumber = calendar.calculateWeekNumber; // locals @@ -2182,8 +3054,6 @@ function BasicView(element, calendar, viewName) { var tm; var colFormat; var showWeekNumbers; - var weekNumberTitle; - var weekNumberFormat; @@ -2211,16 +3081,7 @@ function BasicView(element, calendar, viewName) { function updateOptions() { tm = opt('theme') ? 'ui' : 'fc'; colFormat = opt('columnFormat'); - - // week # options. (TODO: bad, logic also in other views) showWeekNumbers = opt('weekNumbers'); - weekNumberTitle = opt('weekNumberTitle'); - if (opt('weekNumberCalculation') != 'iso') { - weekNumberFormat = "w"; - } - else { - weekNumberFormat = "W"; - } } @@ -2293,14 +3154,14 @@ function BasicView(element, calendar, viewName) { if (showWeekNumbers) { html += "" + - htmlEscape(weekNumberTitle) + + htmlEscape(opt('weekNumberTitle')) + ""; } for (col=0; col" + + "" + htmlEscape(formatDate(date, colFormat)) + ""; } @@ -2329,7 +3190,7 @@ function BasicView(element, calendar, viewName) { html += "" + "
        " + - htmlEscape(formatDate(date, weekNumberFormat)) + + htmlEscape(calculateWeekNumber(date)) + "
        " + ""; } @@ -2348,21 +3209,21 @@ function BasicView(element, calendar, viewName) { } - function buildCellHTML(date) { - var contentClass = tm + "-widget-content"; - var month = t.start.getMonth(); - var today = clearTime(new Date()); + function buildCellHTML(date) { // date assumed to have stripped time + var month = t.intervalStart.month(); + var today = calendar.getNow().stripTime(); var html = ''; + var contentClass = tm + "-widget-content"; var classNames = [ 'fc-day', - 'fc-' + dayIDs[date.getDay()], + 'fc-' + dayIDs[date.day()], contentClass ]; - if (date.getMonth() != month) { + if (date.month() != month) { classNames.push('fc-other-month'); } - if (+date == +today) { + if (date.isSame(today, 'day')) { classNames.push( 'fc-today', tm + '-state-highlight' @@ -2378,12 +3239,12 @@ function BasicView(element, calendar, viewName) { html += "" + "
        "; if (showNumbers) { - html += "
        " + date.getDate() + "
        "; + html += "
        " + date.date() + "
        "; } html += @@ -2405,7 +3266,7 @@ function BasicView(element, calendar, viewName) { function setHeight(height) { viewHeight = height; - var bodyHeight = viewHeight - head.height(); + var bodyHeight = Math.max(viewHeight - head.height(), 0); var rowHeight; var rowHeightLast; var cell; @@ -2458,8 +3319,8 @@ function BasicView(element, calendar, viewName) { function dayClick(ev) { if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick - var date = parseISO8601($(this).data('date')); - trigger('dayClick', this, date, true, ev); + var date = calendar.moment($(this).data('date')); + trigger('dayClick', this, date, ev); } } @@ -2503,13 +3364,13 @@ function BasicView(element, calendar, viewName) { -----------------------------------------------------------------------*/ - function defaultSelectionEnd(startDate, allDay) { - return cloneDate(startDate); + function defaultSelectionEnd(start) { + return start.clone().stripTime().add('days', 1); } - function renderSelection(startDate, endDate, allDay) { - renderDayOverlay(startDate, addDays(cloneDate(endDate), 1), true); // rebuild every time??? + function renderSelection(start, end) { // end is exclusive + renderDayOverlay(start, end, true); // true = rebuild every time } @@ -2518,10 +3379,10 @@ function BasicView(element, calendar, viewName) { } - function reportDayClick(date, allDay, ev) { + function reportDayClick(date, ev) { var cell = dateToCell(date); var _element = bodyCells[cell.row*colCnt + cell.col]; - trigger('dayClick', _element, date, allDay, ev); + trigger('dayClick', _element, date, ev); } @@ -2534,7 +3395,9 @@ function BasicView(element, calendar, viewName) { hoverListener.start(function(cell) { clearOverlays(); if (cell) { - renderCellOverlay(cell.row, cell.col, cell.row, cell.col); + var d1 = cellToDate(cell); + var d2 = d1.clone().add(calendar.defaultAllDayEventDuration); + renderDayOverlay(d1, d2); } }, ev); } @@ -2544,8 +3407,13 @@ function BasicView(element, calendar, viewName) { var cell = hoverListener.stop(); clearOverlays(); if (cell) { - var d = cellToDate(cell); - trigger('drop', _dragElement, d, true, ev, ui); + trigger( + 'drop', + _dragElement, + cellToDate(cell), + ev, + ui + ); } } @@ -2555,11 +3423,6 @@ function BasicView(element, calendar, viewName) { --------------------------------------------------------*/ - function defaultEventEnd(event) { - return cloneDate(event.start); - } - - coordinateGrid = new CoordinateGrid(function(rows, cols) { var e, n, p; headCells.each(function(i, _e) { @@ -2657,93 +3520,77 @@ function BasicEventRenderer() { fcViews.agendaWeek = AgendaWeekView; -function AgendaWeekView(element, calendar) { +function AgendaWeekView(element, calendar) { // TODO: do a WeekView mixin var t = this; // exports + t.incrementDate = incrementDate; t.render = render; // imports AgendaView.call(t, element, calendar, 'agendaWeek'); - var opt = t.opt; - var renderAgenda = t.renderAgenda; - var skipHiddenDays = t.skipHiddenDays; - var getCellsPerWeek = t.getCellsPerWeek; - var formatDates = calendar.formatDates; - - function render(date, delta) { - if (delta) { - addDays(date, delta * 7); - } + function incrementDate(date, delta) { + return date.clone().stripTime().add('weeks', delta).startOf('week'); + } - var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7)); - var end = addDays(cloneDate(start), 7); - var visStart = cloneDate(start); - skipHiddenDays(visStart); + function render(date) { - var visEnd = cloneDate(end); - skipHiddenDays(visEnd, -1, true); + t.intervalStart = date.clone().stripTime().startOf('week'); + t.intervalEnd = t.intervalStart.clone().add('weeks', 1); - var colCnt = getCellsPerWeek(); + t.start = t.skipHiddenDays(t.intervalStart); + t.end = t.skipHiddenDays(t.intervalEnd, -1, true); - t.title = formatDates( - visStart, - addDays(cloneDate(visEnd), -1), - opt('titleFormat') + t.title = calendar.formatRange( + t.start, + t.end.clone().subtract(1), // make inclusive by subtracting 1 ms + t.opt('titleFormat'), + ' \u2014 ' // emphasized dash ); - t.start = start; - t.end = end; - t.visStart = visStart; - t.visEnd = visEnd; - - renderAgenda(colCnt); + t.renderAgenda(t.getCellsPerWeek()); } + } ;; fcViews.agendaDay = AgendaDayView; - -function AgendaDayView(element, calendar) { +function AgendaDayView(element, calendar) { // TODO: make a DayView mixin var t = this; // exports + t.incrementDate = incrementDate; t.render = render; // imports AgendaView.call(t, element, calendar, 'agendaDay'); - var opt = t.opt; - var renderAgenda = t.renderAgenda; - var skipHiddenDays = t.skipHiddenDays; - var formatDate = calendar.formatDate; - - - function render(date, delta) { - if (delta) { - addDays(date, delta); - } - skipHiddenDays(date, delta < 0 ? -1 : 1); - var start = cloneDate(date, true); - var end = addDays(cloneDate(start), 1); + function incrementDate(date, delta) { + var out = date.clone().stripTime().add('days', delta); + out = t.skipHiddenDays(out, delta < 0 ? -1 : 1); + return out; + } - t.title = formatDate(date, opt('titleFormat')); - t.start = t.visStart = start; - t.end = t.visEnd = end; + function render(date) { - renderAgenda(1); + t.start = t.intervalStart = date.clone().stripTime(); + t.end = t.intervalEnd = t.start.clone().add('days', 1); + + t.title = calendar.formatDate(t.start, t.opt('titleFormat')); + + t.renderAgenda(1); } @@ -2754,22 +3601,39 @@ function AgendaDayView(element, calendar) { setDefaults({ allDaySlot: true, allDayText: 'all-day', - firstHour: 6, - slotMinutes: 30, - defaultEventMinutes: 120, - axisFormat: 'h(:mm)tt', + + scrollTime: '06:00:00', + + slotDuration: '00:30:00', + + axisFormat: generateAgendaAxisFormat, timeFormat: { - agenda: 'h:mm{ - h:mm}' + agenda: generateAgendaTimeFormat }, + dragOpacity: { agenda: .5 }, - minTime: 0, - maxTime: 24, + minTime: '00:00:00', + maxTime: '24:00:00', slotEventOverlap: true }); +function generateAgendaAxisFormat(options, langData) { + return langData.longDateFormat('LT') + .replace(':mm', '(:mm)') + .replace(/(\Wmm)$/, '($1)') // like above, but for foreign langs + .replace(/\s*a$/i, 'a'); // convert AM/PM/am/pm to lowercase. remove any spaces beforehand +} + + +function generateAgendaTimeFormat(options, langData) { + return langData.longDateFormat('LT') + .replace(/\s*a$/i, ''); // remove trailing AM/PM +} + + // TODO: make it work in quirks mode (event corners, all-day height) // TODO: test liquid width, especially in IE6 @@ -2783,26 +3647,27 @@ function AgendaView(element, calendar, viewName) { t.setWidth = setWidth; t.setHeight = setHeight; t.afterRender = afterRender; - t.defaultEventEnd = defaultEventEnd; - t.timePosition = timePosition; + t.computeDateTop = computeDateTop; t.getIsCellAllDay = getIsCellAllDay; - t.allDayRow = getAllDayRow; - t.getCoordinateGrid = function() { return coordinateGrid }; // specifically for AgendaEventRenderer - t.getHoverListener = function() { return hoverListener }; + t.allDayRow = function() { return allDayRow; }; // badly named + t.getCoordinateGrid = function() { return coordinateGrid; }; // specifically for AgendaEventRenderer + t.getHoverListener = function() { return hoverListener; }; t.colLeft = colLeft; t.colRight = colRight; t.colContentLeft = colContentLeft; t.colContentRight = colContentRight; - t.getDaySegmentContainer = function() { return daySegmentContainer }; - t.getSlotSegmentContainer = function() { return slotSegmentContainer }; - t.getMinMinute = function() { return minMinute }; - t.getMaxMinute = function() { return maxMinute }; - t.getSlotContainer = function() { return slotContainer }; - t.getRowCnt = function() { return 1 }; - t.getColCnt = function() { return colCnt }; - t.getColWidth = function() { return colWidth }; - t.getSnapHeight = function() { return snapHeight }; - t.getSnapMinutes = function() { return snapMinutes }; + t.getDaySegmentContainer = function() { return daySegmentContainer; }; + t.getSlotSegmentContainer = function() { return slotSegmentContainer; }; + t.getSlotContainer = function() { return slotContainer; }; + t.getRowCnt = function() { return 1; }; + t.getColCnt = function() { return colCnt; }; + t.getColWidth = function() { return colWidth; }; + t.getSnapHeight = function() { return snapHeight; }; + t.getSnapDuration = function() { return snapDuration; }; + t.getSlotHeight = function() { return slotHeight; }; + t.getSlotDuration = function() { return slotDuration; }; + t.getMinTime = function() { return minTime; }; + t.getMaxTime = function() { return maxTime; }; t.defaultSelectionEnd = defaultSelectionEnd; t.renderDayOverlay = renderDayOverlay; t.renderSelection = renderSelection; @@ -2829,6 +3694,7 @@ function AgendaView(element, calendar, viewName) { var dateToCell = t.dateToCell; var rangeToSegments = t.rangeToSegments; var formatDate = calendar.formatDate; + var calculateWeekNumber = calendar.calculateWeekNumber; // locals @@ -2857,9 +3723,11 @@ function AgendaView(element, calendar, viewName) { var axisWidth; var colWidth; var gutterWidth; + + var slotDuration; var slotHeight; // TODO: what if slotHeight changes? (see issue 650) - var snapMinutes; + var snapDuration; var snapRatio; // ratio of number of "selection" slots to normal slots. (ex: 1, 2, 4) var snapHeight; // holds the pixel hight of a "selection" slot @@ -2873,11 +3741,9 @@ function AgendaView(element, calendar, viewName) { var tm; var rtl; - var minMinute, maxMinute; + var minTime; + var maxTime; var colFormat; - var showWeekNumbers; - var weekNumberTitle; - var weekNumberFormat; @@ -2904,22 +3770,15 @@ function AgendaView(element, calendar, viewName) { function updateOptions() { tm = opt('theme') ? 'ui' : 'fc'; - rtl = opt('isRTL') - minMinute = parseTime(opt('minTime')); - maxMinute = parseTime(opt('maxTime')); + rtl = opt('isRTL'); colFormat = opt('columnFormat'); - // week # options. (TODO: bad, logic also in other views) - showWeekNumbers = opt('weekNumbers'); - weekNumberTitle = opt('weekNumberTitle'); - if (opt('weekNumberCalculation') != 'iso') { - weekNumberFormat = "w"; - } - else { - weekNumberFormat = "W"; - } + minTime = moment.duration(opt('minTime')); + maxTime = moment.duration(opt('maxTime')); - snapMinutes = opt('snapMinutes') || opt('slotMinutes'); + slotDuration = moment.duration(opt('slotDuration')); + snapDuration = opt('snapDuration'); + snapDuration = snapDuration ? moment.duration(snapDuration) : slotDuration; } @@ -2929,14 +3788,13 @@ function AgendaView(element, calendar, viewName) { function buildSkeleton() { + var s; var headerClass = tm + "-widget-header"; var contentClass = tm + "-widget-content"; - var s; - var d; - var i; - var maxd; + var slotTime; + var slotDate; var minutes; - var slotNormal = opt('slotMinutes') % 15 == 0; + var slotNormal = slotDuration.asMinutes() % 15 === 0; buildDayTable(); @@ -2953,7 +3811,12 @@ function AgendaView(element, calendar, viewName) { s = "" + "" + - "" + + "" + "" + @@ -2992,27 +3855,32 @@ function AgendaView(element, calendar, viewName) { s = "
        " + opt('allDayText') + "" + + ( + opt('allDayHTML') || + htmlEscape(opt('allDayText')) + ) + + "" + "
        " + "
        " + ""; - d = zeroDate(); - maxd = addMinutes(cloneDate(d), maxMinute); - addMinutes(d, minMinute); + + slotTime = moment.duration(+minTime); // i wish there was .clone() for durations slotCnt = 0; - for (i=0; d < maxd; i++) { - minutes = d.getMinutes(); + while (slotTime < maxTime) { + slotDate = t.start.clone().time(slotTime); // will be in UTC but that's good. to avoid DST issues + minutes = slotDate.minutes(); s += - "" + + "" + "" + "" + ""; - addMinutes(d, opt('slotMinutes')); + slotTime.add(slotDuration); slotCnt++; } + s += "" + "
        " + - ((!slotNormal || !minutes) ? formatDate(d, opt('axisFormat')) : ' ') + + ((!slotNormal || !minutes) ? + htmlEscape(formatDate(slotDate, opt('axisFormat'))) : + ' ' + ) + "" + "
         
        " + "
        "; + slotTable = $(s).appendTo(slotContainer); slotBind(slotTable.find('td')); @@ -3071,14 +3939,14 @@ function AgendaView(element, calendar, viewName) { "" + ""; - if (showWeekNumbers) { + if (opt('weekNumbers')) { date = cellToDate(0, 0); - weekText = formatDate(date, weekNumberFormat); + weekText = calculateWeekNumber(date); if (rtl) { - weekText += weekNumberTitle; + weekText += opt('weekNumberTitle'); } else { - weekText = weekNumberTitle + weekText; + weekText = opt('weekNumberTitle') + weekText; } html += "" + @@ -3092,7 +3960,7 @@ function AgendaView(element, calendar, viewName) { for (col=0; col" + + "" + htmlEscape(formatDate(date, colFormat)) + ""; } @@ -3110,7 +3978,7 @@ function AgendaView(element, calendar, viewName) { var headerClass = tm + "-widget-header"; // TODO: make these when updateOptions() called var contentClass = tm + "-widget-content"; var date; - var today = clearTime(new Date()); + var today = calendar.getNow().stripTime(); var col; var cellsHTML; var cellHTML; @@ -3130,10 +3998,10 @@ function AgendaView(element, calendar, viewName) { classNames = [ 'fc-col' + col, - 'fc-' + dayIDs[date.getDay()], + 'fc-' + dayIDs[date.day()], contentClass ]; - if (+date == +today) { + if (date.isSame(today, 'day')) { classNames.push( tm + '-state-highlight', 'fc-today' @@ -3199,9 +4067,12 @@ function AgendaView(element, calendar, viewName) { // the stylesheet guarantees that the first row has no border. // this allows .height() to work well cross-browser. - slotHeight = slotTable.find('tr:first').height() + 1; // +1 for bottom border + var slotHeight0 = slotTable.find('tr:first').height() + 1; // +1 for bottom border + var slotHeight1 = slotTable.find('tr:eq(1)').height(); + // HACK: i forget why we do this, but i think a cross-browser issue + slotHeight = (slotHeight0 + slotHeight1) / 2; - snapRatio = opt('slotMinutes') / snapMinutes; + snapRatio = slotDuration / snapDuration; snapHeight = slotHeight / snapRatio; } @@ -3259,13 +4130,14 @@ function AgendaView(element, calendar, viewName) { function resetScroll() { - var d0 = zeroDate(); - var scrollDate = cloneDate(d0); - scrollDate.setHours(opt('firstHour')); - var top = timePosition(d0, scrollDate) + 1; // +1 for the border + var top = computeTimeTop( + moment.duration(opt('scrollTime')) + ) + 1; // +1 for the border + function scroll() { slotScroller.scrollTop(top); } + scroll(); setTimeout(scroll, 0); // overrides any previous scroll state made by the browser } @@ -3297,15 +4169,24 @@ function AgendaView(element, calendar, viewName) { if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick var col = Math.min(colCnt-1, Math.floor((ev.pageX - dayTable.offset().left - axisWidth) / colWidth)); var date = cellToDate(0, col); - var rowMatch = this.parentNode.className.match(/fc-slot(\d+)/); // TODO: maybe use data - if (rowMatch) { - var mins = parseInt(rowMatch[1]) * opt('slotMinutes'); - var hours = Math.floor(mins/60); - date.setHours(hours); - date.setMinutes(mins%60 + minMinute); - trigger('dayClick', dayBodyCells[col], date, false, ev); + var match = this.parentNode.className.match(/fc-slot(\d+)/); // TODO: maybe use data + if (match) { + var slotIndex = parseInt(match[1], 10); + date.add(minTime + slotIndex * slotDuration); + date = calendar.rezoneDate(date); + trigger( + 'dayClick', + dayBodyCells[col], + date, + ev + ); }else{ - trigger('dayClick', dayBodyCells[col], date, true, ev); + trigger( + 'dayClick', + dayBodyCells[col], + date, + ev + ); } } } @@ -3346,15 +4227,24 @@ function AgendaView(element, calendar, viewName) { function renderSlotOverlay(overlayStart, overlayEnd) { - for (var i=0; i= 0) { - addMinutes(d, minMinute + slotIndex * snapMinutes); + + if (snapIndex >= 0) { + date.time(moment.duration(minTime + snapIndex * snapDuration)); + date = calendar.rezoneDate(date); } - return d; + + return date; } - - - // get the Y coordinate of the given time on the given day (both Date objects) - function timePosition(day, time) { // both date objects. day holds 00:00 of current day - day = cloneDate(day, true); - if (time < addMinutes(cloneDate(day), minMinute)) { + + + function computeDateTop(date, startOfDayDate) { + return computeTimeTop( + moment.duration( + date.clone().stripZone() - startOfDayDate.clone().stripTime() + ) + ); + } + + + function computeTimeTop(time) { // time is a duration + + if (time < minTime) { return 0; } - if (time >= addMinutes(cloneDate(day), maxMinute)) { + if (time >= maxTime) { return slotTable.height(); } - var slotMinutes = opt('slotMinutes'), - minutes = time.getHours()*60 + time.getMinutes() - minMinute, - slotI = Math.floor(minutes / slotMinutes), - slotTop = slotTopCache[slotI]; + + var slots = (time - minTime) / slotDuration; + var slotIndex = Math.floor(slots); + var slotPartial = slots - slotIndex; + var slotTop = slotTopCache[slotIndex]; + + // find the position of the corresponding + // need to use this tecnhique because not all rows are rendered at same height sometimes. if (slotTop === undefined) { - slotTop = slotTopCache[slotI] = - slotTable.find('tr').eq(slotI).find('td div')[0].offsetTop; + slotTop = slotTopCache[slotIndex] = + slotTable.find('tr').eq(slotIndex).find('td div')[0].offsetTop; // .eq() is faster than ":eq()" selector // [0].offsetTop is faster than .position().top (do we really need this optimization?) // a better optimization would be to cache all these divs } - return Math.max(0, Math.round( - slotTop - 1 + slotHeight * ((minutes % slotMinutes) / slotMinutes) - )); - } - - - function getAllDayRow(index) { - return allDayRow; - } - - - function defaultEventEnd(event) { - var start = cloneDate(event.start); - if (event.allDay) { - return start; - } - return addMinutes(start, opt('defaultEventMinutes')); + + var top = + slotTop - 1 + // because first row doesn't have a top border + slotPartial * slotHeight; // part-way through the row + + top = Math.max(top, 0); + + return top; } /* Selection ---------------------------------------------------------------------------------*/ + - - function defaultSelectionEnd(startDate, allDay) { - if (allDay) { - return cloneDate(startDate); + function defaultSelectionEnd(start) { + if (start.hasTime()) { + return start.clone().add(slotDuration); + } + else { + return start.clone().add('days', 1); } - return addMinutes(cloneDate(startDate), opt('slotMinutes')); } - function renderSelection(startDate, endDate, allDay) { // only for all-day - if (allDay) { - if (opt('allDaySlot')) { - renderDayOverlay(startDate, addDays(cloneDate(endDate), 1), true); - } - }else{ - renderSlotSelection(startDate, endDate); + function renderSelection(start, end) { + if (start.hasTime() || end.hasTime()) { + renderSlotSelection(start, end); + } + else if (opt('allDaySlot')) { + renderDayOverlay(start, end, true); // true for refreshing coordinate grid } } @@ -3522,8 +4423,8 @@ function AgendaView(element, calendar, viewName) { var col = dateToCell(startDate).col; if (col >= 0 && col < colCnt) { // only works when times are on same day var rect = coordinateGrid.rect(0, col, 0, col, slotContainer); // only for horizontal coords - var top = timePosition(startDate, startDate); - var bottom = timePosition(startDate, endDate); + var top = computeDateTop(startDate, startDate); + var bottom = computeDateTop(endDate, startDate); if (bottom > top) { // protect against selections that are entirely before or after visible range rect.top = top; rect.height = bottom - top; @@ -3586,9 +4487,9 @@ function AgendaView(element, calendar, viewName) { var d2 = realCellToDate(cell); dates = [ d1, - addMinutes(cloneDate(d1), snapMinutes), // calculate minutes depending on selection slot minutes + d1.clone().add(snapDuration), // calculate minutes depending on selection slot minutes d2, - addMinutes(cloneDate(d2), snapMinutes) + d2.clone().add(snapDuration) ].sort(dateCompare); renderSlotSelection(dates[0], dates[3]); }else{ @@ -3599,17 +4500,17 @@ function AgendaView(element, calendar, viewName) { hoverListener.stop(); if (dates) { if (+dates[0] == +dates[1]) { - reportDayClick(dates[0], false, ev); + reportDayClick(dates[0], ev); } - reportSelection(dates[0], dates[3], false, ev); + reportSelection(dates[0], dates[3], ev); } }); } } - function reportDayClick(date, allDay, ev) { - trigger('dayClick', dayBodyCells[dateToCell(date).col], date, allDay, ev); + function reportDayClick(date, ev) { + trigger('dayClick', dayBodyCells[dateToCell(date).col], date, ev); } @@ -3622,13 +4523,16 @@ function AgendaView(element, calendar, viewName) { hoverListener.start(function(cell) { clearOverlays(); if (cell) { - if (getIsCellAllDay(cell)) { - renderCellOverlay(cell.row, cell.col, cell.row, cell.col); - }else{ - var d1 = realCellToDate(cell); - var d2 = addMinutes(cloneDate(d1), opt('defaultEventMinutes')); + var d1 = realCellToDate(cell); + var d2 = d1.clone(); + if (d1.hasTime()) { + d2.add(calendar.defaultTimedEventDuration); renderSlotOverlay(d1, d2); } + else { + d2.add(calendar.defaultAllDayEventDuration); + renderDayOverlay(d1, d2); + } } }, ev); } @@ -3638,7 +4542,13 @@ function AgendaView(element, calendar, viewName) { var cell = hoverListener.stop(); clearOverlays(); if (cell) { - trigger('drop', _dragElement, realCellToDate(cell), getIsCellAllDay(cell), ev, ui); + trigger( + 'drop', + _dragElement, + realCellToDate(cell), + ev, + ui + ); } } @@ -3663,15 +4573,12 @@ function AgendaEventRenderer() { var trigger = t.trigger; var isEventDraggable = t.isEventDraggable; var isEventResizable = t.isEventResizable; - var eventEnd = t.eventEnd; var eventElementHandlers = t.eventElementHandlers; var setHeight = t.setHeight; var getDaySegmentContainer = t.getDaySegmentContainer; var getSlotSegmentContainer = t.getSlotSegmentContainer; var getHoverListener = t.getHoverListener; - var getMaxMinute = t.getMaxMinute; - var getMinMinute = t.getMinMinute; - var timePosition = t.timePosition; + var computeDateTop = t.computeDateTop; var getIsCellAllDay = t.getIsCellAllDay; var colContentLeft = t.colContentLeft; var colContentRight = t.colContentRight; @@ -3679,7 +4586,9 @@ function AgendaEventRenderer() { var getColCnt = t.getColCnt; var getColWidth = t.getColWidth; var getSnapHeight = t.getSnapHeight; - var getSnapMinutes = t.getSnapMinutes; + var getSnapDuration = t.getSnapDuration; + var getSlotHeight = t.getSlotHeight; + var getSlotDuration = t.getSlotDuration; var getSlotContainer = t.getSlotContainer; var reportEventElement = t.reportEventElement; var showEvents = t.showEvents; @@ -3689,9 +4598,11 @@ function AgendaEventRenderer() { var renderDayOverlay = t.renderDayOverlay; var clearOverlays = t.clearOverlays; var renderDayEvents = t.renderDayEvents; + var getMinTime = t.getMinTime; + var getMaxTime = t.getMaxTime; var calendar = t.calendar; var formatDate = calendar.formatDate; - var formatDates = calendar.formatDates; + var getEventEnd = calendar.getEventEnd; // overrides @@ -3732,25 +4643,21 @@ function AgendaEventRenderer() { function compileSlotSegs(events) { var colCnt = getColCnt(), - minMinute = getMinMinute(), - maxMinute = getMaxMinute(), - d, - visEventEnds = $.map(events, slotEventEnd), + minTime = getMinTime(), + maxTime = getMaxTime(), + cellDate, i, j, seg, colSegs, segs = []; for (i=0; i start && eventStart < end) { - if (eventStart < start) { - segStart = cloneDate(start); + + // get dates, make copies, then strip zone to normalize + eventStart = event.start.clone().stripZone(); + eventEnd = getEventEnd(event).stripZone(); + + if (eventEnd > rangeStart && eventStart < rangeEnd) { + + if (eventStart < rangeStart) { + segStart = rangeStart.clone(); isStart = false; - }else{ + } + else { segStart = eventStart; isStart = true; } - if (eventEnd > end) { - segEnd = cloneDate(end); + + if (eventEnd > rangeEnd) { + segEnd = rangeEnd.clone(); isEnd = false; - }else{ + } + else { segEnd = eventEnd; isEnd = true; } + segs.push({ event: event, start: segStart, @@ -3800,17 +4721,9 @@ function AgendaEventRenderer() { }); } } + return segs.sort(compareSlotSegs); } - - - function slotEventEnd(event) { - if (event.end) { - return cloneDate(event.end); - }else{ - return addMinutes(cloneDate(event.start), opt('defaultEventMinutes')); - } - } // renders events in the 'time slots' at the bottom @@ -3842,8 +4755,8 @@ function AgendaEventRenderer() { for (i=0; i" + "
        " + "
        " + - htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) + + htmlEscape(t.getEventTimeText(event)) + "
        " + "
        " + htmlEscape(event.title || '') + "
        " + "
        " + "
        "; + if (seg.isEnd && isEventResizable(event)) { html += "
        =
        "; @@ -4034,79 +4951,98 @@ function AgendaEventRenderer() { var revert; var allDay = true; var dayDelta; + var hoverListener = getHoverListener(); var colWidth = getColWidth(); + var minTime = getMinTime(); + var slotDuration = getSlotDuration(); + var slotHeight = getSlotHeight(); + var snapDuration = getSnapDuration(); var snapHeight = getSnapHeight(); - var snapMinutes = getSnapMinutes(); - var minMinute = getMinMinute(); + eventElement.draggable({ opacity: opt('dragOpacity', 'month'), // use whatever the month view was using revertDuration: opt('dragRevertDuration'), start: function(ev, ui) { - trigger('eventDragStart', eventElement, event, ev, ui); + + trigger('eventDragStart', eventElement[0], event, ev, ui); hideEvents(event, eventElement); origWidth = eventElement.width(); + hoverListener.start(function(cell, origCell) { clearOverlays(); if (cell) { revert = false; + var origDate = cellToDate(0, origCell.col); var date = cellToDate(0, cell.col); - dayDelta = dayDiff(date, origDate); - if (!cell.row) { - // on full-days + dayDelta = date.diff(origDate, 'days'); + + if (!cell.row) { // on full-days + renderDayOverlay( - addDays(cloneDate(event.start), dayDelta), - addDays(exclEndDay(event), dayDelta) + event.start.clone().add('days', dayDelta), + getEventEnd(event).add('days', dayDelta) ); + resetElement(); - }else{ - // mouse is over bottom slots + } + else { // mouse is over bottom slots + if (isStart) { if (allDay) { // convert event to temporary slot-event eventElement.width(colWidth - 10); // don't use entire width - setOuterHeight( - eventElement, - snapHeight * Math.round( - (event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes')) / - snapMinutes - ) - ); - eventElement.draggable('option', 'grid', [colWidth, 1]); + setOuterHeight(eventElement, calendar.defaultTimedEventDuration / slotDuration * slotHeight); // the default height + eventElement.draggable('option', 'grid', [ colWidth, 1 ]); allDay = false; } - }else{ + } + else { revert = true; } } + revert = revert || (allDay && !dayDelta); - }else{ + } + else { resetElement(); revert = true; } + eventElement.draggable('option', 'revert', revert); + }, ev, 'drag'); }, stop: function(ev, ui) { hoverListener.stop(); clearOverlays(); - trigger('eventDragStop', eventElement, event, ev, ui); - if (revert) { - // hasn't moved or is out of bounds (draggable has already reverted) + trigger('eventDragStop', eventElement[0], event, ev, ui); + + if (revert) { // hasn't moved or is out of bounds (draggable has already reverted) + resetElement(); eventElement.css('filter', ''); // clear IE opacity side-effects showEvents(event, eventElement); - }else{ - // changed! - var minuteDelta = 0; + } + else { // changed! + + var eventStart = event.start.clone().add('days', dayDelta); // already assumed to have a stripped time + var snapTime; + var snapIndex; if (!allDay) { - minuteDelta = Math.round((eventElement.offset().top - getSlotContainer().offset().top) / snapHeight) - * snapMinutes - + minMinute - - (event.start.getHours() * 60 + event.start.getMinutes()); + snapIndex = Math.round((eventElement.offset().top - getSlotContainer().offset().top) / snapHeight); // why not use ui.offset.top? + snapTime = moment.duration(minTime + snapIndex * snapDuration); + eventStart = calendar.rezoneDate(eventStart.clone().time(snapTime)); } - eventDrop(this, event, dayDelta, minuteDelta, allDay, ev, ui); + + eventDrop( + eventElement[0], + event, + eventStart, + ev, + ui + ); } } }); @@ -4129,7 +5065,7 @@ function AgendaEventRenderer() { var colCnt = getColCnt(); var colWidth = getColWidth(); var snapHeight = getSnapHeight(); - var snapMinutes = getSnapMinutes(); + var snapDuration = getSnapDuration(); // states var origPosition; // original position of the element, not the mouse @@ -4138,7 +5074,10 @@ function AgendaEventRenderer() { var isAllDay, prevIsAllDay; var colDelta, prevColDelta; var dayDelta; // derived from colDelta - var minuteDelta, prevMinuteDelta; + var snapDelta, prevSnapDelta; // the number of snaps away from the original position + + // newly computed + var eventStart, eventEnd; eventElement.draggable({ scroll: false, @@ -4148,7 +5087,7 @@ function AgendaEventRenderer() { revertDuration: opt('dragRevertDuration'), start: function(ev, ui) { - trigger('eventDragStart', eventElement, event, ev, ui); + trigger('eventDragStart', eventElement[0], event, ev, ui); hideEvents(event, eventElement); coordinateGrid.build(); @@ -4160,8 +5099,10 @@ function AgendaEventRenderer() { isAllDay = prevIsAllDay = getIsCellAllDay(origCell); colDelta = prevColDelta = 0; dayDelta = 0; - minuteDelta = prevMinuteDelta = 0; + snapDelta = prevSnapDelta = 0; + eventStart = null; + eventEnd = null; }, drag: function(ev, ui) { @@ -4187,12 +5128,12 @@ function AgendaEventRenderer() { col = Math.max(0, col); col = Math.min(colCnt-1, col); var date = cellToDate(0, col); - dayDelta = dayDiff(date, origDate); + dayDelta = date.diff(origDate, 'days'); } // calculate minute delta (only if over slots) if (!isAllDay) { - minuteDelta = Math.round((ui.position.top - origPosition.top) / snapHeight) * snapMinutes; + snapDelta = Math.round((ui.position.top - origPosition.top) / snapHeight); } } @@ -4201,16 +5142,26 @@ function AgendaEventRenderer() { isInBounds != prevIsInBounds || isAllDay != prevIsAllDay || colDelta != prevColDelta || - minuteDelta != prevMinuteDelta + snapDelta != prevSnapDelta ) { + // compute new dates + if (isAllDay) { + eventStart = event.start.clone().stripTime().add('days', dayDelta); + eventEnd = eventStart.clone().add(calendar.defaultAllDayEventDuration); + } + else { + eventStart = event.start.clone().add(snapDelta * snapDuration).add('days', dayDelta); + eventEnd = getEventEnd(event).add(snapDelta * snapDuration).add('days', dayDelta); + } + updateUI(); // update previous states for next time prevIsInBounds = isInBounds; prevIsAllDay = isAllDay; prevColDelta = colDelta; - prevMinuteDelta = minuteDelta; + prevSnapDelta = snapDelta; } // if out-of-bounds, revert when done, and vice versa. @@ -4220,10 +5171,16 @@ function AgendaEventRenderer() { stop: function(ev, ui) { clearOverlays(); - trigger('eventDragStop', eventElement, event, ev, ui); + trigger('eventDragStop', eventElement[0], event, ev, ui); - if (isInBounds && (isAllDay || dayDelta || minuteDelta)) { // changed! - eventDrop(this, event, dayDelta, isAllDay ? 0 : minuteDelta, isAllDay, ev, ui); + if (isInBounds && (isAllDay || dayDelta || snapDelta)) { // changed! + eventDrop( + eventElement[0], + event, + eventStart, + ev, + ui + ); } else { // either no change or out-of-bounds (draggable has already reverted) @@ -4232,7 +5189,7 @@ function AgendaEventRenderer() { isAllDay = false; colDelta = 0; dayDelta = 0; - minuteDelta = 0; + snapDelta = 0; updateUI(); eventElement.css('filter', ''); // clear IE opacity side-effects @@ -4253,26 +5210,24 @@ function AgendaEventRenderer() { if (isAllDay) { timeElement.hide(); eventElement.draggable('option', 'grid', null); // disable grid snapping - renderDayOverlay( - addDays(cloneDate(event.start), dayDelta), - addDays(exclEndDay(event), dayDelta) - ); + renderDayOverlay(eventStart, eventEnd); } else { - updateTimeText(minuteDelta); + updateTimeText(); timeElement.css('display', ''); // show() was causing display=inline eventElement.draggable('option', 'grid', [colWidth, snapHeight]); // re-enable grid snapping } } } - function updateTimeText(minuteDelta) { - var newStart = addMinutes(cloneDate(event.start), minuteDelta); - var newEnd; - if (event.end) { - newEnd = addMinutes(cloneDate(event.end), minuteDelta); + function updateTimeText() { + if (eventStart) { // must of had a state change + timeElement.text( + t.getEventTimeText(eventStart, event.end ? eventEnd : null) + // ^ + // only display the new end if there was an old end + ); } - timeElement.text(formatDates(newStart, newEnd, opt('timeFormat'))); } } @@ -4286,7 +5241,9 @@ function AgendaEventRenderer() { function resizableSlotEvent(event, eventElement, timeElement) { var snapDelta, prevSnapDelta; var snapHeight = getSnapHeight(); - var snapMinutes = getSnapMinutes(); + var snapDuration = getSnapDuration(); + var eventEnd; + eventElement.resizable({ handles: { s: '.ui-resizable-handle' @@ -4295,28 +5252,36 @@ function AgendaEventRenderer() { start: function(ev, ui) { snapDelta = prevSnapDelta = 0; hideEvents(event, eventElement); - trigger('eventResizeStart', this, event, ev, ui); + trigger('eventResizeStart', eventElement[0], event, ev, ui); }, resize: function(ev, ui) { // don't rely on ui.size.height, doesn't take grid into account snapDelta = Math.round((Math.max(snapHeight, eventElement.height()) - ui.originalSize.height) / snapHeight); if (snapDelta != prevSnapDelta) { - timeElement.text( - formatDates( - event.start, - (!snapDelta && !event.end) ? null : // no change, so don't display time range - addMinutes(eventEnd(event), snapMinutes*snapDelta), - opt('timeFormat') - ) - ); + eventEnd = getEventEnd(event).add(snapDuration * snapDelta); + var text; + if (snapDelta) { // has there been a change? + text = t.getEventTimeText(event.start, eventEnd); + } + else { + text = t.getEventTimeText(event); // the original time text + } + timeElement.text(text); prevSnapDelta = snapDelta; } }, stop: function(ev, ui) { - trigger('eventResizeStop', this, event, ev, ui); + trigger('eventResizeStop', eventElement[0], event, ev, ui); if (snapDelta) { - eventResize(this, event, 0, snapMinutes*snapDelta, ev, ui); - }else{ + eventResize( + eventElement[0], + event, + eventEnd, + ev, + ui + ); + } + else { showEvents(event, eventElement); // BUG: if event was really short, need to put title back in span } @@ -4549,9 +5514,7 @@ function View(element, calendar, viewName) { t.trigger = trigger; t.isEventDraggable = isEventDraggable; t.isEventResizable = isEventResizable; - t.setEventData = setEventData; t.clearEventData = clearEventData; - t.eventEnd = eventEnd; t.reportEventElement = reportEventElement; t.triggerEventDestroy = triggerEventDestroy; t.eventElementHandlers = eventElementHandlers; @@ -4559,28 +5522,26 @@ function View(element, calendar, viewName) { t.hideEvents = hideEvents; t.eventDrop = eventDrop; t.eventResize = eventResize; - // t.title - // t.start, t.end - // t.visStart, t.visEnd + // t.start, t.end // moments with ambiguous-time + // t.intervalStart, t.intervalEnd // moments with ambiguous-time // imports - var defaultEventEnd = t.defaultEventEnd; - var normalizeEvent = calendar.normalizeEvent; // in EventManager var reportEventChange = calendar.reportEventChange; // locals - var eventsByID = {}; // eventID mapped to array of events (there can be multiple b/c of repeating events) var eventElementsByID = {}; // eventID mapped to array of jQuery elements var eventElementCouples = []; // array of objects, { event, element } // TODO: unify with segment system var options = calendar.options; + var nextDayThreshold = moment.duration(options.nextDayThreshold); + function opt(name, viewNameOverride) { var v = options[name]; - if ($.isPlainObject(v)) { + if ($.isPlainObject(v) && !isForcedAtomicOption(name)) { return smartProperty(v, viewNameOverride || viewName); } return v; @@ -4609,8 +5570,7 @@ function View(element, calendar, viewName) { event.editable, source.editable, opt('editable') - ) - && !opt('disableDragging'); // deprecated + ); } @@ -4623,43 +5583,21 @@ function View(element, calendar, viewName) { event.editable, source.editable, opt('editable') - ) - && !opt('disableResizing'); // deprecated + ); } /* Event Data ------------------------------------------------------------------------------*/ - - - function setEventData(events) { // events are already normalized at this point - eventsByID = {}; - var i, len=events.length, event; - for (i=0; i
        "; - if (segment.isEnd && isEventResizable(event)) { + if (event.allDay && segment.isEnd && isEventResizable(event)) { html += "
        " + "   " + // makes hit area a lot better for IE6/7 @@ -5431,17 +6358,18 @@ function DayEventRenderer() { var rowContentHeights = calculateVerticals(segments); // also sets segment.top var rowContentElements = getRowContentElements(); // returns 1 inner div per row var rowContentTops = []; + var i; // Set each row's height by setting height of first inner div if (doRowHeights) { - for (var i=0; i=0 && c>=0) ? { row:r, col:c } : null; + return (r>=0 && c>=0) ? { row: r, col: c } : null; }; @@ -6041,7 +7011,10 @@ function HoverListener(coordinateGrid) { function mouse(ev) { _fixUIEvent(ev); // see below var newCell = coordinateGrid.cell(ev.pageX, ev.pageY); - if (!newCell != !cell || newCell && (newCell.row != cell.row || newCell.col != cell.col)) { + if ( + Boolean(newCell) !== Boolean(cell) || + newCell && (newCell.row != cell.row || newCell.col != cell.col) + ) { if (newCell) { if (!firstCell) { firstCell = newCell; @@ -6086,15 +7059,15 @@ function HorizontalPositionCache(getElement) { rights = {}; function e(i) { - return elements[i] = elements[i] || getElement(i); + return (elements[i] = (elements[i] || getElement(i))); } t.left = function(i) { - return lefts[i] = lefts[i] === undefined ? e(i).position().left : lefts[i]; + return (lefts[i] = (lefts[i] === undefined ? e(i).position().left : lefts[i])); }; t.right = function(i) { - return rights[i] = rights[i] === undefined ? t.left(i) + e(i).width() : rights[i]; + return (rights[i] = (rights[i] === undefined ? t.left(i) + e(i).width() : rights[i])); }; t.clear = function() { @@ -6107,4 +7080,4 @@ function HorizontalPositionCache(getElement) { ;; -})(jQuery); \ No newline at end of file +}); \ No newline at end of file diff --git a/src/UI/JsLibraries/moment.js b/src/UI/JsLibraries/moment.js index c8a870e8c..83282c6fd 100644 --- a/src/UI/JsLibraries/moment.js +++ b/src/UI/JsLibraries/moment.js @@ -1,8 +1,8 @@ -// moment.js -// version : 2.1.0 -// author : Tim Wood -// license : MIT -// momentjs.com +//! moment.js +//! version : 2.7.0 +//! authors : Tim Wood, Iskren Chernev, Moment.js contributors +//! license : MIT +//! momentjs.com (function (undefined) { @@ -11,41 +11,90 @@ ************************************/ var moment, - VERSION = "2.1.0", - round = Math.round, i, + VERSION = "2.7.0", + // the global-scope this is NOT the global object in Node.js + globalScope = typeof global !== 'undefined' ? global : this, + oldGlobalMoment, + round = Math.round, + i, + + YEAR = 0, + MONTH = 1, + DATE = 2, + HOUR = 3, + MINUTE = 4, + SECOND = 5, + MILLISECOND = 6, + // internal storage for language config files languages = {}, + // moment internal properties + momentProperties = { + _isAMomentObject: null, + _i : null, + _f : null, + _l : null, + _strict : null, + _tzm : null, + _isUTC : null, + _offset : null, // optional. Combine with _isUTC + _pf : null, + _lang : null // optional + }, + // check for nodeJS hasModule = (typeof module !== 'undefined' && module.exports), // ASP.NET json date format regex aspNetJsonRegex = /^\/?Date\((\-?\d+)/i, - aspNetTimeSpanJsonRegex = /(\-)?(\d*)?\.?(\d+)\:(\d+)\:(\d+)\.?(\d{3})?/, + aspNetTimeSpanJsonRegex = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/, + + // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html + // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere + isoDurationRegex = /^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/, // format tokens - formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g, + formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|X|zz?|ZZ?|.)/g, localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g, // parsing token regexes parseTokenOneOrTwoDigits = /\d\d?/, // 0 - 99 parseTokenOneToThreeDigits = /\d{1,3}/, // 0 - 999 - parseTokenThreeDigits = /\d{3}/, // 000 - 999 - parseTokenFourDigits = /\d{1,4}/, // 0 - 9999 - parseTokenSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999 + parseTokenOneToFourDigits = /\d{1,4}/, // 0 - 9999 + parseTokenOneToSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999 + parseTokenDigits = /\d+/, // nonzero number of digits parseTokenWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i, // any word (or two) characters or numbers including two/three word month in arabic. - parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/i, // +00:00 -00:00 +0000 -0000 or Z - parseTokenT = /T/i, // T (ISO seperator) + parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/gi, // +00:00 -00:00 +0000 -0000 or Z + parseTokenT = /T/i, // T (ISO separator) parseTokenTimestampMs = /[\+\-]?\d+(\.\d{1,3})?/, // 123456789 123456789.123 + parseTokenOrdinal = /\d{1,2}/, + + //strict parsing regexes + parseTokenOneDigit = /\d/, // 0 - 9 + parseTokenTwoDigits = /\d\d/, // 00 - 99 + parseTokenThreeDigits = /\d{3}/, // 000 - 999 + parseTokenFourDigits = /\d{4}/, // 0000 - 9999 + parseTokenSixDigits = /[+-]?\d{6}/, // -999,999 - 999,999 + parseTokenSignedNumber = /[+-]?\d+/, // -inf - inf + + // iso 8601 regex + // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00) + isoRegex = /^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/, - // preliminary iso regex - // 0000-00-00 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 - isoRegex = /^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/, isoFormat = 'YYYY-MM-DDTHH:mm:ssZ', + isoDates = [ + ['YYYYYY-MM-DD', /[+-]\d{6}-\d{2}-\d{2}/], + ['YYYY-MM-DD', /\d{4}-\d{2}-\d{2}/], + ['GGGG-[W]WW-E', /\d{4}-W\d{2}-\d/], + ['GGGG-[W]WW', /\d{4}-W\d{2}/], + ['YYYY-DDD', /\d{4}-\d{3}/] + ], + // iso time formats and regexes isoTimes = [ - ['HH:mm:ss.S', /(T| )\d\d:\d\d:\d\d\.\d{1,3}/], + ['HH:mm:ss.SSSS', /(T| )\d\d:\d\d:\d\d\.\d+/], ['HH:mm:ss', /(T| )\d\d:\d\d:\d\d/], ['HH:mm', /(T| )\d\d:\d\d/], ['HH', /(T| )\d\d/] @@ -72,14 +121,40 @@ m : 'minute', h : 'hour', d : 'day', + D : 'date', w : 'week', + W : 'isoWeek', M : 'month', - y : 'year' + Q : 'quarter', + y : 'year', + DDD : 'dayOfYear', + e : 'weekday', + E : 'isoWeekday', + gg: 'weekYear', + GG: 'isoWeekYear' + }, + + camelFunctions = { + dayofyear : 'dayOfYear', + isoweekday : 'isoWeekday', + isoweek : 'isoWeek', + weekyear : 'weekYear', + isoweekyear : 'isoWeekYear' }, // format function strings formatFunctions = {}, + // default relative time thresholds + relativeTimeThresholds = { + s: 45, //seconds to minutes + m: 45, //minutes to hours + h: 22, //hours to days + dd: 25, //days to month (month == 1) + dm: 45, //days to months (months > 1) + dy: 345 //days to year + }, + // tokens to ordinalize and pad ordinalizeTokens = 'DDD w W M D d'.split(' '), paddedTokens = 'M D H h m s w W'.split(' '), @@ -127,11 +202,15 @@ YYYYY : function () { return leftZeroFill(this.year(), 5); }, + YYYYYY : function () { + var y = this.year(), sign = y >= 0 ? '+' : '-'; + return sign + leftZeroFill(Math.abs(y), 6); + }, gg : function () { return leftZeroFill(this.weekYear() % 100, 2); }, gggg : function () { - return this.weekYear(); + return leftZeroFill(this.weekYear(), 4); }, ggggg : function () { return leftZeroFill(this.weekYear(), 5); @@ -140,7 +219,7 @@ return leftZeroFill(this.isoWeekYear() % 100, 2); }, GGGG : function () { - return this.isoWeekYear(); + return leftZeroFill(this.isoWeekYear(), 4); }, GGGGG : function () { return leftZeroFill(this.isoWeekYear(), 5); @@ -170,14 +249,17 @@ return this.seconds(); }, S : function () { - return ~~(this.milliseconds() / 100); + return toInt(this.milliseconds() / 100); }, SS : function () { - return leftZeroFill(~~(this.milliseconds() / 10), 2); + return leftZeroFill(toInt(this.milliseconds() / 10), 2); }, SSS : function () { return leftZeroFill(this.milliseconds(), 3); }, + SSSS : function () { + return leftZeroFill(this.milliseconds(), 3); + }, Z : function () { var a = -this.zone(), b = "+"; @@ -185,7 +267,7 @@ a = -a; b = "-"; } - return b + leftZeroFill(~~(a / 60), 2) + ":" + leftZeroFill(~~a % 60, 2); + return b + leftZeroFill(toInt(a / 60), 2) + ":" + leftZeroFill(toInt(a) % 60, 2); }, ZZ : function () { var a = -this.zone(), @@ -194,7 +276,7 @@ a = -a; b = "-"; } - return b + leftZeroFill(~~(10 * a / 6), 4); + return b + leftZeroFill(toInt(a / 60), 2) + leftZeroFill(toInt(a) % 60, 2); }, z : function () { return this.zoneAbbr(); @@ -204,8 +286,57 @@ }, X : function () { return this.unix(); + }, + Q : function () { + return this.quarter(); } + }, + + lists = ['months', 'monthsShort', 'weekdays', 'weekdaysShort', 'weekdaysMin']; + + // Pick the first defined of two or three arguments. dfl comes from + // default. + function dfl(a, b, c) { + switch (arguments.length) { + case 2: return a != null ? a : b; + case 3: return a != null ? a : b != null ? b : c; + default: throw new Error("Implement me"); + } + } + + function defaultParsingFlags() { + // We need to deep clone this object, and es5 standard is not very + // helpful. + return { + empty : false, + unusedTokens : [], + unusedInput : [], + overflow : -2, + charsLeftOver : 0, + nullInput : false, + invalidMonth : null, + invalidFormat : false, + userInvalidated : false, + iso: false }; + } + + function deprecate(msg, fn) { + var firstTime = true; + function printMsg() { + if (moment.suppressDeprecationWarnings === false && + typeof console !== 'undefined' && console.warn) { + console.warn("Deprecation warning: " + msg); + } + } + return extend(function () { + if (firstTime) { + printMsg(); + firstTime = false; + } + return fn.apply(this, arguments); + }, fn); + } function padToken(func, count) { return function (a) { @@ -239,36 +370,37 @@ // Moment prototype object function Moment(config) { + checkOverflow(config); extend(this, config); } // Duration Constructor function Duration(duration) { - var years = duration.years || duration.year || duration.y || 0, - months = duration.months || duration.month || duration.M || 0, - weeks = duration.weeks || duration.week || duration.w || 0, - days = duration.days || duration.day || duration.d || 0, - hours = duration.hours || duration.hour || duration.h || 0, - minutes = duration.minutes || duration.minute || duration.m || 0, - seconds = duration.seconds || duration.second || duration.s || 0, - milliseconds = duration.milliseconds || duration.millisecond || duration.ms || 0; - - // store reference to input for deterministic cloning - this._input = duration; + var normalizedInput = normalizeObjectUnits(duration), + years = normalizedInput.year || 0, + quarters = normalizedInput.quarter || 0, + months = normalizedInput.month || 0, + weeks = normalizedInput.week || 0, + days = normalizedInput.day || 0, + hours = normalizedInput.hour || 0, + minutes = normalizedInput.minute || 0, + seconds = normalizedInput.second || 0, + milliseconds = normalizedInput.millisecond || 0; // representation for dateAddRemove - this._milliseconds = milliseconds + + this._milliseconds = +milliseconds + seconds * 1e3 + // 1000 minutes * 6e4 + // 1000 * 60 hours * 36e5; // 1000 * 60 * 60 // Because of dateAddRemove treats 24 hours as different from a // day when working around DST, we need to store them separately - this._days = days + + this._days = +days + weeks * 7; // It is impossible translate months into days without knowing // which months you are are talking about, so we have to store // it separately. - this._months = months + + this._months = +months + + quarters * 3 + years * 12; this._data = {}; @@ -276,7 +408,6 @@ this._bubble(); } - /************************************ Helpers ************************************/ @@ -288,9 +419,29 @@ a[i] = b[i]; } } + + if (b.hasOwnProperty("toString")) { + a.toString = b.toString; + } + + if (b.hasOwnProperty("valueOf")) { + a.valueOf = b.valueOf; + } + return a; } + function cloneMoment(m) { + var result = {}, i; + for (i in m) { + if (m.hasOwnProperty(i) && momentProperties.hasOwnProperty(i)) { + result[i] = m[i]; + } + } + + return result; + } + function absRound(number) { if (number < 0) { return Math.ceil(number); @@ -301,44 +452,34 @@ // left zero fill a number // see http://jsperf.com/left-zero-filling for performance comparison - function leftZeroFill(number, targetLength) { - var output = number + ''; + function leftZeroFill(number, targetLength, forceSign) { + var output = '' + Math.abs(number), + sign = number >= 0; + while (output.length < targetLength) { output = '0' + output; } - return output; + return (sign ? (forceSign ? '+' : '') : '-') + output; } // helper function for _.addTime and _.subtractTime - function addOrSubtractDurationFromMoment(mom, duration, isAdding, ignoreUpdateOffset) { + function addOrSubtractDurationFromMoment(mom, duration, isAdding, updateOffset) { var milliseconds = duration._milliseconds, days = duration._days, - months = duration._months, - minutes, - hours, - currentDate; + months = duration._months; + updateOffset = updateOffset == null ? true : updateOffset; if (milliseconds) { mom._d.setTime(+mom._d + milliseconds * isAdding); } - // store the minutes and hours so we can restore them - if (days || months) { - minutes = mom.minute(); - hours = mom.hour(); - } if (days) { - mom.date(mom.date() + days * isAdding); + rawSetter(mom, 'Date', rawGetter(mom, 'Date') + days * isAdding); } if (months) { - mom.month(mom.month() + months * isAdding); + rawMonthSetter(mom, rawGetter(mom, 'Month') + months * isAdding); } - if (milliseconds && !ignoreUpdateOffset) { - moment.updateOffset(mom); - } - // restore the minutes and hours after possibly changing dst - if (days || months) { - mom.minute(minutes); - mom.hour(hours); + if (updateOffset) { + moment.updateOffset(mom, days || months); } } @@ -347,14 +488,20 @@ return Object.prototype.toString.call(input) === '[object Array]'; } + function isDate(input) { + return Object.prototype.toString.call(input) === '[object Date]' || + input instanceof Date; + } + // compare two arrays, return the number of differences - function compareArrays(array1, array2) { + function compareArrays(array1, array2, dontConvert) { var len = Math.min(array1.length, array2.length), lengthDiff = Math.abs(array1.length - array2.length), diffs = 0, i; for (i = 0; i < len; i++) { - if (~~array1[i] !== ~~array2[i]) { + if ((dontConvert && array1[i] !== array2[i]) || + (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) { diffs++; } } @@ -362,16 +509,159 @@ } function normalizeUnits(units) { - return units ? unitAliases[units] || units.toLowerCase().replace(/(.)s$/, '$1') : units; + if (units) { + var lowered = units.toLowerCase().replace(/(.)s$/, '$1'); + units = unitAliases[units] || camelFunctions[lowered] || lowered; + } + return units; } + function normalizeObjectUnits(inputObject) { + var normalizedInput = {}, + normalizedProp, + prop; + + for (prop in inputObject) { + if (inputObject.hasOwnProperty(prop)) { + normalizedProp = normalizeUnits(prop); + if (normalizedProp) { + normalizedInput[normalizedProp] = inputObject[prop]; + } + } + } + + return normalizedInput; + } + + function makeList(field) { + var count, setter; + + if (field.indexOf('week') === 0) { + count = 7; + setter = 'day'; + } + else if (field.indexOf('month') === 0) { + count = 12; + setter = 'month'; + } + else { + return; + } + + moment[field] = function (format, index) { + var i, getter, + method = moment.fn._lang[field], + results = []; + + if (typeof format === 'number') { + index = format; + format = undefined; + } + + getter = function (i) { + var m = moment().utc().set(setter, i); + return method.call(moment.fn._lang, m, format || ''); + }; + + if (index != null) { + return getter(index); + } + else { + for (i = 0; i < count; i++) { + results.push(getter(i)); + } + return results; + } + }; + } + + function toInt(argumentForCoercion) { + var coercedNumber = +argumentForCoercion, + value = 0; + + if (coercedNumber !== 0 && isFinite(coercedNumber)) { + if (coercedNumber >= 0) { + value = Math.floor(coercedNumber); + } else { + value = Math.ceil(coercedNumber); + } + } + + return value; + } + + function daysInMonth(year, month) { + return new Date(Date.UTC(year, month + 1, 0)).getUTCDate(); + } + + function weeksInYear(year, dow, doy) { + return weekOfYear(moment([year, 11, 31 + dow - doy]), dow, doy).week; + } + + function daysInYear(year) { + return isLeapYear(year) ? 366 : 365; + } + + function isLeapYear(year) { + return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0; + } + + function checkOverflow(m) { + var overflow; + if (m._a && m._pf.overflow === -2) { + overflow = + m._a[MONTH] < 0 || m._a[MONTH] > 11 ? MONTH : + m._a[DATE] < 1 || m._a[DATE] > daysInMonth(m._a[YEAR], m._a[MONTH]) ? DATE : + m._a[HOUR] < 0 || m._a[HOUR] > 23 ? HOUR : + m._a[MINUTE] < 0 || m._a[MINUTE] > 59 ? MINUTE : + m._a[SECOND] < 0 || m._a[SECOND] > 59 ? SECOND : + m._a[MILLISECOND] < 0 || m._a[MILLISECOND] > 999 ? MILLISECOND : + -1; + + if (m._pf._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) { + overflow = DATE; + } + + m._pf.overflow = overflow; + } + } + + function isValid(m) { + if (m._isValid == null) { + m._isValid = !isNaN(m._d.getTime()) && + m._pf.overflow < 0 && + !m._pf.empty && + !m._pf.invalidMonth && + !m._pf.nullInput && + !m._pf.invalidFormat && + !m._pf.userInvalidated; + + if (m._strict) { + m._isValid = m._isValid && + m._pf.charsLeftOver === 0 && + m._pf.unusedTokens.length === 0; + } + } + return m._isValid; + } + + function normalizeLanguage(key) { + return key ? key.toLowerCase().replace('_', '-') : key; + } + + // Return a moment from input, that is local/utc/zone equivalent to model. + function makeAs(input, model) { + return model._isUTC ? moment(input).zone(model._offset || 0) : + moment(input).local(); + } /************************************ Languages ************************************/ - Language.prototype = { + extend(Language.prototype, { + set : function (config) { var prop, i; for (i in config) { @@ -404,7 +694,7 @@ for (i = 0; i < 12; i++) { // make the regex if we don't have it already if (!this._monthsParse[i]) { - mom = moment([2000, i]); + mom = moment.utc([2000, i]); regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, ''); this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i'); } @@ -470,7 +760,9 @@ }, isPM : function (input) { - return ((input + '').toLowerCase()[0] === 'p'); + // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays + // Using charAt should be more compatible. + return ((input + '').toLowerCase().charAt(0) === 'p'); }, _meridiemParse : /[ap]\.?m?\.?/i, @@ -537,11 +829,17 @@ week : function (mom) { return weekOfYear(mom, this._week.dow, this._week.doy).week; }, + _week : { dow : 0, // Sunday is the first day of the week. doy : 6 // The week that contains Jan 1st is the first week of the year. + }, + + _invalidDate: 'Invalid date', + invalidDate: function () { + return this._invalidDate; } - }; + }); // Loads a language definition into the `languages` cache. The function // takes a key and optionally values. If not in the browser and no values @@ -556,6 +854,11 @@ return languages[key]; } + // Remove a language from the `languages` cache. Mostly useful in tests. + function unloadLang(key) { + delete languages[key]; + } + // Determines which language definition to use and returns it. // // With no parameters, it will return the global language. If you @@ -563,20 +866,52 @@ // definition for 'en', so long as 'en' has already been loaded using // moment.lang. function getLangDefinition(key) { + var i = 0, j, lang, next, split, + get = function (k) { + if (!languages[k] && hasModule) { + try { + require('./lang/' + k); + } catch (e) { } + } + return languages[k]; + }; + if (!key) { return moment.fn._lang; } - if (!languages[key] && hasModule) { - try { - require('./lang/' + key); - } catch (e) { - // call with no params to set to default - return moment.fn._lang; - } - } - return languages[key]; - } + if (!isArray(key)) { + //short-circuit everything else + lang = get(key); + if (lang) { + return lang; + } + key = [key]; + } + + //pick the language from the array + //try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each + //substring from most specific to least, but move to the next array item if it's a more specific variant than the current root + while (i < key.length) { + split = normalizeLanguage(key[i]).split('-'); + j = split.length; + next = normalizeLanguage(key[i + 1]); + next = next ? next.split('-') : null; + while (j > 0) { + lang = get(split.slice(0, j).join('-')); + if (lang) { + return lang; + } + if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) { + //the next array item is better than a shallower substring of this one + break; + } + j--; + } + i++; + } + return moment.fn._lang; + } /************************************ Formatting @@ -584,7 +919,7 @@ function removeFormattingTokens(input) { - if (input.match(/\[.*\]/)) { + if (input.match(/\[[\s\S]/)) { return input.replace(/^\[|\]$/g, ""); } return input.replace(/\\/g, ""); @@ -612,15 +947,12 @@ // format date using native date object function formatMoment(m, format) { - var i = 5; - function replaceLongDateFormatTokens(input) { - return m.lang().longDateFormat(input) || input; + if (!m.isValid()) { + return m.lang().invalidDate(); } - while (i-- && localFormattingTokens.test(format)) { - format = format.replace(localFormattingTokens, replaceLongDateFormatTokens); - } + format = expandFormat(format, m.lang()); if (!formatFunctions[format]) { formatFunctions[format] = makeFormatFunction(format); @@ -629,6 +961,23 @@ return formatFunctions[format](m); } + function expandFormat(format, lang) { + var i = 5; + + function replaceLongDateFormatTokens(input) { + return lang.longDateFormat(input) || input; + } + + localFormattingTokens.lastIndex = 0; + while (i >= 0 && localFormattingTokens.test(format)) { + format = format.replace(localFormattingTokens, replaceLongDateFormatTokens); + localFormattingTokens.lastIndex = 0; + i -= 1; + } + + return format; + } + /************************************ Parsing @@ -637,16 +986,34 @@ // get the regex to find the next token function getParseRegexForToken(token, config) { + var a, strict = config._strict; switch (token) { + case 'Q': + return parseTokenOneDigit; case 'DDDD': return parseTokenThreeDigits; case 'YYYY': - return parseTokenFourDigits; + case 'GGGG': + case 'gggg': + return strict ? parseTokenFourDigits : parseTokenOneToFourDigits; + case 'Y': + case 'G': + case 'g': + return parseTokenSignedNumber; + case 'YYYYYY': case 'YYYYY': - return parseTokenSixDigits; + case 'GGGGG': + case 'ggggg': + return strict ? parseTokenSixDigits : parseTokenOneToSixDigits; case 'S': + if (strict) { return parseTokenOneDigit; } + /* falls through */ case 'SS': + if (strict) { return parseTokenTwoDigits; } + /* falls through */ case 'SSS': + if (strict) { return parseTokenThreeDigits; } + /* falls through */ case 'DDD': return parseTokenOneToThreeDigits; case 'MMM': @@ -665,13 +1032,20 @@ return parseTokenTimezone; case 'T': return parseTokenT; + case 'SSSS': + return parseTokenDigits; case 'MM': case 'DD': case 'YY': + case 'GG': + case 'gg': case 'HH': case 'hh': case 'mm': case 'ss': + case 'ww': + case 'WW': + return strict ? parseTokenTwoDigits : parseTokenOneOrTwoDigits; case 'M': case 'D': case 'd': @@ -679,16 +1053,25 @@ case 'h': case 'm': case 's': + case 'w': + case 'W': + case 'e': + case 'E': return parseTokenOneOrTwoDigits; + case 'Do': + return parseTokenOrdinal; default : - return new RegExp(token.replace('\\', '')); + a = new RegExp(regexpEscape(unescapeFormat(token.replace('\\', '')), "i")); + return a; } } function timezoneMinutesFromString(string) { - var tzchunk = (parseTokenTimezone.exec(string) || [])[0], - parts = (tzchunk + '').match(parseTimezoneChunker) || ['-', 0, 0], - minutes = +(parts[1] * 60) + ~~parts[2]; + string = string || ""; + var possibleTzMatches = (string.match(parseTokenTimezone) || []), + tzChunk = possibleTzMatches[possibleTzMatches.length - 1] || [], + parts = (tzChunk + '').match(parseTimezoneChunker) || ['-', 0, 0], + minutes = +(parts[1] * 60) + toInt(parts[2]); return parts[0] === '+' ? -minutes : minutes; } @@ -698,37 +1081,57 @@ var a, datePartArray = config._a; switch (token) { + // QUARTER + case 'Q': + if (input != null) { + datePartArray[MONTH] = (toInt(input) - 1) * 3; + } + break; // MONTH case 'M' : // fall through to MM case 'MM' : - datePartArray[1] = (input == null) ? 0 : ~~input - 1; + if (input != null) { + datePartArray[MONTH] = toInt(input) - 1; + } break; case 'MMM' : // fall through to MMMM case 'MMMM' : a = getLangDefinition(config._l).monthsParse(input); // if we didn't find a month name, mark the date as invalid. if (a != null) { - datePartArray[1] = a; + datePartArray[MONTH] = a; } else { - config._isValid = false; + config._pf.invalidMonth = input; } break; // DAY OF MONTH - case 'D' : // fall through to DDDD - case 'DD' : // fall through to DDDD + case 'D' : // fall through to DD + case 'DD' : + if (input != null) { + datePartArray[DATE] = toInt(input); + } + break; + case 'Do' : + if (input != null) { + datePartArray[DATE] = toInt(parseInt(input, 10)); + } + break; + // DAY OF YEAR case 'DDD' : // fall through to DDDD case 'DDDD' : if (input != null) { - datePartArray[2] = ~~input; + config._dayOfYear = toInt(input); } + break; // YEAR case 'YY' : - datePartArray[0] = ~~input + (~~input > 68 ? 1900 : 2000); + datePartArray[YEAR] = moment.parseTwoDigitYear(input); break; case 'YYYY' : case 'YYYYY' : - datePartArray[0] = ~~input; + case 'YYYYYY' : + datePartArray[YEAR] = toInt(input); break; // AM / PM case 'a' : // fall through to A @@ -740,23 +1143,24 @@ case 'HH' : // fall through to hh case 'h' : // fall through to hh case 'hh' : - datePartArray[3] = ~~input; + datePartArray[HOUR] = toInt(input); break; // MINUTE case 'm' : // fall through to mm case 'mm' : - datePartArray[4] = ~~input; + datePartArray[MINUTE] = toInt(input); break; // SECOND case 's' : // fall through to ss case 'ss' : - datePartArray[5] = ~~input; + datePartArray[SECOND] = toInt(input); break; // MILLISECOND case 'S' : case 'SS' : case 'SSS' : - datePartArray[6] = ~~ (('0.' + input) * 1000); + case 'SSSS' : + datePartArray[MILLISECOND] = toInt(('0.' + input) * 1000); break; // UNIX TIMESTAMP WITH MS case 'X': @@ -768,137 +1172,330 @@ config._useUTC = true; config._tzm = timezoneMinutesFromString(input); break; + // WEEKDAY - human + case 'dd': + case 'ddd': + case 'dddd': + a = getLangDefinition(config._l).weekdaysParse(input); + // if we didn't get a weekday name, mark the date as invalid + if (a != null) { + config._w = config._w || {}; + config._w['d'] = a; + } else { + config._pf.invalidWeekday = input; + } + break; + // WEEK, WEEK DAY - numeric + case 'w': + case 'ww': + case 'W': + case 'WW': + case 'd': + case 'e': + case 'E': + token = token.substr(0, 1); + /* falls through */ + case 'gggg': + case 'GGGG': + case 'GGGGG': + token = token.substr(0, 2); + if (input) { + config._w = config._w || {}; + config._w[token] = toInt(input); + } + break; + case 'gg': + case 'GG': + config._w = config._w || {}; + config._w[token] = moment.parseTwoDigitYear(input); } + } - // if the input is null, the date is not valid - if (input == null) { - config._isValid = false; + function dayOfYearFromWeekInfo(config) { + var w, weekYear, week, weekday, dow, doy, temp, lang; + + w = config._w; + if (w.GG != null || w.W != null || w.E != null) { + dow = 1; + doy = 4; + + // TODO: We need to take the current isoWeekYear, but that depends on + // how we interpret now (local, utc, fixed offset). So create + // a now version of current config (take local/utc/offset flags, and + // create now). + weekYear = dfl(w.GG, config._a[YEAR], weekOfYear(moment(), 1, 4).year); + week = dfl(w.W, 1); + weekday = dfl(w.E, 1); + } else { + lang = getLangDefinition(config._l); + dow = lang._week.dow; + doy = lang._week.doy; + + weekYear = dfl(w.gg, config._a[YEAR], weekOfYear(moment(), dow, doy).year); + week = dfl(w.w, 1); + + if (w.d != null) { + // weekday -- low day numbers are considered next week + weekday = w.d; + if (weekday < dow) { + ++week; + } + } else if (w.e != null) { + // local weekday -- counting starts from begining of week + weekday = w.e + dow; + } else { + // default to begining of week + weekday = dow; + } } + temp = dayOfYearFromWeeks(weekYear, week, weekday, doy, dow); + + config._a[YEAR] = temp.year; + config._dayOfYear = temp.dayOfYear; } // convert an array to a date. // the array should mirror the parameters below // note: all values past the year are optional and will default to the lowest possible value. // [year, month, day , hour, minute, second, millisecond] - function dateFromArray(config) { - var i, date, input = []; + function dateFromConfig(config) { + var i, date, input = [], currentDate, yearToUse; if (config._d) { return; } - for (i = 0; i < 7; i++) { + currentDate = currentDateArray(config); + + //compute day of the year from weeks and weekdays + if (config._w && config._a[DATE] == null && config._a[MONTH] == null) { + dayOfYearFromWeekInfo(config); + } + + //if the day of the year is set, figure out what it is + if (config._dayOfYear) { + yearToUse = dfl(config._a[YEAR], currentDate[YEAR]); + + if (config._dayOfYear > daysInYear(yearToUse)) { + config._pf._overflowDayOfYear = true; + } + + date = makeUTCDate(yearToUse, 0, config._dayOfYear); + config._a[MONTH] = date.getUTCMonth(); + config._a[DATE] = date.getUTCDate(); + } + + // Default to current date. + // * if no year, month, day of month are given, default to today + // * if day of month is given, default month and year + // * if month is given, default only year + // * if year is given, don't default anything + for (i = 0; i < 3 && config._a[i] == null; ++i) { + config._a[i] = input[i] = currentDate[i]; + } + + // Zero out whatever was not defaulted, including time + for (; i < 7; i++) { config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i]; } - // add the offsets to the time to be parsed so that we can have a clean array for checking isValid - input[3] += ~~((config._tzm || 0) / 60); - input[4] += ~~((config._tzm || 0) % 60); + config._d = (config._useUTC ? makeUTCDate : makeDate).apply(null, input); + // Apply timezone offset from input. The actual zone can be changed + // with parseZone. + if (config._tzm != null) { + config._d.setUTCMinutes(config._d.getUTCMinutes() + config._tzm); + } + } - date = new Date(0); + function dateFromObject(config) { + var normalizedInput; - if (config._useUTC) { - date.setUTCFullYear(input[0], input[1], input[2]); - date.setUTCHours(input[3], input[4], input[5], input[6]); - } else { - date.setFullYear(input[0], input[1], input[2]); - date.setHours(input[3], input[4], input[5], input[6]); + if (config._d) { + return; } - config._d = date; + normalizedInput = normalizeObjectUnits(config._i); + config._a = [ + normalizedInput.year, + normalizedInput.month, + normalizedInput.day, + normalizedInput.hour, + normalizedInput.minute, + normalizedInput.second, + normalizedInput.millisecond + ]; + + dateFromConfig(config); + } + + function currentDateArray(config) { + var now = new Date(); + if (config._useUTC) { + return [ + now.getUTCFullYear(), + now.getUTCMonth(), + now.getUTCDate() + ]; + } else { + return [now.getFullYear(), now.getMonth(), now.getDate()]; + } } // date from string and format string function makeDateFromStringAndFormat(config) { - // This array is used to make a Date, either with `new Date` or `Date.UTC` - var tokens = config._f.match(formattingTokens), - string = config._i, - i, parsedInput; + + if (config._f === moment.ISO_8601) { + parseISO(config); + return; + } config._a = []; + config._pf.empty = true; + + // This array is used to make a Date, either with `new Date` or `Date.UTC` + var lang = getLangDefinition(config._l), + string = '' + config._i, + i, parsedInput, tokens, token, skipped, + stringLength = string.length, + totalParsedInputLength = 0; + + tokens = expandFormat(config._f, lang).match(formattingTokens) || []; for (i = 0; i < tokens.length; i++) { - parsedInput = (getParseRegexForToken(tokens[i], config).exec(string) || [])[0]; + token = tokens[i]; + parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0]; if (parsedInput) { + skipped = string.substr(0, string.indexOf(parsedInput)); + if (skipped.length > 0) { + config._pf.unusedInput.push(skipped); + } string = string.slice(string.indexOf(parsedInput) + parsedInput.length); + totalParsedInputLength += parsedInput.length; } - // don't parse if its not a known token - if (formatTokenFunctions[tokens[i]]) { - addTimeToArrayFromToken(tokens[i], parsedInput, config); + // don't parse if it's not a known token + if (formatTokenFunctions[token]) { + if (parsedInput) { + config._pf.empty = false; + } + else { + config._pf.unusedTokens.push(token); + } + addTimeToArrayFromToken(token, parsedInput, config); + } + else if (config._strict && !parsedInput) { + config._pf.unusedTokens.push(token); } } - // add remaining unparsed input to the string - if (string) { - config._il = string; + // add remaining unparsed input length to the string + config._pf.charsLeftOver = stringLength - totalParsedInputLength; + if (string.length > 0) { + config._pf.unusedInput.push(string); } // handle am pm - if (config._isPm && config._a[3] < 12) { - config._a[3] += 12; + if (config._isPm && config._a[HOUR] < 12) { + config._a[HOUR] += 12; } // if is 12 am, change hours to 0 - if (config._isPm === false && config._a[3] === 12) { - config._a[3] = 0; + if (config._isPm === false && config._a[HOUR] === 12) { + config._a[HOUR] = 0; } - // return - dateFromArray(config); + + dateFromConfig(config); + checkOverflow(config); + } + + function unescapeFormat(s) { + return s.replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) { + return p1 || p2 || p3 || p4; + }); + } + + // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript + function regexpEscape(s) { + return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); } // date from string and array of format strings function makeDateFromStringAndArray(config) { var tempConfig, - tempMoment, bestMoment, - scoreToBeat = 99, + scoreToBeat, i, currentScore; + if (config._f.length === 0) { + config._pf.invalidFormat = true; + config._d = new Date(NaN); + return; + } + for (i = 0; i < config._f.length; i++) { + currentScore = 0; tempConfig = extend({}, config); + tempConfig._pf = defaultParsingFlags(); tempConfig._f = config._f[i]; makeDateFromStringAndFormat(tempConfig); - tempMoment = new Moment(tempConfig); - currentScore = compareArrays(tempConfig._a, tempMoment.toArray()); - - // if there is any input that was not parsed - // add a penalty for that format - if (tempMoment._il) { - currentScore += tempMoment._il.length; + if (!isValid(tempConfig)) { + continue; } - if (currentScore < scoreToBeat) { + // if there is any input that was not parsed add a penalty for that format + currentScore += tempConfig._pf.charsLeftOver; + + //or tokens + currentScore += tempConfig._pf.unusedTokens.length * 10; + + tempConfig._pf.score = currentScore; + + if (scoreToBeat == null || currentScore < scoreToBeat) { scoreToBeat = currentScore; - bestMoment = tempMoment; + bestMoment = tempConfig; } } - extend(config, bestMoment); + extend(config, bestMoment || tempConfig); } // date from iso format - function makeDateFromString(config) { - var i, + function parseISO(config) { + var i, l, string = config._i, match = isoRegex.exec(string); if (match) { - // match[2] should be "T" or undefined - config._f = 'YYYY-MM-DD' + (match[2] || " "); - for (i = 0; i < 4; i++) { + config._pf.iso = true; + for (i = 0, l = isoDates.length; i < l; i++) { + if (isoDates[i][1].exec(string)) { + // match[5] should be "T" or undefined + config._f = isoDates[i][0] + (match[6] || " "); + break; + } + } + for (i = 0, l = isoTimes.length; i < l; i++) { if (isoTimes[i][1].exec(string)) { config._f += isoTimes[i][0]; break; } } - if (parseTokenTimezone.exec(string)) { - config._f += " Z"; + if (string.match(parseTokenTimezone)) { + config._f += "Z"; } makeDateFromStringAndFormat(config); } else { - config._d = new Date(string); + config._isValid = false; + } + } + + // date from iso format or fallback + function makeDateFromString(config) { + parseISO(config); + if (config._isValid === false) { + delete config._isValid; + moment.createFromInputFallback(config); } } @@ -914,12 +1511,53 @@ makeDateFromString(config); } else if (isArray(input)) { config._a = input.slice(0); - dateFromArray(config); + dateFromConfig(config); + } else if (isDate(input)) { + config._d = new Date(+input); + } else if (typeof(input) === 'object') { + dateFromObject(config); + } else if (typeof(input) === 'number') { + // from milliseconds + config._d = new Date(input); } else { - config._d = input instanceof Date ? new Date(+input) : new Date(input); + moment.createFromInputFallback(config); } } + function makeDate(y, m, d, h, M, s, ms) { + //can't just apply() to create a date: + //http://stackoverflow.com/questions/181348/instantiating-a-javascript-object-by-calling-prototype-constructor-apply + var date = new Date(y, m, d, h, M, s, ms); + + //the date constructor doesn't accept years < 1970 + if (y < 1970) { + date.setFullYear(y); + } + return date; + } + + function makeUTCDate(y) { + var date = new Date(Date.UTC.apply(null, arguments)); + if (y < 1970) { + date.setUTCFullYear(y); + } + return date; + } + + function parseWeekday(input, language) { + if (typeof input === 'string') { + if (!isNaN(input)) { + input = parseInt(input, 10); + } + else { + input = language.weekdaysParse(input); + if (typeof input !== 'number') { + return null; + } + } + } + return input; + } /************************************ Relative Time @@ -937,15 +1575,15 @@ hours = round(minutes / 60), days = round(hours / 24), years = round(days / 365), - args = seconds < 45 && ['s', seconds] || + args = seconds < relativeTimeThresholds.s && ['s', seconds] || minutes === 1 && ['m'] || - minutes < 45 && ['mm', minutes] || + minutes < relativeTimeThresholds.m && ['mm', minutes] || hours === 1 && ['h'] || - hours < 22 && ['hh', hours] || + hours < relativeTimeThresholds.h && ['hh', hours] || days === 1 && ['d'] || - days <= 25 && ['dd', days] || - days <= 45 && ['M'] || - days < 345 && ['MM', round(days / 30)] || + days <= relativeTimeThresholds.dd && ['dd', days] || + days <= relativeTimeThresholds.dm && ['M'] || + days < relativeTimeThresholds.dy && ['MM', round(days / 30)] || years === 1 && ['y'] || ['yy', years]; args[2] = withoutSuffix; args[3] = milliseconds > 0; @@ -987,6 +1625,20 @@ }; } + //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday + function dayOfYearFromWeeks(year, week, weekday, firstDayOfWeekOfYear, firstDayOfWeek) { + var d = makeUTCDate(year, 0, 1).getUTCDay(), daysToAdd, dayOfYear; + + d = d === 0 ? 7 : d; + weekday = weekday != null ? weekday : firstDayOfWeek; + daysToAdd = firstDayOfWeek - d + (d > firstDayOfWeekOfYear ? 7 : 0) - (d < firstDayOfWeek ? 7 : 0); + dayOfYear = 7 * (week - 1) + (weekday - firstDayOfWeek) + daysToAdd + 1; + + return { + year: dayOfYear > 0 ? year : year - 1, + dayOfYear: dayOfYear > 0 ? dayOfYear : daysInYear(year - 1) + dayOfYear + }; + } /************************************ Top Level Functions @@ -996,8 +1648,8 @@ var input = config._i, format = config._f; - if (input === null || input === '') { - return null; + if (input === null || (format === undefined && input === '')) { + return moment.invalid({nullInput: true}); } if (typeof input === 'string') { @@ -1005,7 +1657,8 @@ } if (moment.isMoment(input)) { - config = extend({}, input); + config = cloneMoment(input); + config._d = new Date(+input._d); } else if (format) { if (isArray(format)) { @@ -1020,24 +1673,93 @@ return new Moment(config); } - moment = function (input, format, lang) { - return makeMoment({ - _i : input, - _f : format, - _l : lang, - _isUTC : false - }); + moment = function (input, format, lang, strict) { + var c; + + if (typeof(lang) === "boolean") { + strict = lang; + lang = undefined; + } + // object construction must be done this way. + // https://github.com/moment/moment/issues/1423 + c = {}; + c._isAMomentObject = true; + c._i = input; + c._f = format; + c._l = lang; + c._strict = strict; + c._isUTC = false; + c._pf = defaultParsingFlags(); + + return makeMoment(c); + }; + + moment.suppressDeprecationWarnings = false; + + moment.createFromInputFallback = deprecate( + "moment construction falls back to js Date. This is " + + "discouraged and will be removed in upcoming major " + + "release. Please refer to " + + "https://github.com/moment/moment/issues/1407 for more info.", + function (config) { + config._d = new Date(config._i); + }); + + // Pick a moment m from moments so that m[fn](other) is true for all + // other. This relies on the function fn to be transitive. + // + // moments should either be an array of moment objects or an array, whose + // first element is an array of moment objects. + function pickBy(fn, moments) { + var res, i; + if (moments.length === 1 && isArray(moments[0])) { + moments = moments[0]; + } + if (!moments.length) { + return moment(); + } + res = moments[0]; + for (i = 1; i < moments.length; ++i) { + if (moments[i][fn](res)) { + res = moments[i]; + } + } + return res; + } + + moment.min = function () { + var args = [].slice.call(arguments, 0); + + return pickBy('isBefore', args); + }; + + moment.max = function () { + var args = [].slice.call(arguments, 0); + + return pickBy('isAfter', args); }; // creating with utc - moment.utc = function (input, format, lang) { - return makeMoment({ - _useUTC : true, - _isUTC : true, - _l : lang, - _i : input, - _f : format - }); + moment.utc = function (input, format, lang, strict) { + var c; + + if (typeof(lang) === "boolean") { + strict = lang; + lang = undefined; + } + // object construction must be done this way. + // https://github.com/moment/moment/issues/1423 + c = {}; + c._isAMomentObject = true; + c._useUTC = true; + c._isUTC = true; + c._l = lang; + c._i = input; + c._f = format; + c._strict = strict; + c._pf = defaultParsingFlags(); + + return makeMoment(c).utc(); }; // creating with unix timestamp (in seconds) @@ -1047,34 +1769,60 @@ // duration moment.duration = function (input, key) { - var isDuration = moment.isDuration(input), - isNumber = (typeof input === 'number'), - duration = (isDuration ? input._input : (isNumber ? {} : input)), - matched = aspNetTimeSpanJsonRegex.exec(input), + var duration = input, + // matching against regexp is expensive, do it on demand + match = null, sign, - ret; + ret, + parseIso; - if (isNumber) { + if (moment.isDuration(input)) { + duration = { + ms: input._milliseconds, + d: input._days, + M: input._months + }; + } else if (typeof input === 'number') { + duration = {}; if (key) { duration[key] = input; } else { duration.milliseconds = input; } - } else if (matched) { - sign = (matched[1] === "-") ? -1 : 1; + } else if (!!(match = aspNetTimeSpanJsonRegex.exec(input))) { + sign = (match[1] === "-") ? -1 : 1; duration = { y: 0, - d: ~~matched[2] * sign, - h: ~~matched[3] * sign, - m: ~~matched[4] * sign, - s: ~~matched[5] * sign, - ms: ~~matched[6] * sign + d: toInt(match[DATE]) * sign, + h: toInt(match[HOUR]) * sign, + m: toInt(match[MINUTE]) * sign, + s: toInt(match[SECOND]) * sign, + ms: toInt(match[MILLISECOND]) * sign + }; + } else if (!!(match = isoDurationRegex.exec(input))) { + sign = (match[1] === "-") ? -1 : 1; + parseIso = function (inp) { + // We'd normally use ~~inp for this, but unfortunately it also + // converts floats to ints. + // inp may be undefined, so careful calling replace on it. + var res = inp && parseFloat(inp.replace(',', '.')); + // apply sign while we're at it + return (isNaN(res) ? 0 : res) * sign; + }; + duration = { + y: parseIso(match[2]), + M: parseIso(match[3]), + d: parseIso(match[4]), + h: parseIso(match[5]), + m: parseIso(match[6]), + s: parseIso(match[7]), + w: parseIso(match[8]) }; } ret = new Duration(duration); - if (isDuration && input.hasOwnProperty('_lang')) { + if (moment.isDuration(input) && input.hasOwnProperty('_lang')) { ret._lang = input._lang; } @@ -1087,23 +1835,44 @@ // default format moment.defaultFormat = isoFormat; + // constant that refers to the ISO standard + moment.ISO_8601 = function () {}; + + // Plugins that add properties should also add the key here (null value), + // so we can properly clone ourselves. + moment.momentProperties = momentProperties; + // This function will be called whenever a moment is mutated. // It is intended to keep the offset in sync with the timezone. moment.updateOffset = function () {}; + // This function allows you to set a threshold for relative time strings + moment.relativeTimeThreshold = function(threshold, limit) { + if (relativeTimeThresholds[threshold] === undefined) { + return false; + } + relativeTimeThresholds[threshold] = limit; + return true; + }; + // This function will load languages and then set the global language. If // no arguments are passed in, it will simply return the current global // language key. moment.lang = function (key, values) { + var r; if (!key) { return moment.fn._lang._abbr; } if (values) { - loadLang(key, values); + loadLang(normalizeLanguage(key), values); + } else if (values === null) { + unloadLang(key); + key = 'en'; } else if (!languages[key]) { getLangDefinition(key); } - moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key); + r = moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key); + return r._abbr; }; // returns language data @@ -1116,7 +1885,8 @@ // compare moment object moment.isMoment = function (obj) { - return obj instanceof Moment; + return obj instanceof Moment || + (obj != null && obj.hasOwnProperty('_isAMomentObject')); }; // for typechecking Duration objects @@ -1124,13 +1894,40 @@ return obj instanceof Duration; }; + for (i = lists.length - 1; i >= 0; --i) { + makeList(lists[i]); + } + + moment.normalizeUnits = function (units) { + return normalizeUnits(units); + }; + + moment.invalid = function (flags) { + var m = moment.utc(NaN); + if (flags != null) { + extend(m._pf, flags); + } + else { + m._pf.userInvalidated = true; + } + + return m; + }; + + moment.parseZone = function () { + return moment.apply(null, arguments).parseZone(); + }; + + moment.parseTwoDigitYear = function (input) { + return toInt(input) + (toInt(input) > 68 ? 1900 : 2000); + }; /************************************ Moment Prototype ************************************/ - moment.fn = Moment.prototype = { + extend(moment.fn = Moment.prototype, { clone : function () { return moment(this); @@ -1145,7 +1942,7 @@ }, toString : function () { - return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ"); + return this.clone().lang('en').format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ"); }, toDate : function () { @@ -1153,7 +1950,12 @@ }, toISOString : function () { - return formatMoment(moment(this).utc(), 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]'); + var m = moment(this).utc(); + if (0 < m.year() && m.year() <= 9999) { + return formatMoment(m, 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]'); + } else { + return formatMoment(m, 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]'); + } }, toArray : function () { @@ -1170,14 +1972,24 @@ }, isValid : function () { - if (this._isValid == null) { - if (this._a) { - this._isValid = !compareArrays(this._a, (this._isUTC ? moment.utc(this._a) : moment(this._a)).toArray()); - } else { - this._isValid = !isNaN(this._d.getTime()); - } + return isValid(this); + }, + + isDSTShifted : function () { + + if (this._a) { + return this.isValid() && compareArrays(this._a, (this._isUTC ? moment.utc(this._a) : moment(this._a)).toArray()) > 0; } - return !!this._isValid; + + return false; + }, + + parsingFlags : function () { + return extend({}, this._pf); + }, + + invalidAt: function () { + return this._pf.overflow; }, utc : function () { @@ -1198,7 +2010,9 @@ add : function (input, val) { var dur; // switch args to support add('s', 1) and add(1, 's') - if (typeof input === 'string') { + if (typeof input === 'string' && typeof val === 'string') { + dur = moment.duration(isNaN(+val) ? +input : +val, isNaN(+val) ? val : input); + } else if (typeof input === 'string') { dur = moment.duration(+val, input); } else { dur = moment.duration(input, val); @@ -1210,7 +2024,9 @@ subtract : function (input, val) { var dur; // switch args to support subtract('s', 1) and subtract(1, 's') - if (typeof input === 'string') { + if (typeof input === 'string' && typeof val === 'string') { + dur = moment.duration(isNaN(+val) ? +input : +val, isNaN(+val) ? val : input); + } else if (typeof input === 'string') { dur = moment.duration(+val, input); } else { dur = moment.duration(input, val); @@ -1220,7 +2036,7 @@ }, diff : function (input, units, asFloat) { - var that = this._isUTC ? moment(input).zone(this._offset || 0) : moment(input).local(), + var that = makeAs(input, this), zoneDiff = (this.zone() - that.zone()) * 6e4, diff, output; @@ -1261,20 +2077,23 @@ return this.from(moment(), withoutSuffix); }, - calendar : function () { - var diff = this.diff(moment().startOf('day'), 'days', true), + calendar : function (time) { + // We want to compare the start of today, vs this. + // Getting start-of-today depends on whether we're zone'd or not. + var now = time || moment(), + sod = makeAs(now, this).startOf('day'), + diff = this.diff(sod, 'days', true), format = diff < -6 ? 'sameElse' : - diff < -1 ? 'lastWeek' : - diff < 0 ? 'lastDay' : - diff < 1 ? 'sameDay' : - diff < 2 ? 'nextDay' : - diff < 7 ? 'nextWeek' : 'sameElse'; + diff < -1 ? 'lastWeek' : + diff < 0 ? 'lastDay' : + diff < 1 ? 'sameDay' : + diff < 2 ? 'nextDay' : + diff < 7 ? 'nextWeek' : 'sameElse'; return this.format(this.lang().calendar(format, this)); }, isLeapYear : function () { - var year = this.year(); - return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0; + return isLeapYear(this.year()); }, isDST : function () { @@ -1285,42 +2104,14 @@ day : function (input) { var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay(); if (input != null) { - if (typeof input === 'string') { - input = this.lang().weekdaysParse(input); - if (typeof input !== 'number') { - return this; - } - } + input = parseWeekday(input, this.lang()); return this.add({ d : input - day }); } else { return day; } }, - month : function (input) { - var utc = this._isUTC ? 'UTC' : '', - dayOfMonth, - daysInMonth; - - if (input != null) { - if (typeof input === 'string') { - input = this.lang().monthsParse(input); - if (typeof input !== 'number') { - return this; - } - } - - dayOfMonth = this.date(); - this.date(1); - this._d['set' + utc + 'Month'](input); - this.date(Math.min(dayOfMonth, this.daysInMonth())); - - moment.updateOffset(this); - return this; - } else { - return this._d['get' + utc + 'Month'](); - } - }, + month : makeAccessor('Month', true), startOf: function (units) { units = normalizeUnits(units); @@ -1330,10 +2121,12 @@ case 'year': this.month(0); /* falls through */ + case 'quarter': case 'month': this.date(1); /* falls through */ case 'week': + case 'isoWeek': case 'day': this.hours(0); /* falls through */ @@ -1351,13 +2144,21 @@ // weeks are a special case if (units === 'week') { this.weekday(0); + } else if (units === 'isoWeek') { + this.isoWeekday(1); + } + + // quarters are also special + if (units === 'quarter') { + this.month(Math.floor(this.month() / 3) * 3); } return this; }, endOf: function (units) { - return this.startOf(units).add(units, 1).subtract('ms', 1); + units = normalizeUnits(units); + return this.startOf(units).add((units === 'isoWeek' ? 'week' : units), 1).subtract('ms', 1); }, isAfter: function (input, units) { @@ -1371,21 +2172,37 @@ }, isSame: function (input, units) { - units = typeof units !== 'undefined' ? units : 'millisecond'; - return +this.clone().startOf(units) === +moment(input).startOf(units); + units = units || 'ms'; + return +this.clone().startOf(units) === +makeAs(input, this).startOf(units); }, - min: function (other) { - other = moment.apply(null, arguments); - return other < this ? this : other; - }, + min: deprecate( + "moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548", + function (other) { + other = moment.apply(null, arguments); + return other < this ? this : other; + } + ), - max: function (other) { - other = moment.apply(null, arguments); - return other > this ? this : other; - }, + max: deprecate( + "moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548", + function (other) { + other = moment.apply(null, arguments); + return other > this ? this : other; + } + ), - zone : function (input) { + // keepTime = true means only change the timezone, without affecting + // the local hour. So 5:31:26 +0300 --[zone(2, true)]--> 5:31:26 +0200 + // It is possible that 5:31:26 doesn't exist int zone +0200, so we + // adjust the time as needed, to be valid. + // + // Keeping the time actually adds/subtracts (one hour) + // from the actual represented time. That is why we call updateOffset + // a second time. In case it wants us to change the offset again + // _changeInProgress == true case, then we have to adjust, because + // there is no such time in the given timezone. + zone : function (input, keepTime) { var offset = this._offset || 0; if (input != null) { if (typeof input === "string") { @@ -1397,7 +2214,14 @@ this._offset = input; this._isUTC = true; if (offset !== input) { - addOrSubtractDurationFromMoment(this, moment.duration(offset - input, 'm'), 1, true); + if (!keepTime || this._changeInProgress) { + addOrSubtractDurationFromMoment(this, + moment.duration(offset - input, 'm'), 1, false); + } else if (!this._changeInProgress) { + this._changeInProgress = true; + moment.updateOffset(this, true); + this._changeInProgress = null; + } } } else { return this._isUTC ? offset : this._d.getTimezoneOffset(); @@ -1413,8 +2237,28 @@ return this._isUTC ? "Coordinated Universal Time" : ""; }, + parseZone : function () { + if (this._tzm) { + this.zone(this._tzm); + } else if (typeof this._i === 'string') { + this.zone(this._i); + } + return this; + }, + + hasAlignedHourOffset : function (input) { + if (!input) { + input = 0; + } + else { + input = moment(input).zone(); + } + + return (this.zone() - input) % 60 === 0; + }, + daysInMonth : function () { - return moment.utc([this.year(), this.month() + 1, 0]).date(); + return daysInMonth(this.year(), this.month()); }, dayOfYear : function (input) { @@ -1422,6 +2266,10 @@ return input == null ? dayOfYear : this.add("d", (input - dayOfYear)); }, + quarter : function (input) { + return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3); + }, + weekYear : function (input) { var year = weekOfYear(this, this.lang()._week.dow, this.lang()._week.doy).year; return input == null ? year : this.add("y", (input - year)); @@ -1443,7 +2291,7 @@ }, weekday : function (input) { - var weekday = (this._d.getDay() + 7 - this.lang()._week.dow) % 7; + var weekday = (this.day() + 7 - this.lang()._week.dow) % 7; return input == null ? weekday : this.add("d", input - weekday); }, @@ -1454,6 +2302,28 @@ return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7); }, + isoWeeksInYear : function () { + return weeksInYear(this.year(), 1, 4); + }, + + weeksInYear : function () { + var weekInfo = this._lang._week; + return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy); + }, + + get : function (units) { + units = normalizeUnits(units); + return this[units](); + }, + + set : function (units, value) { + units = normalizeUnits(units); + if (typeof this[units] === 'function') { + this[units](value); + } + return this; + }, + // If passed a language key, it will set the language for this // instance. Otherwise, it will return the language configuration // variables for this instance. @@ -1465,35 +2335,70 @@ return this; } } - }; + }); - // helper for adding shortcuts - function makeGetterAndSetter(name, key) { - moment.fn[name] = moment.fn[name + 's'] = function (input) { - var utc = this._isUTC ? 'UTC' : ''; - if (input != null) { - this._d['set' + utc + key](input); - moment.updateOffset(this); + function rawMonthSetter(mom, value) { + var dayOfMonth; + + // TODO: Move this out of here! + if (typeof value === 'string') { + value = mom.lang().monthsParse(value); + // TODO: Another silent failure? + if (typeof value !== 'number') { + return mom; + } + } + + dayOfMonth = Math.min(mom.date(), + daysInMonth(mom.year(), value)); + mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth); + return mom; + } + + function rawGetter(mom, unit) { + return mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit](); + } + + function rawSetter(mom, unit, value) { + if (unit === 'Month') { + return rawMonthSetter(mom, value); + } else { + return mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value); + } + } + + function makeAccessor(unit, keepTime) { + return function (value) { + if (value != null) { + rawSetter(this, unit, value); + moment.updateOffset(this, keepTime); return this; } else { - return this._d['get' + utc + key](); + return rawGetter(this, unit); } }; } - // loop through and add shortcuts (Month, Date, Hours, Minutes, Seconds, Milliseconds) - for (i = 0; i < proxyGettersAndSetters.length; i ++) { - makeGetterAndSetter(proxyGettersAndSetters[i].toLowerCase().replace(/s$/, ''), proxyGettersAndSetters[i]); - } - - // add shortcut for year (uses different syntax than the getter/setter 'year' == 'FullYear') - makeGetterAndSetter('year', 'FullYear'); + moment.fn.millisecond = moment.fn.milliseconds = makeAccessor('Milliseconds', false); + moment.fn.second = moment.fn.seconds = makeAccessor('Seconds', false); + moment.fn.minute = moment.fn.minutes = makeAccessor('Minutes', false); + // Setting the hour should keep the time, because the user explicitly + // specified which hour he wants. So trying to maintain the same hour (in + // a new timezone) makes sense. Adding/subtracting hours does not follow + // this rule. + moment.fn.hour = moment.fn.hours = makeAccessor('Hours', true); + // moment.fn.month is defined separately + moment.fn.date = makeAccessor('Date', true); + moment.fn.dates = deprecate("dates accessor is deprecated. Use date instead.", makeAccessor('Date', true)); + moment.fn.year = makeAccessor('FullYear', true); + moment.fn.years = deprecate("years accessor is deprecated. Use year instead.", makeAccessor('FullYear', true)); // add plural methods moment.fn.days = moment.fn.day; moment.fn.months = moment.fn.month; moment.fn.weeks = moment.fn.week; moment.fn.isoWeeks = moment.fn.isoWeek; + moment.fn.quarters = moment.fn.quarter; // add aliased format methods moment.fn.toJSON = moment.fn.toISOString; @@ -1503,7 +2408,8 @@ ************************************/ - moment.duration.fn = Duration.prototype = { + extend(moment.duration.fn = Duration.prototype, { + _bubble : function () { var milliseconds = this._milliseconds, days = this._days, @@ -1542,7 +2448,7 @@ return this._milliseconds + this._days * 864e5 + (this._months % 12) * 2592e6 + - ~~(this._months / 12) * 31536e6; + toInt(this._months / 12) * 31536e6; }, humanize : function (withSuffix) { @@ -1591,8 +2497,34 @@ return this['as' + units.charAt(0).toUpperCase() + units.slice(1) + 's'](); }, - lang : moment.fn.lang - }; + lang : moment.fn.lang, + + toIsoString : function () { + // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js + var years = Math.abs(this.years()), + months = Math.abs(this.months()), + days = Math.abs(this.days()), + hours = Math.abs(this.hours()), + minutes = Math.abs(this.minutes()), + seconds = Math.abs(this.seconds() + this.milliseconds() / 1000); + + if (!this.asSeconds()) { + // this is the same as C#'s (Noda) and python (isodate)... + // but not other JS (goog.date) + return 'P0D'; + } + + return (this.asSeconds() < 0 ? '-' : '') + + 'P' + + (years ? years + 'Y' : '') + + (months ? months + 'M' : '') + + (days ? days + 'D' : '') + + ((hours || minutes || seconds) ? 'T' : '') + + (hours ? hours + 'H' : '') + + (minutes ? minutes + 'M' : '') + + (seconds ? seconds + 'S' : ''); + } + }); function makeDurationGetter(name) { moment.duration.fn[name] = function () { @@ -1628,7 +2560,7 @@ moment.lang('en', { ordinal : function (number) { var b = number % 10, - output = (~~ (number % 100 / 10) === 1) ? 'th' : + output = (toInt(number % 100 / 10) === 1) ? 'th' : (b === 1) ? 'st' : (b === 2) ? 'nd' : (b === 3) ? 'rd' : 'th'; @@ -1636,27 +2568,43 @@ } }); + /* EMBED_LANGUAGES */ /************************************ Exposing Moment ************************************/ + function makeGlobal(shouldDeprecate) { + /*global ender:false */ + if (typeof ender !== 'undefined') { + return; + } + oldGlobalMoment = globalScope.moment; + if (shouldDeprecate) { + globalScope.moment = deprecate( + "Accessing Moment through the global scope is " + + "deprecated, and will be removed in an upcoming " + + "release.", + moment); + } else { + globalScope.moment = moment; + } + } // CommonJS module is defined if (hasModule) { module.exports = moment; - } - /*global ender:false */ - if (typeof ender === 'undefined') { - // here, `this` means `window` in the browser, or `global` on the server - // add `moment` as a global object via a string identifier, - // for Closure Compiler "advanced" mode - this['moment'] = moment; - } - /*global define:false */ - if (typeof define === "function" && define.amd) { - define("moment", [], function () { + } else if (typeof define === "function" && define.amd) { + define("moment", function (require, exports, module) { + if (module.config && module.config() && module.config().noGlobal === true) { + // release the global variable + globalScope.moment = oldGlobalMoment; + } + return moment; }); + makeGlobal(true); + } else { + makeGlobal(); } }).call(this); diff --git a/src/UI/Series/Details/SeasonLayout.js b/src/UI/Series/Details/SeasonLayout.js index 0a11225fb..cafec8d23 100644 --- a/src/UI/Series/Details/SeasonLayout.js +++ b/src/UI/Series/Details/SeasonLayout.js @@ -26,7 +26,7 @@ define( EpisodeNumberCell, EpisodeWarningCell, CommandController, - Moment, + moment, _, Messenger) { return Marionette.Layout.extend({ @@ -213,15 +213,15 @@ define( }, _shouldShowEpisodes: function () { - var startDate = Moment().add('month', -1); - var endDate = Moment().add('year', 1); + var startDate = moment().add('month', -1); + var endDate = moment().add('year', 1); return this.episodeCollection.some(function (episode) { var airDate = episode.get('airDateUtc'); if (airDate) { - var airDateMoment = Moment(airDate); + var airDateMoment = moment(airDate); if (airDateMoment.isAfter(startDate) && airDateMoment.isBefore(endDate)) { return true; @@ -235,7 +235,7 @@ define( templateHelpers: function () { var episodeCount = this.episodeCollection.filter(function (episode) { - return episode.get('hasFile') || (episode.get('monitored') && Moment(episode.get('airDateUtc')).isBefore(Moment())); + return episode.get('hasFile') || (episode.get('monitored') && moment(episode.get('airDateUtc')).isBefore(moment())); }).length; var episodeFileCount = this.episodeCollection.where({ hasFile: true }).length; diff --git a/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.html b/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.html index 1eb317ace..809d63c8f 100644 --- a/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.html +++ b/src/UI/Series/Index/Overview/SeriesOverviewItemViewTemplate.html @@ -37,7 +37,7 @@
        {{#if_eq status compare="continuing"}} {{#if nextAiring}} - {{NextAiring nextAiring}} + {{RelativeDate nextAiring}} {{/if}} {{else}} Ended diff --git a/src/UI/Series/Index/Posters/SeriesPostersItemViewTemplate.html b/src/UI/Series/Index/Posters/SeriesPostersItemViewTemplate.html index f1b82fc52..ce8253e48 100644 --- a/src/UI/Series/Index/Posters/SeriesPostersItemViewTemplate.html +++ b/src/UI/Series/Index/Posters/SeriesPostersItemViewTemplate.html @@ -22,7 +22,7 @@
        {{#if_eq status compare="continuing"}} {{#if nextAiring}} - {{NextAiring nextAiring}} + {{RelativeDate nextAiring}} {{/if}} {{/if_eq}} {{> EpisodeProgressPartial }} diff --git a/src/UI/Series/Index/SeriesIndexLayout.js b/src/UI/Series/Index/SeriesIndexLayout.js index d66c79bdf..ab6c1cd55 100644 --- a/src/UI/Series/Index/SeriesIndexLayout.js +++ b/src/UI/Series/Index/SeriesIndexLayout.js @@ -65,9 +65,9 @@ define( cell : 'integer' }, { - name : 'profileId', - label: 'Profile', - cell : ProfileCell + name : 'profileId', + label : 'Profile', + cell : ProfileCell }, { name : 'network', diff --git a/src/UI/Series/SeriesCollection.js b/src/UI/Series/SeriesCollection.js index bc4183eb7..eb0b3f269 100644 --- a/src/UI/Series/SeriesCollection.js +++ b/src/UI/Series/SeriesCollection.js @@ -10,7 +10,7 @@ define( 'Mixins/AsSortedCollection', 'Mixins/AsPersistedStateCollection', 'moment' - ], function (_, Backbone, PageableCollection, SeriesModel, SeriesData, AsFilteredCollection, AsSortedCollection, AsPersistedStateCollection, Moment) { + ], function (_, Backbone, PageableCollection, SeriesModel, SeriesData, AsFilteredCollection, AsSortedCollection, AsPersistedStateCollection, moment) { var Collection = PageableCollection.extend({ url : window.NzbDrone.ApiRoot + '/series', model: SeriesModel, @@ -63,13 +63,13 @@ define( var nextAiring = model.get(attr); if (nextAiring) { - return Moment(nextAiring).unix(); + return moment(nextAiring).unix(); } var previousAiring = model.get(attr.replace('nextAiring', 'previousAiring')); if (previousAiring) { - return 10000000000 - Moment(previousAiring).unix(); + return 10000000000 - moment(previousAiring).unix(); } return Number.MAX_VALUE; diff --git a/src/UI/Settings/SettingsLayout.js b/src/UI/Settings/SettingsLayout.js index a346e915a..8d39eaaa1 100644 --- a/src/UI/Settings/SettingsLayout.js +++ b/src/UI/Settings/SettingsLayout.js @@ -21,6 +21,8 @@ define( 'Settings/Notifications/NotificationCollection', 'Settings/Metadata/MetadataLayout', 'Settings/General/GeneralView', + 'Settings/UI/UiView', + 'Settings/UI/UiSettingsModel', 'Shared/LoadingView', 'Config' ], function ($, @@ -43,6 +45,8 @@ define( NotificationCollection, MetadataLayout, GeneralView, + UiView, + UiSettingsModel, LoadingView, Config) { return Marionette.Layout.extend({ @@ -57,6 +61,7 @@ define( notifications : '#notifications', metadata : '#metadata', general : '#general', + uiRegion : '#ui', loading : '#loading-region' }, @@ -69,6 +74,7 @@ define( notificationsTab : '.x-notifications-tab', metadataTab : '.x-metadata-tab', generalTab : '.x-general-tab', + uiTab : '.x-ui-tab', advancedSettings : '.x-advanced-settings' }, @@ -81,6 +87,7 @@ define( 'click .x-notifications-tab' : '_showNotifications', 'click .x-metadata-tab' : '_showMetadata', 'click .x-general-tab' : '_showGeneral', + 'click .x-ui-tab' : '_showUi', 'click .x-save-settings' : '_save', 'change .x-advanced-settings' : '_toggleAdvancedSettings' }, @@ -103,6 +110,7 @@ define( this.downloadClientSettings = new DownloadClientSettingsModel(); this.notificationCollection = new NotificationCollection(); this.generalSettings = new GeneralSettingsModel(); + this.uiSettings = new UiSettingsModel(); Backbone.$.when( this.mediaManagementSettings.fetch(), @@ -110,7 +118,8 @@ define( this.indexerSettings.fetch(), this.downloadClientSettings.fetch(), this.notificationCollection.fetch(), - this.generalSettings.fetch() + this.generalSettings.fetch(), + this.uiSettings.fetch() ).done(function () { if(!self.isClosed) { @@ -123,6 +132,7 @@ define( self.notifications.show(new NotificationCollectionView({ collection: self.notificationCollection })); self.metadata.show(new MetadataLayout()); self.general.show(new GeneralView({ model: self.generalSettings })); + self.uiRegion.show(new UiView({ model: self.uiSettings })); } }); @@ -155,6 +165,9 @@ define( case 'general': this._showGeneral(); break; + case 'ui': + this._showUi(); + break; default: this._showMediaManagement(); } @@ -232,6 +245,15 @@ define( this._navigate('settings/general'); }, + _showUi: function (e) { + if (e) { + e.preventDefault(); + } + + this.ui.uiTab.tab('show'); + this._navigate('settings/ui'); + }, + _navigate:function(route){ Backbone.history.navigate(route, { trigger: false, replace: true }); }, diff --git a/src/UI/Settings/SettingsLayoutTemplate.html b/src/UI/Settings/SettingsLayoutTemplate.html index a1deab4da..7d37ff78c 100644 --- a/src/UI/Settings/SettingsLayoutTemplate.html +++ b/src/UI/Settings/SettingsLayoutTemplate.html @@ -7,6 +7,7 @@
      • Connect
      • Metadata
      • General
        • +
      • UI
      @@ -42,6 +43,7 @@
      +
      \ No newline at end of file diff --git a/src/UI/Settings/UI/UiSettingsModel.js b/src/UI/Settings/UI/UiSettingsModel.js new file mode 100644 index 000000000..4d40b3dae --- /dev/null +++ b/src/UI/Settings/UI/UiSettingsModel.js @@ -0,0 +1,12 @@ +'use strict'; +define( + [ + 'Settings/SettingsModelBase' + ], function (SettingsModelBase) { + return SettingsModelBase.extend({ + + url : window.NzbDrone.ApiRoot + '/config/ui', + successMessage: 'UI settings saved', + errorMessage : 'Failed to save UI settings' + }); + }); diff --git a/src/UI/Settings/UI/UiView.js b/src/UI/Settings/UI/UiView.js new file mode 100644 index 000000000..b251d0cb1 --- /dev/null +++ b/src/UI/Settings/UI/UiView.js @@ -0,0 +1,27 @@ +'use strict'; +define( + [ + 'vent', + 'marionette', + 'Shared/UiSettingsModel', + 'Mixins/AsModelBoundView', + 'Mixins/AsValidatedView' + ], function (vent, Marionette, UiSettingsModel, AsModelBoundView, AsValidatedView) { + var view = Marionette.ItemView.extend({ + template: 'Settings/UI/UiViewTemplate', + + initialize: function () { + this.listenTo(this.model, 'sync', this._reloadUiSettings); + }, + + _reloadUiSettings: function() { + UiSettingsModel.fetch(); + } + }); + + AsModelBoundView.call(view); + AsValidatedView.call(view); + + return view; + }); + diff --git a/src/UI/Settings/UI/UiViewTemplate.html b/src/UI/Settings/UI/UiViewTemplate.html new file mode 100644 index 000000000..291e8610f --- /dev/null +++ b/src/UI/Settings/UI/UiViewTemplate.html @@ -0,0 +1,95 @@ +
      +
      + Calendar + +
      + + +
      + +
      +
      + +
      + + +
      + +
      + +
      + +
      +
      +
      + +
      + Dates + +
      + + +
      + +
      +
      + +
      + + +
      + +
      +
      + +
      + + +
      + +
      +
      + +
      + + +
      +
      +
      +
      +
      +
      diff --git a/src/UI/Settings/settings.less b/src/UI/Settings/settings.less index fdaab3e3d..34f503e7a 100644 --- a/src/UI/Settings/settings.less +++ b/src/UI/Settings/settings.less @@ -109,6 +109,10 @@ li.save-and-add:hover { } .settings-tabs { + li>a { + padding : 10px; + } + @media (min-width: @screen-sm-min) and (max-width: @screen-md-max) { li { a { diff --git a/src/UI/Shared/FormatHelpers.js b/src/UI/Shared/FormatHelpers.js index aaf51b1e1..7b1e35417 100644 --- a/src/UI/Shared/FormatHelpers.js +++ b/src/UI/Shared/FormatHelpers.js @@ -3,8 +3,9 @@ define( [ 'moment', - 'filesize' - ], function (Moment, Filesize) { + 'filesize', + 'Shared/UiSettingsModel' + ], function (moment, filesize, UiSettings) { return { @@ -15,16 +16,15 @@ define( return ''; } - return Filesize(size, { base: 2, round: 1 }); + return filesize(size, { base: 2, round: 1 }); }, - dateHelper: function (sourceDate) { + relativeDate: function (sourceDate) { if (!sourceDate) { return ''; } - var date = Moment(sourceDate); - + var date = moment(sourceDate); var calendarDate = date.calendar(); //TODO: It would be nice to not have to hack this... @@ -34,12 +34,12 @@ define( return strippedCalendarDate; } - if (date.isAfter(Moment())) { + if (date.isAfter(moment())) { return date.fromNow(true); } - if (date.isBefore(Moment().add('years', -1))) { - return date.format('ll'); + if (date.isBefore(moment().add('years', -1))) { + return date.format(UiSettings.get('shortDateFormat')); } return date.fromNow(); diff --git a/src/UI/Shared/UiSettingsModel.js b/src/UI/Shared/UiSettingsModel.js new file mode 100644 index 000000000..5d9cda590 --- /dev/null +++ b/src/UI/Shared/UiSettingsModel.js @@ -0,0 +1,22 @@ +'use strict'; +define( + [ + 'backbone', + 'api!config/ui' + ], function (Backbone, uiSettings) { + var UiSettings = Backbone.Model.extend({ + + url : window.NzbDrone.ApiRoot + '/config/ui', + + shortDateTime : function () { + return this.get('shortDateFormat') + ' ' + this.get('timeFormat').replace('(', '').replace(')', ''); + }, + + longDateTime : function () { + return this.get('longDateFormat') + ' ' + this.get('timeFormat').replace('(', '').replace(')', ''); + } + }); + + var instance = new UiSettings(uiSettings); + return instance; + }); diff --git a/src/UI/System/Logs/Table/LogTimeCell.js b/src/UI/System/Logs/Table/LogTimeCell.js index dbabc1246..49f082c27 100644 --- a/src/UI/System/Logs/Table/LogTimeCell.js +++ b/src/UI/System/Logs/Table/LogTimeCell.js @@ -2,16 +2,17 @@ define( [ 'Cells/NzbDroneCell', - 'moment' - ], function (NzbDroneCell, Moment) { + 'moment', + 'Shared/UiSettingsModel' + ], function (NzbDroneCell, moment, UiSettings) { return NzbDroneCell.extend({ className: 'log-time-cell', render: function () { - var date = Moment(this._getValue()); - this.$el.html('{0}'.format(date.format('LT'), date.format('LLLL'))); + var date = moment(this._getValue()); + this.$el.html('{0}'.format(date.format(UiSettings.get('timeFormat')), date.format(UiSettings.longDateFormat()))); return this; } diff --git a/src/UI/app.js b/src/UI/app.js index a0878855c..cdec34b7c 100644 --- a/src/UI/app.js +++ b/src/UI/app.js @@ -199,7 +199,6 @@ require.config({ headerCell: 'NzbDrone', sortType : 'toggle' }; - }); } }, @@ -247,7 +246,19 @@ define( 'Instrumentation/StringFormat', 'LifeCycle', 'Hotkeys/Hotkeys' - ], function ($, Backbone, Marionette, RouteBinder, SignalRBroadcaster, NavbarView, AppLayout, SeriesController, Router, ModalController, ControlPanelController, serverStatusModel, Tooltip) { + ], function ($, + Backbone, + Marionette, + RouteBinder, + SignalRBroadcaster, + NavbarView, + AppLayout, + SeriesController, + Router, + ModalController, + ControlPanelController, + serverStatusModel, + Tooltip) { new SeriesController(); new ModalController(); From cd66f8f1989d737fec273cf1d21c82cb0d6f4aea Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 4 Aug 2014 23:31:12 -0700 Subject: [PATCH 041/105] Week column header help is info not warning --- src/UI/Settings/UI/UiViewTemplate.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UI/Settings/UI/UiViewTemplate.html b/src/UI/Settings/UI/UiViewTemplate.html index 291e8610f..6e8cb4fca 100644 --- a/src/UI/Settings/UI/UiViewTemplate.html +++ b/src/UI/Settings/UI/UiViewTemplate.html @@ -17,7 +17,7 @@
      - +
      From 0a8dcaaf168d8bad765b445a7707fae52c9433ef Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 5 Aug 2014 06:33:05 -0700 Subject: [PATCH 042/105] Fixed error when trying to display time --- src/UI/System/Logs/Table/LogTimeCell.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UI/System/Logs/Table/LogTimeCell.js b/src/UI/System/Logs/Table/LogTimeCell.js index 49f082c27..25b4134e0 100644 --- a/src/UI/System/Logs/Table/LogTimeCell.js +++ b/src/UI/System/Logs/Table/LogTimeCell.js @@ -12,7 +12,7 @@ define( render: function () { var date = moment(this._getValue()); - this.$el.html('{0}'.format(date.format(UiSettings.get('timeFormat')), date.format(UiSettings.longDateFormat()))); + this.$el.html('{0}'.format(date.format(UiSettings.get('timeFormat').replace('(', '').replace(')', '')), date.format(UiSettings.longDateTime()))); return this; } From b0c45aef505ba14956b82a1e057c777880c192a9 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 5 Aug 2014 07:30:44 -0700 Subject: [PATCH 043/105] Cleaned up time formatting --- src/UI/Handlebars/Helpers/DateTime.js | 7 +------ src/UI/Shared/FormatHelpers.js | 2 +- src/UI/Shared/UiSettingsModel.js | 12 ++++++++++-- src/UI/System/Logs/Table/LogTimeCell.js | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/UI/Handlebars/Helpers/DateTime.js b/src/UI/Handlebars/Helpers/DateTime.js index 28b8fdf49..ff7f7174f 100644 --- a/src/UI/Handlebars/Helpers/DateTime.js +++ b/src/UI/Handlebars/Helpers/DateTime.js @@ -61,11 +61,6 @@ define( return ''; } - var date = moment(input); - if (date.format('mm') === '00') { - return date.format('ha'); - } - - return date.format('h:mma'); + return moment(input).format(UiSettings.time(false)); }); }); diff --git a/src/UI/Shared/FormatHelpers.js b/src/UI/Shared/FormatHelpers.js index 7b1e35417..8881b82b2 100644 --- a/src/UI/Shared/FormatHelpers.js +++ b/src/UI/Shared/FormatHelpers.js @@ -45,7 +45,7 @@ define( return date.fromNow(); }, - pad: function(n, width, z) { + pad: function (n, width, z) { z = z || '0'; n = n + ''; return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n; diff --git a/src/UI/Shared/UiSettingsModel.js b/src/UI/Shared/UiSettingsModel.js index 5d9cda590..808179019 100644 --- a/src/UI/Shared/UiSettingsModel.js +++ b/src/UI/Shared/UiSettingsModel.js @@ -9,11 +9,19 @@ define( url : window.NzbDrone.ApiRoot + '/config/ui', shortDateTime : function () { - return this.get('shortDateFormat') + ' ' + this.get('timeFormat').replace('(', '').replace(')', ''); + return this.get('shortDateFormat') + ' ' + this.time(true); }, longDateTime : function () { - return this.get('longDateFormat') + ' ' + this.get('timeFormat').replace('(', '').replace(')', ''); + return this.get('longDateFormat') + ' ' + this.time(true); + }, + + time : function (includeMinuteZero) { + if (includeMinuteZero) { + return this.get('timeFormat').replace('(', '').replace(')', ''); + } + + return this.get('timeFormat').replace(/\(\:mm\)/, ''); } }); diff --git a/src/UI/System/Logs/Table/LogTimeCell.js b/src/UI/System/Logs/Table/LogTimeCell.js index 25b4134e0..fd558b404 100644 --- a/src/UI/System/Logs/Table/LogTimeCell.js +++ b/src/UI/System/Logs/Table/LogTimeCell.js @@ -12,7 +12,7 @@ define( render: function () { var date = moment(this._getValue()); - this.$el.html('{0}'.format(date.format(UiSettings.get('timeFormat').replace('(', '').replace(')', '')), date.format(UiSettings.longDateTime()))); + this.$el.html('{0}'.format(date.format(UiSettings.time(true)), date.format(UiSettings.longDateTime()))); return this; } From b427954f5f27768ce9c7f7891021b32bf2043c19 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Mon, 28 Jul 2014 13:16:40 +0200 Subject: [PATCH 044/105] null EmbeddedDocuments are now stored as DBNull instead of json null. --- .../Datastore/MarrDataLazyLoadingFixture.cs | 1 + .../HistoryTests/HistoryRepositoryFixture.cs | 9 +++++++-- .../Housekeepers/CleanupOrphanedBlacklistFixture.cs | 11 +++++++++-- .../CleanupOrphanedEpisodeFilesFixture.cs | 4 ++++ .../CleanupOrphanedHistoryItemsFixture.cs | 5 +++++ .../CleanupOrphanedMetadataFilesFixture.cs | 2 ++ .../CleanupOrphanedPendingReleasesFixture.cs | 11 ++++++++--- .../DownloadedEpisodesImportServiceFixture.cs | 2 +- .../EpisodesRepositoryReadFixture.cs | 5 ++++- .../EpisodesWithFilesFixture.cs | 7 +++++-- .../Datastore/Converters/EmbeddedDocumentConverter.cs | 1 + 11 files changed, 47 insertions(+), 11 deletions(-) diff --git a/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs b/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs index 8cf59717b..49d67f063 100644 --- a/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs @@ -36,6 +36,7 @@ namespace NzbDrone.Core.Test.Datastore var episodeFiles = Builder.CreateListOfSize(1) .All() .With(v => v.SeriesId = series[0].Id) + .With(v => v.Quality = new QualityModel()) .BuildListOfNew(); Db.InsertMany(episodeFiles); diff --git a/src/NzbDrone.Core.Test/HistoryTests/HistoryRepositoryFixture.cs b/src/NzbDrone.Core.Test/HistoryTests/HistoryRepositoryFixture.cs index e2da6251c..34b6936bb 100644 --- a/src/NzbDrone.Core.Test/HistoryTests/HistoryRepositoryFixture.cs +++ b/src/NzbDrone.Core.Test/HistoryTests/HistoryRepositoryFixture.cs @@ -4,6 +4,7 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.History; using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Qualities; namespace NzbDrone.Core.Test.HistoryTests { @@ -15,7 +16,8 @@ namespace NzbDrone.Core.Test.HistoryTests { var historyItem = Builder.CreateListOfSize(30) .All() - .With(c=>c.Id = 0) + .With(c => c.Id = 0) + .With(c => c.Quality = new QualityModel()) .TheFirst(10).With(c => c.Date = DateTime.Now) .TheNext(20).With(c => c.Date = DateTime.Now.AddDays(-31)) .Build(); @@ -32,7 +34,9 @@ namespace NzbDrone.Core.Test.HistoryTests [Test] public void should_read_write_dictionary() { - var history = Builder.CreateNew().BuildNew(); + var history = Builder.CreateNew() + .With(c => c.Quality = new QualityModel()) + .BuildNew(); history.Data.Add("key1","value1"); history.Data.Add("key2","value2"); @@ -48,6 +52,7 @@ namespace NzbDrone.Core.Test.HistoryTests var history = Builder .CreateListOfSize(5) .All() + .With(c => c.Quality = new QualityModel()) .With(c => c.EventType = HistoryEventType.Unknown) .Random(3) .With(c => c.EventType = HistoryEventType.Grabbed) diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBlacklistFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBlacklistFixture.cs index 350471a1d..e5c3c077e 100644 --- a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBlacklistFixture.cs +++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedBlacklistFixture.cs @@ -3,8 +3,11 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Blacklisting; using NzbDrone.Core.Housekeeping.Housekeepers; +using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; +using System; +using System.Collections.Generic; namespace NzbDrone.Core.Test.Housekeeping.Housekeepers { @@ -15,6 +18,8 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers public void should_delete_orphaned_blacklist_items() { var blacklist = Builder.CreateNew() + .With(h => h.EpisodeIds = new List()) + .With(h => h.Quality = new QualityModel()) .BuildNew(); Db.Insert(blacklist); @@ -30,8 +35,10 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers Db.Insert(series); var blacklist = Builder.CreateNew() - .With(b => b.SeriesId = series.Id) - .BuildNew(); + .With(h => h.EpisodeIds = new List()) + .With(h => h.Quality = new QualityModel()) + .With(b => b.SeriesId = series.Id) + .BuildNew(); Db.Insert(blacklist); diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedEpisodeFilesFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedEpisodeFilesFixture.cs index 0c97d0ae7..b09def40c 100644 --- a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedEpisodeFilesFixture.cs +++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedEpisodeFilesFixture.cs @@ -6,6 +6,7 @@ using NzbDrone.Core.Housekeeping.Housekeepers; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; +using NzbDrone.Core.Qualities; namespace NzbDrone.Core.Test.Housekeeping.Housekeepers { @@ -16,6 +17,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers public void should_delete_orphaned_episode_files() { var episodeFile = Builder.CreateNew() + .With(h => h.Quality = new QualityModel()) .BuildNew(); Db.Insert(episodeFile); @@ -27,6 +29,8 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers public void should_not_delete_unorphaned_episode_files() { var episodeFiles = Builder.CreateListOfSize(2) + .All() + .With(h => h.Quality = new QualityModel()) .BuildListOfNew(); Db.InsertMany(episodeFiles); diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedHistoryItemsFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedHistoryItemsFixture.cs index 3ebf89dbd..022248abd 100644 --- a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedHistoryItemsFixture.cs +++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedHistoryItemsFixture.cs @@ -2,6 +2,7 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Housekeeping.Housekeepers; +using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -39,6 +40,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers GivenEpisode(); var history = Builder.CreateNew() + .With(h => h.Quality = new QualityModel()) .With(h => h.EpisodeId = _episode.Id) .BuildNew(); Db.Insert(history); @@ -53,6 +55,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers GivenSeries(); var history = Builder.CreateNew() + .With(h => h.Quality = new QualityModel()) .With(h => h.SeriesId = _series.Id) .BuildNew(); Db.Insert(history); @@ -69,6 +72,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers var history = Builder.CreateListOfSize(2) .All() + .With(h => h.Quality = new QualityModel()) .With(h => h.EpisodeId = _episode.Id) .TheFirst(1) .With(h => h.SeriesId = _series.Id) @@ -89,6 +93,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers var history = Builder.CreateListOfSize(2) .All() + .With(h => h.Quality = new QualityModel()) .With(h => h.SeriesId = _series.Id) .TheFirst(1) .With(h => h.EpisodeId = _episode.Id) diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedMetadataFilesFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedMetadataFilesFixture.cs index 4ea0046c3..7e4dc060f 100644 --- a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedMetadataFilesFixture.cs +++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedMetadataFilesFixture.cs @@ -5,6 +5,7 @@ using NzbDrone.Core.Housekeeping.Housekeepers; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Metadata; using NzbDrone.Core.Metadata.Files; +using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -68,6 +69,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers .BuildNew(); var episodeFile = Builder.CreateNew() + .With(h => h.Quality = new QualityModel()) .BuildNew(); Db.Insert(series); diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedPendingReleasesFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedPendingReleasesFixture.cs index 34965efae..104ba9bfc 100644 --- a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedPendingReleasesFixture.cs +++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedPendingReleasesFixture.cs @@ -3,6 +3,7 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Download.Pending; using NzbDrone.Core.Housekeeping.Housekeepers; +using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -15,7 +16,9 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers public void should_delete_orphaned_pending_items() { var pendingRelease = Builder.CreateNew() - .BuildNew(); + .With(h => h.ParsedEpisodeInfo = new ParsedEpisodeInfo()) + .With(h => h.Release = new ReleaseInfo()) + .BuildNew(); Db.Insert(pendingRelease); Subject.Clean(); @@ -30,8 +33,10 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers Db.Insert(series); var pendingRelease = Builder.CreateNew() - .With(h => h.SeriesId = series.Id) - .BuildNew(); + .With(h => h.SeriesId = series.Id) + .With(h => h.ParsedEpisodeInfo = new ParsedEpisodeInfo()) + .With(h => h.Release = new ReleaseInfo()) + .BuildNew(); Db.Insert(pendingRelease); diff --git a/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesImportServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesImportServiceFixture.cs index 3cc90f748..ad3d85bbb 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesImportServiceFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesImportServiceFixture.cs @@ -95,7 +95,7 @@ namespace NzbDrone.Core.Test.MediaFiles Subject.Execute(new DownloadedEpisodesScanCommand()); Mocker.GetMock() - .Verify(c => c.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()), + .Verify(c => c.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), It.IsAny()), Times.Never()); VerifyNoImport(); diff --git a/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesRepositoryReadFixture.cs b/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesRepositoryReadFixture.cs index 1a7f06151..07a43b9ca 100644 --- a/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesRepositoryReadFixture.cs +++ b/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesRepositoryReadFixture.cs @@ -2,6 +2,7 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.MediaFiles; +using NzbDrone.Core.Qualities; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; @@ -25,7 +26,9 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests [Test] public void should_get_episodes_by_file() { - var episodeFile = Builder.CreateNew().BuildNew(); + var episodeFile = Builder.CreateNew() + .With(h => h.Quality = new QualityModel()) + .BuildNew(); Db.Insert(episodeFile); diff --git a/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWithFilesFixture.cs b/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWithFilesFixture.cs index 5dd3b03d2..3925850ee 100644 --- a/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWithFilesFixture.cs +++ b/src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWithFilesFixture.cs @@ -7,6 +7,7 @@ using NUnit.Framework; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; +using NzbDrone.Core.Qualities; namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests { @@ -21,8 +22,9 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests public void Setup() { _episodeFiles = Builder.CreateListOfSize(5) - .BuildListOfNew() - .ToList(); + .All() + .With(c => c.Quality = new QualityModel()) + .BuildListOfNew(); Db.InsertMany(_episodeFiles); @@ -56,6 +58,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeRepositoryTests { var episodeFile = Builder.CreateNew() .With(f => f.Path = "another path") + .With(c => c.Quality = new QualityModel()) .BuildNew(); Db.Insert(episodeFile); diff --git a/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs b/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs index 806bbf5f4..222c53b2a 100644 --- a/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs +++ b/src/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs @@ -55,6 +55,7 @@ namespace NzbDrone.Core.Datastore.Converters public object ToDB(object clrValue) { if (clrValue == null) return null; + if (clrValue == DBNull.Value) return DBNull.Value; return JsonConvert.SerializeObject(clrValue, SerializerSetting); } From 7b420fc03309fe2a87b7639c0b71ee80ab647393 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Thu, 10 Apr 2014 19:58:50 +0200 Subject: [PATCH 045/105] Added MediaInfo to EpisodeFile. --- .../UpdateMediaInfoServiceFixture.cs | 118 ++++++++++++++++++ .../NzbDrone.Core.Test.csproj | 1 + .../056_add_mediainfo_to_episodefile.cs | 15 +++ src/NzbDrone.Core/MediaFiles/EpisodeFile.cs | 2 + .../EpisodeImport/ImportApprovedEpisodes.cs | 1 + .../EpisodeImport/ImportDecisionMaker.cs | 7 +- .../MediaFiles/MediaFileRepository.cs | 6 + .../MediaFiles/MediaFileService.cs | 6 + .../MediaFiles/MediaInfo/MediaInfoModel.cs | 3 +- .../MediaInfo/UpdateMediaInfoService.cs | 63 ++++++++++ src/NzbDrone.Core/NzbDrone.Core.csproj | 2 + .../Organizer/FileNameBuilder.cs | 87 +++++++++++++ .../Parser/Model/LocalEpisode.cs | 2 + src/NzbDrone.Core/Parser/ParsingService.cs | 3 + 14 files changed, 314 insertions(+), 2 deletions(-) create mode 100644 src/NzbDrone.Core.Test/MediaFiles/MediaInfo/UpdateMediaInfoServiceFixture.cs create mode 100644 src/NzbDrone.Core/Datastore/Migration/056_add_mediainfo_to_episodefile.cs create mode 100644 src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs diff --git a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/UpdateMediaInfoServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/UpdateMediaInfoServiceFixture.cs new file mode 100644 index 000000000..4b29c0b46 --- /dev/null +++ b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/UpdateMediaInfoServiceFixture.cs @@ -0,0 +1,118 @@ +using FizzWare.NBuilder; +using Moq; +using NUnit.Framework; +using NzbDrone.Common.Disk; +using NzbDrone.Core.Lifecycle; +using NzbDrone.Core.MediaFiles; +using NzbDrone.Core.MediaFiles.Events; +using NzbDrone.Core.MediaFiles.MediaInfo; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Test.Common; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Core.Test.MediaFiles.MediaInfo +{ + [TestFixture] + public class UpdateMediaInfoServiceFixture : CoreTest + { + private void GivenFileExists() + { + Mocker.GetMock() + .Setup(v => v.FileExists(It.IsAny())) + .Returns(true); + } + + private void GivenSuccessfulScan() + { + Mocker.GetMock() + .Setup(v => v.GetMediaInfo(It.IsAny())) + .Returns(new MediaInfoModel()); + } + + private void GivenFailedScan(String path) + { + Mocker.GetMock() + .Setup(v => v.GetMediaInfo(path)) + .Returns((MediaInfoModel)null); + } + + [Test] + public void should_get_for_existing_episodefile_on_after_series_scan() + { + var episodeFiles = Builder.CreateListOfSize(3) + .All() + .With(v => v.Path = @"C:\series\media.mkv".AsOsAgnostic()) + .TheFirst(1) + .With(v => v.MediaInfo = new MediaInfoModel()) + .BuildList(); + + Mocker.GetMock() + .Setup(v => v.GetFilesBySeries(1)) + .Returns(episodeFiles); + + GivenFileExists(); + GivenSuccessfulScan(); + + Subject.Handle(new SeriesScannedEvent(new Tv.Series { Id = 1 })); + + Mocker.GetMock() + .Verify(v => v.GetMediaInfo(@"C:\series\media.mkv".AsOsAgnostic()), Times.Exactly(2)); + + Mocker.GetMock() + .Verify(v => v.Update(It.IsAny()), Times.Exactly(2)); + } + + [Test] + public void should_ignore_missing_files() + { + var episodeFiles = Builder.CreateListOfSize(2) + .All() + .With(v => v.Path = @"C:\series\media.mkv".AsOsAgnostic()) + .BuildList(); + + Mocker.GetMock() + .Setup(v => v.GetFilesBySeries(1)) + .Returns(episodeFiles); + + GivenSuccessfulScan(); + + Subject.Handle(new SeriesScannedEvent(new Tv.Series { Id = 1 })); + + Mocker.GetMock() + .Verify(v => v.GetMediaInfo(@"C:\series\media.mkv".AsOsAgnostic()), Times.Never()); + + Mocker.GetMock() + .Verify(v => v.Update(It.IsAny()), Times.Never()); + } + + [Test] + public void should_continue_after_failure() + { + var episodeFiles = Builder.CreateListOfSize(2) + .All() + .With(v => v.Path = @"C:\series\media.mkv".AsOsAgnostic()) + .TheFirst(1) + .With(v => v.Path = @"C:\series\media2.mkv".AsOsAgnostic()) + .BuildList(); + + Mocker.GetMock() + .Setup(v => v.GetFilesBySeries(1)) + .Returns(episodeFiles); + + GivenFileExists(); + GivenSuccessfulScan(); + GivenFailedScan(@"C:\series\media2.mkv".AsOsAgnostic()); + + Subject.Handle(new SeriesScannedEvent(new Tv.Series { Id = 1 })); + + Mocker.GetMock() + .Verify(v => v.GetMediaInfo(@"C:\series\media.mkv".AsOsAgnostic()), Times.Exactly(1)); + + Mocker.GetMock() + .Verify(v => v.Update(It.IsAny()), Times.Exactly(1)); + } + } +} diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 9d137cfde..bf8c6b567 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -190,6 +190,7 @@ + diff --git a/src/NzbDrone.Core/Datastore/Migration/056_add_mediainfo_to_episodefile.cs b/src/NzbDrone.Core/Datastore/Migration/056_add_mediainfo_to_episodefile.cs new file mode 100644 index 000000000..f8763332b --- /dev/null +++ b/src/NzbDrone.Core/Datastore/Migration/056_add_mediainfo_to_episodefile.cs @@ -0,0 +1,15 @@ +using FluentMigrator; +using NzbDrone.Core.Datastore.Migration.Framework; +using System.Data; + +namespace NzbDrone.Core.Datastore.Migration +{ + [Migration(56)] + public class add_mediainfo_to_episodefile : NzbDroneMigrationBase + { + protected override void MainDbUpgrade() + { + Alter.Table("EpisodeFiles").AddColumn("MediaInfo").AsString().Nullable(); + } + } +} diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeFile.cs b/src/NzbDrone.Core/MediaFiles/EpisodeFile.cs index 12dccb7b0..242ee02aa 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeFile.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeFile.cs @@ -2,6 +2,7 @@ using NzbDrone.Core.Datastore; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; +using NzbDrone.Core.MediaFiles.MediaInfo; namespace NzbDrone.Core.MediaFiles { @@ -15,6 +16,7 @@ namespace NzbDrone.Core.MediaFiles public string SceneName { get; set; } public string ReleaseGroup { get; set; } public QualityModel Quality { get; set; } + public MediaInfoModel MediaInfo { get; set; } public LazyList Episodes { get; set; } public override string ToString() diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs index e0e6c7263..5494717e8 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs @@ -73,6 +73,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport episodeFile.Path = localEpisode.Path.CleanFilePath(); episodeFile.Size = _diskProvider.GetFileSize(localEpisode.Path); episodeFile.Quality = localEpisode.Quality; + episodeFile.MediaInfo = localEpisode.MediaInfo; episodeFile.SeasonNumber = localEpisode.SeasonNumber; episodeFile.Episodes = localEpisode.Episodes; episodeFile.ReleaseGroup = localEpisode.ParsedEpisodeInfo.ReleaseGroup; diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs index 3836c1ef0..93382b430 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs @@ -8,6 +8,7 @@ using NzbDrone.Core.Parser; using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; +using NzbDrone.Core.MediaFiles.MediaInfo; namespace NzbDrone.Core.MediaFiles.EpisodeImport @@ -23,19 +24,21 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport private readonly IParsingService _parsingService; private readonly IMediaFileService _mediaFileService; private readonly IDiskProvider _diskProvider; + private readonly IVideoFileInfoReader _videoFileInfoReader; private readonly Logger _logger; public ImportDecisionMaker(IEnumerable specifications, IParsingService parsingService, IMediaFileService mediaFileService, IDiskProvider diskProvider, - + IVideoFileInfoReader videoFileInfoReader, Logger logger) { _specifications = specifications; _parsingService = parsingService; _mediaFileService = mediaFileService; _diskProvider = diskProvider; + _videoFileInfoReader = videoFileInfoReader; _logger = logger; } @@ -69,6 +72,8 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport parsedEpisode.Size = _diskProvider.GetFileSize(file); _logger.Debug("Size: {0}", parsedEpisode.Size); + parsedEpisode.MediaInfo = _videoFileInfoReader.GetMediaInfo(file); + decision = GetDecision(parsedEpisode); } diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs index 0a7fe8a70..57f9976cb 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs @@ -9,6 +9,7 @@ namespace NzbDrone.Core.MediaFiles { List GetFilesBySeries(int seriesId); List GetFilesBySeason(int seriesId, int seasonNumber); + List GetFilesWithoutMediaInfo(); } @@ -30,5 +31,10 @@ namespace NzbDrone.Core.MediaFiles .AndWhere(c => c.SeasonNumber == seasonNumber) .ToList(); } + + public List GetFilesWithoutMediaInfo() + { + return Query.Where(c => c.MediaInfo == null).ToList(); + } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs index 3bc146fad..f45753929 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs @@ -15,6 +15,7 @@ namespace NzbDrone.Core.MediaFiles void Delete(EpisodeFile episodeFile, bool forUpgrade = false); List GetFilesBySeries(int seriesId); List GetFilesBySeason(int seriesId, int seasonNumber); + List GetFilesWithoutMediaInfo(); List FilterExistingFiles(List files, int seriesId); EpisodeFile Get(int id); List Get(IEnumerable ids); @@ -62,6 +63,11 @@ namespace NzbDrone.Core.MediaFiles return _mediaFileRepository.GetFilesBySeason(seriesId, seasonNumber); } + public List GetFilesWithoutMediaInfo() + { + return _mediaFileRepository.GetFilesWithoutMediaInfo(); + } + public List FilterExistingFiles(List files, int seriesId) { var seriesFiles = GetFilesBySeries(seriesId).Select(f => f.Path).ToList(); diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs index c18ec0870..964c62d4d 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs @@ -1,8 +1,9 @@ using System; +using NzbDrone.Core.Datastore; namespace NzbDrone.Core.MediaFiles.MediaInfo { - public class MediaInfoModel + public class MediaInfoModel : IEmbeddedDocument { public string VideoCodec { get; set; } public int VideoBitrate { get; set; } diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs new file mode 100644 index 000000000..cf3502dea --- /dev/null +++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs @@ -0,0 +1,63 @@ +using NLog; +using NzbDrone.Common.Disk; +using NzbDrone.Core.Lifecycle; +using NzbDrone.Core.MediaFiles.Events; +using NzbDrone.Core.Messaging.Events; +using NzbDrone.Core.Tv; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Core.MediaFiles.MediaInfo +{ + public class UpdateMediaInfoService : IHandle + { + private readonly IDiskProvider _diskProvider; + private readonly IMediaFileService _mediaFileService; + private readonly IVideoFileInfoReader _videoFileInfoReader; + private readonly Logger _logger; + + public UpdateMediaInfoService(IDiskProvider diskProvider, + IMediaFileService mediaFileService, + IVideoFileInfoReader videoFileInfoReader, + Logger logger) + { + _diskProvider = diskProvider; + _mediaFileService = mediaFileService; + _videoFileInfoReader = videoFileInfoReader; + _logger = logger; + } + + private void UpdateMediaInfo(List mediaFiles) + { + foreach (var mediaFile in mediaFiles) + { + var path = mediaFile.Path; + + if (!_diskProvider.FileExists(path)) + { + _logger.Debug("Can't update MediaInfo because '{0}' does not exist", path); + continue; + } + + mediaFile.MediaInfo = _videoFileInfoReader.GetMediaInfo(path); + + if (mediaFile.MediaInfo != null) + { + _mediaFileService.Update(mediaFile); + _logger.Debug("Updated MediaInfo for '{0}'", path); + } + } + } + + public void Handle(SeriesScannedEvent message) + { + var mediaFiles = _mediaFileService.GetFilesBySeries(message.Series.Id) + .Where(c => c.MediaInfo == null) + .ToList(); + + UpdateMediaInfo(mediaFiles); + } + } +} diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 6ea6013bd..3873058a0 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -212,6 +212,7 @@ + @@ -482,6 +483,7 @@ + diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index 7a65d7dfb..7b9920f1a 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -216,6 +216,8 @@ namespace NzbDrone.Core.Organizer tokenValues.Add("{Episode Title}", GetEpisodeTitle(episodeTitles)); tokenValues.Add("{Quality Title}", GetQualityTitle(episodeFile.Quality)); + AddMediaInfoTokens(episodeFile, tokenValues); + var filename = ReplaceTokens(pattern, tokenValues).Trim(); filename = FilenameCleanupRegex.Replace(filename, match => match.Captures[0].Value[0].ToString() ); @@ -333,6 +335,91 @@ namespace NzbDrone.Core.Organizer return result.Trim(); } + private void AddMediaInfoTokens(EpisodeFile episodeFile, Dictionary tokenValues) + { + if (episodeFile.MediaInfo == null) + return; + + var mediaInfoFull = string.Empty; + + switch (episodeFile.MediaInfo.VideoCodec) + { + case "AVC": + if (Path.GetFileNameWithoutExtension(episodeFile.Path).Contains("x264")) + mediaInfoFull += "x264"; + else if (Path.GetFileNameWithoutExtension(episodeFile.Path).Contains("h264")) + mediaInfoFull += "h264"; + else + mediaInfoFull += "h264"; + break; + + default: + mediaInfoFull += episodeFile.MediaInfo.VideoCodec; + break; + } + + switch (episodeFile.MediaInfo.AudioFormat) + { + case "AC-3": + mediaInfoFull += ".AC3"; + break; + + case "MPEG Audio": + if (episodeFile.MediaInfo.AudioProfile == "Layer 3") + mediaInfoFull += ".MP3"; + else + mediaInfoFull += "." + episodeFile.MediaInfo.AudioFormat; + break; + + case "DTS": + mediaInfoFull += "." + episodeFile.MediaInfo.AudioFormat; + break; + + default: + mediaInfoFull += "." + episodeFile.MediaInfo.AudioFormat; + break; + } + + tokenValues.Add("{MediaInfo Short}", mediaInfoFull); + + var audioLanguagesToken = GetLanguagesToken(episodeFile.MediaInfo.AudioLanguages); + if (!string.IsNullOrEmpty(audioLanguagesToken) && audioLanguagesToken != "EN") + mediaInfoFull += string.Format("[{0}]", audioLanguagesToken); + + var subtitleLanguagesToken = GetLanguagesToken(episodeFile.MediaInfo.Subtitles); + if (!string.IsNullOrEmpty(subtitleLanguagesToken)) + mediaInfoFull += string.Format(".[{0}]", subtitleLanguagesToken); + + tokenValues.Add("{MediaInfo Full}", mediaInfoFull); + } + + private string GetLanguagesToken(string mediaInfoLanguages) + { + List tokens = new List(); + foreach (var item in mediaInfoLanguages.Split('/')) + { + if (!string.IsNullOrWhiteSpace(item)) + tokens.Add(item.Trim()); + } + + var cultures = System.Globalization.CultureInfo.GetCultures(System.Globalization.CultureTypes.NeutralCultures); + for (int i = 0; i < tokens.Count; i++) + { + try + { + var cultureInfo = cultures.FirstOrDefault(p => p.EnglishName == tokens[i]); + + if (cultureInfo != null) + tokens[i] = cultureInfo.TwoLetterISOLanguageName.ToUpper(); + } + catch + { + } + } + + return string.Join("+", tokens.Distinct()); + } + private string ReplaceTokens(string pattern, Dictionary tokenValues) { return TitleRegex.Replace(pattern, match => ReplaceToken(match, tokenValues)); diff --git a/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs b/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs index 447055328..eefe76e51 100644 --- a/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs +++ b/src/NzbDrone.Core/Parser/Model/LocalEpisode.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Collections.Generic; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; +using NzbDrone.Core.MediaFiles.MediaInfo; namespace NzbDrone.Core.Parser.Model { @@ -14,6 +15,7 @@ namespace NzbDrone.Core.Parser.Model public Series Series { get; set; } public List Episodes { get; set; } public QualityModel Quality { get; set; } + public MediaInfoModel MediaInfo { get; set; } public Boolean ExistingFile { get; set; } public int SeasonNumber diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs index 61ede3492..d39a53064 100644 --- a/src/NzbDrone.Core/Parser/ParsingService.cs +++ b/src/NzbDrone.Core/Parser/ParsingService.cs @@ -27,16 +27,19 @@ namespace NzbDrone.Core.Parser private readonly IEpisodeService _episodeService; private readonly ISeriesService _seriesService; private readonly ISceneMappingService _sceneMappingService; + private readonly IDiskProvider _diskProvider; private readonly Logger _logger; public ParsingService(IEpisodeService episodeService, ISeriesService seriesService, ISceneMappingService sceneMappingService, + IDiskProvider diskProvider, Logger logger) { _episodeService = episodeService; _seriesService = seriesService; _sceneMappingService = sceneMappingService; + _diskProvider = diskProvider; _logger = logger; } From 8a5edfeaf50ea59d0c7902cf333e538a2405855a Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Mon, 28 Jul 2014 23:14:34 +0200 Subject: [PATCH 046/105] Rewrote most of the renamer token handling code to give it a bit more generic architecture. Also added MediaInfo as possible token. --- src/NzbDrone.Api/Config/NamingConfigModule.cs | 8 +- .../MoveEpisodeFileFixture.cs | 2 +- .../MediaFiles/MediaFileServiceTest.cs | 2 +- .../OrganizerTests/FileNameBuilderFixture.cs | 144 ++++-- .../OrganizerTests/GetSeriesFolderFixture.cs | 4 +- .../SeriesServiceTests/AddSeriesFixture.cs | 2 +- .../Download/Clients/Pneumatic/Pneumatic.cs | 2 +- .../UsenetBlackhole/UsenetBlackhole.cs | 6 +- .../MediaFiles/EpisodeFileMovingService.cs | 6 +- .../MediaFiles/RenameEpisodeFileService.cs | 2 +- src/NzbDrone.Core/NzbDrone.Core.csproj | 6 +- .../Organizer/FileNameBuilder.cs | 439 +++++++++++------- .../FilenameBuilderTokenEqualityComparer.cs | 6 +- .../Organizer/FilenameSampleService.cs | 59 ++- .../Organizer/FilenameValidationService.cs | 8 +- src/NzbDrone.Core/Organizer/SampleResult.cs | 2 +- src/NzbDrone.Core/Tv/SeriesService.cs | 2 +- .../Naming/NamingViewTemplate.html | 3 + .../Partials/MediaInfoNamingPartial.html | 11 + .../Partials/SeriesTitleNamingPartial.html | 3 + 20 files changed, 452 insertions(+), 265 deletions(-) create mode 100644 src/UI/Settings/MediaManagement/Naming/Partials/MediaInfoNamingPartial.html diff --git a/src/NzbDrone.Api/Config/NamingConfigModule.cs b/src/NzbDrone.Api/Config/NamingConfigModule.cs index 03d494aac..b7b2a035f 100644 --- a/src/NzbDrone.Api/Config/NamingConfigModule.cs +++ b/src/NzbDrone.Api/Config/NamingConfigModule.cs @@ -85,19 +85,19 @@ namespace NzbDrone.Api.Config sampleResource.SingleEpisodeExample = _filenameValidationService.ValidateStandardFilename(singleEpisodeSampleResult) != null ? "Invalid format" - : singleEpisodeSampleResult.Filename; + : singleEpisodeSampleResult.FileName; sampleResource.MultiEpisodeExample = _filenameValidationService.ValidateStandardFilename(multiEpisodeSampleResult) != null ? "Invalid format" - : multiEpisodeSampleResult.Filename; + : multiEpisodeSampleResult.FileName; sampleResource.DailyEpisodeExample = _filenameValidationService.ValidateDailyFilename(dailyEpisodeSampleResult) != null ? "Invalid format" - : dailyEpisodeSampleResult.Filename; + : dailyEpisodeSampleResult.FileName; sampleResource.AnimeEpisodeExample = _filenameValidationService.ValidateAnimeFilename(animeEpisodeSampleResult) != null ? "Invalid format" - : animeEpisodeSampleResult.Filename; + : animeEpisodeSampleResult.FileName; sampleResource.SeriesFolderExample = nameSpec.SeriesFolderFormat.IsNullOrWhiteSpace() ? "Invalid format" diff --git a/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs index 00b1302ec..75fe64ca6 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs @@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeFileMovingServiceTests .Build(); Mocker.GetMock() - .Setup(s => s.BuildFilename(It.IsAny>(), It.IsAny(), It.IsAny())) + .Setup(s => s.BuildFileName(It.IsAny>(), It.IsAny(), It.IsAny(), null)) .Returns("File Name"); Mocker.GetMock() diff --git a/src/NzbDrone.Core.Test/MediaFiles/MediaFileServiceTest.cs b/src/NzbDrone.Core.Test/MediaFiles/MediaFileServiceTest.cs index ea567a509..d1bd43441 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/MediaFileServiceTest.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/MediaFileServiceTest.cs @@ -19,7 +19,7 @@ namespace NzbDrone.Core.Test.MediaFiles "Law & Order- Criminal Intent - S10E07 - Icarus [HDTV-720p]")] public void CleanFileName(string name, string expectedName) { - FileNameBuilder.CleanFilename(name).Should().Be(expectedName); + FileNameBuilder.CleanFileName(name).Should().Be(expectedName); } [Test] diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs index e0a06619d..278407505 100644 --- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs +++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs @@ -69,7 +69,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{Series Title}"; - Subject.BuildFilename(new List {_episode1}, _series, _episodeFile) + Subject.BuildFileName(new List {_episode1}, _series, _episodeFile) .Should().Be("South Park"); } @@ -78,7 +78,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{Series_Title}"; - Subject.BuildFilename(new List {_episode1}, _series, _episodeFile) + Subject.BuildFileName(new List {_episode1}, _series, _episodeFile) .Should().Be("South_Park"); } @@ -87,7 +87,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{Series.Title}"; - Subject.BuildFilename(new List {_episode1}, _series, _episodeFile) + Subject.BuildFileName(new List {_episode1}, _series, _episodeFile) .Should().Be("South.Park"); } @@ -96,7 +96,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{Series-Title}"; - Subject.BuildFilename(new List {_episode1}, _series, _episodeFile) + Subject.BuildFileName(new List {_episode1}, _series, _episodeFile) .Should().Be("South-Park"); } @@ -105,7 +105,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{SERIES TITLE}"; - Subject.BuildFilename(new List {_episode1}, _series, _episodeFile) + Subject.BuildFileName(new List {_episode1}, _series, _episodeFile) .Should().Be("SOUTH PARK"); } @@ -114,7 +114,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{sErIES-tItLE}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be(_series.Title.Replace(' ', '-')); } @@ -123,16 +123,26 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{series title}"; - Subject.BuildFilename(new List {_episode1}, _series, _episodeFile) + Subject.BuildFileName(new List {_episode1}, _series, _episodeFile) .Should().Be("south park"); } + [Test] + public void should_cleanup_Series_Title() + { + _namingConfig.StandardEpisodeFormat = "{Series.CleanTitle}"; + _series.Title = "South Park (1997)"; + + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) + .Should().Be("South.Park.1997"); + } + [Test] public void should_replace_episode_title() { _namingConfig.StandardEpisodeFormat = "{Episode Title}"; - Subject.BuildFilename(new List {_episode1}, _series, _episodeFile) + Subject.BuildFileName(new List {_episode1}, _series, _episodeFile) .Should().Be("City Sushi"); } @@ -141,7 +151,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{ePisOde-TitLe}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("City-Sushi"); } @@ -151,7 +161,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _episode1.SeasonNumber = 1; _namingConfig.StandardEpisodeFormat = "{season}x{episode}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("1x6"); } @@ -161,7 +171,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _episode1.SeasonNumber = 1; _namingConfig.StandardEpisodeFormat = "{season:00}x{episode}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("01x6"); } @@ -171,7 +181,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _episode1.SeasonNumber = 1; _namingConfig.StandardEpisodeFormat = "{season}x{episode}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("1x6"); } @@ -181,7 +191,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _episode1.SeasonNumber = 1; _namingConfig.StandardEpisodeFormat = "{season}x{episode:00}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("1x06"); } @@ -190,7 +200,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{Quality Title}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("HDTV-720p"); } @@ -200,7 +210,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _namingConfig.StandardEpisodeFormat = "{Quality Title}"; _episodeFile.Quality.Proper = true; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("HDTV-720p Proper"); } @@ -209,7 +219,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title} [{Quality Title}]"; - Subject.BuildFilename(new List {_episode1}, _series, _episodeFile) + Subject.BuildFileName(new List {_episode1}, _series, _episodeFile) .Should().Be("South Park - S15E06 - City Sushi [HDTV-720p]"); } @@ -219,7 +229,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _namingConfig.RenameEpisodes = false; _episodeFile.Path = @"C:\Test\TV\30 Rock - S01E01 - Test"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be(Path.GetFileNameWithoutExtension(_episodeFile.Path)); } @@ -230,7 +240,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _episodeFile.SceneName = "30.Rock.S01E01.xvid-LOL"; _episodeFile.Path = @"C:\Test\TV\30 Rock - S01E01 - Test"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("30.Rock.S01E01.xvid-LOL"); } @@ -253,7 +263,7 @@ namespace NzbDrone.Core.Test.OrganizerTests .Build(); - Subject.BuildFilename(new List {episode2, episode}, new Series {Title = "30 Rock"}, _episodeFile) + Subject.BuildFileName(new List {episode2, episode}, new Series {Title = "30 Rock"}, _episodeFile) .Should().Be("30 Rock - S06E06-E07 - Hey, Baby, What's Wrong!"); } @@ -266,7 +276,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _episode1.Title = "Hello"; _episode2.Title = "World"; - Subject.BuildFilename(new List {_episode1, _episode2}, _series, _episodeFile) + Subject.BuildFileName(new List {_episode1, _episode2}, _series, _episodeFile) .Should().Be("South Park - S15E06-E07 - Hello + World"); } @@ -281,7 +291,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _episode1.AirDate = "2012-12-13"; _episode1.Title = "Kristen Stewart"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("The Daily Show with Jon Stewart - 2012-12-13 - Kristen Stewart"); } @@ -296,7 +306,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _episode1.AirDate = null; _episode1.Title = "Kristen Stewart"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("The Daily Show with Jon Stewart - Unknown - Kristen Stewart"); } @@ -306,7 +316,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _namingConfig.StandardEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title}"; _namingConfig.MultiEpisodeStyle = 0; - Subject.BuildFilename(new List {_episode1, _episode2}, _series, _episodeFile) + Subject.BuildFileName(new List {_episode1, _episode2}, _series, _episodeFile) .Should().Be("South Park - S15E06-07 - City Sushi"); } @@ -316,7 +326,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _namingConfig.StandardEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title}"; _namingConfig.MultiEpisodeStyle = 1; - Subject.BuildFilename(new List { _episode1, _episode2 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1, _episode2 }, _series, _episodeFile) .Should().Be("South Park - S15E06 - S15E07 - City Sushi"); } @@ -326,7 +336,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _namingConfig.StandardEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title}"; _namingConfig.MultiEpisodeStyle = 2; - Subject.BuildFilename(new List { _episode1, _episode2 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1, _episode2 }, _series, _episodeFile) .Should().Be("South Park - S15E06E07 - City Sushi"); } @@ -336,7 +346,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _namingConfig.StandardEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title}"; _namingConfig.MultiEpisodeStyle = 3; - Subject.BuildFilename(new List { _episode1, _episode2 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1, _episode2 }, _series, _episodeFile) .Should().Be("South Park - S15E06-E07 - City Sushi"); } @@ -348,7 +358,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _namingConfig.StandardEpisodeFormat = "{Episode Title}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be(title); } @@ -357,7 +367,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{Release Group}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be(_episodeFile.ReleaseGroup); } @@ -370,7 +380,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _episodeFile.SceneName = "30.Rock.S01E01.xvid-LOL"; _episodeFile.Path = @"C:\Test\TV\30 Rock - S01E01 - Test"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("30 Rock - 30.Rock.S01E01.xvid-LOL"); } @@ -387,7 +397,7 @@ namespace NzbDrone.Core.Test.OrganizerTests .Build(); - Subject.BuildFilename(new List { episode }, new Series { Title = "30 Rock" }, _episodeFile) + Subject.BuildFileName(new List { episode }, new Series { Title = "30 Rock" }, _episodeFile) .Should().Be("30 Rock - S06E06 - Part 1"); } @@ -404,7 +414,7 @@ namespace NzbDrone.Core.Test.OrganizerTests .Build(); - Subject.BuildFilename(new List { episode }, new Series { Title = "30 Rock" }, _episodeFile) + Subject.BuildFileName(new List { episode }, new Series { Title = "30 Rock" }, _episodeFile) .Should().Be("30 Rock - S06E06 - Part 1"); } @@ -419,7 +429,7 @@ namespace NzbDrone.Core.Test.OrganizerTests .With(e => e.EpisodeNumber = 6) .Build(); - Subject.BuildFilename(new List { episode }, new Series { Title = "Chicago P.D." }, _episodeFile) + Subject.BuildFileName(new List { episode }, new Series { Title = "Chicago P.D." }, _episodeFile) .Should().Be("Chicago.P.D.S06E06.Part.1"); } @@ -434,7 +444,7 @@ namespace NzbDrone.Core.Test.OrganizerTests .With(e => e.EpisodeNumber = 6) .Build(); - Subject.BuildFilename(new List { episode }, new Series { Title = "Chicago P.D.." }, _episodeFile) + Subject.BuildFileName(new List { episode }, new Series { Title = "Chicago P.D.." }, _episodeFile) .Should().Be("Chicago.P.D.S06E06.Part.1"); } @@ -443,7 +453,7 @@ namespace NzbDrone.Core.Test.OrganizerTests { _namingConfig.StandardEpisodeFormat = "{Series.Title}.S{season:00}E{episode:00}.{absolute:00}.{Episode.Title}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("South.Park.S15E06.City.Sushi"); } @@ -453,7 +463,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _series.SeriesType = SeriesTypes.Anime; _namingConfig.AnimeEpisodeFormat = "{Series.Title}.S{season:00}E{episode:00}.{absolute:00}.{Episode.Title}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("South.Park.S15E06.100.City.Sushi"); } @@ -463,7 +473,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _series.SeriesType = SeriesTypes.Anime; _namingConfig.AnimeEpisodeFormat = "{Series.Title}.S{season:00}E{episode:00}.{Episode.Title}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("South.Park.S15E06.City.Sushi"); } @@ -473,7 +483,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _series.SeriesType = SeriesTypes.Anime; _namingConfig.AnimeEpisodeFormat = "{Series.Title}.{absolute:00}.{Episode.Title}"; - Subject.BuildFilename(new List { _episode1 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) .Should().Be("South.Park.100.City.Sushi"); } @@ -483,7 +493,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _series.SeriesType = SeriesTypes.Anime; _namingConfig.AnimeEpisodeFormat = "{Series Title} - {absolute:000} - {Episode Title}"; - Subject.BuildFilename(new List { _episode1, _episode2 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1, _episode2 }, _series, _episodeFile) .Should().Be("South Park - 100-101 - City Sushi"); } @@ -496,7 +506,7 @@ namespace NzbDrone.Core.Test.OrganizerTests _namingConfig.StandardEpisodeFormat = "{Series Title} - {season:0}x{episode:00} - {Episode Title}"; _namingConfig.AnimeEpisodeFormat = "{Series Title} - {absolute:000} - {Episode Title}"; - Subject.BuildFilename(new List { _episode1, }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1, }, _series, _episodeFile) .Should().Be("South Park - 15x06 - City Sushi"); } @@ -507,8 +517,62 @@ namespace NzbDrone.Core.Test.OrganizerTests _namingConfig.MultiEpisodeStyle = (int)MultiEpisodeStyle.Duplicate; _namingConfig.AnimeEpisodeFormat = "{Series Title} - {absolute:000} - {Episode Title}"; - Subject.BuildFilename(new List { _episode1, _episode2 }, _series, _episodeFile) + Subject.BuildFileName(new List { _episode1, _episode2 }, _series, _episodeFile) .Should().Be("South Park - 100 - 101 - City Sushi"); } + + [Test] + public void should_include_affixes_if_value_not_empty() + { + _namingConfig.StandardEpisodeFormat = "{Series.Title}.S{season:00}E{episode:00}{_Episode.Title_}"; + + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) + .Should().Be("South.Park.S15E06_City.Sushi_"); + } + + [Test] + public void should_not_include_affixes_if_value_empty() + { + _namingConfig.StandardEpisodeFormat = "{Series.Title}.S{season:00}E{episode:00}{_Episode.Title_}"; + + _episode1.Title = ""; + + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) + .Should().Be("South.Park.S15E06"); + } + + [Test] + public void should_format_mediainfo_properly() + { + _namingConfig.StandardEpisodeFormat = "{Series.Title}.S{season:00}E{episode:00}.{Episode.Title}.{MEDIAINFO.FULL}"; + + _episodeFile.MediaInfo = new Core.MediaFiles.MediaInfo.MediaInfoModel() + { + VideoCodec = "AVC", + AudioFormat = "DTS", + AudioLanguages = "English/Spanish", + Subtitles = "English/Spanish/Italian" + }; + + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) + .Should().Be("South.Park.S15E06.City.Sushi.X264.DTS[EN+ES].[EN+ES+IT]"); + } + + [Test] + public void should_exclude_english_in_mediainfo_audio_language() + { + _namingConfig.StandardEpisodeFormat = "{Series.Title}.S{season:00}E{episode:00}.{Episode.Title}.{MEDIAINFO.FULL}"; + + _episodeFile.MediaInfo = new Core.MediaFiles.MediaInfo.MediaInfoModel() + { + VideoCodec = "AVC", + AudioFormat = "DTS", + AudioLanguages = "English", + Subtitles = "English/Spanish/Italian" + }; + + Subject.BuildFileName(new List { _episode1 }, _series, _episodeFile) + .Should().Be("South.Park.S15E06.City.Sushi.X264.DTS.[EN+ES+IT]"); + } } } \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/OrganizerTests/GetSeriesFolderFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/GetSeriesFolderFixture.cs index abe7bf78b..8757da319 100644 --- a/src/NzbDrone.Core.Test/OrganizerTests/GetSeriesFolderFixture.cs +++ b/src/NzbDrone.Core.Test/OrganizerTests/GetSeriesFolderFixture.cs @@ -27,7 +27,9 @@ namespace NzbDrone.Core.Test.OrganizerTests { namingConfig.SeriesFolderFormat = format; - Subject.GetSeriesFolder(seriesTitle).Should().Be(expected); + var series = new NzbDrone.Core.Tv.Series { Title = seriesTitle }; + + Subject.GetSeriesFolder(series).Should().Be(expected); } } } \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/AddSeriesFixture.cs b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/AddSeriesFixture.cs index c62504f12..cdc1041e7 100644 --- a/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/AddSeriesFixture.cs +++ b/src/NzbDrone.Core.Test/TvTests/SeriesServiceTests/AddSeriesFixture.cs @@ -26,7 +26,7 @@ namespace NzbDrone.Core.Test.TvTests.SeriesServiceTests fakeSeries.RootFolderPath = @"C:\Test\TV"; Mocker.GetMock() - .Setup(s => s.GetSeriesFolder(fakeSeries.Title)) + .Setup(s => s.GetSeriesFolder(fakeSeries, null)) .Returns(fakeSeries.Title); var series = Subject.AddSeries(fakeSeries); diff --git a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs index c0f202af3..6ad451295 100644 --- a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs +++ b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs @@ -46,7 +46,7 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic throw new NotSupportedException("Full season releases are not supported with Pneumatic."); } - title = FileNameBuilder.CleanFilename(title); + title = FileNameBuilder.CleanFileName(title); //Save to the Pneumatic directory (The user will need to ensure its accessible by XBMC) var filename = Path.Combine(Settings.NzbFolder, title + ".nzb"); diff --git a/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs b/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs index bbc077dcd..3dfe01648 100644 --- a/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs +++ b/src/NzbDrone.Core/Download/Clients/UsenetBlackhole/UsenetBlackhole.cs @@ -46,7 +46,7 @@ namespace NzbDrone.Core.Download.Clients.UsenetBlackhole var url = remoteEpisode.Release.DownloadUrl; var title = remoteEpisode.Release.Title; - title = FileNameBuilder.CleanFilename(title); + title = FileNameBuilder.CleanFileName(title); var filename = Path.Combine(Settings.NzbFolder, title + ".nzb"); @@ -61,7 +61,7 @@ namespace NzbDrone.Core.Download.Clients.UsenetBlackhole { foreach (var folder in _diskProvider.GetDirectories(Settings.WatchFolder)) { - var title = FileNameBuilder.CleanFilename(Path.GetFileName(folder)); + var title = FileNameBuilder.CleanFileName(Path.GetFileName(folder)); var files = _diskProvider.GetFiles(folder, SearchOption.AllDirectories); @@ -95,7 +95,7 @@ namespace NzbDrone.Core.Download.Clients.UsenetBlackhole foreach (var videoFile in _diskScanService.GetVideoFiles(Settings.WatchFolder, false)) { - var title = FileNameBuilder.CleanFilename(Path.GetFileName(videoFile)); + var title = FileNameBuilder.CleanFileName(Path.GetFileName(videoFile)); var historyItem = new DownloadClientItem { diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs index 44bec3fbe..98d801144 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs @@ -49,7 +49,7 @@ namespace NzbDrone.Core.MediaFiles public EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, Series series) { var episodes = _episodeService.GetEpisodesByFileId(episodeFile.Id); - var newFileName = _buildFileNames.BuildFilename(episodes, series, episodeFile); + var newFileName = _buildFileNames.BuildFileName(episodes, series, episodeFile); var filePath = _buildFileNames.BuildFilePath(series, episodes.First().SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path)); _logger.Debug("Renaming episode file: {0} to {1}", episodeFile, filePath); @@ -59,7 +59,7 @@ namespace NzbDrone.Core.MediaFiles public EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode) { - var newFileName = _buildFileNames.BuildFilename(localEpisode.Episodes, localEpisode.Series, episodeFile); + var newFileName = _buildFileNames.BuildFileName(localEpisode.Episodes, localEpisode.Series, episodeFile); var filePath = _buildFileNames.BuildFilePath(localEpisode.Series, localEpisode.SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path)); _logger.Debug("Moving episode file: {0} to {1}", episodeFile, filePath); @@ -69,7 +69,7 @@ namespace NzbDrone.Core.MediaFiles public EpisodeFile CopyEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEpisode) { - var newFileName = _buildFileNames.BuildFilename(localEpisode.Episodes, localEpisode.Series, episodeFile); + var newFileName = _buildFileNames.BuildFileName(localEpisode.Episodes, localEpisode.Series, episodeFile); var filePath = _buildFileNames.BuildFilePath(localEpisode.Series, localEpisode.SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path)); _logger.Debug("Copying episode file: {0} to {1}", episodeFile, filePath); diff --git a/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs index 6a81ee4c8..a960cca5f 100644 --- a/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs @@ -85,7 +85,7 @@ namespace NzbDrone.Core.MediaFiles } var seasonNumber = episodesInFile.First().SeasonNumber; - var newName = _filenameBuilder.BuildFilename(episodesInFile, series, file); + var newName = _filenameBuilder.BuildFileName(episodesInFile, series, file); var newPath = _filenameBuilder.BuildFilePath(series, seasonNumber, newName, Path.GetExtension(file.Path)); if (!file.Path.PathEquals(newPath)) diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 3873058a0..88d5299eb 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -634,10 +634,10 @@ - - + + - + diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index 7b9920f1a..e6b27419a 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -14,13 +14,11 @@ namespace NzbDrone.Core.Organizer { public interface IBuildFileNames { - string BuildFilename(IList episodes, Series series, EpisodeFile episodeFile); - string BuildFilename(IList episodes, Series series, EpisodeFile episodeFile, NamingConfig namingConfig); - string BuildFilePath(Series series, int seasonNumber, string fileName, string extension); + string BuildFileName(List episodes, Series series, EpisodeFile episodeFile, NamingConfig namingConfig = null); + string BuildFilePath(Series series, Int32 seasonNumber, String fileName, String extension); BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec); - string GetSeriesFolder(string seriesTitle); - string GetSeriesFolder(string seriesTitle, NamingConfig namingConfig); - string GetSeasonFolder(string seriesTitle, int seasonNumber, NamingConfig namingConfig); + string GetSeriesFolder(Series series, NamingConfig namingConfig = null); + string GetSeasonFolder(Series series, Int32 seasonNumber, NamingConfig namingConfig = null); } public class FileNameBuilder : IBuildFileNames @@ -30,7 +28,7 @@ namespace NzbDrone.Core.Organizer private readonly ICached _patternCache; private readonly Logger _logger; - private static readonly Regex TitleRegex = new Regex(@"(?\{(?:\w+)(?\s|\.|-|_)\w+\})", + private static readonly Regex TitleRegex = new Regex(@"\{(?[- ._]*)(?(?:[a-z0-9]+)(?:(?[- ._]+)(?:[a-z0-9]+))?)(?::(?[a-z0-9]+))?(?[- ._]*)\}", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex EpisodeRegex = new Regex(@"(?\{episode(?:\:0+)?})", @@ -50,12 +48,12 @@ namespace NzbDrone.Core.Organizer public static readonly Regex AirDateRegex = new Regex(@"\{Air(\s|\W|_)Date\}", RegexOptions.Compiled | RegexOptions.IgnoreCase); - public static readonly Regex SeriesTitleRegex = new Regex(@"(?\{(?:Series)(?\s|\.|-|_)Title\})", + public static readonly Regex SeriesTitleRegex = new Regex(@"(?\{(?:Series)(?\s|\.|-|_)(Clean)?Title\})", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private static readonly Regex FilenameCleanupRegex = new Regex(@"\.{2,}", RegexOptions.Compiled); + private static readonly Regex FileNameCleanupRegex = new Regex(@"\.{2,}", RegexOptions.Compiled); - private static readonly char[] EpisodeTitleTrimCharaters = new[] { ' ', '.', '?' }; + private static readonly char[] EpisodeTitleTrimCharacters = new[] { ' ', '.', '?' }; public FileNameBuilder(INamingConfigService namingConfigService, IQualityDefinitionService qualityDefinitionService, @@ -68,18 +66,16 @@ namespace NzbDrone.Core.Organizer _logger = logger; } - public string BuildFilename(IList episodes, Series series, EpisodeFile episodeFile) + public string BuildFileName(List episodes, Series series, EpisodeFile episodeFile, NamingConfig namingConfig = null) { - var nameSpec = _namingConfigService.GetConfig(); + if (namingConfig == null) + { + namingConfig = _namingConfigService.GetConfig(); + } - return BuildFilename(episodes, series, episodeFile, nameSpec); - } - - public string BuildFilename(IList episodes, Series series, EpisodeFile episodeFile, NamingConfig namingConfig) - { if (!namingConfig.RenameEpisodes) { - if (String.IsNullOrWhiteSpace(episodeFile.SceneName)) + if (episodeFile.SceneName.IsNullOrWhiteSpace()) { return Path.GetFileNameWithoutExtension(episodeFile.Path); } @@ -87,42 +83,33 @@ namespace NzbDrone.Core.Organizer return episodeFile.SceneName; } - if (String.IsNullOrWhiteSpace(namingConfig.StandardEpisodeFormat) && series.SeriesType == SeriesTypes.Standard) + if (namingConfig.StandardEpisodeFormat.IsNullOrWhiteSpace() && series.SeriesType == SeriesTypes.Standard) { throw new NamingFormatException("Standard episode format cannot be null"); } - if (String.IsNullOrWhiteSpace(namingConfig.DailyEpisodeFormat) && series.SeriesType == SeriesTypes.Daily) + if (namingConfig.DailyEpisodeFormat.IsNullOrWhiteSpace() && series.SeriesType == SeriesTypes.Daily) { throw new NamingFormatException("Daily episode format cannot be null"); } - var sortedEpisodes = episodes.OrderBy(e => e.EpisodeNumber).ToList(); var pattern = namingConfig.StandardEpisodeFormat; + + var tokenHandlers = new Dictionary>(FileNameBuilderTokenEqualityComparer.Instance); + + episodes = episodes.OrderBy(e => e.SeasonNumber).ThenBy(e => e.EpisodeNumber).ToList(); + + AddSeriesTokens(tokenHandlers, series); + + AddEpisodeTokens(tokenHandlers, episodes); + + AddEpisodeFileTokens(tokenHandlers, episodeFile); + + AddMediaInfoTokens(tokenHandlers, episodeFile); - var episodeTitles = new List - { - sortedEpisodes.First().Title.TrimEnd(EpisodeTitleTrimCharaters) - }; - - var tokenValues = new Dictionary(FilenameBuilderTokenEqualityComparer.Instance); - - tokenValues.Add("{Series Title}", series.Title); - tokenValues.Add("{Original Title}", episodeFile.SceneName); - tokenValues.Add("{Release Group}", episodeFile.ReleaseGroup); - if (series.SeriesType == SeriesTypes.Daily) { pattern = namingConfig.DailyEpisodeFormat; - - if (!String.IsNullOrWhiteSpace(episodes.First().AirDate)) - { - tokenValues.Add("{Air Date}", episodes.First().AirDate.Replace('-', ' ')); - } - - else { - tokenValues.Add("{Air Date}", "Unknown"); - } } if (series.SeriesType == SeriesTypes.Anime && episodes.All(e => e.AbsoluteEpisodeNumber > 0)) @@ -137,7 +124,7 @@ namespace NzbDrone.Core.Organizer pattern = pattern.Replace(episodeFormat.SeasonEpisodePattern, "{Season Episode}"); var seasonEpisodePattern = episodeFormat.SeasonEpisodePattern; - foreach (var episode in sortedEpisodes.Skip(1)) + foreach (var episode in episodes.Skip(1)) { switch ((MultiEpisodeStyle)namingConfig.MultiEpisodeStyle) { @@ -158,12 +145,10 @@ namespace NzbDrone.Core.Organizer seasonEpisodePattern += "-" + episodeFormat.EpisodePattern; break; } - - episodeTitles.Add(episode.Title.TrimEnd(EpisodeTitleTrimCharaters)); } - seasonEpisodePattern = ReplaceNumberTokens(seasonEpisodePattern, sortedEpisodes); - tokenValues.Add("{Season Episode}", seasonEpisodePattern); + seasonEpisodePattern = ReplaceNumberTokens(seasonEpisodePattern, episodes); + tokenHandlers["{Season Episode}"] = m => seasonEpisodePattern; } //TODO: Extract to another method @@ -181,7 +166,7 @@ namespace NzbDrone.Core.Organizer pattern = pattern.Replace(absoluteEpisodeFormat.AbsoluteEpisodePattern, "{Absolute Pattern}"); var absoluteEpisodePattern = absoluteEpisodeFormat.AbsoluteEpisodePattern; - foreach (var episode in sortedEpisodes.Skip(1)) + foreach (var episode in episodes.Skip(1)) { switch ((MultiEpisodeStyle)namingConfig.MultiEpisodeStyle) { @@ -204,24 +189,17 @@ namespace NzbDrone.Core.Organizer absoluteEpisodePattern += "-" + absoluteEpisodeFormat.AbsoluteEpisodePattern; break; } - - episodeTitles.Add(episode.Title.TrimEnd(EpisodeTitleTrimCharaters)); } - absoluteEpisodePattern = ReplaceAbsoluteNumberTokens(absoluteEpisodePattern, sortedEpisodes); - tokenValues.Add("{Absolute Pattern}", absoluteEpisodePattern); + absoluteEpisodePattern = ReplaceAbsoluteNumberTokens(absoluteEpisodePattern, episodes); + tokenHandlers["{Absolute Pattern}"] = m => absoluteEpisodePattern; } } - tokenValues.Add("{Episode Title}", GetEpisodeTitle(episodeTitles)); - tokenValues.Add("{Quality Title}", GetQualityTitle(episodeFile.Quality)); + var filename = ReplaceTokens(pattern, tokenHandlers).Trim(); + filename = FileNameCleanupRegex.Replace(filename, match => match.Captures[0].Value[0].ToString()); - AddMediaInfoTokens(episodeFile, tokenValues); - - var filename = ReplaceTokens(pattern, tokenValues).Trim(); - filename = FilenameCleanupRegex.Replace(filename, match => match.Captures[0].Value[0].ToString() ); - - return CleanFilename(filename); + return filename; } public string BuildFilePath(Series series, int seasonNumber, string fileName, string extension) @@ -240,10 +218,10 @@ namespace NzbDrone.Core.Organizer else { var nameSpec = _namingConfigService.GetConfig(); - seasonFolder = GetSeasonFolder(series.Title, seasonNumber, nameSpec); + seasonFolder = GetSeasonFolder(series, seasonNumber, nameSpec); } - seasonFolder = CleanFilename(seasonFolder); + seasonFolder = CleanFileName(seasonFolder); path = Path.Combine(path, seasonFolder); } @@ -297,160 +275,260 @@ namespace NzbDrone.Core.Organizer return basicNamingConfig; } - public string GetSeriesFolder(string seriesTitle) + public string GetSeriesFolder(Series series, NamingConfig namingConfig = null) { - var namingConfig = _namingConfigService.GetConfig(); + if (namingConfig == null) + { + namingConfig = _namingConfigService.GetConfig(); + } - return GetSeriesFolder(seriesTitle, namingConfig); + var tokenHandlers = new Dictionary>(FileNameBuilderTokenEqualityComparer.Instance); + + AddSeriesTokens(tokenHandlers, series); + + return ReplaceTokens(namingConfig.SeriesFolderFormat, tokenHandlers); } - public string GetSeriesFolder(string seriesTitle, NamingConfig namingConfig) + public string GetSeasonFolder(Series series, Int32 seasonNumber, NamingConfig namingConfig = null) { - seriesTitle = CleanFilename(seriesTitle); + if (namingConfig == null) + { + namingConfig = _namingConfigService.GetConfig(); + } - var tokenValues = new Dictionary(FilenameBuilderTokenEqualityComparer.Instance); - tokenValues.Add("{Series Title}", seriesTitle); + var tokenHandlers = new Dictionary>(FileNameBuilderTokenEqualityComparer.Instance); - return ReplaceTokens(namingConfig.SeriesFolderFormat, tokenValues); + AddSeriesTokens(tokenHandlers, series); + + AddSeasonTokens(tokenHandlers, seasonNumber); + + return ReplaceTokens(namingConfig.SeasonFolderFormat, tokenHandlers); } - public string GetSeasonFolder(string seriesTitle, int seasonNumber, NamingConfig namingConfig) + public static string CleanTitle(string name) { - var tokenValues = new Dictionary(FilenameBuilderTokenEqualityComparer.Instance); - tokenValues.Add("{Series Title}", seriesTitle); - - var seasonFolder = ReplaceSeasonTokens(namingConfig.SeasonFolderFormat, seasonNumber); - return ReplaceTokens(seasonFolder, tokenValues); + string[] dropCharacters = { ":", ".", "(", ")" }; + + string result = name; + + for (int i = 0; i < dropCharacters.Length; i++) + { + result = result.Replace(dropCharacters[i], ""); + } + + return result; } - public static string CleanFilename(string name) + public static string CleanFileName(string name) { string result = name; string[] badCharacters = { "\\", "/", "<", ">", "?", "*", ":", "|", "\"" }; - string[] goodCharacters = { "+", "+", "", "", "!", "-", "-", "", "" }; + string[] goodCharacters = { "+", "+", "", "", "!", "-", "-", "", "" }; for (int i = 0; i < badCharacters.Length; i++) + { result = result.Replace(badCharacters[i], goodCharacters[i]); + } return result.Trim(); } - private void AddMediaInfoTokens(EpisodeFile episodeFile, Dictionary tokenValues) + private void AddSeriesTokens(Dictionary> tokenHandlers, Series series) { - if (episodeFile.MediaInfo == null) - return; - - var mediaInfoFull = string.Empty; - - switch (episodeFile.MediaInfo.VideoCodec) - { - case "AVC": - if (Path.GetFileNameWithoutExtension(episodeFile.Path).Contains("x264")) - mediaInfoFull += "x264"; - else if (Path.GetFileNameWithoutExtension(episodeFile.Path).Contains("h264")) - mediaInfoFull += "h264"; - else - mediaInfoFull += "h264"; - break; - - default: - mediaInfoFull += episodeFile.MediaInfo.VideoCodec; - break; - } - - switch (episodeFile.MediaInfo.AudioFormat) - { - case "AC-3": - mediaInfoFull += ".AC3"; - break; - - case "MPEG Audio": - if (episodeFile.MediaInfo.AudioProfile == "Layer 3") - mediaInfoFull += ".MP3"; - else - mediaInfoFull += "." + episodeFile.MediaInfo.AudioFormat; - break; - - case "DTS": - mediaInfoFull += "." + episodeFile.MediaInfo.AudioFormat; - break; - - default: - mediaInfoFull += "." + episodeFile.MediaInfo.AudioFormat; - break; - } - - tokenValues.Add("{MediaInfo Short}", mediaInfoFull); - - var audioLanguagesToken = GetLanguagesToken(episodeFile.MediaInfo.AudioLanguages); - if (!string.IsNullOrEmpty(audioLanguagesToken) && audioLanguagesToken != "EN") - mediaInfoFull += string.Format("[{0}]", audioLanguagesToken); - - var subtitleLanguagesToken = GetLanguagesToken(episodeFile.MediaInfo.Subtitles); - if (!string.IsNullOrEmpty(subtitleLanguagesToken)) - mediaInfoFull += string.Format(".[{0}]", subtitleLanguagesToken); - - tokenValues.Add("{MediaInfo Full}", mediaInfoFull); + tokenHandlers["{Series Title}"] = m => series.Title; + tokenHandlers["{Series CleanTitle}"] = m => CleanTitle(series.Title); } - private string GetLanguagesToken(string mediaInfoLanguages) + private void AddSeasonTokens(Dictionary> tokenHandlers, Int32 seasonNumber) { - List tokens = new List(); - foreach (var item in mediaInfoLanguages.Split('/')) - { - if (!string.IsNullOrWhiteSpace(item)) - tokens.Add(item.Trim()); - } - - var cultures = System.Globalization.CultureInfo.GetCultures(System.Globalization.CultureTypes.NeutralCultures); - for (int i = 0; i < tokens.Count; i++) - { - try - { - var cultureInfo = cultures.FirstOrDefault(p => p.EnglishName == tokens[i]); - - if (cultureInfo != null) - tokens[i] = cultureInfo.TwoLetterISOLanguageName.ToUpper(); - } - catch - { - } - } - - return string.Join("+", tokens.Distinct()); + tokenHandlers["{Season}"] = m => seasonNumber.ToString(m.CustomFormat ?? "0"); } - private string ReplaceTokens(string pattern, Dictionary tokenValues) + private void AddEpisodeTokens(Dictionary> tokenHandlers, List episodes) { - return TitleRegex.Replace(pattern, match => ReplaceToken(match, tokenValues)); - } - - private string ReplaceToken(Match match, Dictionary tokenValues) - { - var separator = match.Groups["separator"].Value; - var token = match.Groups["token"].Value; - var replacementText = ""; - var patternTokenArray = token.ToCharArray(); - if (!tokenValues.TryGetValue(token, out replacementText)) return null; - - if (patternTokenArray.All(t => !Char.IsLetter(t) || Char.IsLower(t))) + if (!episodes.First().AirDate.IsNullOrWhiteSpace()) { - replacementText = replacementText.ToLowerInvariant(); + tokenHandlers["{Air Date}"] = m => episodes.First().AirDate.Replace('-', ' '); + } + else + { + tokenHandlers["{Air Date}"] = m => "Unknown"; } - else if (patternTokenArray.All(t => !Char.IsLetter(t) || Char.IsUpper(t))) + tokenHandlers["{Episode Title}"] = m => GetEpisodeTitle(episodes); + } + + private void AddEpisodeFileTokens(Dictionary> tokenHandlers, EpisodeFile episodeFile) + { + tokenHandlers["{Original Title}"]= m => episodeFile.SceneName; + tokenHandlers["{Release Group}"] = m => episodeFile.ReleaseGroup; + tokenHandlers["{Quality Title}"] = m => GetQualityTitle(episodeFile.Quality); + } + + private void AddMediaInfoTokens(Dictionary> tokenHandlers, EpisodeFile episodeFile) + { + if (episodeFile.MediaInfo == null) return; + + String mediaInfoVideo; + switch (episodeFile.MediaInfo.VideoCodec) + { + case "AVC": + // TODO: What to do if the original SceneName is hashed? + if (!episodeFile.SceneName.IsNullOrWhiteSpace() && Path.GetFileNameWithoutExtension(episodeFile.SceneName).Contains("h264")) + { + mediaInfoVideo = "h264"; + } + else + { + mediaInfoVideo = "x264"; + } + break; + + default: + mediaInfoVideo = episodeFile.MediaInfo.VideoCodec; + break; + } + + String mediaInfoAudio; + switch (episodeFile.MediaInfo.AudioFormat) + { + case "AC-3": + mediaInfoAudio = "AC3"; + break; + + case "MPEG Audio": + if (episodeFile.MediaInfo.AudioProfile == "Layer 3") + { + mediaInfoAudio = "MP3"; + } + else + { + mediaInfoAudio = episodeFile.MediaInfo.AudioFormat; + } + break; + + case "DTS": + mediaInfoAudio = episodeFile.MediaInfo.AudioFormat; + break; + + default: + mediaInfoAudio = episodeFile.MediaInfo.AudioFormat; + break; + } + + var mediaInfoAudioLanguages = GetLanguagesToken(episodeFile.MediaInfo.AudioLanguages); + if (!mediaInfoAudioLanguages.IsNullOrWhiteSpace()) + { + mediaInfoAudioLanguages = String.Format("[{0}]", mediaInfoAudioLanguages); + } + + if (mediaInfoAudioLanguages == "[EN]") + { + mediaInfoAudioLanguages = String.Empty; + } + + var mediaInfoSubtitleLanguages = GetLanguagesToken(episodeFile.MediaInfo.Subtitles); + if (!mediaInfoSubtitleLanguages.IsNullOrWhiteSpace()) + { + mediaInfoSubtitleLanguages = String.Format("[{0}]", mediaInfoSubtitleLanguages); + } + + tokenHandlers["{MediaInfo Video}"] = m => mediaInfoVideo; + tokenHandlers["{MediaInfo Audio}"] = m => mediaInfoAudio; + + tokenHandlers["{MediaInfo Simple}"] = m => String.Format("{0} {1}", mediaInfoVideo, mediaInfoAudio); + + tokenHandlers["{MediaInfo Full}"] = m => String.Format("{0} {1}{2} {3}", mediaInfoVideo, mediaInfoAudio, mediaInfoAudioLanguages, mediaInfoSubtitleLanguages); + } + + private string GetLanguagesToken(String mediaInfoLanguages) + { + List tokens = new List(); + foreach (var item in mediaInfoLanguages.Split('/')) + { + if (!string.IsNullOrWhiteSpace(item)) + tokens.Add(item.Trim()); + } + + var cultures = System.Globalization.CultureInfo.GetCultures(System.Globalization.CultureTypes.NeutralCultures); + for (int i = 0; i < tokens.Count; i++) + { + try + { + var cultureInfo = cultures.FirstOrDefault(p => p.EnglishName == tokens[i]); + + if (cultureInfo != null) + tokens[i] = cultureInfo.TwoLetterISOLanguageName.ToUpper(); + } + catch + { + } + } + + return string.Join("+", tokens.Distinct()); + } + + private string ReplaceTokens(String pattern, Dictionary> tokenHandlers) + { + return TitleRegex.Replace(pattern, match => ReplaceToken(match, tokenHandlers)); + } + + private string ReplaceToken(Match match, Dictionary> tokenHandlers) + { + var tokenMatch = new TokenMatch + { + RegexMatch = match, + Prefix = match.Groups["prefix"].Value, + Separator = match.Groups["separator"].Value, + Suffix = match.Groups["suffix"].Value, + Token = match.Groups["token"].Value, + CustomFormat = match.Groups["customFormat"].Value + }; + + if (tokenMatch.CustomFormat.IsNullOrWhiteSpace()) + { + tokenMatch.CustomFormat = null; + } + + var tokenHandler = tokenHandlers.GetValueOrDefault(tokenMatch.Token, m => String.Empty); + + var replacementText = tokenHandler(tokenMatch).Trim(); + + if (tokenMatch.Token.All(t => !Char.IsLetter(t) || Char.IsLower(t))) + { + replacementText = replacementText.ToLower(); + } + else if (tokenMatch.Token.All(t => !Char.IsLetter(t) || Char.IsUpper(t))) { replacementText = replacementText.ToUpper(); } - if (!separator.Equals(" ")) + if (!tokenMatch.Separator.IsNullOrWhiteSpace()) { - replacementText = replacementText.Replace(" ", separator); + replacementText = replacementText.Replace(" ", tokenMatch.Separator); + } + + replacementText = CleanFileName(replacementText); + + if (!replacementText.IsNullOrWhiteSpace()) + { + replacementText = tokenMatch.Prefix + replacementText + tokenMatch.Suffix; } return replacementText; } + + private sealed class TokenMatch + { + public Match RegexMatch { get; set; } + public String Prefix { get; set; } + public String Separator { get; set; } + public String Suffix { get; set; } + public String Token { get; set; } + public String CustomFormat { get; set; } + } + private string ReplaceNumberTokens(string pattern, List episodes) { var episodeIndex = 0; @@ -531,17 +609,22 @@ namespace NzbDrone.Core.Organizer return null; } - private string GetEpisodeTitle(List episodeTitles) + private String GetEpisodeTitle(List episodes) { - if (episodeTitles.Count == 1) + if (episodes.Count == 1) { - return episodeTitles.First(); + return episodes.First().Title.TrimEnd(EpisodeTitleTrimCharacters); } - return String.Join(" + ", episodeTitles.Select(Parser.Parser.CleanupEpisodeTitle).Distinct()); + var titles = episodes + .Select(c => c.Title.TrimEnd(EpisodeTitleTrimCharacters)) + .Select(Parser.Parser.CleanupEpisodeTitle) + .Distinct(); + + return String.Join(" + ", titles); } - private string GetQualityTitle(QualityModel quality) + private String GetQualityTitle(QualityModel quality) { if (quality.Proper) return _qualityDefinitionService.Get(quality.Quality).Title + " Proper"; diff --git a/src/NzbDrone.Core/Organizer/FilenameBuilderTokenEqualityComparer.cs b/src/NzbDrone.Core/Organizer/FilenameBuilderTokenEqualityComparer.cs index 16b225131..055083d81 100644 --- a/src/NzbDrone.Core/Organizer/FilenameBuilderTokenEqualityComparer.cs +++ b/src/NzbDrone.Core/Organizer/FilenameBuilderTokenEqualityComparer.cs @@ -4,13 +4,13 @@ using System.Text.RegularExpressions; namespace NzbDrone.Core.Organizer { - public class FilenameBuilderTokenEqualityComparer : IEqualityComparer + public class FileNameBuilderTokenEqualityComparer : IEqualityComparer { - public static readonly FilenameBuilderTokenEqualityComparer Instance = new FilenameBuilderTokenEqualityComparer(); + public static readonly FileNameBuilderTokenEqualityComparer Instance = new FileNameBuilderTokenEqualityComparer(); private static readonly Regex SimpleTokenRegex = new Regex(@"\s|_|\W", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private FilenameBuilderTokenEqualityComparer() + private FileNameBuilderTokenEqualityComparer() { } diff --git a/src/NzbDrone.Core/Organizer/FilenameSampleService.cs b/src/NzbDrone.Core/Organizer/FilenameSampleService.cs index c4231e533..80ca9083d 100644 --- a/src/NzbDrone.Core/Organizer/FilenameSampleService.cs +++ b/src/NzbDrone.Core/Organizer/FilenameSampleService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; +using NzbDrone.Core.MediaFiles.MediaInfo; namespace NzbDrone.Core.Organizer { @@ -16,7 +17,7 @@ namespace NzbDrone.Core.Organizer String GetSeasonFolderSample(NamingConfig nameSpec); } - public class FilenameSampleService : IFilenameSampleService + public class FileNameSampleService : IFilenameSampleService { private readonly IBuildFileNames _buildFileNames; private static Series _standardSeries; @@ -31,26 +32,26 @@ namespace NzbDrone.Core.Organizer private static EpisodeFile _dailyEpisodeFile; private static EpisodeFile _animeEpisodeFile; - public FilenameSampleService(IBuildFileNames buildFileNames) + public FileNameSampleService(IBuildFileNames buildFileNames) { _buildFileNames = buildFileNames; _standardSeries = new Series - { - SeriesType = SeriesTypes.Standard, - Title = "Series Title" - }; + { + SeriesType = SeriesTypes.Standard, + Title = "Series Title (2010)" + }; _dailySeries = new Series { SeriesType = SeriesTypes.Daily, - Title = "Series Title" + Title = "Series Title (2010)" }; _animeSeries = new Series { SeriesType = SeriesTypes.Anime, - Title = "Series Title" + Title = "Series Title (2010)" }; _episode1 = new Episode @@ -73,32 +74,52 @@ namespace NzbDrone.Core.Organizer _singleEpisode = new List { _episode1 }; _multiEpisodes = new List { _episode1, _episode2 }; + var mediaInfo = new MediaInfoModel() + { + VideoCodec = "AVC", + AudioFormat = "DTS", + AudioLanguages = "English", + Subtitles = "English/German" + }; + + var mediaInfoAnime = new MediaInfoModel() + { + VideoCodec = "AVC", + AudioFormat = "DTS", + AudioLanguages = "Japanese", + Subtitles = "Japanese/English" + }; + _singleEpisodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), Path = @"C:\Test\Series.Title.S01E01.720p.HDTV.x264-EVOLVE.mkv", - ReleaseGroup = "RlsGrp" + ReleaseGroup = "RlsGrp", + MediaInfo = mediaInfo }; _multiEpisodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), Path = @"C:\Test\Series.Title.S01E01-E02.720p.HDTV.x264-EVOLVE.mkv", - ReleaseGroup = "RlsGrp" + ReleaseGroup = "RlsGrp", + MediaInfo = mediaInfo }; _dailyEpisodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), Path = @"C:\Test\Series.Title.2013.10.30.HDTV.x264-EVOLVE.mkv", - ReleaseGroup = "RlsGrp" + ReleaseGroup = "RlsGrp", + MediaInfo = mediaInfo }; _animeEpisodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), Path = @"C:\Test\Series.Title.001.HDTV.x264-EVOLVE.mkv", - ReleaseGroup = "RlsGrp" + ReleaseGroup = "RlsGrp", + MediaInfo = mediaInfoAnime }; } @@ -106,7 +127,7 @@ namespace NzbDrone.Core.Organizer { var result = new SampleResult { - Filename = BuildSample(_singleEpisode, _standardSeries, _singleEpisodeFile, nameSpec), + FileName = BuildSample(_singleEpisode, _standardSeries, _singleEpisodeFile, nameSpec), Series = _standardSeries, Episodes = _singleEpisode, EpisodeFile = _singleEpisodeFile @@ -119,7 +140,7 @@ namespace NzbDrone.Core.Organizer { var result = new SampleResult { - Filename = BuildSample(_multiEpisodes, _standardSeries, _multiEpisodeFile, nameSpec), + FileName = BuildSample(_multiEpisodes, _standardSeries, _multiEpisodeFile, nameSpec), Series = _standardSeries, Episodes = _multiEpisodes, EpisodeFile = _multiEpisodeFile @@ -132,7 +153,7 @@ namespace NzbDrone.Core.Organizer { var result = new SampleResult { - Filename = BuildSample(_singleEpisode, _dailySeries, _dailyEpisodeFile, nameSpec), + FileName = BuildSample(_singleEpisode, _dailySeries, _dailyEpisodeFile, nameSpec), Series = _dailySeries, Episodes = _singleEpisode, EpisodeFile = _dailyEpisodeFile @@ -145,7 +166,7 @@ namespace NzbDrone.Core.Organizer { var result = new SampleResult { - Filename = BuildSample(_singleEpisode, _animeSeries, _animeEpisodeFile, nameSpec), + FileName = BuildSample(_singleEpisode, _animeSeries, _animeEpisodeFile, nameSpec), Series = _animeSeries, Episodes = _singleEpisode, EpisodeFile = _animeEpisodeFile @@ -156,19 +177,19 @@ namespace NzbDrone.Core.Organizer public string GetSeriesFolderSample(NamingConfig nameSpec) { - return _buildFileNames.GetSeriesFolder(_standardSeries.Title, nameSpec); + return _buildFileNames.GetSeriesFolder(_standardSeries, nameSpec); } public string GetSeasonFolderSample(NamingConfig nameSpec) { - return _buildFileNames.GetSeasonFolder(_standardSeries.Title, _episode1.SeasonNumber, nameSpec); + return _buildFileNames.GetSeasonFolder(_standardSeries, _episode1.SeasonNumber, nameSpec); } private string BuildSample(List episodes, Series series, EpisodeFile episodeFile, NamingConfig nameSpec) { try { - return _buildFileNames.BuildFilename(episodes, series, episodeFile, nameSpec); + return _buildFileNames.BuildFileName(episodes, series, episodeFile, nameSpec); } catch (NamingFormatException) { diff --git a/src/NzbDrone.Core/Organizer/FilenameValidationService.cs b/src/NzbDrone.Core/Organizer/FilenameValidationService.cs index 5c2703cc1..13d91aca6 100644 --- a/src/NzbDrone.Core/Organizer/FilenameValidationService.cs +++ b/src/NzbDrone.Core/Organizer/FilenameValidationService.cs @@ -14,14 +14,14 @@ namespace NzbDrone.Core.Organizer ValidationFailure ValidateAnimeFilename(SampleResult sampleResult); } - public class FilenameValidationService : IFilenameValidationService + public class FileNameValidationService : IFilenameValidationService { private const string ERROR_MESSAGE = "Produces invalid file names"; public ValidationFailure ValidateStandardFilename(SampleResult sampleResult) { var validationFailure = new ValidationFailure("StandardEpisodeFormat", ERROR_MESSAGE); - var parsedEpisodeInfo = Parser.Parser.ParseTitle(sampleResult.Filename); + var parsedEpisodeInfo = Parser.Parser.ParseTitle(sampleResult.FileName); if (parsedEpisodeInfo == null) { @@ -39,7 +39,7 @@ namespace NzbDrone.Core.Organizer public ValidationFailure ValidateDailyFilename(SampleResult sampleResult) { var validationFailure = new ValidationFailure("DailyEpisodeFormat", ERROR_MESSAGE); - var parsedEpisodeInfo = Parser.Parser.ParseTitle(sampleResult.Filename); + var parsedEpisodeInfo = Parser.Parser.ParseTitle(sampleResult.FileName); if (parsedEpisodeInfo == null) { @@ -67,7 +67,7 @@ namespace NzbDrone.Core.Organizer public ValidationFailure ValidateAnimeFilename(SampleResult sampleResult) { var validationFailure = new ValidationFailure("AnimeEpisodeFormat", ERROR_MESSAGE); - var parsedEpisodeInfo = Parser.Parser.ParseTitle(sampleResult.Filename); + var parsedEpisodeInfo = Parser.Parser.ParseTitle(sampleResult.FileName); if (parsedEpisodeInfo == null) { diff --git a/src/NzbDrone.Core/Organizer/SampleResult.cs b/src/NzbDrone.Core/Organizer/SampleResult.cs index 928438e8c..8966646e0 100644 --- a/src/NzbDrone.Core/Organizer/SampleResult.cs +++ b/src/NzbDrone.Core/Organizer/SampleResult.cs @@ -9,7 +9,7 @@ namespace NzbDrone.Core.Organizer { public class SampleResult { - public string Filename { get; set; } + public String FileName { get; set; } public Series Series { get; set; } public List Episodes { get; set; } public EpisodeFile EpisodeFile { get; set; } diff --git a/src/NzbDrone.Core/Tv/SeriesService.cs b/src/NzbDrone.Core/Tv/SeriesService.cs index f48e900b7..5d765dfd4 100644 --- a/src/NzbDrone.Core/Tv/SeriesService.cs +++ b/src/NzbDrone.Core/Tv/SeriesService.cs @@ -71,7 +71,7 @@ namespace NzbDrone.Core.Tv if (String.IsNullOrWhiteSpace(newSeries.Path)) { - var folderName = _fileNameBuilder.GetSeriesFolder(newSeries.Title); + var folderName = _fileNameBuilder.GetSeriesFolder(newSeries); newSeries.Path = Path.Combine(newSeries.RootFolderPath, folderName); } diff --git a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html index 33c76d757..10280503d 100644 --- a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html +++ b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.html @@ -48,6 +48,7 @@ {{> EpisodeNamingPartial}} {{> EpisodeTitleNamingPartial}} {{> QualityTitleNamingPartial}} + {{> MediaInfoNamingPartial}} {{> ReleaseGroupNamingPartial}} {{> OriginalTitleNamingPartial}} {{> SeparatorNamingPartial}} @@ -79,6 +80,7 @@ {{> EpisodeNamingPartial}} {{> EpisodeTitleNamingPartial}} {{> QualityTitleNamingPartial}} + {{> MediaInfoNamingPartial}} {{> ReleaseGroupNamingPartial}} {{> OriginalTitleNamingPartial}} {{> SeparatorNamingPartial}} @@ -110,6 +112,7 @@ {{> EpisodeNamingPartial}} {{> EpisodeTitleNamingPartial}} {{> QualityTitleNamingPartial}} + {{> MediaInfoNamingPartial}} {{> ReleaseGroupNamingPartial}} {{> OriginalTitleNamingPartial}} {{> SeparatorNamingPartial}} diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/MediaInfoNamingPartial.html b/src/UI/Settings/MediaManagement/Naming/Partials/MediaInfoNamingPartial.html new file mode 100644 index 000000000..49203cafc --- /dev/null +++ b/src/UI/Settings/MediaManagement/Naming/Partials/MediaInfoNamingPartial.html @@ -0,0 +1,11 @@ +
    • + MediaInfo + +
      • diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/SeriesTitleNamingPartial.html b/src/UI/Settings/MediaManagement/Naming/Partials/SeriesTitleNamingPartial.html index f2cd5fd81..cc76c95b5 100644 --- a/src/UI/Settings/MediaManagement/Naming/Partials/SeriesTitleNamingPartial.html +++ b/src/UI/Settings/MediaManagement/Naming/Partials/SeriesTitleNamingPartial.html @@ -4,5 +4,8 @@
    • Series Title
    • Series.Title
    • Series_Title
      • +
    • Series CleanTitle
      • +
    • Series.CleanTitle
      • +
    • Series_CleanTitle
    From 4ad28bb6f687a987f73c4220a2d4999e77783bbc Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 5 Aug 2014 13:51:06 -0700 Subject: [PATCH 047/105] Pushover default to Normal --- src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs b/src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs index 2bd17b79d..0b0276e85 100644 --- a/src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs +++ b/src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs @@ -18,6 +18,11 @@ namespace NzbDrone.Core.Notifications.Pushover { private static readonly PushoverSettingsValidator Validator = new PushoverSettingsValidator(); + public PushoverSettings() + { + Priority = 0; + } + [FieldDefinition(0, Label = "API Key", HelpLink = "https://pushover.net/apps/clone/nzbdrone")] public String ApiKey { get; set; } From 1586743df26ce410c2bfa4078ae724f269780eab Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 5 Aug 2014 17:51:40 -0700 Subject: [PATCH 048/105] New: Show calendar title above buttons on small screens (phones) --- src/UI/Calendar/CalendarView.js | 12 ++++++++++++ src/UI/Calendar/calendar.less | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/src/UI/Calendar/CalendarView.js b/src/UI/Calendar/CalendarView.js index 1c26d1908..eee12dc9f 100644 --- a/src/UI/Calendar/CalendarView.js +++ b/src/UI/Calendar/CalendarView.js @@ -33,6 +33,18 @@ define( }, _viewRender: function (view) { + + if ($(window).width() < 768) { + this.$('.fc-header-title').show(); + this.$('.calendar-title').remove(); + + var title = this.$('.fc-header-title').text(); + var titleDiv = '

    {0}

    '.format(title); + + this.$('.fc-header').before(titleDiv); + this.$('.fc-header-title').hide(); + } + if (Config.getValue(this.storageKey) !== view.name) { Config.setValue(this.storageKey, view.name); } diff --git a/src/UI/Calendar/calendar.less b/src/UI/Calendar/calendar.less index 82525175c..6eeb72fe9 100644 --- a/src/UI/Calendar/calendar.less +++ b/src/UI/Calendar/calendar.less @@ -185,3 +185,12 @@ cursor : text; } } + +.calendar-title { + text-align : center; + + h2 { + margin-top : 0px; + margin-bottom : 5px; + } +} From 15f9c3a95dfd80c47e7892c836748000de6d5215 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 5 Aug 2014 23:17:44 -0700 Subject: [PATCH 049/105] Removed some extra using statements --- src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs b/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs index 6b0b7bb01..1818cc0a4 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs @@ -2,10 +2,6 @@ using System.Collections.Generic; using System.Linq; using NLog; -using Newtonsoft.Json.Linq; -using NzbDrone.Common; -using NzbDrone.Common.Http; -using NzbDrone.Common.Serializer; using NzbDrone.Core.Notifications.Xbmc.Model; using NzbDrone.Core.Tv; @@ -82,8 +78,6 @@ namespace NzbDrone.Core.Notifications.Xbmc { var seriesPath = GetSeriesPath(settings, series); - JObject postJson; - if (seriesPath != null) { _logger.Debug("Updating series {0} (Path: {1}) on XBMC host: {2}", series, seriesPath, settings.Address); From 75236118dd08554a18d50395304f4efc8ea83faa Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 5 Aug 2014 23:41:43 -0700 Subject: [PATCH 050/105] Wait 30 seconds for automation tests to load UI --- src/NzbDrone.Automation.Test/PageModel/PageBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NzbDrone.Automation.Test/PageModel/PageBase.cs b/src/NzbDrone.Automation.Test/PageModel/PageBase.cs index b8e56a44d..93c804703 100644 --- a/src/NzbDrone.Automation.Test/PageModel/PageBase.cs +++ b/src/NzbDrone.Automation.Test/PageModel/PageBase.cs @@ -28,7 +28,7 @@ namespace NzbDrone.Automation.Test.PageModel } - public void WaitForNoSpinner(int timeout = 20) + public void WaitForNoSpinner(int timeout = 30) { //give the spinner some time to show up. Thread.Sleep(100); From be0d779448c3aa4176e9881f117cb28200e44f13 Mon Sep 17 00:00:00 2001 From: Frank Riley Date: Wed, 6 Aug 2014 19:34:49 -0700 Subject: [PATCH 051/105] When running under mono, WebClient will sometimes return less data than it should. This causes the FetchFeedService to log errors because the XML received cannot be parsed. Setting the AutomaticDecompression property on the WebRequest fixes this issue. --- src/NzbDrone.Common/Http/HttpProvider.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Common/Http/HttpProvider.cs b/src/NzbDrone.Common/Http/HttpProvider.cs index 6b04cb548..b122b9464 100644 --- a/src/NzbDrone.Common/Http/HttpProvider.cs +++ b/src/NzbDrone.Common/Http/HttpProvider.cs @@ -22,6 +22,16 @@ namespace NzbDrone.Common.Http public class HttpProvider : IHttpProvider { + private class GZipWebClient : WebClient + { + protected override WebRequest GetWebRequest(Uri address) + { + HttpWebRequest request = (HttpWebRequest)base.GetWebRequest(address); + request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate; + return request; + } + } + private readonly Logger _logger; public const string CONTENT_LENGTH_HEADER = "Content-Length"; @@ -49,7 +59,7 @@ namespace NzbDrone.Common.Http { try { - var client = new WebClient { Credentials = identity }; + var client = new GZipWebClient { Credentials = identity }; client.Headers.Add(HttpRequestHeader.UserAgent, _userAgent); return client.DownloadString(url); } @@ -107,7 +117,7 @@ namespace NzbDrone.Common.Http _logger.Debug("Downloading [{0}] to [{1}]", url, fileName); var stopWatch = Stopwatch.StartNew(); - var webClient = new WebClient(); + var webClient = new GZipWebClient(); webClient.Headers.Add(HttpRequestHeader.UserAgent, _userAgent); webClient.DownloadFile(url, fileName); stopWatch.Stop(); From c3fee509f60ba6255c92a916197f1e732729a704 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 6 Aug 2014 23:23:13 -0700 Subject: [PATCH 052/105] More info on calendar New: Show more information of grabbed and failed downloads on calendar --- src/UI/Calendar/CalendarView.js | 33 +++++++++++++++++++------ src/UI/Calendar/calendar.less | 5 ++-- src/UI/History/Queue/QueueStatusCell.js | 9 +++++-- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/UI/Calendar/CalendarView.js b/src/UI/Calendar/CalendarView.js index eee12dc9f..afd900920 100644 --- a/src/UI/Calendar/CalendarView.js +++ b/src/UI/Calendar/CalendarView.js @@ -60,15 +60,24 @@ define( var progress = 100 - (event.downloading.get('sizeleft') / event.downloading.get('size') * 100); var releaseTitle = event.downloading.get('title'); var estimatedCompletionTime = moment(event.downloading.get('estimatedCompletionTime')).fromNow(); + var status = event.downloading.get('status').toLocaleLowerCase(); + var errorMessage = event.downloading.get('errorMessage'); - if (event.downloading.get('status').toLocaleLowerCase() === 'pending') { - this.$(element).find('.fc-event-time') - .after(''); + if (status === 'pending') { + this._addStatusIcon(element, 'icon-time', 'Release will be processed {0}'.format(estimatedCompletionTime)); + } - this.$(element).find('.pending').tooltip({ - title: 'Release will be processed {0}'.format(estimatedCompletionTime), - container: 'body' - }); + else if (errorMessage) { + if (status === 'completed') { + this._addStatusIcon(element, 'icon-nd-import-failed', 'Import failed: {0}'.format(errorMessage)); + } + else { + this._addStatusIcon(element, 'icon-nd-download-failed', 'Download failed: {0}'.format(errorMessage)); + } + } + + else if (status === 'failed') { + this._addStatusIcon(element, 'icon-nd-download-failed', 'Download failed: check download client for more details'); } else { @@ -218,6 +227,16 @@ define( }; return options; + }, + + _addStatusIcon: function (element, icon, tooltip) { + this.$(element).find('.fc-event-time') + .after(''.format(icon)); + + this.$(element).find('.status').tooltip({ + title: tooltip, + container: 'body' + }); } }); }); diff --git a/src/UI/Calendar/calendar.less b/src/UI/Calendar/calendar.less index 6eeb72fe9..a383a6126 100644 --- a/src/UI/Calendar/calendar.less +++ b/src/UI/Calendar/calendar.less @@ -22,7 +22,7 @@ .fc-event { .clickable; - .pending { + .status { margin-right : 4px; } } @@ -173,8 +173,7 @@ } } -.ical -{ +.ical { color: @btn-link-disabled-color; cursor: pointer; } diff --git a/src/UI/History/Queue/QueueStatusCell.js b/src/UI/History/Queue/QueueStatusCell.js index 2fda4b6ea..c85b2238a 100644 --- a/src/UI/History/Queue/QueueStatusCell.js +++ b/src/UI/History/Queue/QueueStatusCell.js @@ -37,14 +37,19 @@ define( title = 'Pending'; } + if (status === 'failed') { + icon = 'icon-nd-download-failed'; + title = 'Download failed: check download client for more details'; + } + if (errorMessage !== '') { if (status === 'completed') { icon = 'icon-nd-import-failed'; - title = "Import failed"; + title = 'Import failed'; } else { icon = 'icon-nd-download-failed'; - title = "Download failed"; + title = 'Download failed'; } this.$el.html(''.format(icon)); From b4698b070ca91cb54a1e5441394040d59f6a6bb3 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 7 Aug 2014 08:24:23 -0700 Subject: [PATCH 053/105] Fixed: Update IMDB ID from trakt when series is refreshed --- src/NzbDrone.Core/Queue/QueueService.cs | 4 +--- src/NzbDrone.Core/Tv/RefreshSeriesService.cs | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/Queue/QueueService.cs b/src/NzbDrone.Core/Queue/QueueService.cs index bf36068de..0f1983ad6 100644 --- a/src/NzbDrone.Core/Queue/QueueService.cs +++ b/src/NzbDrone.Core/Queue/QueueService.cs @@ -14,12 +14,10 @@ namespace NzbDrone.Core.Queue public class QueueService : IQueueService { private readonly IDownloadTrackingService _downloadTrackingService; - private readonly Logger _logger; - public QueueService(IDownloadTrackingService downloadTrackingService, Logger logger) + public QueueService(IDownloadTrackingService downloadTrackingService) { _downloadTrackingService = downloadTrackingService; - _logger = logger; } public List GetQueue() diff --git a/src/NzbDrone.Core/Tv/RefreshSeriesService.cs b/src/NzbDrone.Core/Tv/RefreshSeriesService.cs index 15a694fad..b7b4563b0 100644 --- a/src/NzbDrone.Core/Tv/RefreshSeriesService.cs +++ b/src/NzbDrone.Core/Tv/RefreshSeriesService.cs @@ -55,6 +55,7 @@ namespace NzbDrone.Core.Tv series.Title = seriesInfo.Title; series.TitleSlug = seriesInfo.TitleSlug; series.TvRageId = seriesInfo.TvRageId; + series.ImdbId = seriesInfo.ImdbId; series.AirTime = seriesInfo.AirTime; series.Overview = seriesInfo.Overview; series.Status = seriesInfo.Status; From 3991ae5748e85c75b40379de1b4f91e05e731712 Mon Sep 17 00:00:00 2001 From: Frank Riley Date: Fri, 8 Aug 2014 15:14:50 -0700 Subject: [PATCH 054/105] Move grid below show/hide button so that the button does not move when the grid is shown --- src/UI/Series/Details/SeasonLayoutTemplate.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UI/Series/Details/SeasonLayoutTemplate.html b/src/UI/Series/Details/SeasonLayoutTemplate.html index ff5e8b95a..dae85be8c 100644 --- a/src/UI/Series/Details/SeasonLayoutTemplate.html +++ b/src/UI/Series/Details/SeasonLayoutTemplate.html @@ -31,7 +31,6 @@
-

{{#if showingEpisodes}} @@ -43,4 +42,5 @@ {{/if}}

+
From e752e7f35d3a3d81013ed84ab3bf4b13fab09aab Mon Sep 17 00:00:00 2001 From: Frank Riley Date: Thu, 7 Aug 2014 22:18:22 -0700 Subject: [PATCH 055/105] Fixed several issues in GrowlService: 1) Calls to the growl SDK were not made in a thread safe manner 2) Loading the icon from a URL did not work in mono, and it made the GrowlService calls take exceptionally long 3) The result of the growl SDK calls was not checked 4) A bug in the growl for windows SDK caused the mono version on unix platforms to not work. A fixed version of the SDK is now included in the build (do not use the NuGet version, it's broken on unix). The bug was reported to growl for windows here: https://code.google.com/p/growl-for-windows/issues/detail?id=48 use var for locals made requested changes from code review Gave state class a better name --- src/Libraries/Growl.Connector.dll | Bin 0 -> 50688 bytes src/Libraries/Growl.CoreLibrary.dll | Bin 0 -> 17408 bytes .../Notifications/Growl/GrowlService.cs | 112 +++++++++++++--- src/NzbDrone.Core/NzbDrone.Core.csproj | 27 +++- .../Properties/Resources.Designer.cs | 73 +++++++++++ src/NzbDrone.Core/Properties/Resources.resx | 124 ++++++++++++++++++ src/NzbDrone.Core/Resources/64.png | Bin 0 -> 3582 bytes src/NzbDrone.Core/packages.config | 1 - 8 files changed, 314 insertions(+), 23 deletions(-) create mode 100644 src/Libraries/Growl.Connector.dll create mode 100644 src/Libraries/Growl.CoreLibrary.dll create mode 100644 src/NzbDrone.Core/Properties/Resources.Designer.cs create mode 100644 src/NzbDrone.Core/Properties/Resources.resx create mode 100644 src/NzbDrone.Core/Resources/64.png diff --git a/src/Libraries/Growl.Connector.dll b/src/Libraries/Growl.Connector.dll new file mode 100644 index 0000000000000000000000000000000000000000..ba848ae440a489b7b6c8eae8af9a1f9551269e9a GIT binary patch literal 50688 zcmdSC3wT^r)i=J*nVBuG)ddoG)a@RrBGXb6+!rZYwdI9k~Vnx-sk^3 z|Fl_WueJAHd+oK?UVH7m&rH^wc{RC+$c^6*J|KDkPySgZ@Wa6vvh$~XGoSAFJyrgI z*8Eg?XK!CJI+U=sC%Oir-Ccu&)^K!dJen98jP?yi8(KS}16EJGHZRX#VY6;)Bx=@N zG*tIWhtt|iq?hMtIYi$A#Zc7KUc@ts-`KW#~ykiaML}H|LX8#HH$xb<46A7vplln=V$(U zQ}5=H3%;@Ml2A@wckj^cpFFc+*E=^1KXYhbYw1^i`(LX*cjeXX=ZBx!a`PKs{`As| ze{uNHyMOh;*DBwbG=KK3uipAt#XK#(bNem(`&M*J?)%Zh?{9kT+O6NZdCK)~bQR|| zyz-}kGk^W-omJOH>(}m`(dC+}Q>QJR9t#us^}W!BdlYu$*7vf-jCv)B!FG>gh(Lu- z-J|F+k{(X_Ihia%;e&WDH!=2Pv0pR+pMtu7mpu%2PHYBe9|8;1tU$Wv5wzfWKLYEsTd35~vQ8nITTied zPMXi4 z{-oO4BM7$@n-AG@3~v(FkM32@(p_$z2}UI}ikZP04JfvPGJCG<1NUNaeZ%64Nz5T5$6LA8XLIrL;-#r?#JH_PkBFfLp6vgXH zVlEo&T|%Ct#;h9<75PLw1U`zqkl&Yf&#=ZfG{6?j}7+pnKH=TwjbQRED z7WBsJ!F-qXC{j7$Le1;;j9`X|9K!gTk;D z2EzVuj%ye_({s%|7QZ z0(6}WYnTyx;BVa)#@09rUv(-<<#>G&-&K7UWY4Iv|F|_oogpL2vE!AHRSS8ms=Wbk zB;W;y)4?HR2F%F3*#RTA3>fE_Rvl8Y<(z2*j6^QN+7hcCX!Umk?tmi_RAB@>)tmo` zCVT;3b`!pTzKOI>B9P-)og6I;`2)(4#u^~wQ99agR4+EHMi#hMJ&Uasz*M@#TFJ#+ zvsj;8$XX?NO@Q9&e6RHpPFSk}!#QD9@CCM)y1N1J1D{Q7V;C{Qcyg?R|3qivH;msw z{ASXx0Dc(1Z77vVcZ1ds+7Nzu+QEkjpBn(-zUdA;vBaeKe-wBN@TW8AI&kL0!6E0j zBh5eTi=ueK*~51TYqc@1844(>BlAXvIo59?3kLAvR5F#hx&)GS9xuo|B zDa!o47WNE&6p;p=Jz5lSOA8?ntlS&$s77E2DqfjGwHpYl1X$6fH1`3*GOGFw^CGNL z0llU$@p;&6;vqKN^!3;?gS5ikZ*@+Z#%xBx4v z^2s48oI%ssMp(Bf%QkboHki9#=fDRp#uckWTRGksY#d8p$bEErp0w#px9J<-X24zP zv>9EHZu4HWi4IGfYaw=GJAmq!i=APVEp=`fi9;w^JI$ulPOVyqe<*?3khNOq$Wc~f(y=2o4U>`A4ol5tK?E8&c( zNi6w-Oe@T-Dh!fq6a=>s^1k>hW_neh_k@Z>m4}AhV!GZdFm*JLRVJ02~ri zypCOa#*HV>@fd#D^;fmn7R1czs_-6C=E89819!aZ+PeqUEXeyOa7x^)2x zROi~r9w3#81%BSfU5K=r`d^f#O}9o>QC{bCYp)c&d|XlXYj6-$0=XktF3>KNGH*uW z9TZIXa%jkvZFaIU?E|k1T+*3b-E_sqfZJ=!&rs!`T3b$_aJ`y?PS|jovx9KQuuAh; zl8X>m$R0suxof-$%-o?WPa=p1e6*p8VxtDD^1G|c;Sgjzh3>ZYgIb-dyRDBR5yOfD zZ|*{$KL@`2gMbFhEC)1LFWq|aD2ljUHGZ@N1S^wU-@~wG*j-)aPL!e5QtKjSItBSy zu~1d0iRH+$4j^ZA3$v&WyAll`#V+Q;%&beuMXtn|T=Ehon;>Ih!?6Ju-;$zpajX@x z6=d;PW*0Sz#E?0LaKWf9)?@8>Mif7`FY99fmHHm8itIgHHKN#NWJ@jHh;fhk$zA3r z_miI@5uT0&EI8A-xBTS(@e?bU+ImTX*H0H=C7@E+64uY^ZMy8~3L$W@^frk=(C}Ba z?1jgNMP3SGj@P=3^G@`wohzGZV!kYE-UBg!5qaJU+UFU{W4SU1oKKrm8D6vpNr> zUEQ&46&GUp0*8c2@!X+&HqP>xs!L6H;2tNMx; zgv`i|!T%(9SWIW}G z16^6KF(c45rpuWVpU0p+pOnB|@O(jUq!y!W4T8(QVz|I_CBoMROuhAKeIhJbnYKh(H>TqWBWJ0p0qbnz0^Sv4j0vlP$gWghfht7%Cgvv z(2et`MMgNxuGgrPv?rbR*mOQG>4w(f-vcfSgJJlSH-SfvJA`FDx2i0V6UeD? z+`W8K?GF`JwFV1gpXH>P{3Z+Q!x4)}8vwt6;^zp zrDqv+zXHb`tYoQ?%=IeOc&iG6UQtaRb}ph9uhPqF=(RUfFYf9y+*Ual@#aGXOJOtd zCk$*r9dt|ess*N;54+_^R{W08%>*A5yXA;h9B(?S*zc)6)wTgdi%KxFDiAc)m>DJv zLqs!`X#WGz%uLaAGiyAI^mt5WT~DRSCplyA4VwC#O7lMS6zB+D3M8Lm1$kXTvW_5y z2~h%ztoG|B)+DSMMx|*LF~z5w?ijp;QOOBRdqW*_OX^JJ{;KoT6Cn~77e1ri!+wRy z{B+14cUMnUTB?rdd)R|i=c^|symbxNyhM+_h1oj_39uH#Zh@FjhT>I^D&GBtrdUnwqQc zL3ivj@J`G?-vc>8;t0uQeIArb*q%<98giH9lEKV@k=YkWy1_ooaPEQF$c}#xvPNVjf)nvm$s0KN)s`*vG=mUnh%&77? z5GbVj!-J|+@CEMt-ZNPuUfXn<0Ub^4yjzoJCKfvg zu1B!30}ozTA+n0+ZBBk8b|=fna+Ywt&b#- z!MzlMB%lYjts*>Uv%aLhOO=wtJ;(mse6Db88MhqsNg?*VTqc;}<8~OWV4WJ3=h(X$ zV=n?)^xx%9!txy3xEFO}sGIKzuT=$4!ctA5e)~+;9cx1Q91H=JZI1#p9|1x1juBCL zY7{(b6nyF_OWZ2d4|!YxkMb3D`JN=K*;t$JY12i~NVrASNVr7HNO;6VkWk}^1TG#~ ze|&pcD;&n8OFQj-c=F3^l?Ys5pkLu6dLqLj&%e2rt@rOL4=x4<&F*yF76zJ1}lw zjCoeJ>#i#>8`bX0T^#!^_u>LQaTSYo1;$+E$hBEGqO#SRhsh{Edh&ko9)&-~JpLxC zWAb8U!sNwfj5S}SxkoYSaj#Mx!m8{R;`>_UeXYtJsnQ~&aP0iT!5(Jevc7Kjh0kzC zbt3dDAYvCszO}*0Frs$v<4A%vtmS>h`}D> zG;=}G2l1$R5-Sn{-asn+^on}nA@*=D;A7EW7^*@!&ya)6SRa#d`^lw*Ts<}D*#j@F z981WX_#~7Hx9gSB#;GwMu7uDNRzUUXc1_qMVrd(J|1v`U#I2}kQ(%V~w?`aa%jtN? zOgt=wSoLVbRMZ?}FIF~XIz}Kz*0r>G8ELI#id}}cTJ~&9RZADD%FD_zEetny0!!fM z3DG-L>F15i(wl(?ayf?dFU3+pin&b*dM;$0@HiWxJhgSm59C`sr2_eKx`dKYqS{tV zBntYE(7Rxsh=qMk02>V0R#p+=02b-t#TMzf{eY~Pt^Si%eel5t7;S7e;27=AMutv| z)V$KLIO=pFEwP-q_Osfz&(`zNH`<$c38E$b#Na&u8C*5PSoMej+%!t=m`c~FCLCAc_pO8~G|=CxY-a?K=^ zhYS1=?(i|S<+>u2k8|YWkg;Ss7I7HuqfGY(jHSf5H})i}AJ;m(gYhqY9)jpVJ`N<| zF33Es8vP=Ak;)5a=V4jLykICEqeLAdhIB=X6wBG&s4B&Ll!h)wE7cpGX73`GrK)u7 zJ4~(}PmZWpKe(_z8G>4JjFJVeVin@7idLgLi5R4kJM^5Y<vT1SDZ)0|MQ7p6T4eek;5jN#3S^e{U2I(~D3^AFR@@%t0d{*pnTzxOU4EIFUVI`BRViCvI? zjL8T~oJ(%kTtCMN@&kLtyCPWiBav|IX{ZT}^E;f)PQG(`b~m$jkHTH?^*L5pxju(0 z!_zYgpM|F}ibV)d?Xo@kSa}?dik|V-T)-!<%>{gHtD(6*`Z=B_KzHNbn`6bP7u&L4>dMtc zVJat27iHNK2+Oa1#EbP7VO~3otaJSnc>82EhoTBv=whNkVgvBKY7*gOCN2!7W92m%zDVm6E`r2A4zZ zDNkI7r1F{06_|lkkOT`O5_68H!#Bvia zNQvJgjr(s;>@ZX#b@P;^VPtHxaVyKR1vUe2WhZ)!nN`nLPh~}A{H~c89kjyPnMUN6 zcd_NbpV!cjK=yfJLus?YSvd=?Miw^2^Fo;bY={L`7LdoIm*lbGjfO7obb~LhO%g^B zr)07JgRIJgy+Lq|eiMp=H$yzb1A{Pz&lvdJqZu;HXBosK&5{~r) zuc6K$qVL?-@GgiT^=^1N2< z*lQ;1dl+|FPohXoK4yYD$r_D)z-n!Aa^D8#vYuk5pR{XEa`Lz)pY13l|wl;`IniUZjuFgpm# zv3)LMR5$9e5@~D(SRugk=iscX3{N~J;gRe?Yq^H9dlW%vsa{Y=YwlEQhTT>n&0XfS z<&rU8#BF(?1l&b7=oWU2>KH$_Y6{*?pT!M&tAlv&s{=XeeSY;WxUNofe~ymnnWwqX zraE&gqRP`%TZjhGaX)(%%yVUWk^lkbt_YF<0fwyzk^li_FGd0rlqYOX_II!+7|F9X zW5z1a)%S32b)kA%&ml81Pu@Ice^m$F=JD9aeu9iqW_;Y&{ZKXCks)8umyQy0C0f;EL+GXQ)3(Xkhk&YqrC2LS#VgV;3-)72 z5N>%TJN*u}>NubE%KlS}{R}!5&WKg`6?MA+Y~1Ex$Q^`DhMC)BZ(#+(wS;DsRVRxzg?s3*#sxI$esjESz{mA3q0DdervU$ow4Z+AI^y!vwZ;*b zK{HL}Fkj#o%`44(T9{Xq=cmJYM_l=IZKNpApz;!~yFg%LDVP7vWQNUCYNi-;-;^5w zk4||K@NI$lQ#oBF@FN1d1@0AigTSv%<+_gxd{!vG6X>7Db?c|iopv2CnlHTcDa^`d{vsB=w=}ptoqNFdG z&aK}z{YulIhXnqYz~==1O5mFUyNkGte+I)D0#6ZmmcSh|nE!c_zFpuW0-q7Mynr9sCvYA}w7J*-z$(sM3z%Cj0U(94}`~|sw z^37tam@|vZuN1gJ;MQ5J?ftXPE%(z^Qs#3=8}x|4pQDVQeh2z&%E3JPw#H+WPp8bD z1x(pCL;hEYd&d(n{~YXeU?x_NpyaKVyaK$%!zDKXE5uvBQw8f6EJzi!AJpAaGK{%} z*-sxsD?YsUaU$kQq1;_~fSpVl^6rF1HV4HiasIOn2mjkv}hrH8YN4Scb(L`4VXb!(~W|CU3h+) z?h@=l!EUB+3idrzGJrWJVwrZcANK-Xwv-Zq#{m%ssm2ZVl;r0*2?4S_$*3z_BA zQNUwo74X>Y1=MJN0gvzHpsyeMCerK24hwu%;41>(7MNeixw8Z=64)g09DzduzbSk! zDP(Rp3H++S?+Scb;5!0y0$gTD(lJRd6qqlRWs*Ki;DrLO6Zn9@p9wriO8!aGo*;7z z0csQtmKA8!EO39Y0%_I9g`poHeOBldz;1!(2^CUn9ib~)a_Z6L^x#_B+PZzrBnxdNv*N(ja`r5JI00!t?jz|thcCVDYMBu#w)%<-_(vJx|BJc;o=ebBpz?t1g zGs^QQJM<@tw_#SgO49Q4SZh>V!je2+a%aGqcSdPRVEtIWz+!<@1QecUV1q54WW77p&Wn+s4YqPPHf}LSwXSq)W zmn}9n>|Oz^SFi*033nT?U4mUhUvaNT#CfTm_YCsf6rRqqTtmM{o`>EO>;UC?+VHv4 zpW$4N^C~^-v6A#xFm^39dCtL#aDk0&0hUXb3U;vMsQG!k?DcEGxVQTdGrXlR^Z$63 zQUSeZWAAzP0rOy21HG6Y;{aBdJR8e5E(2DgFe)}a0h_u)uxqK@xCYn}!48N%gY=9l z3G5J}j#m|C*5S$}On@fVf*mj{R+YMOA95`qVmix zaDkmGjLtLe0d_zz=J{1%Us8Ff_b^uU!*;!gjPK&T(I;)}ad4SJ&!*~qAJ`cZSE(LN zrLGjV53$n06!r(~aPJiC5_5@nDc*0n*Tx#X`+)u0#@fAq#yd8@v$5^ocY*!c#xC?~ zS_QptW7l{MU?y*9=m6dA&DBIjzz%!v^9C}o$GyecY^s%#hqV{I)3iCX(609z?@XfAF55)iOiGZfpgoA@)$%tnL)Lw3_Q(OTRYn&`zN@QrO+vskEiW$-7TGotB7j*V3Ej!&)6R zq_FR5_4sNLRq{>qX>A3)A%b5^@0drmkI<62D(@Zhb!`pZDc!i1G~b`Kwe&q3EAYLi zwbR&qRkGBl>mBrS8=L7f^-ju@4qr*-;^l%F_*4yUj~_=MiG zDXiE$lRijcQ_M|Nje{^k6#Zh}A$;4xPX)U~X51Ef$;MvGTZ+hc9*(hi#{EUGr8cJJ z--En58_N@{$;PG#w${ex3bxV4>ICbuv39}wY-}K(+dI$3F3qnnx6p1IyD@(bumgf! zOLym=V0O{p1yiHBl}d0l;LOdfG&_YAn?1BRg-tQHQKMi7X?ejNS}$!#K95R5&_I+P6aVFE_1Dmb;^ zd}_9_lYs4_12%Rhu-){qjr9Y&fZnpPYlE?ZJyb2HB$t?90d^sEDNMZED4mteyKrJo0D3-;3$f<3PNF*qOC^(pL>f{W<36t=S961q2q zbrxJkohNe(k8AG)w-#JUn^RbC!Bw;)g;@nx)A=cESHUOgq7?Sgf=|;YQrO1}uA`e$ z*ry6^q&rjCXA3?TJWUns0FG&jwcBZtjpYHmgPLt@O6ZFP zcX6eZKfBw;*q;?^Uru4m%=-)OO=0ZM?zb`J2fv=mn`(Zs;2SAynfYh|?i}#rf?l}Z zw~0TTug2j=1&`7}g_&$UkI@Y_wlwtfg2(7Kh0(##+rTPLlX`Shs11D{R+#yP(7OfS zr3-EBYl0oHvBQF0VPnqp*)7640&-V;HEf~+ElMA1r zu{u;EH8-E78x%%A2`{2&=^???YWOTYW@E31mm=>8!48;z3O5u!OFy>r+(n%C3mYpe z`ZKU!*(IkJy$kFOJC9e&=jbgvk5|g)?C*-Y1ZxNH7b=#sWQ?^H{*+eP*gNK#h0oKu zg2B%hbr=4E4%pbTqJhGrw5*=%DPQ*rH4CQt{tBHd*hS{&if$`>g%T=H#`YDuU$6tf z4)IRDLACznqDAy7g#^2X9xBrHS1BskjmR+I9m8y`mM^N6C?jq_e zD9rqAWGQ*Hw`}Z#$Ub0yw=s@C4b8Kf+q=Z%_|wqxZ7fv0l)PHR#>$HK0h?xH<;XL& z*)~>%JX4!%V~ddI)0WuSX~^?wbvCxL_#X0WO*YnEyg1<3+HLIY;*$e8+L<r(O#Z*slp^q&esk%D}9z5s{;Aj7x~~zVlYJ8 z+JB_5LsY2!X9`;v2x{*rOk#$JrnN{t(NaY7+ZeBS#ag+I{TQtmYn3*}QkQ7+ZH%QZ z(N4CpUqKV4TD^_^0h%b)niVEemuY6JBlS6fGVL6}*b0ixN!maPyCE<|yFxIw$U}js z_Lj;s8%huhYwy|Eh7!cW8n!Upck^82&Cv2}>;mM?&>}YW@sfL}LYr!1*Ox2~RA@25 z9@oB5awsrUyGZ4sy+!!s__cP)UzL0<>YySc*x82di?*j|8U4p6kuuvOQn0a04Qd+28YGZen z?gMtv#vVl8BJBnn`yTQZX}8+gPm#A+`=X7#hP=hveKz(^sTMp@d&tK8WlQNq?J*lG zDSNlzMC}QM(ZaHQ$a~(-Ys5>7OSG5my!B=G&=T!Eg^A9VXiXi`TN^tgg{?N1XnhJZ zeUt9NecX9A7M!#=aFTX`jZH${$=by>He0Yy3U-mXc+#BU$=Z!}-pWZ!QSw$BJ7dy5 zU|+JazDc#gQ?&aPM!P311oo0(kBbeSuEo|lnm;voy0%5Ii|DdRjlpFapLL%VV)*;`K#gC=vI<3od%KW3W()K6*rMix_{Nq+Mx<)v66tFzpN8RrGeo%CrhB94Q zSLV1+l%B|PJ}aERC~c+FF54b5DSyXX7aEPHIF|FUaA2t0byZr`N~aypigF~Q7N?KR zb>Re#+fA2O6sO&Z>^yC&$F*VbblUp&to=B(GI-jprzmcjFCLj$&U{hh_`LLbp?IP9 zMH^~NuMvx7-{RPeXUadD&Xc2Jo<3Dk}7l5)cjT2 z;IvCxbkh^XtbvKRDLzWu#U)%)rFqu7a4yc23(#LjOULrb%pK21apM~U=D_3Vl5sqi z0=vb?dhC%^QXRi7zQJH_Y|q*K;`K`>HM{r8m?}ODb-HRwIhErUlq0dP3VaZ7AMSq{ z9ufGAz~=?NEbw)KZwh=zpr*a+S{(2J?xTRfQi0_H=KyXBE(Pok)&VZUI5P|joGh?O zdt%zOP?%nsRuQToExIIBO?lB~z`x|J1*Ir@4|Qpk(M7oZL8j4q`n?U&IKz}KSX;k(eg)3mPw&JBN6 zn_Yf__Mr6lLG2^ujo}BiE#<4jN3=cVYXL7Q-xz*gJ5=5Ucvty$aJ#SE0(_!;B>cK| zw0utCgW4a;N5gMwe=A=ccvFi^zX<7R(-+Z$0*}~`b)xB&({Bl%NAsuO6K)oLmeT3d zzZv%FuS|O^9MHAs5zx8U0i89|DP=l^QmXSA|2*0|{k3qp&O5q!bZ|QN>oe1TAD)BU zee^u`yzhnQA-#x}3ak^@Byg?3jry<6yrM2i_X#{t;BJA;t+MDc{lJX*fLF{|M3?E; zN&2%h8VWDdzdB_Sq>YNT=4E=gqC0q*KD}Z^5&Bp$zvwRT zytt@IYpb{%=`$;?M!E|no3#Fl+l!vj?yUGyQ8RtD;#+`^R2)X`XQn?<)G3rsp?n7% z4v|m)WyLc^Yw6Vr9^X2n0vz717{Mse%r%iF&74_|^xG93NWWcjd(m#Z?Q=%th+a1H z9=ePc&papcjQ&VPPvm)>&wh79tJtlICU4N1X1*4_LF=EHh?MIiGj~T`M~hcS%0=_< zApOa?#I#FQoLKi8tAt*aQZBatgCg_cS_ijA1`UrHqCmnBv<(N z3uJA)S~4u@3vI~l4%5)A^3q}2J*&EuZFPR>0m(feEnX*B2pGDcv{grqV9g_h;ceRKK(0h0;D3Yvv%`RbE(jkbXI< zBXXYWtyy}%h76IN%Cjs71rvpAf4S)|*6W%*|lv)4}(?-DW z(K&!m(#3#J(-nZv(m}wV(H8(;pho~-q89*Pp}zyZMpN-_)f?0Z_($pme2Z=Z{3{&> ze2-oQB+YQ=<2|1$KvQc0%+*E!3$;UlVeL7<5-s18Pm{GZfKlyIzzXdtz!=`Y$fs(p z6>zTB1GrE-4{(WgJ>V(YcL0}Ze*|pMO1=5`KDJeW&Dz<3ZQ2-Mr*;tV4DD{fP1+NH zTeRPJO}bOtVnQ=o9PnQ4T)_J^3-AGL81P|jH{he%UckfJMS$PaE(Ls2yAtqe?UQ)d z?pf_Rz@KSBA2g$#4EU0^4e%B1O2F5&!+>vS{|E4oTEq{{Xsv*M)h+;hPrC__^oIf6 z`fmYEeSQu!qbC6i^*aH>`s;ut`YE~4jD96xRKE{zh*jwBd}v0$3UEjtD})W`{{eVF z|2E*w0uSkLApMHIEnw1n`YV9sdL7X1VoNYxYzet8wuHGtStyhxLTM99r%=uSr55jE zJzG{wpQ7(gs-=255%4B@25<&V2CNdefaW26vcPVEt7$DL9g^NdcOZQ^eH(BGjRIao z_fMLkf69Gb(!#~0RFM)Wx&4`X`XhM5h(`@M!Eo}M)m{7BDVm}i+l(0q{z#F z4Uw^eC-9ZyFBjiroLkmVk^>75hOE%nLobH@C-he6-B36@J6sh$G5qoH9pUG~Z-@1w zaM8@7bw%eEomX^S(E~*<6zzz7H1a^?KO?V3-j1v+`B=$qCI37ihzm$5)ipn;Y?JB#n?2fYg%bqNYAg&?2xv>ebS>XQQ7DO-_ zq9^DZx91*sKz_sCi#u?BQ!aoT;1F(lODT%)beazB&O+=^P1Eq{!zkWpE~k?~Jr(cF zo`$#J8^QN{PY>Wl0sJAMx}e_eY-d0BZ~`Ip4SmutU;k2>iIf=Z$ATe@W6V zolCysT?q00=2Ada_knz-KPK=<{vsI8GXh@}_=doD1R4dLJEefjFDzJ!v`^!7owf<- z)fwsL(0?Ne91YhN5?w6tQvyFHP)V|?i0iH?;xFeuOVZs%Y1t0v-2?g!#au?od6%T` z7Wg%R-za8zChM&MM+4u=D6eEwnt4}B-e1Dp9uxS(60ZAR$@8e&UB>hwfqMjAT9zLq z`n04!SH`{gMp+1yTPJa?I|P13U_Wet=$n(6!%Tf`(B$_4@qWWFApc{V7=cw3;^xmS zxCfN;VIPIG3s48u3+TaW&3mUDKrgIDN2vn95UfX|u)qi~{v`V{K{#{0yxG z{46yAevVcH-py}x(mnX>1%G~OE#Oxmi-y>L9n$v-{2HXt=srN59)c7a{Rr)2ry}sj zkV3<1bv7u^(PpH70;tnZsSD|!0rFpT=tlbI0$;!zpE~_Q;ES{!^rHe_!cDSH|1I!k z_$rNl38-VG8$kMXKpk(IT1fv^;O}rttYZZ{50pR1X#ZZ|+Zbn@F#ziH7mTomHId=p z5RK{dj=;au9;6Lz6m+jZpSBMaQ=nhl4|)zDzNtmK2ry5(7%*S^7+|4x8DNoiIm$!; zb)3&%30R`xol~5^BMPB14R4&%BtY1P_G$Q{06vB{H`EYXAKD!HZ0Kv@r^53~PA~a# zNw~DE^t95((lw_w@u-PMw_L8Q;KOb=!lD-+2wkr zhzU#f;Wr0zjUH^6~(Kp;X(7AgkP93`k2IBZ+LU%TKRlKW*nT;fetpOWhQJrL8a;U#+ zcT3kmoEp;Ux?ynII)YXk2fMjlNC9C-`iH48k+2d9*5fY>sZ>Ke*`4Tl#!_IQU)veD%uef``^8*S@KB!RV9 z!+qPFVah~AUu|8<YQ!_IWZ|>WgK)-k(tdT@_oK*SceS@H8)TrfYPTS+dn=?Dk zcvi17362CzbNVLz%_L+NQnPKGs9acO93xX*PfyceFUD;+-jf!!(^69)NgeTF$sg{^ z%wLgkW^|Ikq23x8um&fnK0b4NUD54Cb;o69)`et_+IVgx29(u->?kUeoT+iAnkdpi z93?uHCDTEi%;Rcz0?iJxW9#dNy|Vg+UD8P~rHQkcB8jxdGy5pDB)^AU!7zJUt}Bj# z6Eb53lhjC}U-BKtzYcguuQk%&vpOChvOOcFQ0q{9Ftu86A*X`vX%ouf;xD_U+!#Js z#tqs9IGO3!kZb3RqjuJ}ZEkCA@1(}oH8kWnzFsRiEczL;62r73zB_ACp?J#kr&bhc z-0_#9wiLp$z(HrTV8tFoybg*$FJz>>mNzP zL0%q*DPoZr?7`HrL0xk9U^lNJ*&-gV#iqfX){ZzeNfle8l6D4&mdCgE4cf&T2Qhi2 zf_(6A`R?I(l2RUiLs#GM3M-MSxehCnTF-mqyXt$ppn2QFV@(_3b*DCKp>IbtU=6g4 z3~Y@j#P4^p`$`OMr(T2rY;Vboky3bVxA-_HX9!C;_t#m*A(t%YWV4DZX;;N}K@Yr| zBeiZYuF^{JTwTl>Xj)kg1^VQv($RN8oObf+wRtnGX;?%ZtLm^Yt*V>9XfZz)ELq5p zMf2tpW^>;lyGClSpHB^q9n^`)p+C;4I{Y@&b=GZO)mYci*uJ@~y>Ug;8C1WnqqB9* zIO59o)(y>@+Z#Jt*R|I-!n~VWI@48_x3)Gr6*}A3HEv#C*SxNgGRZ6InmZi2-Cj%G znnti(*?7iguwU1)~#vFZY`A$y>%WV-}v0kog48-F0=ZXD$-fkzOr$m)@|;a?LsM|YHDa~;jwCL zrxdNZv1MiFDuNPLHnnVCQ&+#Lsijd3j7{rkUD3Iru6+XH`o{JSwiCNBhP87=Yx|lk z4k@BjxUs#xwH>C?&`2tY*;3!$)Fu|!-dNw*v>rClv2Hn2mtz`WyfZK{;|yHZ0vi_| zn>#z39Y4f#v$j3HeWbrD(YR|UfruN6RT4|f_V_MJ#J4x@vNsP{WmZ@tgFQBi`A>aG z#ISumcrNen8r;#0z!GVR?BPfyFl)2=urWdi#yhWZM2Ov&Z0f--2umKy^d;50Znw~v z$->UjK&oq zLsCUJen-Locp2y{*UHM0MKzluyBWLB8GTXxaQcube^a*7nlhEvl&RgO;}1+$^Y&;# z)+{n%O+&0FT3rzz?(U_Y^zKo*m9d+2R-br}T5g)wQ=E5^vVZK!*gCR0WPd3+DJ*k$ z$&R97bL%=x<;Knpt?jEfuc&KkUf148O)c=yO%3ofYuCY-(7Kk@Ev*|`u!yvFw$`^c zA4Aye%r36c)DE_`r(e_5(E(S+o@8^~y3SRYs%K()ISex#dWx3mbf~Vm9qZRdZn?g( zqXSiCZEC4&-rUjHj#f9zBt~US-PV;Y%soTwj&*H3K|yPPR9IEkH=<~o>WJOax;eAi z4qls@IzgN`!n_0e`)YwDWW+hnzuC4^mEX(FZ5)r}j;*2-p1XNt3`u4C2ay5^P8 zQs=5QSy_!O_3ay#gGm?2P#?>mDRpLd#F>vTupEm%R0vPl(!!d-!Yf6v# z$IY-=95>II#3O@)_*M$aMw_i}oV4(!cstGtoHG#)rZc+KI+!h6>)>%4>Pp}{FL+L3 zuL%ch4R-a*amYBdR}P$#_V!!(tt9oN{B{!Gr6dbLk|3Is45^4$ z+9NC6_Ey*rCzDopAC6cuR*98yoaDua6-V_Y9?FTPh|4XjKi)Msj@mRhJdWb5T8hj8 zuzm7GoxNC!_~5875x0A^rVk6~AXd%ngRNxNnH+Wu85&A;qs7Ad$$@@)n}p!pK9J*G z(GInrp=1}1=F$sawpiT$i^NUD#>~ z>uk0T%k0XwXJy}0*GXHQ*g&lZTV>0%RZePH4I*sDz`;1u(F6udjh(6sR3$nsMJC7J ztB5LvIbIWgGkw_VwrtB&bqCa`qHJn*pnH9T-Tfmyai=Rub=oMWEcQS<2aqdUI@>lM z>zbE0*R`zP+>FRj1x$7=+r)P|M`$n-oX72q;|vlfmb9je7g9+xUsYN{sIK&Zvn;uY zu!j4FaiBNM8>u8t6?g2$SC-lbm)%xZKUP&3ogHFioL5VA9^COXHUSjpEW1{xw7>+F z;u5lP6B0Mfln&K6)9fTuQ-`QbPa&LBpD7&YW)a3q1yNMv(y-k?R*m>z7fv>NMDWa* zgWGD%$aB)pv!QWC9rh!eGb8DtID#5%f3YXeJVX^Y2kVM=4M3+jz!9x;11cU%9fELo z#*w&GX8giMGI7ptOEoLnN?|MG!|LQ%CdD|$nM~3QoWmX49ok1dV!2oZcN1PbPES{{j{oYJ5CG+;)(5WHoIZL>UM(tTnbsfn>|*%6DQ6v#evin zMykLD+)MzGBXo=+_7OY#tdXR1)#3Q{UcT*MOXZVwR)$kRT4Q}=5i(0agv@-PnYq$_ zX1)-(1k3C&wW~N%a(3GUl6G|M#97KXX|o6$x{?Tsad6%PdvscmemDqZbdn-YmMHdp z1C%w92wAN;(Vp7yZcOj@uxn~v4Ik#jB%Ky<6yRJ^IfIh&v`t)`H6;mFK~qv90#Ocj z6Lw`m9VA^lvmN1*Nl+t_zDMbZ4`*=zo<4PERXKJcvN&>N$k3F@9dbJxe6=qoYwNk{ z916Wu0i5z!a)aiOXkaU@FZ${Hac6U=41Y|xM(eeDQaXbsag1g!F1?wHq^uW`tCo?j ztP8omozB6Wv+wDT4{pb#z`>u*4Qq{@oM8gQQFvrvMPIzXhcdi94Q8DFa(l@vN=it_ zDaCnTmE{_`5?upzi9}cW4g>?Bj0?z#s!l8J= z8iI%1+1CwuT1V1D2s2W5bvRZRCz&a}TDf?hJLU)r?3~&LY;^| zeoRcBHH(C0=}+b5V%kFFvrff48h0>4FZqErGk=?hK)wj10XUTMHWA*0+5G zeiEVY@v;#S4Q43WVOnnu?M}d<9;dy|1jb>YE3-4HTF?v5veWG#;#%J)chYIv%8|bG zbrFZW(ra61>0(aCioX8%gqa!FG+q72l(L7Vp|5NEAZ`u%y7`2A>&W))y!NJBQZ$Sf zuPDjX$k-Q?95h0NM9Oj$K@{2^@9)|rsbrd+Z3Pl+4)<;C>&NMMI@g{ItS(`@H!usXJISkuIDgq7sJ z$)&i3*vuN*+%&+q{(ZOtAKclOum%UXvZGvSZWoU5htd5M(MgEuLm+wD+Ld;lH12}f zvIe&+O-o*Dhm*?^HYMRJ$yNz_0$B{=+%99{JLSy*K2IOO@{JvUNIi&Yjx#x6_9$YH z0tdiz3ZW*Z6Q(nc?|T#(cN4ghP-#+#U9BZPT-#xF?}!g4sk3{izQ2$Ak7>bgP7rc= zTB<0Cg|bt2<)&6J;{b{_@GU2?!^Be9g$o+FBCi!Ujh%!gf^mn}b*@-qGh$iM5Z<_8 zF2KYj5`9Tr-r@QsDQl@1pM(+8gv8BCUNzcEUS6T_g^b-hn5W9_=p7mEvCbc)RHDA0 zhn%Mu`gOiM>mfWu7Ej7ji7};2JmYqrnlh}eF0maJI5^BEn%)4~Lx$HC_*N$s`PiET z`)DomeUHBGbY;F-QLidMcXGj!f#IGd1H*NTgW*m_T`Sp>4?b{bAHOnzOPJ$la9k{J zoQ$uLx~@5Xc6;BsgFRjGey3$D7YpWNl*hlFA`u5qJ7-^sQ$ZdaJb3i+XzRj3gYqSk zW8+lcH-x)#b}>ShM3WK*9(6E@yT1WwkH^d2n!+2Ta#moQ*)J9#?MO-%;gn?vrs~_* zWy+giGkzvkKDE{>J9J(=VTt)N4}ta&ZgqQvb+cOTJ4Uu9#b_NmSCwS&|hd>fzT)9P7dg+`0`Hh1=t4GvQ@Nl}xsGoiEXv z%w{!L+T%n0U3fiVI+*dmfeo_Qgd0tB8ghwzBxIrH8+y-zI3NOYptsi_+?|P-ji^ZtNU65K$*9~{K@Sl^$AF^u2_u2H} zjmJJ3#2cP#@P1@BzUPv$IPezW14wCevdeYgoyTo>oArF;C$dYP@Q+I3ashRcXv0D) z<2kqCQz3YV1Kcf?8pxDk9Oq+8j^jLKB{*1+5pQltTimB^@Mg|bUWfNmhmh9?8n>wA z$>{ThC7Mt}WXG2sSWqz1`C|Zhw78h;w0&ayAaiX!y9G0AU9)x2Nhf!%83iU~$9$-9ZQB>l_xsgFB z!=35IKdzHR4enY$RKo%?C#PN)Qat!2kacY7y@-AF*+xq{n=9H*gCVN z+dN~{tY%x}abo))#6PxWN6CY>GPRnC+t~x#7)1^Kyuu#56OQ+ni_+3A$3SokNuv0~ zJThfX*Z8+2J-ZQo=thrtZVVrziT_9LV^18*z7E#59ctr28J4dHX5}lja2Fh#?voTx z1y*zv!^Udr!*c|`QP^W#td^bP1!89GULB<>1;H2+6hD^7Y;euAvFsZEmer0uacndHKens?z0Ul9Y*#s3)BbA1Dva|kd`5-G+LF~y z`PFope`~DE=fX?Q$LD4i;!`t=`ET6OQhX|AIbwqbw6=n1&hcA5j_rncCEk_2CUmRX z>mawX(@fcqE&p%zVFSkv?84Z|II-e(P}uG83dD=9icWYDXP1SS(Lq%a9WTUc^~rRV zwWJM9#5a4!sVI$I-m$LtUudmBx!exhYth(KE1|Msd@e25BUR<4Q9{kLZARVVD z|9hf0U}5ntITZHY1bD4i;~3 zphTa9IrcVcHjkb&0+}0{q|J$^A;SKDX~WQo@xY6K(p$~fi4O;^;}4?3MjD|%I-wmo zJQq}a!;_rt+8JXN=Wt|hhpaAqds30oZrWBQ;`Ru1!AkJ8r5seAWCxT~>R7!)sYMRQ zGY%&wO0ubW&5*#E5fo6|PO!N}5#{5xG0f#Q^kSZDY^Wf6+sNOksQSZO#Xi~0&?0uJ z9L@1^upMa?>~N2nn!QDE+#k*6TD%$HInHCs;V{=x8zj~XM`Tp>&vU1$Ce%=YJ3G>T zaLe9w@$6F;MALYDGG(j5VxxK`+t5nKWY}o6Oi`&z!hSC-gIn9`X$Muu}Ghdcqk{1BrMfc^kf)w5o}DwLx<{CMups z*$-(qbqKI%Vtzb>d5qMIRkNT5!7jGfH9Y1#yV+y%a?N%z5hq$OQBDnb@mj-cNEdpS zq1ibT*J(tH&K4YB*RkL%Y1!Gc*a!^jvjlTY}7Q zT(D_<>B5&TGm3&!wBSNKX6pI*x{>d-lV<4GpZVxZ-g|pYMF`GuMZpYz573N~D($lq z!8x9&rUiTPDQqoh275ht=Hri6p=iu0YA3+O2+nb%c)mMIc17S6>@`RW<_3G+F(ESt zrW6Ky(I);Bj}{CgX#{G_s2h2K8fFlv;fxZg6{yh-)17xFzJJO&oj~zw{LVF^E>tnO zLN$vTsOIEcNzUcQ`#n)KIN1vr9J_fkGW6iE4-Ex}gHe4l%R3o@p&kJ0>DuHHWC!Qv zPYy2P;#zPX7oXzc;x1!~2i=V7hOQfvqyH$7MbV|Uk^|LF0)IG+@W&=Z3m6z=kUqsT z#UqKpDo*;zr4oU;dHCDfLJQ0-lnl=2f4Ss#l8~Dqpb3~i#Utr_z(BRYx%m1+X~1-k z;jGhrhygyYOztrT{JCcNfU+AHzJ7xNe`?vyM1MMRadRj$>z|8<3>7}P*}lWa3tl3b z#B^jb^}}6t^dB8oPFTQkQ?n+TaoO>~^ofe49n1WQi%jH;ViQ-%c10i3ywj1X6Z2xn zS}}2UdOi7&W;)?$_7k$vk0JHl)sX zPy1IY9_wLG`d6y6_$nx2%{Bb{RnrIC|5Cp*!_-y(Z>^`}-SF|YHMyD5<*Zg2;eT{@ z63Z?&@zqJ~KPs3VnvLUo>~)B<#~R1?*n-)7!C&+GtFdRfjvupEVuZpDEeme07$*}sIir$yH+U`NMVgp`rL7LjL~tQ5=sK^?b-XOeTFFZb*D>?4M&r-=X~AZ!(J?aJ-{ZC6 z2!m=~K57`$GB|<3)eH_Y_#}f*F?b8$0_Wf$J4|PhIjG^Vk2lrMfh~u;Do{+Hm^jA; z36$qBit~9;`0QRC6la!5A5P%gjX!MHk}g;|(MF{QZE>sVt8G<1P9NVm1!~)Eq5rv^^oofFVSG@Yc`C=6 z%D${vHW3@vFi%=_k)r0-@s8XU9zQH`#{KwXylf&5oq2FLh%x6W!Gk&8NZOZ!%=fx# zM%BQ_@K!|4rEcW#U6y0BjH!zkW|fvqt)0w;>$UMDRcChD)3gWd*aDANQQgF(9bDQE z;SWPrIMY7c9MiWlECA>6X$jw0vMKPiX8UH#=c8tIQmEwOiSHb@#<3fZVz14bR68qm z@5v{F>sR$C(%PNE&2d*l&WL3(N2nY*q1f^H`-pvA6cl{(YfzW})ofdCLzJi#nEX zZ2JLqfhLXsqIz%+5Ul3C`EJ5aU3T$Y1uE%hfw3J8@V^RQc|LDpu{jO)vuvKQb8_jNNb-)|5P?0m+;xtibx!kjrgH*ksN+bxgAJQOkh;@-4>_@KxI;qgbI+_A& zeD>MP*a5$D)-ra0+YXK$KriKBAUEofr)byjoU@D_aKHb-2Oqfc`+>-FwVa-;RZ5n# zleJ#vIRz&%5Pz+gYcc{AT#tb+aT_p24gyQiWh7)kE*vURaP{r~`RS8Sz5k4G+mXNB(P@pGJ$&xei|5^X-=b%}I`;8L{#5(a4{x9Q z+erh9>zgir|MI1;j6PD>^z@&e54`wH{}1S@7vH-wqn+#FIWF=*NgENIv@Yt zUp{u*=35`Vf6ubdN4ELfUwHlTkA8jGe?Ic+yw~sW%28HuPOjGzTI)MY{)@hl)bPKr>aT;2cgMD>#Skqb@k70+uS2{NO?-OHy~CzEg=$ z(*k2(*FwateI3({YtISRu`#d^IbK~VaTZ(>j%}dxM`UomBk;RIIbwQU(ve=T*994Z zxv*`P1z3Kt&;XZ0_#L*H|i|l9)1rfEjjI*dIQbjGL)Im^Enii0ZRM+0%(2%%sL>h^M zS1Pw2_yc+=5{Dj;!XJ!cs_RH;Jj#=G-9^WMz7nY?-L zZJ~xxJ^aQ#rK)@T6d*5^hyZ;Q6b~)+CtTr=F#s(g$;t!%sDefuC6^6OKwieDL0~zy zR1$hF3KRjtD_4nr_coJ5$HyN2i=^vI|@|@8`1MH zPtqO=)X}B%q{}pykkXTerhLx>2M<__KG4yJ`E1q&{(*7_BM^BGVq6GrOW*|xUZSiA z$UO7`YsFV))3jg%E2AnyVQZ!KJ8GX5wNBhLXfq0@RU1it{vGIh!m6T5)3l8^Xw^pI zX2iuf8o5!jgpfF!jp9d$?) z@VA(nY^MsrSem-6Fa3c6OL|i zCbW3dcZI$yyrVj7>>pq3Ef0*3^0Nc8yktaj)*yb}%FZHz+31A^vbgOP z6Wf3@n-JX&5sq~2fmK-9m8WXvH%xae92h7L#f3kv?6#p={6=UxBH2Hx;e-icMUk0U zxil))QCM3ykf7dZuXaLK*@+c;!mim^GoqAEM^bFu;;MnkCMgS9q4{DSsbT-}^aw4i z0y4W0_)~T>(L)E12~_WOSL>b}AoOIx1GhZTJ^A%@z|9gVA?elVZN0rXwB+VeNRM1T zv&EtDD~IknqHkcaj%jp2QWRueE_)e;-45s)b}ASeWxt&EU03(Ypk6^aT?VfolecsL zpEm=wz?{OA0EM?Z6Fw1LXimCd)Q@gIOF*&~&c+1bJfx#LoM71J@F`q#&OhI#>BnSx z^lr?!T8c;>ApLzz^rmbkeBCHCb>9LPzZz^Nwhwp=Z*z$2;jbln2$H zEkos8RYWv9pX+9_0Q%_Y;TK8wOFy84u_qyRjsPJj`Cf_ea%}CnJ#1Wr5)5yjbJPn} z7*a{p>Q2NeN2fmxsx{CQznDbrQm)Q3k4a)oP{c=7WU7rVse;CVEGd|XRYjP)q!tXO zTsJgOz!x=3b=*-eCE9W3ySwI5$xOXg!-qbn9d&G`{z`kP9nMzTvnOXO!O4@I%GJ&+ zyxpMtYPVjm)jMsa4#383y;`fDs)BM)I4Ub1p~l=wiNh1e6!%h#spsE=Nmb}}B)St~ z!(kwe?>Fv)SX&FVC4_wcBYr#Fjm=#Qu6-T+arwrZcfS06{?EhPKQTk+wH6J$4O&a< z&~)2s4PtATt&eD-r~=KD$|jT*);0$f=rgQdYYEcqbBwwc6j58yhzlXO|6p9T-@PiW ze`X)~pT|wB(rw26-7d2$oehTu!TQ_^G>4W~m6%WsL$Sxp*uP&yIk1TRU%4Cs2A|Ry z?uCeBQb9!J;c%vF;`jb9N-gjlF}@bk*or_#_9E<1Uxwh!yKv3J!u5Ih=ka_4ZeBZ? z-~N)V0?s8JSV*>`ItOtkdx3f+mYCxpaMGEB$B649phV^onUQ3=@H(cLYZ0-Q5oC2M zVzCoRv7On*v~$p=v1~a-o%WV=OVZQ;x4i?fr+@>n+7BTw4+(fI&pNgMk(KXb@u8GM zrjzBckUK|S&q$=;W4Os%=G6qoodk+G#Eec3#*8(lI|pd2R!23~sTgtl$P8oOU_YId zv-fO+`RiakQK#V)ejq`pw}|u)a(l;6{Cj;>z(eL6EXBjhx&w@mVM!(!vC;=VcnSz> zkOJkyVFq6}GRQ-GKN(L3t!EGL)5;6d?%iibtaa3P*w#9Or)!`(xZI$iA|l8t7$m;6A~KvZ@=8%VYIW0MOIAe!${{vd^4; NS{3|X?z4=6e*igmpELjf literal 0 HcmV?d00001 diff --git a/src/Libraries/Growl.CoreLibrary.dll b/src/Libraries/Growl.CoreLibrary.dll new file mode 100644 index 0000000000000000000000000000000000000000..5e67e08f40c03cb8e76163e4d0824db30faa2486 GIT binary patch literal 17408 zcmeHueRLGpk#F_wnVt`gMw$@_FanRvhX)}E3B-r6!3asf*a&1KFvK`8l3LQ3(X`w> z0t5jIu)V?9CQf2<$a4Igwd2H2)(QE*@n*d*_Dje*8}G*CWZ&9xNE|!w#c{k&cKxzR z*4eyYRrg54N1Wum{ITzxZJ6p?b?e?+w{BJ4y4|gg_k4hKBJ$z)+uss>33t9$34C`j zhU(~*e-))Kgr2YdlD7W&>h8gelNh$G0XsdE=uPKxRzA^VChU=1B9lwBZR|=6S$$@G zX=!-2*L7z*(RxiMtL3$>!e~DrRb8T$5M2w3;ZhI22loViJMkkbm$Gu@W&+DE*F%7y zKl%n?UaRh8R{lS6_fRI`N}^vGcqiu0in#b1BZ`3bv#mr`7uUTTo*)Vq)dzvEE5hsZ z=H5K;JC*~WPUZ@^i?0M`TW>pdFNh-BP84{eEAcD3R$;m7Z8K|uk!7VZ{J5{x_!V8N zE}>um)+;WSO_85ot|gj;Ur4AEpflliJ3+a8>G~_)yX=A8=Kp->`Wxpw+I;p@$XEJ* z9(v+~&z_yKW7}7@F8kZ6FTQvEKKtCNn$uIByy{f;%#EXS9=P?EdtW%#pS|bqzkL6z zBO^;cW+Y4Q`PQ9dfAi*7J{kE*{e3CpJ@dZ&sgrO0)vLdbe))#&O+Re#?S5v<&+)~k?r~;yCM6qO?D6A}?;jodMgj)?2*Q?}Yt`auG zs^t3RN>5_yhMt6;jhZbgITd83AAo82lWg7OL8SvI0E8Nj3G!tH3zMa?~tQ`~A4<)+}y2j?HH5R=u{;trmUhqE<_)Sf}Vj zbgn1ofIF=A!*6}HhLM~L)NNZ~>gsfq! z5ojrlBqVDcHfpyS$%UZR-l(P=i1M_IqT_IdPsM!J z5+=snW=pvY_wji>oe$4dmD1;Vs$qMAz;x_>3PTOrOvQF+u{Q^!@*i3Xf*?S*{J*vZNg@&NX?`$kH$6zRq%EI-SBX= za}}GeVgF@eMq&FI6ibYNgP;mUC9lD4E{nx8=Q~fC?>tMs^9*aQg3qr2XAO_>K8%5N zjwuU4He45(WPb;JI@bZ&r;@91t5uU~#2v%)+X62{f>)L*}D27VuQ~V!jtD z{4xKP;YFxg4bt2xrSsJkUM|CRP0YBJ>2CF$lFEkDUJb{I6y(7E5t|fNwW}*5YEEff zNr-UT(5NJUB?~0mQMA?o1gy1y;q#H0k7I_bN>OXbjUTWsEEGbCqAO_f0(YC>n6PAp ztKaFEJ3NNtzKl6TRXW%cczFUz_=yoNUZwN;-1BU)g+9wDG}Y~gN4RP>>1-F%8+>#O zJXk>PGl@Bc>-H(hRb+t&L-5ta|1yOo(n#f zL^P-&obiqosw(Jj9!+m^$K;y1Nvd{rsS{k61&irPC?i}~u3Mml>w>zq1@~Itl+yD{ zRT3U&gyH!JKSqh}-Xj?JCh(M=ubgYgG;BIR#ATsj?;{YbkzBv|}u-8@uDl3BXZ;fFcK3Wp6ZU)iX z4iE`ix8PP0n%@`;S?@)$G-U0-tuAnICvNkhJ4P#f2f4S9l?DQH?%`XA)0=SJS*$5< zjGmTb*z&OY!B_yh-hHU^v(30hFP$i>56x;L9%2Hik-=&_f7n1P?*xgobPih+gch9N&I-oeqzX+&HGfI?rT!F!Z4kBd#TL z=*Hb~Ebef8R^K;jR;%PNXm!{kZ^M1A1k)yzkV$!|6Gthd2t}lltpb|x)vUz4xS%E- zz@8xUkvr450J`w4k?3LYI9L^!uq~)0yxDM& zI~ZZZ5uSx^g(U+Q5S9q*p<_K@;c}_k?P@>rK40A`Wg$=+wNtTU^9&_XOU?u708&KX z{AtQ!71YL*l3tVO$*sa(%{{37%!irFT>_Jv2XdbBU5tiZFNOeM^J3aQMZ>!6NU|%J zOoGN7)aX_ouryRRSinbsSNQC8;|<`M)u2fvDY3r*dc?4HgJSIgs9jKmj382J9I0!k z+08l)$Nbh_@ZdID=mGl-N28#-P2kR$F@n&hRT$U`=EjUlYacf&FaeA zncM(0Kr}l+^tTvf*5)qy=`8o$IBV_Z6xNd70X`K*HEVU2!;@SJqTY1NnNTPU^w)D1 z5nPi;zX?Cs2w`!k8$Y-sVMsaJa>!*Ktcl#Y?86Tsf}j8?GYw*l*JE;0<{nmPOEiPp z1f~R<+RdQYQoa)~Odr*bgYu&G*MPlhoigZc#jP}*;V!^1ozRcy20iP$S&PyuzH>f< z=K0sDFfH*PM{Pxb;miQ@|1@weV9=DHKWI?Bz_kMV1RfE1O5l?M&j}2N-T?nhfwduS z+b*z2;QK>I^ka02y^Q`Y^r?_RZwQQ(>Obmxbp!q5n9{ zv-_=-BPHCbQQ-0t<{v7#rNp4!0{^0fwe*C*ua>Yp?+A~Iur?|qNAxgV4QS9}Pz>54 z@cj|i&!-~~L=5@`%Ftmc!?3`~fKh5IJ?D$k4S-=fUHYNYFuf#@q8}? zLO7>-*lOvs8rTes-9!6xP^+qj53IFYYtNe#S`G%kQzw3V- z@Q3~+~>9Z3nj1!@`O=vx1$VsVWWZZ5Ip9QUh35?J6Gc{;B^M zUZe-9RIt0~u(}f`jOpXpTG+t6aqMoyn6`23IP%{7IQC)K!z1I^Nvz&E4?7CUqV#>i zPS6L{gTUT$>oD7gk(HDqZbC1?Z>nd2wRzY-0xPFIE=I4auS>k-sK;9RrbI`^&T4O} zy9v1=F2>6AbFiZVHeLTNEax8Sh1)$0D{Gt0wRZ(Sr!Ur~(RvSiR1={_)hjsW?1Jmco=#XVIu!vx1={dB! zf<7$R3Hsl@KJ5w$&SlOM^tNx8Hl4P6nC`c6XiHwrb@x-bf3G%!J}KAJ6w+I`i3Kd{+!OzO_A z`mFzPZ4TWh*d3zJIdsBp2kZ>$o^-L`oBnQi@qhO)WjqZ}{kn&h8qWgbtFW2{j92p! zP1wBEd{IL(Bb;Y7Ud=lCmQx?kf(@#C@MqmplD9ra$+IUrKpz8!XK|{vZX(4rb z*b(C=+9KK}*da)LH=@qqIQC0z3GET=uHX|!H!Y>xJ?xBeH?ZR#rm6qXmeEH%>~D-; z0{euAecf2BHPcfb_JUw%J?#5}{gYs4>2-|IOmDk&^e=+da?%Zdn5A^pOiklhNG+#p z$FXvC4ecDqrl@OaXdIiNR?z##vDs=R{Zz28(p7;5bsc@1Q(f_+hiMf`8Z`ta;A9rvVc6+sCHG!VLGZEF>L*QZB5BR{iwF3#MV!0hf7ZCAJgtDc@Xeq z$;b7_v`>^guAkOEUxMrj{6Ep2(q1U}jQ*7NO34Z>LvNOx(Vu~Y-_W1aqLGK`1(aXb zU(^;veyG2K^4(O85jShqv^KKU_qxO}r`l(v<=2H01+SUXC40Yh|8=}*w}?(kc_NurrX^=xU#->808 zTJCRFbEB317G*}O{8i*c8~it_+oOy9N9msEa{o5Nic{iO_v&xsM(`se;4~?hP z#`5Fzl-dDGvy2r*MiWPtk)S64XVd2alX%A%r3QKhu!+jGdb)=81nQAt{L-jLHn|Gr z=>libO(@S7xQK2+c^5qoc#QrHuuJGS)59pYO4*^8P~J~J0z5+h9C(ag)&3P3{PT3D z|L5vz{R8@6>*w@0^giD~--mpk_x+Ra7rrik-v7AqMdPc+j}2t=h>vGg72=ZyN&S-f zmh-a|TA=V01aD4oXr^X`LoTfp$}PUNXp|8+BJd6$bACkNqrMwZd&buZSYsu|`T%YN&)Ane6Up7mt(~h~M>C#GCoymcxEuBx(>e0NpdL)zWGi_>3 zXR|%&-d&qaXC#}aHnV4BAeHO4=q5XpH`{lcx%|3xt}hGLHZyPb<}I7nZs_jB@!w1j zZ8Fo`NopuPV76Mh-KL#qv~zPllg;Earb8R7e5OCso6cvfTw$y>Giwf{^X6qMWylsA zPZloM^a6o8)A>Pnq)~$W)`;C}(oJShYc>P1+xOCt(`(t;Ob>O9I(c)5Hul_#8Blv} zWQaO2UC8C+$E9(Z>Qfu(g2{EHZD%l@T|K(V>@Re{Y7rT|HXF?R#K7pk7jN&OFS(`K zcC6XBsiURalcK)M>>Yt}N9$Yd(cwIQ128-|N*!&BX{c{8W%{U(7pY!UJz(Z{;5iE4 z)|%E0bfLuQhX~4V{A78s3o_8qQ{VGkF5)wUaifwgSH=c&nAoLM2!n zr(U|q^wRo_li%4$J+KlkQpQ=I$>+0Xd#*2&&QZ(ou$k+_fO)nfhYRkrAa|e^r)$u% z^Rzpi9Wi(8pw{)N)*ApfcC}M?s-wMabB!gw(3f$Bv*}UCL${c=1I19}Ub^RM(bC59BNdM&!_%OxE@CvKOoFqQNd6sCW?9x!|zrK3U{~ zI_>lxp1Z^n7j|2&g$ZemZ4F(7Znm>7BiDJ|vZbuIdUsJ(vvm#}(l zMJ$+BSGwPHEqntsAnwZ)SZpya<@TI2Vw-IlTjKs``(A_thgz+n9`?==s6WGzpVC=u z27RN29iR{6y1|$Q$W3Lj>C~zUKwyPu0{^8_o z9ra!qVOQuzcV>PKz7aFU5c7EC-ZO%Iv(Uus_kuSS9IiWqK;1IVSRi-WNE&+cmsYfy zPOqIA<_+M|N~~vpW?%%{%I~Ni8cyd%FV}8()XoeHUS_;*8wtZu8eVmYjIA(!SldKJ zVV0g^#L=u_&wa!Uw`80QLh3}5wIi9n39K-CPoA(?wRdr23PC=GBx zpJ?gQuyRPzurXdFKip;*PG%QR00bFelbKELm69{joo5l;4plvzQ57lM>%E&lkCTLh zEk^vUd(ATVs3c?XA~zxQd`W_+WQY^a<&_|o#HkCXRA?ufD9osPklmff>#%Ye&IsEj z2U(YP23xWN7LuF6Ar2G6FjgiKB1fLHDzqsio*c^|-g>x*jbul%omTV%*bn@A7dC&4YB8@uI5F5wnUf`9j7ck9Zh z?Yyvh1n3+Toz)sM*(z|8PSv}I<&qoDk!$>x}(QY3a&X0O~0ehts zWlt6rGRYf@i|k*b=ayccwiLS%W|4DSdvaMT-Pgt`H19f{mV*r#SzJ+$03#Yo4^yfa zWH^Y2IqNNJn2$o97^%+POOT-K5-EykT{suHwD#LZ(%Er8N4ik&r3^)(gT_fn6Z+HG z_hAk#+3dw+Zj#+@gT*;|A+;)!MA*E63qfN-x(g&h2-$6J;2;LS z&Zm);vorCKDL%1560aXO_rswJVSx{K1rzmbZ~RczY1%^>hZA?KjCazSpiOu{p{_;J zMA35&i9)824U9e0-M1OS;&Cp((v7?EL`l5Ojaw77DI_3Rv%T&_+)~O}JvyAmLdem{ zqoH9RW`n@%xN0uKJqwv&5e^PJ5;s^yZPpMpM(gtV;o_7BH8+^%a7#7=U-PybIrm8q z7ZBJ*I?{VnIN*09`w*9D-#d(aud$(lS0s}|NaL$+FWxc?kWCitp)ATafgRWgO1&sA z$D4))c&gMu2T1ep#k&QX(M22av;^lpJP+N3Cn?+U1f|de9)rZ%@ZJ=;5&BEx=^#EP zn7kHci+X@(!R_`&3np5vL9LDcGL)k}k;S1M=z9csPN)O;C}4uW9+K_Fk17^G$|1B_ zj&TO1C0)~vl1T|^-G`EmQAfRA65z{&g7g;c5+Z2=V~l_YUqp-@ZAB-H^r13`avpc? zBrhEeNjKcN1Fjx$a7{h%_2BK52_^t>+?PQd@GVEJJLLovoWQh949z`rKP{KxZDeH+ ztVewgi<8H69B^9H517IW>x)NVoE3MWR0)iNaEZr;JOc}`FdwGlNP>Rr@g!@5)D1&k z3rZaYAFJm!%r7G)?l&(yX|!RZ;92ntc6U}+leVk#|Dm<3l@avG%Rhjgi)CR+-LY6J z7;EfE@nC6)$qHgs;h}~s0pBg)6BE94LTqn^)h`~Jm%1P7VH4nidp#8t`ezGGL#Rk{S2ZE&`#3~24To#a95f#g1Ql#B#%RV8p07i$HHS^ zBVOevO^a87QH%O9eAU!oLXXdj#_OtBrue-2iCFN5#EzQdNa1NLUZ#zu9;Ejahp?IQZz9 zYo@*R;)Z{D=t2F+mjCv%rQiMb7Y}Z}_X}Sy&wONG$s@Ndy?O8cx_@uq*YFotzIo&W zcU}9)reIUU7k}A#=H)ZjxBAvq&41sr#KZZ|{PV!udv5ETwdTxgH($N&BR8ykaQoli zb8q!C&Girb`46wZ_lc1w>1jW{8yh=`DbMgneE~pB4@D4QnxYq0l2%pDQ<~wQ;rGFu zsxU{^v=$#b9W4ofib7Dq-Z3dmEMDyw`(;g5P#AD>eC#O{rE`2J1?wAoMi4__*bjfG z;5QNRv9G!RBjuVtlgek})x=Ev2?Y!}7|`QY{Lg2^$6k=pUtq7Oib5tOt2Fk#DEf;p zj+O@eQ83|uRebDwfrJi*auo{b7~mEBXMc!BgWw%|Gd}iuAfQLV|9YQBJNmq5`SnGQ z{1Ss{2Y-cT<`TA>@AM`1;3StQ;vIi#S)b_4nrX*Oj12eT$dUhXa_)>7cHHFhZ=vZ-Njk-i!ifz-s-Kf-j8yimiHvUxlFpM)AKi;nSkAL;l#I zQ0!2tEKa;*Y9NIAjyPVWwn=L#fty!?Et}$pVkH3|m{!COO%`K@Cqan{%M2Yl5ag=> znh1osC;4BEwiu;~3FCcWbT+aX_?iw9#}2JHG^Jh}yW?Fl+3|M1=JHbEF4v29RTSq%MbFZu>BYT^mozpnYBC#^HILn^ zb#K1?kCS9gHa+ks6~fOwI{46uym05k+UV@KI!qctED-QT^%*+*So~0mT^do0m%W1* zBHqDv*AWK-(v1RdDGLPRDeP}-H=E;!w&DHZ74;k1yT_ld)fRNeU%zV99i22@#phzY z7vQwJoZBSEYZ6VB$YL*f6Nisxd5@xL8co8xETmMu#6*DY!6O)p#0Z}v1cF2l#W z8U+?&;hXCl@$IWdenIdDGMe{B5(RvVi)$u_y7&m^L!lNB)k0Zk4qharF zO*x`hffm_@-!&ZC+q&j;T~&Gf&Qy}$?e)MigRJ{i_GnKLc1N0#5llQT3bKd*TYlz&v|v? zFFOiXj?0MxcHzD7_oNfl9e9=7md$qXiB3G)H06yhbNqG=`r%KY|Lgisp#lD?7vHrb zyT4Ez_A0^&_)(ZW12~Pv&?fz@RaThwkL3c9R@-cY`2Q?mJ6f<%U zF5JH<67eyHPh@<8vT*$5Lydc^yA|bL)bO<)-^XaK)d=HmE8(zWRudf7Vz$?LjzR@kRZ}j@- z6=c~9Ygjl&Qqgmn-=(*SIkd@IxX0Q)98Yx0(-n>QX%@S}u69~ZC0#5xeZ u#o;w;!8-8)7_aFt3w{9cyV~&ju?_you1@TI=xl8HpRC9K>gfL?4g6nSg>ohU literal 0 HcmV?d00001 diff --git a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs index 88fd7a337..b14991721 100644 --- a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs +++ b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs @@ -2,11 +2,16 @@ using System.Collections.Generic; using System.Linq; using System.Threading; +using System.Drawing; +using System.Drawing.Imaging; using FluentValidation.Results; +using Growl.CoreLibrary; using Growl.Connector; using NLog; using NzbDrone.Common.Instrumentation; using GrowlNotification = Growl.Connector.Notification; +using System.Reflection; +using System.IO; namespace NzbDrone.Core.Notifications.Growl { @@ -21,42 +26,121 @@ namespace NzbDrone.Core.Notifications.Growl private readonly Logger _logger; private readonly Application _growlApplication = new Application("NzbDrone"); - private GrowlConnector _growlConnector; - private readonly List _notificationTypes; + private readonly NotificationType[] _notificationTypes; + + private class GrowlRequestState + { + private AutoResetEvent _autoEvent = new AutoResetEvent(false); + private bool _isError = false; + private int _code; + private string _description; + + public void Wait(int timeoutMs) + { + try + { + if (!_autoEvent.WaitOne(timeoutMs)) + { + throw new GrowlException(ErrorCode.TIMED_OUT, ErrorDescription.TIMED_OUT, null); + } + if (_isError) + { + throw new GrowlException(_code, _description, null); + } + } + finally + { + _autoEvent.Reset(); + _isError = false; + _code = 0; + _description = null; + } + } + + public void Update() + { + _autoEvent.Set(); + } + + public void Update(int code, string description) + { + _code = code; + _description = description; + _isError = true; + _autoEvent.Set(); + } + } public GrowlService(Logger logger) { _logger = logger; _notificationTypes = GetNotificationTypes(); - _growlApplication.Icon = "https://raw.github.com/NzbDrone/NzbDrone/master/Logo/64.png"; + + var icon = Properties.Resources.Icon64; + var stream = new MemoryStream(); + icon.Save(stream, ImageFormat.Bmp); + _growlApplication.Icon = new BinaryData(stream.ToArray()); + } + + private GrowlConnector GetGrowlConnector(string hostname, int port, string password) + { + var growlConnector = new GrowlConnector(password, hostname, port); + growlConnector.OKResponse += GrowlOKResponse; + growlConnector.ErrorResponse += GrowlErrorResponse; + return growlConnector; } public void SendNotification(string title, string message, string notificationTypeName, string hostname, int port, string password) { - var notificationType = _notificationTypes.Single(n => n.Name == notificationTypeName); - var notification = new GrowlNotification("NzbDrone", notificationType.Name, DateTime.Now.Ticks.ToString(), title, message); - - _growlConnector = new GrowlConnector(password, hostname, port); - _logger.Debug("Sending Notification to: {0}:{1}", hostname, port); - _growlConnector.Notify(notification); + + var notificationType = _notificationTypes.Single(n => n.Name == notificationTypeName); + var notification = new GrowlNotification(_growlApplication.Name, notificationType.Name, DateTime.Now.Ticks.ToString(), title, message); + + var growlConnector = GetGrowlConnector(hostname, port, password); + + var requestState = new GrowlRequestState(); + growlConnector.Notify(notification, requestState); + requestState.Wait(5000); } private void Register(string host, int port, string password) { _logger.Debug("Registering NzbDrone with Growl host: {0}:{1}", host, port); - _growlConnector = new GrowlConnector(password, host, port); - _growlConnector.Register(_growlApplication, _notificationTypes.ToArray()); + + var growlConnector = GetGrowlConnector(host, port, password); + + var requestState = new GrowlRequestState(); + growlConnector.Register(_growlApplication, _notificationTypes, requestState); + requestState.Wait(5000); } - private List GetNotificationTypes() + private void GrowlErrorResponse(Response response, object state) + { + var requestState = state as GrowlRequestState; + if (requestState != null) + { + requestState.Update(response.ErrorCode, response.ErrorDescription); + } + } + + private void GrowlOKResponse(Response response, object state) + { + var requestState = state as GrowlRequestState; + if (requestState != null) + { + requestState.Update(); + } + } + + private NotificationType[] GetNotificationTypes() { var notificationTypes = new List(); notificationTypes.Add(new NotificationType("TEST", "Test")); notificationTypes.Add(new NotificationType("GRAB", "Episode Grabbed")); notificationTypes.Add(new NotificationType("DOWNLOAD", "Episode Complete")); - return notificationTypes; + return notificationTypes.ToArray(); } public ValidationFailure Test(GrowlSettings settings) @@ -68,8 +152,6 @@ namespace NzbDrone.Core.Notifications.Growl const string title = "Test Notification"; const string body = "This is a test message from NzbDrone"; - Thread.Sleep(5000); - SendNotification(title, body, "TEST", settings.Host, settings.Port, settings.Password); } catch (Exception ex) diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 88d5299eb..399c6735a 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -52,6 +52,14 @@ 4 + + False + ..\Libraries\Growl.Connector.dll + + + False + ..\Libraries\Growl.CoreLibrary.dll + @@ -70,12 +78,6 @@ ..\packages\FluentValidation.5.0.0.1\lib\Net40\FluentValidation.dll - - ..\packages\Growl.0.6\lib\Growl.Connector.dll - - - ..\packages\Growl.0.6\lib\Growl.CoreLibrary.dll - ..\packages\MediaInfoNet.0.3\lib\MediaInfoDotNet.dll @@ -661,6 +663,11 @@ + + True + True + Resources.resx + @@ -795,8 +802,14 @@ Always + + + + + ResXFileCodeGenerator + Resources.Designer.cs + - diff --git a/src/NzbDrone.Core/Properties/Resources.Designer.cs b/src/NzbDrone.Core/Properties/Resources.Designer.cs new file mode 100644 index 000000000..a995b6ddd --- /dev/null +++ b/src/NzbDrone.Core/Properties/Resources.Designer.cs @@ -0,0 +1,73 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.18444 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace NzbDrone.Core.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NzbDrone.Core.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Icon64 { + get { + object obj = ResourceManager.GetObject("Icon64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/src/NzbDrone.Core/Properties/Resources.resx b/src/NzbDrone.Core/Properties/Resources.resx new file mode 100644 index 000000000..d22523afe --- /dev/null +++ b/src/NzbDrone.Core/Properties/Resources.resx @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + ..\Resources\64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/src/NzbDrone.Core/Resources/64.png b/src/NzbDrone.Core/Resources/64.png new file mode 100644 index 0000000000000000000000000000000000000000..33387d7f9372b0951d676da70a366cf594312de4 GIT binary patch literal 3582 zcmVTbCem6VE_Do_KvSwY?P+AWiK0-gy5 zMMX4G1QbvsB18n#z-)ib-~awI3@|hQpuDQC>FNLP;~o9p>(}qsP%A@aWo0n?LGfc{ zgw%}xo+e(;kbZMmDZ+mb509MIT%V?ukd9(Mk*q{Dfv6==ArWRjEBhEhD%vCg7}DVI zd{(B}0O{r+g_RAqk_?TF5MM4K{wx7fu|O>$G%Ar_AtC=fVLdA=t=$?LD-nkhOO}*b zTL2(Gju9cl(vEgkAP-SL--eJUN#~@qwXJJa0ywmHN}eAVm;ChUQ)-JaFE%!gtudVy zPn!}TF)`7T4Z0VKZhLAP&7LzClF+7*U%p}`rR~^>YIu(x{$>-w&J3=5ZogBP?(5?N zn@)j&Jt_Z2K1Gfj-)4xgc*zpV&i;X%ot=5cT?V#tJKBYn|ytJsGxH% za&vX<^0JHln9@6UcGlPZT5FXAV9!6Oco0>*_e=Wu%n`aha*F({xTJ(Kj~{=olEC&n zrS06o*CN*BI`c2Qel2w~mEA8B*2;1T_{UdYO*@x;ZiTzMJ2|v-Aor@Dsk+{dI!1m# zZiN>J?I=|bAJT~vC!e__V9y^qbeJ3*9LUQ{%S-3^YpE*d6qSFQM*jYOd^@l;_6i9J z(OkcN-Fy=XJI{(fF)>Ncq(C1M8mf2q?8xihk<;}(Ki$gfXu~tq19}GP(=#&k=+~Mh zH#b)wK57)7bJ+0V{1;_J(l>l<#_ba)MeA?gyotWymTUnoHqp_OXj4K0)zs9;4{9>^ zQI|(|sr!;m2JJU*-J*qy7SWWc)94nfx55F7)~t=EnX_W()Tz_Fty-ENYZ07Rwg&|T zQT*C9#2h4!6C1;`MNiO_dwb~cVOqR+30E-1#SQx{@ZC97q4T4A8y1ms2j>RjRM+r# z?w6O-z>pA%nKg?qLJfeJP_}2zoS}lk0zQXwKA*X(s9oN7boIb4@?moWO4u4hLqlov zri}u5*==V37c@x#>0oo-)M;)9v#}dCCeXEO*GZVe`vIZk)<29K_pCQ)SJofbKBkC> z2pT&!g2ILjF$-xX=5*@xX(}ozqNFWbO^%DY@0?Yn&HsTee!Exhi)ZcIJJJ5VdyJ76 z;Lq9%#h-S@x}~Y3EVcub%3P*-0bW`y6|?QYCta3I+SD(&2%^256-WWz2bU6)lIXyJ z1Egh&s^UQf1qb&hA0JmZy?oGRg&YzSh{@T7#|n?A3dt3wAAg*A>T*}luFR7^E@*tH2C$wvfVAt%4D41 z(O^?2e@xmj?{Gv=fCP&8uPma!s0-xz-j+0k6& zNvY$M5>Oz;?ab21uMP~Q&Yg9f+u(GsmD`9y-{8;hB`l`E2l<@40B}^)p{TH6C{suV z5LedA@0ZK(ppI>WIc|qfVZ@D=$EU1=Tspq{K8s66`mv+bwQE;Pj?a*S3Ohv%&(GZ6 zpmIv`mwe$^02Y6B`3JHj=wjE<1*fjER!+~zl*J!}5D25MvM$6Q?}$2nmB@qhzNNXG zSQr<5qoboOL0%l6qm)}(ogWUvR8w^<0?<-Ir{nI(MCch>N<|7RGh4 zEtGY8R}XUT86+bQMJwhL<9_(T3~MZGq`Ud` zlkVJO>na*sJWg?j=MKB zvh7WcyKL!F19NF146w6?^8>n;p<2fY-qha7+M9qyTNuAPQW!zeVKvIP4wgg`2rG z5%ynOd@q{|PwX8j zaN+0VI zag4`BJ#0vrS^|u)Qybld>#7t};ROO***U>ASj8fJ0vc@v5%%J4Z%`lAr_6S02Y?=c z4aedjrl<=){xUl(X;qHjXVQoClsQ#m4&gI^2tEA$)h<6+l@e4sMoK%+UD)f_$gxW| z)f_5!(l+T!yzs&cs_zrp*@6ILM!!Ml&YzdHG~8Fz?SobCQBFjAN#sQwK-A6j`&)Ml za5Ja%l5Mln?;l{JXppcdrp^{>0b9W42?)YVLzqe}Jh@~0@S3p%s7^T8wQHArZpR7E zS2_gQ|5B!UfptHf;~dAh!n%lhettd$1O%uVzQWEHR1`LvA9I;MAhrYU6V$@(!@C=g zE7kAZy{mTk96PlVfcTx#HC5W|x*yM}+6FimxD{M5@G+FG@Z;KAo9KWGY6i&9zrpQ4 z76$u_IusFu3j59P48mNO zPafl31#*ZQ0Z}E=boLP4ST=>O&I~8#2c?|rVqBkbGfalkFyHPyd#ttqNU#!)PzG6% z<%M{^sn8bA{>3nZ8JS$1m0>QJwW0&NOa?b96;WX^me-7>^khN|b$9XRAvfds5)+g7 z4U`qIPZ<(JfN-xRy^$s}njLtQ;VJI8Oo$`r;nJSpypU@0FByc(jO)hzmF+wv#tu}j zGgmff{@fE(wdK=BedE`zrB?@7>~~IQ5|Cn5SX{&dW8>lsIEj##h~7e!eKoZ*hg%A5 zHCM-x7(rI<1hMU7d=-bQu#96zEsh5oUyS_Sl2~ABTB^)B{3?;J+OnMQYjJir4rd8v zDZo_7OWBS{Fye&#+`;D1#jZ8z17*0QAwS3>@i)F0F*`WAaM5Dg$=qMKy!_NR`A_nt z2twDItb_7_1Y~{rWI4L4MBK(DRF$db6M?}ezP?!EM@;bglz8D!c zY$$ymA8+mnvGLWI)R59rPo$-sI(n(F$#O=kkm+%jizs6xMalIwPTG_6A zE+hf^rSfr|f$woSFVEa`ofPHmu<`Y{rz8cQO(Fk7cDC&G!9KtE@g}-??7!q(Uc${+ ziO3&N>}A{#q20mJk;X+uk&{zKuYQce&o8lsPdfGeou z;-X*QeiRlqgon?}0dNss9>!a|0@c^+o5~MB zPVowJ7I0pfmosJRRGx41N>GrTd(-!`?Q%|zvK{qKoxSy+EL|pYb5s}PDvgPVFqlKs z{iA2gIZMiC140JsnU|;>r@*Wf8HoUh6yv1fi6lfMFBk+V#>a7o#yR)6VQkRdgJNQ4 z(eK}UvpEs88ldTM6<1$hZ;+ovp`)qJqZ8R5*>3PYE^QQPG6O71tw&Py+>}c}U(}ym_MJsF9;+&FaJ2%(&5Lnf>4G8^4%~R20R1#>`~(Ac8|Md& z#x7@N#GsKeF)@W4J-K(Um#2xur$rxqM6t2+s4W1LBeK_E2H`m}a|vZP^6BH+ z7Q=lOeKNz8$~s2jxH+?D)8zNwqqYQ)gm>SY4C|1xDPhBcmN;(}0RV5kJ#pH$ty|Vn z>wX$%tt6~uW_X1qeXRXx%1??Pw3Y9M3Z?UXhBZ-PYfMogD~LcWu*JoSN?0#BIT_Y; zw#A2&*b3|D*?%~hBKh`(Y6h|Or?Vi!{8rQt6;d!mHR3iWfDtjo$J61Y{`y@YoeA&M z)@#+Ywwy|mAwHq+FG+`|2?eSQ&u2>YoYww){(k}t0KEI%guUx~4gdfE07*qoM6N<$ Ef+h&)O8@`> literal 0 HcmV?d00001 diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config index f657add80..e035259dc 100644 --- a/src/NzbDrone.Core/packages.config +++ b/src/NzbDrone.Core/packages.config @@ -2,7 +2,6 @@ - From ca09588390417558a9a1747b750ab0720e8f9647 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 9 Aug 2014 01:27:53 -0700 Subject: [PATCH 056/105] Fixed: Remove GDI+ dependency with embedded resource --- .../Notifications/Growl/GrowlService.cs | 14 +- src/NzbDrone.Core/NzbDrone.Core.csproj | 12 -- .../Properties/Resources.Designer.cs | 73 ----------- src/NzbDrone.Core/Properties/Resources.resx | 124 ------------------ src/NzbDrone.Core/Resources/64.png | Bin 3582 -> 0 bytes 5 files changed, 5 insertions(+), 218 deletions(-) delete mode 100644 src/NzbDrone.Core/Properties/Resources.Designer.cs delete mode 100644 src/NzbDrone.Core/Properties/Resources.resx delete mode 100644 src/NzbDrone.Core/Resources/64.png diff --git a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs index b14991721..c7c943c5b 100644 --- a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs +++ b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs @@ -2,15 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading; -using System.Drawing; -using System.Drawing.Imaging; using FluentValidation.Results; using Growl.CoreLibrary; using Growl.Connector; using NLog; -using NzbDrone.Common.Instrumentation; using GrowlNotification = Growl.Connector.Notification; -using System.Reflection; using System.IO; namespace NzbDrone.Core.Notifications.Growl @@ -31,7 +27,7 @@ namespace NzbDrone.Core.Notifications.Growl private class GrowlRequestState { private AutoResetEvent _autoEvent = new AutoResetEvent(false); - private bool _isError = false; + private bool _isError; private int _code; private string _description; @@ -76,10 +72,10 @@ namespace NzbDrone.Core.Notifications.Growl _logger = logger; _notificationTypes = GetNotificationTypes(); - var icon = Properties.Resources.Icon64; - var stream = new MemoryStream(); - icon.Save(stream, ImageFormat.Bmp); - _growlApplication.Icon = new BinaryData(stream.ToArray()); + var iconPath = Path.Combine("UI", "Content", "Images", "logos", "64.png"); + var bytes = File.ReadAllBytes(iconPath); + + _growlApplication.Icon = new BinaryData(bytes); } private GrowlConnector GetGrowlConnector(string hostname, int port, string password) diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 399c6735a..8dbf6f83e 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -663,11 +663,6 @@ - - True - True - Resources.resx - @@ -802,13 +797,6 @@ Always - - - - - ResXFileCodeGenerator - Resources.Designer.cs - diff --git a/src/NzbDrone.Core/Properties/Resources.Designer.cs b/src/NzbDrone.Core/Properties/Resources.Designer.cs deleted file mode 100644 index a995b6ddd..000000000 --- a/src/NzbDrone.Core/Properties/Resources.Designer.cs +++ /dev/null @@ -1,73 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.18444 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace NzbDrone.Core.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NzbDrone.Core.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Icon64 { - get { - object obj = ResourceManager.GetObject("Icon64", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - } -} diff --git a/src/NzbDrone.Core/Properties/Resources.resx b/src/NzbDrone.Core/Properties/Resources.resx deleted file mode 100644 index d22523afe..000000000 --- a/src/NzbDrone.Core/Properties/Resources.resx +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\Resources\64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - \ No newline at end of file diff --git a/src/NzbDrone.Core/Resources/64.png b/src/NzbDrone.Core/Resources/64.png deleted file mode 100644 index 33387d7f9372b0951d676da70a366cf594312de4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3582 zcmVTbCem6VE_Do_KvSwY?P+AWiK0-gy5 zMMX4G1QbvsB18n#z-)ib-~awI3@|hQpuDQC>FNLP;~o9p>(}qsP%A@aWo0n?LGfc{ zgw%}xo+e(;kbZMmDZ+mb509MIT%V?ukd9(Mk*q{Dfv6==ArWRjEBhEhD%vCg7}DVI zd{(B}0O{r+g_RAqk_?TF5MM4K{wx7fu|O>$G%Ar_AtC=fVLdA=t=$?LD-nkhOO}*b zTL2(Gju9cl(vEgkAP-SL--eJUN#~@qwXJJa0ywmHN}eAVm;ChUQ)-JaFE%!gtudVy zPn!}TF)`7T4Z0VKZhLAP&7LzClF+7*U%p}`rR~^>YIu(x{$>-w&J3=5ZogBP?(5?N zn@)j&Jt_Z2K1Gfj-)4xgc*zpV&i;X%ot=5cT?V#tJKBYn|ytJsGxH% za&vX<^0JHln9@6UcGlPZT5FXAV9!6Oco0>*_e=Wu%n`aha*F({xTJ(Kj~{=olEC&n zrS06o*CN*BI`c2Qel2w~mEA8B*2;1T_{UdYO*@x;ZiTzMJ2|v-Aor@Dsk+{dI!1m# zZiN>J?I=|bAJT~vC!e__V9y^qbeJ3*9LUQ{%S-3^YpE*d6qSFQM*jYOd^@l;_6i9J z(OkcN-Fy=XJI{(fF)>Ncq(C1M8mf2q?8xihk<;}(Ki$gfXu~tq19}GP(=#&k=+~Mh zH#b)wK57)7bJ+0V{1;_J(l>l<#_ba)MeA?gyotWymTUnoHqp_OXj4K0)zs9;4{9>^ zQI|(|sr!;m2JJU*-J*qy7SWWc)94nfx55F7)~t=EnX_W()Tz_Fty-ENYZ07Rwg&|T zQT*C9#2h4!6C1;`MNiO_dwb~cVOqR+30E-1#SQx{@ZC97q4T4A8y1ms2j>RjRM+r# z?w6O-z>pA%nKg?qLJfeJP_}2zoS}lk0zQXwKA*X(s9oN7boIb4@?moWO4u4hLqlov zri}u5*==V37c@x#>0oo-)M;)9v#}dCCeXEO*GZVe`vIZk)<29K_pCQ)SJofbKBkC> z2pT&!g2ILjF$-xX=5*@xX(}ozqNFWbO^%DY@0?Yn&HsTee!Exhi)ZcIJJJ5VdyJ76 z;Lq9%#h-S@x}~Y3EVcub%3P*-0bW`y6|?QYCta3I+SD(&2%^256-WWz2bU6)lIXyJ z1Egh&s^UQf1qb&hA0JmZy?oGRg&YzSh{@T7#|n?A3dt3wAAg*A>T*}luFR7^E@*tH2C$wvfVAt%4D41 z(O^?2e@xmj?{Gv=fCP&8uPma!s0-xz-j+0k6& zNvY$M5>Oz;?ab21uMP~Q&Yg9f+u(GsmD`9y-{8;hB`l`E2l<@40B}^)p{TH6C{suV z5LedA@0ZK(ppI>WIc|qfVZ@D=$EU1=Tspq{K8s66`mv+bwQE;Pj?a*S3Ohv%&(GZ6 zpmIv`mwe$^02Y6B`3JHj=wjE<1*fjER!+~zl*J!}5D25MvM$6Q?}$2nmB@qhzNNXG zSQr<5qoboOL0%l6qm)}(ogWUvR8w^<0?<-Ir{nI(MCch>N<|7RGh4 zEtGY8R}XUT86+bQMJwhL<9_(T3~MZGq`Ud` zlkVJO>na*sJWg?j=MKB zvh7WcyKL!F19NF146w6?^8>n;p<2fY-qha7+M9qyTNuAPQW!zeVKvIP4wgg`2rG z5%ynOd@q{|PwX8j zaN+0VI zag4`BJ#0vrS^|u)Qybld>#7t};ROO***U>ASj8fJ0vc@v5%%J4Z%`lAr_6S02Y?=c z4aedjrl<=){xUl(X;qHjXVQoClsQ#m4&gI^2tEA$)h<6+l@e4sMoK%+UD)f_$gxW| z)f_5!(l+T!yzs&cs_zrp*@6ILM!!Ml&YzdHG~8Fz?SobCQBFjAN#sQwK-A6j`&)Ml za5Ja%l5Mln?;l{JXppcdrp^{>0b9W42?)YVLzqe}Jh@~0@S3p%s7^T8wQHArZpR7E zS2_gQ|5B!UfptHf;~dAh!n%lhettd$1O%uVzQWEHR1`LvA9I;MAhrYU6V$@(!@C=g zE7kAZy{mTk96PlVfcTx#HC5W|x*yM}+6FimxD{M5@G+FG@Z;KAo9KWGY6i&9zrpQ4 z76$u_IusFu3j59P48mNO zPafl31#*ZQ0Z}E=boLP4ST=>O&I~8#2c?|rVqBkbGfalkFyHPyd#ttqNU#!)PzG6% z<%M{^sn8bA{>3nZ8JS$1m0>QJwW0&NOa?b96;WX^me-7>^khN|b$9XRAvfds5)+g7 z4U`qIPZ<(JfN-xRy^$s}njLtQ;VJI8Oo$`r;nJSpypU@0FByc(jO)hzmF+wv#tu}j zGgmff{@fE(wdK=BedE`zrB?@7>~~IQ5|Cn5SX{&dW8>lsIEj##h~7e!eKoZ*hg%A5 zHCM-x7(rI<1hMU7d=-bQu#96zEsh5oUyS_Sl2~ABTB^)B{3?;J+OnMQYjJir4rd8v zDZo_7OWBS{Fye&#+`;D1#jZ8z17*0QAwS3>@i)F0F*`WAaM5Dg$=qMKy!_NR`A_nt z2twDItb_7_1Y~{rWI4L4MBK(DRF$db6M?}ezP?!EM@;bglz8D!c zY$$ymA8+mnvGLWI)R59rPo$-sI(n(F$#O=kkm+%jizs6xMalIwPTG_6A zE+hf^rSfr|f$woSFVEa`ofPHmu<`Y{rz8cQO(Fk7cDC&G!9KtE@g}-??7!q(Uc${+ ziO3&N>}A{#q20mJk;X+uk&{zKuYQce&o8lsPdfGeou z;-X*QeiRlqgon?}0dNss9>!a|0@c^+o5~MB zPVowJ7I0pfmosJRRGx41N>GrTd(-!`?Q%|zvK{qKoxSy+EL|pYb5s}PDvgPVFqlKs z{iA2gIZMiC140JsnU|;>r@*Wf8HoUh6yv1fi6lfMFBk+V#>a7o#yR)6VQkRdgJNQ4 z(eK}UvpEs88ldTM6<1$hZ;+ovp`)qJqZ8R5*>3PYE^QQPG6O71tw&Py+>}c}U(}ym_MJsF9;+&FaJ2%(&5Lnf>4G8^4%~R20R1#>`~(Ac8|Md& z#x7@N#GsKeF)@W4J-K(Um#2xur$rxqM6t2+s4W1LBeK_E2H`m}a|vZP^6BH+ z7Q=lOeKNz8$~s2jxH+?D)8zNwqqYQ)gm>SY4C|1xDPhBcmN;(}0RV5kJ#pH$ty|Vn z>wX$%tt6~uW_X1qeXRXx%1??Pw3Y9M3Z?UXhBZ-PYfMogD~LcWu*JoSN?0#BIT_Y; zw#A2&*b3|D*?%~hBKh`(Y6h|Or?Vi!{8rQt6;d!mHR3iWfDtjo$J61Y{`y@YoeA&M z)@#+Ywwy|mAwHq+FG+`|2?eSQ&u2>YoYww){(k}t0KEI%guUx~4gdfE07*qoM6N<$ Ef+h&)O8@`> From dd15442dcd3fdd4efa4af85b84dbcf081c84b808 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 9 Aug 2014 01:51:19 -0700 Subject: [PATCH 057/105] Copy logo into output folder on build, fix broken tests --- build.ps1 | 4 +++- src/NzbDrone.Core/Notifications/Growl/GrowlService.cs | 3 +-- src/NzbDrone.Core/NzbDrone.Core.csproj | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.ps1 b/build.ps1 index 0a20c3af3..073ab6516 100644 --- a/build.ps1 +++ b/build.ps1 @@ -161,7 +161,7 @@ Function PackageTests() Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force Copy-Item $outputFolder\*.pdb -Destination $testPackageFolder -Force - Copy-Item .\*.sh -Destination $testPackageFolder -Force + Copy-Item .\*.sh -Destination $testPackageFolder -Force get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname} @@ -170,6 +170,8 @@ Function PackageTests() Write-Host "Adding MediaInfoDotNet.dll.config (for dllmap)" Copy-Item "$sourceFolder\MediaInfoDotNet.dll.config" -Destination $testPackageFolder -Force + Copy-Item "$outputFolder\64.png" -Destination $testPackageFolder -Force + Write-Host "##teamcity[progressFinish 'Creating Test Package']" } diff --git a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs index c7c943c5b..32c81e9c7 100644 --- a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs +++ b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs @@ -72,8 +72,7 @@ namespace NzbDrone.Core.Notifications.Growl _logger = logger; _notificationTypes = GetNotificationTypes(); - var iconPath = Path.Combine("UI", "Content", "Images", "logos", "64.png"); - var bytes = File.ReadAllBytes(iconPath); + var bytes = File.ReadAllBytes("64.png"); _growlApplication.Icon = new BinaryData(bytes); } diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 8dbf6f83e..2f2700b26 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -794,6 +794,9 @@ + + Always + Always From 9eab1459241a0ef5d3672513e3e4e0c0a5d9d270 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 9 Aug 2014 01:53:15 -0700 Subject: [PATCH 058/105] Fixing csproj --- src/NzbDrone.Core/NzbDrone.Core.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 2f2700b26..eeda53753 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -794,7 +794,8 @@ - + + 64.png Always From cd5f404cea977098f60787ec4057b05555bad234 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 9 Aug 2014 02:12:56 -0700 Subject: [PATCH 059/105] Removing logo from growl temporarily --- src/NzbDrone.Core/Notifications/Growl/GrowlService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs index 32c81e9c7..b572747c2 100644 --- a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs +++ b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs @@ -72,9 +72,9 @@ namespace NzbDrone.Core.Notifications.Growl _logger = logger; _notificationTypes = GetNotificationTypes(); - var bytes = File.ReadAllBytes("64.png"); - - _growlApplication.Icon = new BinaryData(bytes); +// var bytes = File.ReadAllBytes("64.png"); +// +// _growlApplication.Icon = new BinaryData(bytes); } private GrowlConnector GetGrowlConnector(string hostname, int port, string password) From a5a99f64ffee4e2e17def85cc72a317d14ec3913 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Thu, 7 Aug 2014 22:12:54 +0200 Subject: [PATCH 060/105] Fixed: Parser now recognizes 848x480 as 480p. --- src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs | 1 + src/NzbDrone.Core/Parser/QualityParser.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs index bef9f4c41..bd8d56fdf 100644 --- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs @@ -76,6 +76,7 @@ namespace NzbDrone.Core.Test.ParserTests [TestCase("Hannibal.S01E05.576p.BluRay.DD5.1.x264-HiSD", false)] [TestCase("Hannibal.S01E05.480p.BluRay.DD5.1.x264-HiSD", false)] [TestCase("Heidi Girl of the Alps (BD)(640x480(RAW) (BATCH 1) (1-13)", false)] + [TestCase("[Doki] Clannad - 02 (848x480 XviD BD MP3) [95360783]", false)] public void should_parse_dvd_quality(string title, bool proper) { ParseAndVerifyQuality(title, Quality.DVD, proper); diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs index 156a17caf..36fa12447 100644 --- a/src/NzbDrone.Core/Parser/QualityParser.cs +++ b/src/NzbDrone.Core/Parser/QualityParser.cs @@ -31,7 +31,7 @@ namespace NzbDrone.Core.Parser private static readonly Regex ProperRegex = new Regex(@"\b(?proper|repack)\b", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private static readonly Regex ResolutionRegex = new Regex(@"\b(?:(?<_480p>480p|640x480)|(?<_576p>576p)|(?<_720p>720p|1280x720)|(?<_1080p>1080p|1920x1080))\b", + private static readonly Regex ResolutionRegex = new Regex(@"\b(?:(?<_480p>480p|640x480|848x480)|(?<_576p>576p)|(?<_720p>720p|1280x720)|(?<_1080p>1080p|1920x1080))\b", RegexOptions.Compiled | RegexOptions.IgnoreCase); private static readonly Regex CodecRegex = new Regex(@"\b(?:(?x264)|(?h264)|(?XvidHD)|(?Xvid)|(?divx))\b", From 6c44121b093777b16ff26d12dd4b527513f78574 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Thu, 7 Aug 2014 14:42:46 +0200 Subject: [PATCH 061/105] Fixed: Now assuming that an Ended series without any airdates are direct-to-dvd. --- .../TvTests/RefreshEpisodeServiceFixture.cs | 25 +++++++++++++++++++ src/NzbDrone.Core/Tv/RefreshEpisodeService.cs | 17 +++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core.Test/TvTests/RefreshEpisodeServiceFixture.cs b/src/NzbDrone.Core.Test/TvTests/RefreshEpisodeServiceFixture.cs index 0284b2431..16de304c9 100644 --- a/src/NzbDrone.Core.Test/TvTests/RefreshEpisodeServiceFixture.cs +++ b/src/NzbDrone.Core.Test/TvTests/RefreshEpisodeServiceFixture.cs @@ -306,5 +306,30 @@ namespace NzbDrone.Core.Test.TvTests _insertedEpisodes.Should().HaveCount(episodes.Count); } + + [Test] + public void should_override_empty_airdate_for_direct_to_dvd() + { + var series = GetSeries(); + series.Status = SeriesStatusType.Ended; + + var episodes = Builder.CreateListOfSize(10) + .All() + .With(v => v.AirDateUtc = null) + .BuildListOfNew(); + + Mocker.GetMock().Setup(c => c.GetEpisodeBySeries(It.IsAny())) + .Returns(new List()); + + List updateEpisodes = null; + Mocker.GetMock().Setup(c => c.InsertMany(It.IsAny>())) + .Callback>(c => updateEpisodes = c); + + Subject.RefreshEpisodeInfo(series, episodes); + + updateEpisodes.Should().NotBeNull(); + updateEpisodes.Should().NotBeEmpty(); + updateEpisodes.All(v => v.AirDateUtc.HasValue).Should().BeTrue(); + } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/Tv/RefreshEpisodeService.cs b/src/NzbDrone.Core/Tv/RefreshEpisodeService.cs index 8db1e864b..46b11c0f1 100644 --- a/src/NzbDrone.Core/Tv/RefreshEpisodeService.cs +++ b/src/NzbDrone.Core/Tv/RefreshEpisodeService.cs @@ -47,7 +47,7 @@ namespace NzbDrone.Core.Tv dupeFreeRemoteEpisodes = MapAbsoluteEpisodeNumbers(series, dupeFreeRemoteEpisodes); } - foreach (var episode in OrderEpsiodes(series, dupeFreeRemoteEpisodes)) + foreach (var episode in OrderEpisodes(series, dupeFreeRemoteEpisodes)) { try { @@ -90,6 +90,7 @@ namespace NzbDrone.Core.Tv allEpisodes.AddRange(updateList); AdjustMultiEpisodeAirTime(series, allEpisodes); + AdjustDirectToDvdAirDate(series, allEpisodes); _episodeService.DeleteMany(existingEpisodes); _episodeService.UpdateMany(updateList); @@ -151,6 +152,18 @@ namespace NzbDrone.Core.Tv } } + private static void AdjustDirectToDvdAirDate(Series series, IEnumerable allEpisodes) + { + if (series.Status == SeriesStatusType.Ended && allEpisodes.All(v => !v.AirDateUtc.HasValue) && series.FirstAired.HasValue) + { + foreach (var episode in allEpisodes) + { + episode.AirDateUtc = series.FirstAired; + episode.AirDate = series.FirstAired.Value.ToString("yyyy-MM-dd"); + } + } + } + private List MapAbsoluteEpisodeNumbers(Series series, List traktEpisodes) { var tvdbEpisodes = _tvdbProxy.GetEpisodeInfo(series.TvdbId); @@ -192,7 +205,7 @@ namespace NzbDrone.Core.Tv return existingEpisodes.FirstOrDefault(e => e.SeasonNumber == episode.SeasonNumber && e.EpisodeNumber == episode.EpisodeNumber); } - private IEnumerable OrderEpsiodes(Series series, List episodes) + private IEnumerable OrderEpisodes(Series series, List episodes) { if (series.SeriesType == SeriesTypes.Anime) { From 10de8087f7ad4c8ca691fa5db9188bc1a26b35b8 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Sun, 3 Aug 2014 00:51:20 +0200 Subject: [PATCH 062/105] Added warning to Sabnzbd Client Test to disable the sabnzbd pre-check option. --- .../Download/Clients/Sabnzbd/Sabnzbd.cs | 18 +++++++++++++++++- .../Clients/Sabnzbd/SabnzbdCategory.cs | 1 + .../Download/DownloadTrackingService.cs | 12 ++++++------ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs index 514bcbee8..13f7e3d77 100644 --- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs +++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs @@ -355,6 +355,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd { failures.AddIfNotNull(TestConnection()); failures.AddIfNotNull(TestAuthentication()); + failures.AddIfNotNull(TestGlobalConfig()); failures.AddIfNotNull(TestCategory()); if (!Settings.TvCategoryLocalPath.IsNullOrWhiteSpace()) @@ -399,10 +400,25 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd return null; } + + private ValidationFailure TestGlobalConfig() + { + var config = _proxy.GetConfig(Settings); + if (config.Misc.pre_check) + { + return new NzbDroneValidationFailure("", "Disable 'Check before download' option in Sabnbzd") + { + InfoLink = String.Format("http://{0}:{1}/sabnzbd/config/switches/", Settings.Host, Settings.Port), + DetailedDescription = "Using Check before download affects NzbDrone ability to track new downloads. Also Sabnzbd recommends 'Abort jobs that cannot be completed' instead since it's more effective." + }; + } + + return null; + } private ValidationFailure TestCategory() { - var config = this._proxy.GetConfig(Settings); + var config = _proxy.GetConfig(Settings); var category = GetCategories(config).FirstOrDefault((SabnzbdCategory v) => v.Name == Settings.TvCategory); if (category != null) diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdCategory.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdCategory.cs index 15913c620..2068cd0a8 100644 --- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdCategory.cs +++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdCategory.cs @@ -19,6 +19,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd public String complete_dir { get; set; } public String[] tv_categories { get; set; } public Boolean enable_tv_sorting { get; set; } + public Boolean pre_check { get; set; } } public class SabnzbdCategory diff --git a/src/NzbDrone.Core/Download/DownloadTrackingService.cs b/src/NzbDrone.Core/Download/DownloadTrackingService.cs index 3dc255219..37ad08d4b 100644 --- a/src/NzbDrone.Core/Download/DownloadTrackingService.cs +++ b/src/NzbDrone.Core/Download/DownloadTrackingService.cs @@ -147,7 +147,7 @@ namespace NzbDrone.Core.Download State = TrackedDownloadState.Unknown }; - _logger.Debug("Started tracking download from history: {0}: {1}", trackedDownload.TrackingId, downloadItem.Title); + _logger.Debug("[{0}] Started tracking download with id {1}.", downloadItem.Title, trackingId); stateChanged = true; } @@ -157,17 +157,17 @@ namespace NzbDrone.Core.Download } } - foreach (var downloadItem in oldTrackedDownloads.Values.Where(v => !newTrackedDownloads.ContainsKey(v.TrackingId))) + foreach (var trackedDownload in oldTrackedDownloads.Values.Where(v => !newTrackedDownloads.ContainsKey(v.TrackingId))) { - if (downloadItem.State != TrackedDownloadState.Removed) + if (trackedDownload.State != TrackedDownloadState.Removed) { - downloadItem.State = TrackedDownloadState.Removed; + trackedDownload.State = TrackedDownloadState.Removed; stateChanged = true; - _logger.Debug("Item removed from download client by user: {0}: {1}", downloadItem.TrackingId, downloadItem.DownloadItem.Title); + _logger.Debug("[{0}] Item with id {1} removed from download client directly (possibly by user).", trackedDownload.DownloadItem.Title, trackedDownload.TrackingId); } - _logger.Debug("Stopped tracking download: {0}: {1}", downloadItem.TrackingId, downloadItem.DownloadItem.Title); + _logger.Debug("[{0}] Stopped tracking download with id {1}.", trackedDownload.DownloadItem.Title, trackedDownload.TrackingId); } _trackedDownloadCache.Set("tracked", newTrackedDownloads.Values.ToArray()); From a62cd042de786ee9c58a82cdf9b7feec79a102fc Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Sat, 2 Aug 2014 00:10:31 +0200 Subject: [PATCH 063/105] Added some resilience in the GetCurrentProcess calls so it doesn't cause a Fatal exit. --- .../MonitoringProviderTest.cs | 35 ------------- .../NzbDrone.Host.Test.csproj | 1 - .../EnvironmentInfo/RuntimeInfoBase.cs | 29 +++++++---- src/NzbDrone.Host/ApplicationServer.cs | 13 ++--- src/NzbDrone.Host/NzbDrone.Host.csproj | 1 - src/NzbDrone.Host/PriorityMonitor.cs | 52 ------------------- src/NzbDrone.Host/SingleInstancePolicy.cs | 31 +++++++---- 7 files changed, 43 insertions(+), 119 deletions(-) delete mode 100644 src/NzbDrone.App.Test/MonitoringProviderTest.cs delete mode 100644 src/NzbDrone.Host/PriorityMonitor.cs diff --git a/src/NzbDrone.App.Test/MonitoringProviderTest.cs b/src/NzbDrone.App.Test/MonitoringProviderTest.cs deleted file mode 100644 index e980d2c46..000000000 --- a/src/NzbDrone.App.Test/MonitoringProviderTest.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using FizzWare.NBuilder; -using Moq; -using NUnit.Framework; -using NzbDrone.Common.Model; -using NzbDrone.Common.Processes; -using NzbDrone.Host; -using NzbDrone.Test.Common; - -namespace NzbDrone.App.Test -{ - [TestFixture] - public class MonitoringProviderTest : TestBase - { - [Test] - public void Ensure_priority_doesnt_fail_on_invalid_process_id() - { - Mocker.GetMock().Setup(c => c.GetCurrentProcess()) - .Returns(Builder.CreateNew().Build()); - - Mocker.GetMock().Setup(c => c.GetProcessById(It.IsAny())).Returns((ProcessInfo)null); - - Subject.EnsurePriority(null); - } - - [Test] - public void Ensure_should_log_warn_exception_rather_than_throw() - { - Mocker.GetMock().Setup(c => c.GetCurrentProcess()).Throws(); - Subject.EnsurePriority(null); - - ExceptionVerification.ExpectedWarns(1); - } - } -} diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj index a7ddd84f0..7157fa439 100644 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj @@ -60,7 +60,6 @@ - diff --git a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfoBase.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfoBase.cs index 6f8de3f9a..5e92b46f0 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfoBase.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfoBase.cs @@ -12,7 +12,6 @@ namespace NzbDrone.Common.EnvironmentInfo public abstract class RuntimeInfoBase : IRuntimeInfo { private readonly Logger _logger; - private static readonly string ProcessName = Process.GetCurrentProcess().ProcessName.ToLower(); public RuntimeInfoBase(IServiceProvider serviceProvider, Logger logger) { @@ -73,10 +72,12 @@ namespace NzbDrone.Common.EnvironmentInfo { get { - return (OsInfo.IsWindows && - IsUserInteractive && - ProcessName.Equals(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME, StringComparison.InvariantCultureIgnoreCase)) || - OsInfo.IsMono; + if (OsInfo.IsWindows) + { + return IsUserInteractive && Process.GetCurrentProcess().ProcessName.Equals(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME, StringComparison.InvariantCultureIgnoreCase); + } + + return true; } } @@ -93,11 +94,19 @@ namespace NzbDrone.Common.EnvironmentInfo if (BuildInfo.IsDebug || Debugger.IsAttached) return false; if (BuildInfo.Version.Revision > 10000) return false; //Official builds will never have such a high revision - var lowerProcessName = ProcessName.ToLower(); - if (lowerProcessName.Contains("vshost")) return false; - if (lowerProcessName.Contains("nunit")) return false; - if (lowerProcessName.Contains("jetbrain")) return false; - if (lowerProcessName.Contains("resharper")) return false; + try + { + var lowerProcessName = Process.GetCurrentProcess().ProcessName.ToLower(); + + if (lowerProcessName.Contains("vshost")) return false; + if (lowerProcessName.Contains("nunit")) return false; + if (lowerProcessName.Contains("jetbrain")) return false; + if (lowerProcessName.Contains("resharper")) return false; + } + catch + { + + } string lowerCurrentDir = Directory.GetCurrentDirectory().ToLower(); if (lowerCurrentDir.Contains("teamcity")) return false; diff --git a/src/NzbDrone.Host/ApplicationServer.cs b/src/NzbDrone.Host/ApplicationServer.cs index c76fcc75c..bf1eb19f1 100644 --- a/src/NzbDrone.Host/ApplicationServer.cs +++ b/src/NzbDrone.Host/ApplicationServer.cs @@ -21,23 +21,20 @@ namespace NzbDrone.Host private readonly IConfigFileProvider _configFileProvider; private readonly IRuntimeInfo _runtimeInfo; private readonly IHostController _hostController; - private readonly PriorityMonitor _priorityMonitor; private readonly IStartupContext _startupContext; private readonly IBrowserService _browserService; private readonly Logger _logger; - public NzbDroneServiceFactory(IConfigFileProvider configFileProvider, + public NzbDroneServiceFactory(IConfigFileProvider configFileProvider, IHostController hostController, - IRuntimeInfo runtimeInfo, - PriorityMonitor priorityMonitor, - IStartupContext startupContext, - IBrowserService browserService, + IRuntimeInfo runtimeInfo, + IStartupContext startupContext, + IBrowserService browserService, Logger logger) { _configFileProvider = configFileProvider; _hostController = hostController; _runtimeInfo = runtimeInfo; - _priorityMonitor = priorityMonitor; _startupContext = startupContext; _browserService = browserService; _logger = logger; @@ -63,8 +60,6 @@ namespace NzbDrone.Host { _browserService.LaunchWebUI(); } - - _priorityMonitor.Start(); } protected override void OnStop() diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index 67d954511..f95e3ffa2 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -116,7 +116,6 @@ - diff --git a/src/NzbDrone.Host/PriorityMonitor.cs b/src/NzbDrone.Host/PriorityMonitor.cs deleted file mode 100644 index 2972024dd..000000000 --- a/src/NzbDrone.Host/PriorityMonitor.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Diagnostics; -using System.Threading; -using NLog; -using NzbDrone.Common.EnvironmentInfo; -using NzbDrone.Common.Processes; - -namespace NzbDrone.Host -{ - public class PriorityMonitor - { - private readonly IProcessProvider _processProvider; - private readonly Logger _logger; - - private Timer _processPriorityCheckTimer; - - public PriorityMonitor(IProcessProvider processProvider, Logger logger) - { - _processProvider = processProvider; - _logger = logger; - } - - public void Start() - { - _processPriorityCheckTimer = new Timer(EnsurePriority); - _processPriorityCheckTimer.Change(TimeSpan.FromSeconds(15), TimeSpan.FromMinutes(30)); - } - - public virtual void EnsurePriority(object sender) - { - try - { - if (_processProvider.GetCurrentProcessPriority() != ProcessPriorityClass.Normal) - { - _processProvider.SetPriority(_processProvider.GetCurrentProcess().Id, ProcessPriorityClass.Normal); - } - } - catch (Exception e) - { - if (OsInfo.IsMono) - { - _logger.TraceException("Unable to verify priority", e); - } - - else - { - _logger.WarnException("Unable to verify priority", e); - } - } - } - } -} \ No newline at end of file diff --git a/src/NzbDrone.Host/SingleInstancePolicy.cs b/src/NzbDrone.Host/SingleInstancePolicy.cs index a1b489705..4e8d44790 100644 --- a/src/NzbDrone.Host/SingleInstancePolicy.cs +++ b/src/NzbDrone.Host/SingleInstancePolicy.cs @@ -52,19 +52,28 @@ namespace NzbDrone.Host private List GetOtherNzbDroneProcessIds() { - var currentId = _processProvider.GetCurrentProcess().Id; - var otherProcesses = _processProvider.FindProcessByName(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME) - .Union(_processProvider.FindProcessByName(ProcessProvider.NZB_DRONE_PROCESS_NAME)) - .Select(c => c.Id) - .Except(new[] {currentId}) - .ToList(); - - if (otherProcesses.Any()) + try { - _logger.Info("{0} instance(s) of NzbDrone are running", otherProcesses.Count); - } + var currentId = _processProvider.GetCurrentProcess().Id; - return otherProcesses; + var otherProcesses = _processProvider.FindProcessByName(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME) + .Union(_processProvider.FindProcessByName(ProcessProvider.NZB_DRONE_PROCESS_NAME)) + .Select(c => c.Id) + .Except(new[] { currentId }) + .ToList(); + + if (otherProcesses.Any()) + { + _logger.Info("{0} instance(s) of NzbDrone are running", otherProcesses.Count); + } + + return otherProcesses; + } + catch (Exception ex) + { + _logger.WarnException("Failed to check for multiple instances of NzbDrone.", ex); + return new List(); + } } } } \ No newline at end of file From d1a8cd2a84b369e75c9e073660af2ac193db863e Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Sat, 9 Aug 2014 14:58:04 +0200 Subject: [PATCH 064/105] Readded Growl logo via embedded binary blob. --- src/NzbDrone.Common/NzbDrone.Common.csproj | 1 + src/NzbDrone.Common/ResourceExtensions.cs | 28 +++++++++++++++++++ .../Notifications/Growl/GrowlService.cs | 21 +++++++------- src/NzbDrone.Core/NzbDrone.Core.csproj | 7 ++--- 4 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 src/NzbDrone.Common/ResourceExtensions.cs diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index 8d4a98d3d..346c4dc04 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -138,6 +138,7 @@ + diff --git a/src/NzbDrone.Common/ResourceExtensions.cs b/src/NzbDrone.Common/ResourceExtensions.cs new file mode 100644 index 000000000..2a168a151 --- /dev/null +++ b/src/NzbDrone.Common/ResourceExtensions.cs @@ -0,0 +1,28 @@ +using NzbDrone.Common.EnsureThat; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Text; + +namespace NzbDrone.Common +{ + public static class ResourceExtensions + { + public static Byte[] GetManifestResourceBytes(this Assembly assembly, String name) + { + var stream = assembly.GetManifestResourceStream(name); + + var result = new Byte[stream.Length]; + var read = stream.Read(result, 0, result.Length); + + if (read != result.Length) + { + throw new EndOfStreamException("Reached end of stream before reading enough bytes."); + } + + return result; + } + } +} diff --git a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs index b572747c2..d08fbc66d 100644 --- a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs +++ b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs @@ -1,13 +1,14 @@ -using System; +using FluentValidation.Results; +using Growl.Connector; +using Growl.CoreLibrary; +using GrowlNotification = Growl.Connector.Notification; +using NLog; +using NzbDrone.Common; +using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Threading; -using FluentValidation.Results; -using Growl.CoreLibrary; -using Growl.Connector; -using NLog; -using GrowlNotification = Growl.Connector.Notification; -using System.IO; namespace NzbDrone.Core.Notifications.Growl { @@ -72,9 +73,9 @@ namespace NzbDrone.Core.Notifications.Growl _logger = logger; _notificationTypes = GetNotificationTypes(); -// var bytes = File.ReadAllBytes("64.png"); -// -// _growlApplication.Icon = new BinaryData(bytes); + var logo = typeof(GrowlService).Assembly.GetManifestResourceBytes("NzbDrone.Core.Resources.Logo.64.png"); + + _growlApplication.Icon = new BinaryData(logo); } private GrowlConnector GetGrowlConnector(string hostname, int port, string password) diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index eeda53753..a93414f85 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -794,10 +794,9 @@ - - 64.png - Always - + + Resources\Logo\64.png + Always From 4b5cf7d7d3b96f48aae16cdeb06ecac6b7df37e2 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 10 Aug 2014 19:02:06 -0700 Subject: [PATCH 065/105] Styling fixes --- src/UI/AddSeries/addSeries.less | 6 +++++ src/UI/History/Queue/QueueLayoutTemplate.html | 4 ++-- src/UI/Series/Index/EmptyTemplate.html | 24 +++++++++++-------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/UI/AddSeries/addSeries.less b/src/UI/AddSeries/addSeries.less index 3a6357677..19ceb4b94 100644 --- a/src/UI/AddSeries/addSeries.less +++ b/src/UI/AddSeries/addSeries.less @@ -136,4 +136,10 @@ li.add-new:hover { .validation-errors { display: none; } + + .input-group { + .form-control { + background-color: white; + } + } } diff --git a/src/UI/History/Queue/QueueLayoutTemplate.html b/src/UI/History/Queue/QueueLayoutTemplate.html index bdf520b80..4af587514 100644 --- a/src/UI/History/Queue/QueueLayoutTemplate.html +++ b/src/UI/History/Queue/QueueLayoutTemplate.html @@ -1,11 +1,11 @@ 
-
+
-
+
\ No newline at end of file diff --git a/src/UI/Series/Index/EmptyTemplate.html b/src/UI/Series/Index/EmptyTemplate.html index 4dcbb9624..7c7849d9c 100644 --- a/src/UI/Series/Index/EmptyTemplate.html +++ b/src/UI/Series/Index/EmptyTemplate.html @@ -1,12 +1,16 @@ -
-
- - You must be new around here, You should add some series. +
+
+
+ + You must be new around here, You should add some series. +
+
+
+
+ + + Add Series + +
-
- - - Add Series - -
From 78e5209cfd3edd99da2a648f4d8a4fc7ada1ec29 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 10 Aug 2014 21:13:28 -0700 Subject: [PATCH 066/105] New: Details for import/grab on Episode Activity tab --- src/UI/Cells/cells.less | 10 ++ .../Activity/EpisodeActivityDetailsCell.js | 35 +++++ .../Episode/Activity/EpisodeActivityLayout.js | 8 + .../History/Details/HistoryDetailsLayout.js | 40 +++++ .../Details/HistoryDetailsLayoutTemplate.html | 23 +++ src/UI/History/Details/HistoryDetailsView.js | 25 +--- .../Details/HistoryDetailsViewTemplate.html | 140 ++++++++---------- src/UI/Series/series.less | 4 + src/UI/Shared/Modal/ModalController.js | 6 +- 9 files changed, 184 insertions(+), 107 deletions(-) create mode 100644 src/UI/Episode/Activity/EpisodeActivityDetailsCell.js create mode 100644 src/UI/History/Details/HistoryDetailsLayout.js create mode 100644 src/UI/History/Details/HistoryDetailsLayoutTemplate.html diff --git a/src/UI/Cells/cells.less b/src/UI/Cells/cells.less index 67c567269..e7cc528c0 100644 --- a/src/UI/Cells/cells.less +++ b/src/UI/Cells/cells.less @@ -129,6 +129,16 @@ td.episode-status-cell, td.quality-cell { } } +.episode-activity-details-cell { + width : 18px; +} + +.episode-detail-modal { + .episode-actions-cell { + width : 18px; + } +} + .series-actions-cell { width : 56px; min-width : 56px; diff --git a/src/UI/Episode/Activity/EpisodeActivityDetailsCell.js b/src/UI/Episode/Activity/EpisodeActivityDetailsCell.js new file mode 100644 index 000000000..d4b7c5452 --- /dev/null +++ b/src/UI/Episode/Activity/EpisodeActivityDetailsCell.js @@ -0,0 +1,35 @@ +'use strict'; + +define( + [ + 'jquery', + 'vent', + 'marionette', + 'Cells/NzbDroneCell', + 'History/Details/HistoryDetailsView', + 'bootstrap' + ], function ($, vent, Marionette, NzbDroneCell, HistoryDetailsView) { + return NzbDroneCell.extend({ + + className: 'episode-activity-details-cell', + + + render: function () { + this.$el.empty(); + this.$el.html(''); + + var html = new HistoryDetailsView({ model: this.model }).render().$el; + + this.$el.popover({ + content : html, + html : true, + trigger : 'hover', + title : 'Details', + placement: 'left', + container: this.$el + }); + + return this; + } + }); + }); diff --git a/src/UI/Episode/Activity/EpisodeActivityLayout.js b/src/UI/Episode/Activity/EpisodeActivityLayout.js index b9c9582d6..519a7d283 100644 --- a/src/UI/Episode/Activity/EpisodeActivityLayout.js +++ b/src/UI/Episode/Activity/EpisodeActivityLayout.js @@ -8,6 +8,7 @@ define( 'Cells/QualityCell', 'Cells/RelativeDateCell', 'Episode/Activity/EpisodeActivityActionsCell', + 'Episode/Activity/EpisodeActivityDetailsCell', 'Episode/Activity/NoActivityView', 'Shared/LoadingView' ], function (Marionette, @@ -17,6 +18,7 @@ define( QualityCell, RelativeDateCell, EpisodeActivityActionsCell, + EpisodeActivityDetailsCell, NoActivityView, LoadingView) { @@ -50,6 +52,12 @@ define( label: 'Date', cell : RelativeDateCell }, + { + name : 'this', + label : '', + cell : EpisodeActivityDetailsCell, + sortable: false + }, { name : 'this', label : '', diff --git a/src/UI/History/Details/HistoryDetailsLayout.js b/src/UI/History/Details/HistoryDetailsLayout.js new file mode 100644 index 000000000..0545aefee --- /dev/null +++ b/src/UI/History/Details/HistoryDetailsLayout.js @@ -0,0 +1,40 @@ +'use strict'; +define( + [ + 'jquery', + 'vent', + 'marionette', + 'History/Details/HistoryDetailsView' + ], function ($, vent, Marionette, HistoryDetailsView) { + + return Marionette.Layout.extend({ + template: 'History/Details/HistoryDetailsLayoutTemplate', + + regions: { + bodyRegion: '.modal-body' + }, + + events: { + 'click .x-mark-as-failed': '_markAsFailed' + }, + + onShow: function () { + this.bodyRegion.show(new HistoryDetailsView({ model: this.model })); + }, + + _markAsFailed: function () { + var url = window.NzbDrone.ApiRoot + '/history/failed'; + var data = { + id: this.model.get('id') + }; + + $.ajax({ + url: url, + type: 'POST', + data: data + }); + + vent.trigger(vent.Commands.CloseModalCommand); + } + }); + }); diff --git a/src/UI/History/Details/HistoryDetailsLayoutTemplate.html b/src/UI/History/Details/HistoryDetailsLayoutTemplate.html new file mode 100644 index 000000000..897ff0549 --- /dev/null +++ b/src/UI/History/Details/HistoryDetailsLayoutTemplate.html @@ -0,0 +1,23 @@ +
+
+
+
+ + +

+ {{#if_eq eventType compare="grabbed"}}Grabbed{{/if_eq}} + {{#if_eq eventType compare="downloadFailed"}}Download Failed{{/if_eq}} + {{#if_eq eventType compare="downloadFolderImported"}}Episode Imported{{/if_eq}} +

+ +
+
+ +
+
+ {{#if_eq eventType compare="grabbed"}}{{/if_eq}} + +
+
+
+
diff --git a/src/UI/History/Details/HistoryDetailsView.js b/src/UI/History/Details/HistoryDetailsView.js index 045189137..c7be5ad23 100644 --- a/src/UI/History/Details/HistoryDetailsView.js +++ b/src/UI/History/Details/HistoryDetailsView.js @@ -1,32 +1,11 @@ 'use strict'; define( [ - 'jquery', - 'vent', 'marionette', 'History/Details/HistoryDetailsAge' - ], function ($, vent, Marionette) { + ], function (Marionette) { return Marionette.ItemView.extend({ - template: 'History/Details/HistoryDetailsViewTemplate', - - events: { - 'click .x-mark-as-failed': '_markAsFailed' - }, - - _markAsFailed: function () { - var url = window.NzbDrone.ApiRoot + '/history/failed'; - var data = { - id: this.model.get('id') - }; - - $.ajax({ - url: url, - type: 'POST', - data: data - }); - - vent.trigger(vent.Commands.CloseModalCommand); - } + template: 'History/Details/HistoryDetailsViewTemplate' }); }); diff --git a/src/UI/History/Details/HistoryDetailsViewTemplate.html b/src/UI/History/Details/HistoryDetailsViewTemplate.html index 19b6d3794..0a17b5161 100644 --- a/src/UI/History/Details/HistoryDetailsViewTemplate.html +++ b/src/UI/History/Details/HistoryDetailsViewTemplate.html @@ -1,93 +1,71 @@ -
-
-
-
- +{{#if_eq eventType compare="grabbed"}} +
-

- {{#if_eq eventType compare="grabbed"}}Grabbed{{/if_eq}} - {{#if_eq eventType compare="downloadFailed"}}Download Failed{{/if_eq}} - {{#if_eq eventType compare="downloadFolderImported"}}Episode Imported{{/if_eq}} -

+
Name:
+
{{sourceTitle}}
-
-
- {{#if_eq eventType compare="grabbed"}} -
+ {{#with data}} + {{#if indexer}} +
Indexer:
+
{{indexer}}
+ {{/if}} -
Name:
-
{{sourceTitle}}
+ {{#if releaseGroup}} +
Release Group:
+
{{releaseGroup}}
+ {{/if}} - {{#with data}} - {{#if indexer}} -
Indexer:
-
{{indexer}}
- {{/if}} + {{#if nzbInfoUrl}} +
Info:
+
{{nzbInfoUrl}}
+ {{/if}} - {{#if releaseGroup}} -
Release Group:
-
{{releaseGroup}}
- {{/if}} + {{#if downloadClient}} +
Download Client:
+
{{downloadClient}}
+ {{/if}} - {{#if nzbInfoUrl}} -
Info:
-
{{nzbInfoUrl}}
- {{/if}} + {{#if downloadClientId}} +
Download Client ID:
+
{{downloadClientId}}
+ {{/if}} - {{#if downloadClient}} -
Download Client:
-
{{downloadClient}}
- {{/if}} + {{#if age}} + {{historyAge}} + {{/if}} + {{/with}} +
+{{/if_eq}} +{{#if_eq eventType compare="downloadFailed"}} +
- {{#if downloadClientId}} -
Download Client ID:
-
{{downloadClientId}}
- {{/if}} +
Name:
+
{{sourceTitle}}
- {{#if age}} - {{historyAge}} - {{/if}} - {{/with}} -
- {{/if_eq}} - {{#if_eq eventType compare="downloadFailed"}} -
+ {{#with data}} +
Message:
+
{{message}}
+ {{/with}} +
+{{/if_eq}} +{{#if_eq eventType compare="downloadFolderImported"}} +
-
Name:
-
{{sourceTitle}}
+ {{#if sourceTitle}} +
Name:
+
{{sourceTitle}}
+ {{/if}} - {{#with data}} -
Message:
-
{{message}}
- {{/with}} -
- {{/if_eq}} - {{#if_eq eventType compare="downloadFolderImported"}} -
+ {{#with data}} + {{#if droppedPath}} +
Source:
+
{{droppedPath}}
+ {{/if}} - {{#if sourceTitle}} -
Name:
-
{{sourceTitle}}
- {{/if}} - - {{#with data}} - {{#if droppedPath}} -
Source:
-
{{droppedPath}}
- {{/if}} - - {{#if importedPath}} -
Imported To:
-
{{importedPath}}
- {{/if}} - {{/with}} -
- {{/if_eq}} -
-
- {{#if_eq eventType compare="grabbed"}}{{/if_eq}} - -
-
-
-
+ {{#if importedPath}} +
Imported To:
+
{{importedPath}}
+ {{/if}} + {{/with}} + +{{/if_eq}} \ No newline at end of file diff --git a/src/UI/Series/series.less b/src/UI/Series/series.less index e4e05f63d..c69a1f7a5 100644 --- a/src/UI/Series/series.less +++ b/src/UI/Series/series.less @@ -266,6 +266,10 @@ margin-top : 30px; font-size : 12px; } + + .episode-activity-details-cell .popover { + max-width: 800px; + } } .season-grid { diff --git a/src/UI/Shared/Modal/ModalController.js b/src/UI/Shared/Modal/ModalController.js index 177092de3..b62aaf64b 100644 --- a/src/UI/Shared/Modal/ModalController.js +++ b/src/UI/Shared/Modal/ModalController.js @@ -7,10 +7,10 @@ define( 'Series/Edit/EditSeriesView', 'Series/Delete/DeleteSeriesView', 'Episode/EpisodeDetailsLayout', - 'History/Details/HistoryDetailsView', + 'History/Details/HistoryDetailsLayout', 'System/Logs/Table/Details/LogDetailsView', 'Rename/RenamePreviewLayout' - ], function (vent, AppLayout, Marionette, EditSeriesView, DeleteSeriesView, EpisodeDetailsLayout, HistoryDetailsView, LogDetailsView, RenamePreviewLayout) { + ], function (vent, AppLayout, Marionette, EditSeriesView, DeleteSeriesView, EpisodeDetailsLayout, HistoryDetailsLayout, LogDetailsView, RenamePreviewLayout) { return Marionette.AppRouter.extend({ @@ -49,7 +49,7 @@ define( }, _showHistory: function (options) { - var view = new HistoryDetailsView({ model: options.model }); + var view = new HistoryDetailsLayout({ model: options.model }); AppLayout.modalRegion.show(view); }, From 9ffdf1893504385842c8c10272ee451453195936 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 10 Aug 2014 21:20:06 -0700 Subject: [PATCH 067/105] Fixed: Set permissions on new series folders (mono) --- .../MediaFiles/DiskScanService.cs | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs index 4bdfe04b7..13a1cd83a 100644 --- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs +++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs @@ -1,4 +1,5 @@ -using System.Diagnostics; +using System; +using System.Diagnostics; using System.IO; using System.Linq; using NLog; @@ -74,6 +75,7 @@ namespace NzbDrone.Core.MediaFiles { _logger.Debug("Creating missing series folder: {0}", series.Path); _diskProvider.CreateFolder(series.Path); + SetPermissions(series.Path); } else { @@ -112,6 +114,27 @@ namespace NzbDrone.Core.MediaFiles return mediaFileList.ToArray(); } + private void SetPermissions(String path) + { + if (!_configService.SetPermissionsLinux) + { + return; + } + + try + { + var permissions = _configService.FolderChmod; + _diskProvider.SetPermissions(path, permissions, _configService.ChownUser, _configService.ChownGroup); + } + + catch (Exception ex) + { + + _logger.WarnException("Unable to apply permissions to: " + path, ex); + _logger.DebugException(ex.Message, ex); + } + } + public void Handle(SeriesUpdatedEvent message) { Scan(message.Series); From 9f52daf78e4d945b3a95b5e0b8cbd458049af615 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 10 Aug 2014 22:36:51 -0700 Subject: [PATCH 068/105] New: close modal dialogs by clicking outside of modal --- .../RootFolders/RootFolderLayoutTemplate.html | 52 +++-- src/UI/Calendar/CalendarFeedViewTemplate.html | 44 ++-- .../Episode/EpisodeDetailsLayoutTemplate.html | 57 +++-- .../Details/HistoryDetailsLayoutTemplate.html | 32 ++- src/UI/Hotkeys/HotkeysViewTemplate.html | 72 +++--- .../Rename/RenamePreviewLayoutTemplate.html | 48 ++-- .../Series/Delete/DeleteSeriesTemplate.html | 70 +++--- .../Series/Edit/EditSeriesViewTemplate.html | 138 ++++++------ .../Organize/OrganizeFilesViewTemplate.html | 42 ++-- ...wnloadClientAddCollectionViewTemplate.html | 24 +- .../DownloadClientDeleteViewTemplate.html | 24 +- .../Edit/DownloadClientEditViewTemplate.html | 110 +++++---- .../Add/IndexerAddCollectionViewTemplate.html | 24 +- .../Delete/IndexerDeleteViewTemplate.html | 24 +- .../Edit/IndexerEditViewTemplate.html | 110 +++++---- .../Metadata/MetadataEditViewTemplate.html | 74 +++---- ...NotificationAddCollectionViewTemplate.html | 24 +- .../NotificationDeleteViewTemplate.html | 26 +-- .../Edit/NotificationEditViewTemplate.html | 208 +++++++++--------- .../Profile/DeleteProfileViewTemplate.html | 24 +- .../Edit/EditProfileLayoutTemplate.html | 58 +++-- src/UI/Shared/Modal/ModalRegion.js | 11 +- .../Table/Details/LogDetailsViewTemplate.html | 36 ++- 23 files changed, 645 insertions(+), 687 deletions(-) diff --git a/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.html b/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.html index 1d0822902..8209c2da6 100644 --- a/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.html +++ b/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.html @@ -1,32 +1,30 @@ -
-
-
- -

Select Folder

-
-
-
-
Enter the path that contains some or all of your TV series, you will be able to choose which series you want to import
+
+
+ +

Select Folder

+
+
+
+
Enter the path that contains some or all of your TV series, you will be able to choose which series you want to import
-
-
-   - - - - -
+
+
+   + + + +
+
- {{#if items}} -

Recent Folders

- {{/if}} -
-
-
- -
+ {{#if items}} +

Recent Folders

+ {{/if}} +
+
+
+
diff --git a/src/UI/Calendar/CalendarFeedViewTemplate.html b/src/UI/Calendar/CalendarFeedViewTemplate.html index b217a953e..ca427785a 100644 --- a/src/UI/Calendar/CalendarFeedViewTemplate.html +++ b/src/UI/Calendar/CalendarFeedViewTemplate.html @@ -1,30 +1,28 @@ -
-
-
- -

NzbDrone Calendar feed

-
-
-
-
- -
- -
-
-
- -
- - -
+
+
+ +

NzbDrone Calendar feed

+
+
+
+
+ +
+ +
+
+
+ +
+ +
-
- -
+
+
+
diff --git a/src/UI/Episode/EpisodeDetailsLayoutTemplate.html b/src/UI/Episode/EpisodeDetailsLayoutTemplate.html index 9a8036be5..c80a74901 100644 --- a/src/UI/Episode/EpisodeDetailsLayoutTemplate.html +++ b/src/UI/Episode/EpisodeDetailsLayoutTemplate.html @@ -1,37 +1,34 @@ -
-
-
-
- +
+
+
+ -

- - {{series.title}} - {{EpisodeNumber}} - {{title}} -

+

+ + {{series.title}} - {{EpisodeNumber}} - {{title}} +

+
+
+ +
+
+
+ -
- -
-
-
- -
-
- {{#unless hideSeriesLink}} - {{#with series}} - open series - {{/with}} - {{/unless}} +
+
+ {{#unless hideSeriesLink}} + {{#with series}} + open series + {{/with}} + {{/unless}} - -
+
- diff --git a/src/UI/History/Details/HistoryDetailsLayoutTemplate.html b/src/UI/History/Details/HistoryDetailsLayoutTemplate.html index 897ff0549..cdbfbfa04 100644 --- a/src/UI/History/Details/HistoryDetailsLayoutTemplate.html +++ b/src/UI/History/Details/HistoryDetailsLayoutTemplate.html @@ -1,23 +1,21 @@ -
-
-
-
- +
+
+
+ -

- {{#if_eq eventType compare="grabbed"}}Grabbed{{/if_eq}} - {{#if_eq eventType compare="downloadFailed"}}Download Failed{{/if_eq}} - {{#if_eq eventType compare="downloadFolderImported"}}Episode Imported{{/if_eq}} -

+

+ {{#if_eq eventType compare="grabbed"}}Grabbed{{/if_eq}} + {{#if_eq eventType compare="downloadFailed"}}Download Failed{{/if_eq}} + {{#if_eq eventType compare="downloadFolderImported"}}Episode Imported{{/if_eq}} +

-
-
+
+
-
-
- {{#if_eq eventType compare="grabbed"}}{{/if_eq}} - -
+
+
+ {{#if_eq eventType compare="grabbed"}}{{/if_eq}} +
diff --git a/src/UI/Hotkeys/HotkeysViewTemplate.html b/src/UI/Hotkeys/HotkeysViewTemplate.html index aeae692b1..45f4ae1a7 100644 --- a/src/UI/Hotkeys/HotkeysViewTemplate.html +++ b/src/UI/Hotkeys/HotkeysViewTemplate.html @@ -1,47 +1,45 @@ -
-
-
- -

Keyboard Shortcuts

-
-
-
-
-
-
-

Focus Search Box

-
-
- t -
+
+
+ +

Keyboard Shortcuts

+
+
+
+
+
+
+

Focus Search Box

-
-
- Pressing 't' puts the cursor in the search box below the navigation links -
+
+ t
-
-
-
-
-
-

Save Settings

-
-
- ctrl + s -
-
-
-
- Pressing ctrl + 's' saves your settings (only in settings) -
+
+
+ Pressing 't' puts the cursor in the search box below the navigation links
-
- +
+
+
+
+

Save Settings

+
+
+ ctrl + s +
+
+
+
+ Pressing ctrl + 's' saves your settings (only in settings) +
+
+
+
+ +
diff --git a/src/UI/Rename/RenamePreviewLayoutTemplate.html b/src/UI/Rename/RenamePreviewLayoutTemplate.html index 4418753b8..d87a7a94d 100644 --- a/src/UI/Rename/RenamePreviewLayoutTemplate.html +++ b/src/UI/Rename/RenamePreviewLayoutTemplate.html @@ -1,29 +1,27 @@ -
-
-
-
- -

- Organize & Rename -

+
+
+
+ +

+ Organize & Rename +

-
-
-
All paths are relative to: {{path}}
-
-
-
- - - - - -
+
+
+
All paths are relative to: {{path}}
+
+
+
+ + + + +
diff --git a/src/UI/Series/Delete/DeleteSeriesTemplate.html b/src/UI/Series/Delete/DeleteSeriesTemplate.html index c4e047c77..34be9cc7e 100644 --- a/src/UI/Series/Delete/DeleteSeriesTemplate.html +++ b/src/UI/Series/Delete/DeleteSeriesTemplate.html @@ -1,48 +1,46 @@ -
-
-
- -

Delete {{title}}

-
-
+
+
+ +

Delete {{title}}

+
+
-
- -
-
-

{{path}}

+
+ +
+
+

{{path}}

-
- +
+ -
-
-
-
- - -
+
+
+ +
diff --git a/src/UI/Series/Edit/EditSeriesViewTemplate.html b/src/UI/Series/Edit/EditSeriesViewTemplate.html index 4b8d3f3cd..812206918 100644 --- a/src/UI/Series/Edit/EditSeriesViewTemplate.html +++ b/src/UI/Series/Edit/EditSeriesViewTemplate.html @@ -1,97 +1,95 @@ -
-
-
- -

{{title}}

-
-
-
- -
-
+
+
+ +

{{title}}

+
+
+
+ +
+
-
- +
+ -
-
-