diff --git a/NzbDrone.Core/Indexers/Newznab/NewznabParser.cs b/NzbDrone.Core/Indexers/Newznab/NewznabParser.cs index 519953085..06a09da7b 100644 --- a/NzbDrone.Core/Indexers/Newznab/NewznabParser.cs +++ b/NzbDrone.Core/Indexers/Newznab/NewznabParser.cs @@ -25,8 +25,7 @@ protected override ReportInfo PostProcessor(XElement item, ReportInfo currentRes if (sizeElement == null) { - var message = String.Format("Unable to parse size from: {0} [{1}]", currentResult.Title, currentResult.Indexer); - throw new SizeParsingException(message); + throw new SizeParsingException("Unable to parse size from: {0} [{1}]", currentResult.Title, currentResult.Indexer); } currentResult.Size = Convert.ToInt64(sizeElement.Attribute("value").Value); diff --git a/NzbDrone.Core/Indexers/Newznab/SizeParsingException.cs b/NzbDrone.Core/Indexers/Newznab/SizeParsingException.cs index 33735a7ba..84c96535b 100644 --- a/NzbDrone.Core/Indexers/Newznab/SizeParsingException.cs +++ b/NzbDrone.Core/Indexers/Newznab/SizeParsingException.cs @@ -2,12 +2,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using NzbDrone.Common.Exceptions; namespace NzbDrone.Core.Indexers.Newznab { - public class SizeParsingException : Exception + public class SizeParsingException : NzbDroneException { - public SizeParsingException(string message) : base(message) + public SizeParsingException(string message, params object[] args) : base(message, args) { } } diff --git a/NzbDrone.Core/Parser/Model/RemoteEpisode.cs b/NzbDrone.Core/Parser/Model/RemoteEpisode.cs index 4632ba00e..cc7459e4f 100644 --- a/NzbDrone.Core/Parser/Model/RemoteEpisode.cs +++ b/NzbDrone.Core/Parser/Model/RemoteEpisode.cs @@ -19,5 +19,10 @@ public bool IsRecentEpisode() { return Episodes.Any(e => e.AirDateUtc >= DateTime.Today.AddDays(-14)); } + + public override string ToString() + { + return Report.Title; + } } } \ No newline at end of file diff --git a/NzbDrone.Core/RootFolders/RootFolderService.cs b/NzbDrone.Core/RootFolders/RootFolderService.cs index 42de42e2a..442f4b32e 100644 --- a/NzbDrone.Core/RootFolders/RootFolderService.cs +++ b/NzbDrone.Core/RootFolders/RootFolderService.cs @@ -73,8 +73,8 @@ public virtual RootFolder Add(RootFolder rootFolder) if (!_diskProvider.FolderExists(rootFolder.Path)) throw new DirectoryNotFoundException("Can't add root directory that doesn't exist."); - if (All().Exists(r => DiskProvider.PathEquals(r.Path, rootFolder.Path))) - throw new InvalidOperationException("Recent directory already exist."); + if (all.Exists(r => DiskProvider.PathEquals(r.Path, rootFolder.Path))) + throw new InvalidOperationException("Recent directory already exists."); if (!String.IsNullOrWhiteSpace(_configService.DownloadedEpisodesFolder) && DiskProvider.PathEquals(_configService.DownloadedEpisodesFolder, rootFolder.Path)) diff --git a/UI/Content/icons.less b/UI/Content/icons.less index 131b4f381..34a55b224 100644 --- a/UI/Content/icons.less +++ b/UI/Content/icons.less @@ -92,7 +92,7 @@ } .icon-nd-downloading:before { - .icon(@download-alt); + .icon(@cloud-download); } .icon-nd-tba:before { @@ -105,4 +105,8 @@ .icon-nd-not-aired:before { .icon(@time); +} + +.icon-nd-imported:before { + .icon(@download-alt); } \ No newline at end of file diff --git a/UI/History/EventTypeCell.js b/UI/History/EventTypeCell.js index 3979edacd..d328b9bf1 100644 --- a/UI/History/EventTypeCell.js +++ b/UI/History/EventTypeCell.js @@ -18,7 +18,7 @@ define( switch (this.cellValue.get('eventType')) { case 'grabbed': - icon = 'icon-cloud-download'; + icon = 'icon-nd-downloading'; toolTip = 'Episode grabbed from {0} and sent to download client'.format(this.cellValue.get('data').indexer); break; case 'seriesFolderImported': @@ -26,7 +26,7 @@ define( toolTip = 'Existing episode file added to library'; break; case 'downloadFolderImported': - icon = 'icon-download-alt'; + icon = 'icon-nd-imported'; toolTip = 'Episode downloaded successfully and picked up from download client'; break; default :