From 226f884233e060b8774f8275ffe35145ff330310 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Tue, 3 Apr 2018 23:45:59 -0400
Subject: [PATCH] New: Grouped Album Import Notification (#265)

* New: Grouped Album Import Notification

* fixup: Add Emby and Kodi Notify for Album Download
---
 .../EditNotificationModalContent.js           | 21 +++++++--
 .../Notifications/Notification.js             | 13 +++++-
 .../Notifications/NotificationResource.cs     | 10 +++-
 .../NotificationBaseFixture.cs                | 11 ++++-
 .../SynologyIndexerFixture.cs                 |  4 +-
 .../Xbmc/OnDownloadFixture.cs                 | 10 ++--
 .../013_album_download_notification.cs        | 14 ++++++
 src/NzbDrone.Core/Datastore/TableMapping.cs   |  1 +
 .../MediaFiles/Events/AlbumImportedEvent.cs   | 33 +++++++++++++
 .../TrackImport/ImportApprovedTracks.cs       | 13 ++++++
 .../Notifications/AlbumDownloadMessage.cs     | 21 +++++++++
 .../Notifications/Boxcar/Boxcar.cs            |  9 +++-
 .../CustomScript/CustomScript.cs              | 23 +++++++++-
 .../Notifications/Email/Email.cs              |  8 +++-
 .../Notifications/Growl/Growl.cs              |  6 ++-
 .../Notifications/INotification.cs            |  4 +-
 src/NzbDrone.Core/Notifications/Join/Join.cs  |  9 +++-
 .../MediaBrowser/MediaBrowser.cs              | 10 +++-
 .../Notifications/NotificationBase.cs         | 12 ++++-
 .../Notifications/NotificationDefinition.cs   |  4 +-
 .../Notifications/NotificationFactory.cs      | 11 ++++-
 .../Notifications/NotificationService.cs      | 46 ++++++++++++++++++-
 .../NotifyMyAndroid/NotifyMyAndroid.cs        |  9 +++-
 .../Notifications/Plex/PlexClient.cs          |  2 +-
 .../Notifications/Plex/PlexHomeTheater.cs     |  2 +-
 .../Notifications/Plex/PlexServer.cs          |  2 +-
 .../Notifications/Prowl/Prowl.cs              |  7 ++-
 .../Notifications/PushBullet/PushBullet.cs    |  9 +++-
 .../Notifications/Pushalot/Pushalot.cs        |  6 ++-
 .../Notifications/Pushover/Pushover.cs        |  9 +++-
 .../Notifications/Slack/Slack.cs              | 19 +++++++-
 .../Notifications/Synology/SynologyIndexer.cs |  2 +-
 .../Notifications/Telegram/Telegram.cs        |  9 +++-
 ...loadMessage.cs => TrackDownloadMessage.cs} |  2 +-
 .../Notifications/Twitter/Twitter.cs          |  9 +++-
 .../Notifications/Webhook/Webhook.cs          |  2 +-
 src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs  |  9 +++-
 src/NzbDrone.Core/NzbDrone.Core.csproj        |  5 +-
 38 files changed, 345 insertions(+), 51 deletions(-)
 create mode 100644 src/NzbDrone.Core/Datastore/Migration/013_album_download_notification.cs
 create mode 100644 src/NzbDrone.Core/MediaFiles/Events/AlbumImportedEvent.cs
 create mode 100644 src/NzbDrone.Core/Notifications/AlbumDownloadMessage.cs
 rename src/NzbDrone.Core/Notifications/{DownloadMessage.cs => TrackDownloadMessage.cs} (93%)

diff --git a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js
index 6c75b869e..4c84adce3 100644
--- a/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js
+++ b/frontend/src/Settings/Notifications/Notifications/EditNotificationModalContent.js
@@ -39,10 +39,12 @@ function EditNotificationModalContent(props) {
     name,
     onGrab,
     onDownload,
+    onAlbumDownload,
     onUpgrade,
     onRename,
     supportsOnGrab,
     supportsOnDownload,
+    supportsOnAlbumDownload,
     supportsOnUpgrade,
     supportsOnRename,
     tags,
@@ -107,12 +109,25 @@ function EditNotificationModalContent(props) {
               </FormGroup>
 
               <FormGroup>
-                <FormLabel>On Import</FormLabel>
+                <FormLabel>On Album Import</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.CHECK}
+                  name="onAlbumDownload"
+                  helpText="Be notified when complete albums are successfully imported"
+                  isDisabled={!supportsOnAlbumDownload.value}
+                  {...onAlbumDownload}
+                  onChange={onInputChange}
+                />
+              </FormGroup>
+
+              <FormGroup>
+                <FormLabel>On Track Import</FormLabel>
 
                 <FormInputGroup
                   type={inputTypes.CHECK}
                   name="onDownload"
-                  helpText="Be notified when tracks are successfully imported"
+                  helpText="Be notified when track files are successfully imported"
                   isDisabled={!supportsOnDownload.value}
                   {...onDownload}
                   onChange={onInputChange}
@@ -122,7 +137,7 @@ function EditNotificationModalContent(props) {
               {
                 onDownload.value &&
                   <FormGroup>
-                    <FormLabel>On Upgrade</FormLabel>
+                    <FormLabel>On Track Upgrade</FormLabel>
 
                     <FormInputGroup
                       type={inputTypes.CHECK}
diff --git a/frontend/src/Settings/Notifications/Notifications/Notification.js b/frontend/src/Settings/Notifications/Notifications/Notification.js
index 08017f6c5..d51b737a9 100644
--- a/frontend/src/Settings/Notifications/Notifications/Notification.js
+++ b/frontend/src/Settings/Notifications/Notifications/Notification.js
@@ -68,10 +68,12 @@ class Notification extends Component {
       name,
       onGrab,
       onDownload,
+      onAlbumDownload,
       onUpgrade,
       onRename,
       supportsOnGrab,
       supportsOnDownload,
+      supportsOnAlbumDownload,
       supportsOnUpgrade,
       supportsOnRename
     } = this.props;
@@ -93,11 +95,18 @@ class Notification extends Component {
           On Grab
         </Label>
 
+        <Label
+          kind={getLabelKind(supportsOnAlbumDownload, onAlbumDownload)}
+          outline={supportsOnAlbumDownload && !onAlbumDownload}
+        >
+          On Album Download
+        </Label>
+
         <Label
           kind={getLabelKind(supportsOnDownload, onDownload)}
           outline={supportsOnDownload && !onDownload}
         >
-          On Download
+          On Track Download
         </Label>
 
         <Label
@@ -140,10 +149,12 @@ Notification.propTypes = {
   name: PropTypes.string.isRequired,
   onGrab: PropTypes.bool.isRequired,
   onDownload: PropTypes.bool.isRequired,
+  onAlbumDownload: PropTypes.bool.isRequired,
   onUpgrade: PropTypes.bool.isRequired,
   onRename: PropTypes.bool.isRequired,
   supportsOnGrab: PropTypes.bool.isRequired,
   supportsOnDownload: PropTypes.bool.isRequired,
+  supportsOnAlbumDownload: PropTypes.bool.isRequired,
   supportsOnUpgrade: PropTypes.bool.isRequired,
   supportsOnRename: PropTypes.bool.isRequired,
   onConfirmDeleteNotification: PropTypes.func.isRequired
diff --git a/src/Lidarr.Api.V1/Notifications/NotificationResource.cs b/src/Lidarr.Api.V1/Notifications/NotificationResource.cs
index 3d1c9ff2b..e66ce1834 100644
--- a/src/Lidarr.Api.V1/Notifications/NotificationResource.cs
+++ b/src/Lidarr.Api.V1/Notifications/NotificationResource.cs
@@ -1,4 +1,4 @@
-using NzbDrone.Core.Notifications;
+using NzbDrone.Core.Notifications;
 
 namespace Lidarr.Api.V1.Notifications
 {
@@ -7,10 +7,12 @@ namespace Lidarr.Api.V1.Notifications
         public string Link { get; set; }
         public bool OnGrab { get; set; }
         public bool OnDownload { get; set; }
+        public bool OnAlbumDownload { get; set; }
         public bool OnUpgrade { get; set; }
         public bool OnRename { get; set; }
         public bool SupportsOnGrab { get; set; }
         public bool SupportsOnDownload { get; set; }
+        public bool SupportsOnAlbumDownload { get; set; }
         public bool SupportsOnUpgrade { get; set; }
         public bool SupportsOnRename { get; set; }
         public string TestCommand { get; set; }
@@ -26,10 +28,12 @@ namespace Lidarr.Api.V1.Notifications
 
             resource.OnGrab = definition.OnGrab;
             resource.OnDownload = definition.OnDownload;
+            resource.OnAlbumDownload = definition.OnAlbumDownload;
             resource.OnUpgrade = definition.OnUpgrade;
             resource.OnRename = definition.OnRename;
             resource.SupportsOnGrab = definition.SupportsOnGrab;
             resource.SupportsOnDownload = definition.SupportsOnDownload;
+            resource.SupportsOnAlbumDownload = definition.SupportsOnAlbumDownload;
             resource.SupportsOnUpgrade = definition.SupportsOnUpgrade;
             resource.SupportsOnRename = definition.SupportsOnRename;
 
@@ -44,14 +48,16 @@ namespace Lidarr.Api.V1.Notifications
 
             definition.OnGrab = resource.OnGrab;
             definition.OnDownload = resource.OnDownload;
+            definition.OnAlbumDownload = resource.OnAlbumDownload;
             definition.OnUpgrade = resource.OnUpgrade;
             definition.OnRename = resource.OnRename;
             definition.SupportsOnGrab = resource.SupportsOnGrab;
             definition.SupportsOnDownload = resource.SupportsOnDownload;
+            definition.SupportsOnAlbumDownload = resource.SupportsOnAlbumDownload;
             definition.SupportsOnUpgrade = resource.SupportsOnUpgrade;
             definition.SupportsOnRename = resource.SupportsOnRename;
 
             return definition;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
index c017a56f2..07bb299cd 100644
--- a/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/NotificationBaseFixture.cs
@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.NotificationTests
                 throw new NotImplementedException();
             }
 
-            public override void OnDownload(DownloadMessage downloadMessage)
+            public override void OnDownload(TrackDownloadMessage trackDownloadMessage)
             {
                 TestLogger.Info("OnDownload was called");
             }
@@ -55,11 +55,16 @@ namespace NzbDrone.Core.Test.NotificationTests
                 TestLogger.Info("OnGrab was called");
             }
 
-            public override void OnDownload(DownloadMessage message)
+            public override void OnDownload(TrackDownloadMessage message)
             {
                 TestLogger.Info("OnDownload was called");
             }
 
+            public override void OnAlbumDownload(AlbumDownloadMessage message)
+            {
+                TestLogger.Info("OnAlbumDownload was called");
+            }
+
             public override void OnRename(Artist artist)
             {
                 TestLogger.Info("OnRename was called");
@@ -100,6 +105,7 @@ namespace NzbDrone.Core.Test.NotificationTests
 
             notification.SupportsOnGrab.Should().BeTrue();
             notification.SupportsOnDownload.Should().BeTrue();
+            notification.SupportsOnAlbumDownload.Should().BeTrue();
             notification.SupportsOnUpgrade.Should().BeTrue();
             notification.SupportsOnRename.Should().BeTrue();
         }
@@ -112,6 +118,7 @@ namespace NzbDrone.Core.Test.NotificationTests
 
             notification.SupportsOnGrab.Should().BeFalse();
             notification.SupportsOnDownload.Should().BeFalse();
+            notification.SupportsOnAlbumDownload.Should().BeFalse();
             notification.SupportsOnUpgrade.Should().BeFalse();
             notification.SupportsOnRename.Should().BeFalse();
         }
diff --git a/src/NzbDrone.Core.Test/NotificationTests/SynologyIndexerFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/SynologyIndexerFixture.cs
index 53b2f081f..2564b1edd 100644
--- a/src/NzbDrone.Core.Test/NotificationTests/SynologyIndexerFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/SynologyIndexerFixture.cs
@@ -14,7 +14,7 @@ namespace NzbDrone.Core.Test.NotificationTests
     public class SynologyIndexerFixture : CoreTest<SynologyIndexer>
     {
         private Artist _artist;
-        private DownloadMessage _upgrade;
+        private TrackDownloadMessage _upgrade;
 
         [SetUp]
         public void SetUp()
@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Test.NotificationTests
                 Path = @"C:\Test\".AsOsAgnostic()
             };
 
-            _upgrade = new DownloadMessage()
+            _upgrade = new TrackDownloadMessage()
             {
                 Artist = _artist,
 
diff --git a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/OnDownloadFixture.cs b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/OnDownloadFixture.cs
index 2dba7a3af..ae0dc8efb 100644
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/OnDownloadFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/OnDownloadFixture.cs
@@ -14,7 +14,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
     [TestFixture]
     public class OnDownloadFixture : CoreTest<Notifications.Xbmc.Xbmc>
     {
-        private DownloadMessage _downloadMessage;
+        private TrackDownloadMessage _trackDownloadMessage;
         
         [SetUp]
         public void Setup()
@@ -25,7 +25,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
             var trackFile = Builder<TrackFile>.CreateNew()
                                                    .Build();
 
-            _downloadMessage = Builder<DownloadMessage>.CreateNew()
+            _trackDownloadMessage = Builder<TrackDownloadMessage>.CreateNew()
                                                        .With(d => d.Artist = artist)
                                                        .With(d => d.TrackFile = trackFile)
                                                        .With(d => d.OldFiles = new List<TrackFile>())
@@ -40,7 +40,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
 
         private void GivenOldFiles()
         {
-            _downloadMessage.OldFiles = Builder<TrackFile>.CreateListOfSize(1)
+            _trackDownloadMessage.OldFiles = Builder<TrackFile>.CreateListOfSize(1)
                                                             .Build()
                                                             .ToList();
 
@@ -54,7 +54,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
         [Test]
         public void should_not_clean_if_no_episode_was_replaced()
         {
-            Subject.OnDownload(_downloadMessage);
+            Subject.OnDownload(_trackDownloadMessage);
 
             Mocker.GetMock<IXbmcService>().Verify(v => v.Clean(It.IsAny<XbmcSettings>()), Times.Never());
         }
@@ -63,7 +63,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
         public void should_clean_if_episode_was_replaced()
         {
             GivenOldFiles();
-            Subject.OnDownload(_downloadMessage);
+            Subject.OnDownload(_trackDownloadMessage);
 
             Mocker.GetMock<IXbmcService>().Verify(v => v.Clean(It.IsAny<XbmcSettings>()), Times.Once());
         }
diff --git a/src/NzbDrone.Core/Datastore/Migration/013_album_download_notification.cs b/src/NzbDrone.Core/Datastore/Migration/013_album_download_notification.cs
new file mode 100644
index 000000000..39bba97be
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/013_album_download_notification.cs
@@ -0,0 +1,14 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(13)]
+    public class album_download_notification : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Notifications").AddColumn("OnAlbumDownload").AsBoolean().WithDefaultValue(0);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs
index c4ecfed48..45b734219 100644
--- a/src/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/src/NzbDrone.Core/Datastore/TableMapping.cs
@@ -71,6 +71,7 @@ namespace NzbDrone.Core.Datastore
             Mapper.Entity<NotificationDefinition>().RegisterDefinition("Notifications")
                   .Ignore(i => i.SupportsOnGrab)
                   .Ignore(i => i.SupportsOnDownload)
+                  .Ignore(i => i.SupportsOnAlbumDownload)
                   .Ignore(i => i.SupportsOnUpgrade)
                   .Ignore(i => i.SupportsOnRename);
             
diff --git a/src/NzbDrone.Core/MediaFiles/Events/AlbumImportedEvent.cs b/src/NzbDrone.Core/MediaFiles/Events/AlbumImportedEvent.cs
new file mode 100644
index 000000000..1d63a7608
--- /dev/null
+++ b/src/NzbDrone.Core/MediaFiles/Events/AlbumImportedEvent.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using NzbDrone.Common.Messaging;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Music;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.MediaFiles.Events
+{
+    public class AlbumImportedEvent : IEvent
+    {
+        public Artist Artist { get; private set; }
+        public Album Album { get; private set; }
+        public List<LocalTrack> ImportedTracks { get; private set; }
+        public bool NewDownload { get; private set; }
+        public string DownloadClient { get; private set; }
+        public string DownloadId { get; private set; }
+
+        public AlbumImportedEvent(Artist artist, Album album, List<LocalTrack> importedTracks, bool newDownload, DownloadClientItem downloadClientItem)
+        {
+            Artist = artist;
+            Album = album;
+            ImportedTracks = importedTracks;
+            NewDownload = newDownload;
+
+            if (downloadClientItem != null)
+            {
+                DownloadClient = downloadClientItem.DownloadClient;
+                DownloadId = downloadClientItem.DownloadId;
+            }
+
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
index add47d573..280d2afbe 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackImport/ImportApprovedTracks.cs
@@ -157,6 +157,19 @@ namespace NzbDrone.Core.MediaFiles.TrackImport
                 }
             }
 
+            var albumImports = importResults.GroupBy(e => e.ImportDecision.LocalTrack.Album.Id).ToList();
+
+            foreach (var albumImport in albumImports)
+            {
+                var album = albumImport.First().ImportDecision.LocalTrack.Album;
+                var artist = albumImport.First().ImportDecision.LocalTrack.Artist;
+
+                if (albumImport.Where(e => e.Errors.Count == 0).ToList().Count > 0 && artist != null && album != null)
+                {
+                    _eventAggregator.PublishEvent(new AlbumImportedEvent(artist, album, albumImport.Select(e => e.ImportDecision.LocalTrack).ToList(), newDownload, downloadClientItem));
+                }
+            }
+
             //Adding all the rejected decisions
             importResults.AddRange(decisions.Where(c => !c.Approved)
                                             .Select(d => new ImportResult(d, d.Rejections.Select(r => r.Reason).ToArray())));
diff --git a/src/NzbDrone.Core/Notifications/AlbumDownloadMessage.cs b/src/NzbDrone.Core/Notifications/AlbumDownloadMessage.cs
new file mode 100644
index 000000000..7748ca90f
--- /dev/null
+++ b/src/NzbDrone.Core/Notifications/AlbumDownloadMessage.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Music;
+
+namespace NzbDrone.Core.Notifications
+{
+    public class AlbumDownloadMessage
+    {
+        public string Message { get; set; }
+        public Artist Artist { get; set; }
+        public Album Album { get; set; }
+        public List<TrackFile> TrackFiles { get; set; }
+        public string DownloadClient { get; set; }
+        public string DownloadId { get; set; }
+
+        public override string ToString()
+        {
+            return Message;
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs b/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs
index b38172f43..97a98e632 100644
--- a/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs
+++ b/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation.Results;
 using NzbDrone.Common.Extensions;
 
@@ -21,11 +21,16 @@ namespace NzbDrone.Core.Notifications.Boxcar
             _proxy.SendNotification(ALBUM_GRABBED_TITLE, grabMessage.Message, Settings);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             _proxy.SendNotification(TRACK_DOWNLOADED_TITLE , message.Message, Settings);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            _proxy.SendNotification(TRACK_DOWNLOADED_TITLE, message.Message, Settings);
+        }
+
         public override ValidationResult Test()
         {
             var failures = new List<ValidationFailure>();
diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
index 5549a8b39..fb4e0b2fb 100644
--- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
+++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
             ExecuteScript(environmentVariables);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             var artist = message.Artist;
             var trackFile = message.TrackFile;
@@ -94,6 +94,27 @@ namespace NzbDrone.Core.Notifications.CustomScript
             ExecuteScript(environmentVariables);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            var artist = message.Artist;
+            var album = message.Album;
+            var environmentVariables = new StringDictionary();
+
+            environmentVariables.Add("Lidarr_EventType", "AlbumDownload");
+            environmentVariables.Add("Lidarr_Artist_Id", artist.Id.ToString());
+            environmentVariables.Add("Lidarr_Artist_Name", artist.Name);
+            environmentVariables.Add("Lidarr_Artist_Path", artist.Path);
+            environmentVariables.Add("Lidarr_Artist_MBId", artist.ForeignArtistId);
+            environmentVariables.Add("Lidarr_Artist_Type", artist.ArtistType);
+            environmentVariables.Add("Lidarr_Album_Id", album.Id.ToString());
+            environmentVariables.Add("Lidarr_Album_Title", album.Title);
+            environmentVariables.Add("Lidarr_Album_MBId", album.ForeignAlbumId);
+            environmentVariables.Add("Lidarr_Download_Client", message.DownloadClient ?? string.Empty);
+            environmentVariables.Add("Lidarr_Download_Id", message.DownloadId ?? string.Empty);
+
+            ExecuteScript(environmentVariables);
+        }
+
         public override void OnRename(Artist artist)
         {
             var environmentVariables = new StringDictionary();
diff --git a/src/NzbDrone.Core/Notifications/Email/Email.cs b/src/NzbDrone.Core/Notifications/Email/Email.cs
index 69158599b..b43cb8bf4 100644
--- a/src/NzbDrone.Core/Notifications/Email/Email.cs
+++ b/src/NzbDrone.Core/Notifications/Email/Email.cs
@@ -25,13 +25,19 @@ namespace NzbDrone.Core.Notifications.Email
             _emailService.SendEmail(Settings, ALBUM_GRABBED_TITLE_BRANDED, body);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             var body = $"{message.Message} Downloaded and sorted.";
 
             _emailService.SendEmail(Settings, TRACK_DOWNLOADED_TITLE_BRANDED, body);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            var body = $"{message.Message} Downloaded and sorted.";
+
+            _emailService.SendEmail(Settings, ALBUM_DOWNLOADED_TITLE_BRANDED, body);
+        }
 
         public override ValidationResult Test()
         {
diff --git a/src/NzbDrone.Core/Notifications/Growl/Growl.cs b/src/NzbDrone.Core/Notifications/Growl/Growl.cs
index e6ff72463..a6ada196a 100644
--- a/src/NzbDrone.Core/Notifications/Growl/Growl.cs
+++ b/src/NzbDrone.Core/Notifications/Growl/Growl.cs
@@ -23,11 +23,15 @@ namespace NzbDrone.Core.Notifications.Growl
             _growlService.SendNotification(ALBUM_GRABBED_TITLE, grabMessage.Message, "GRAB", Settings.Host, Settings.Port, Settings.Password);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             _growlService.SendNotification(TRACK_DOWNLOADED_TITLE, message.Message, "DOWNLOAD", Settings.Host, Settings.Port, Settings.Password);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            _growlService.SendNotification(ALBUM_DOWNLOADED_TITLE, message.Message, "DOWNLOAD", Settings.Host, Settings.Port, Settings.Password);
+        }
 
         public override ValidationResult Test()
         {
diff --git a/src/NzbDrone.Core/Notifications/INotification.cs b/src/NzbDrone.Core/Notifications/INotification.cs
index 36b01e8db..29fb8288f 100644
--- a/src/NzbDrone.Core/Notifications/INotification.cs
+++ b/src/NzbDrone.Core/Notifications/INotification.cs
@@ -8,10 +8,12 @@ namespace NzbDrone.Core.Notifications
         string Link { get; }
 
         void OnGrab(GrabMessage grabMessage);
-        void OnDownload(DownloadMessage message);
+        void OnDownload(TrackDownloadMessage message);
+        void OnAlbumDownload(AlbumDownloadMessage message);
         void OnRename(Artist artist);
         bool SupportsOnGrab { get; }
         bool SupportsOnDownload { get; }
+        bool SupportsOnAlbumDownload { get; }
         bool SupportsOnUpgrade { get; }
         bool SupportsOnRename { get; }
     }
diff --git a/src/NzbDrone.Core/Notifications/Join/Join.cs b/src/NzbDrone.Core/Notifications/Join/Join.cs
index c47b4f993..d4926138d 100644
--- a/src/NzbDrone.Core/Notifications/Join/Join.cs
+++ b/src/NzbDrone.Core/Notifications/Join/Join.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation.Results;
 using NzbDrone.Common.Extensions;
 
@@ -22,11 +22,16 @@ namespace NzbDrone.Core.Notifications.Join
             _proxy.SendNotification(ALBUM_GRABBED_TITLE_BRANDED, message.Message, Settings);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             _proxy.SendNotification(TRACK_DOWNLOADED_TITLE_BRANDED, message.Message, Settings);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            _proxy.SendNotification(ALBUM_DOWNLOADED_TITLE_BRANDED, message.Message, Settings);
+        }
+
         public override ValidationResult Test()
         {
             var failures = new List<ValidationFailure>();
diff --git a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs
index baa150246..3a4af46a6 100644
--- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs
+++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs
@@ -26,7 +26,15 @@ namespace NzbDrone.Core.Notifications.Emby
             }
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            if (Settings.Notify)
+            {
+                _mediaBrowserService.Notify(Settings, ALBUM_DOWNLOADED_TITLE_BRANDED, message.Message);
+            }
+        }
+
+        public override void OnDownload(TrackDownloadMessage message)
         {
             if (Settings.Notify)
             {
diff --git a/src/NzbDrone.Core/Notifications/NotificationBase.cs b/src/NzbDrone.Core/Notifications/NotificationBase.cs
index 915d1d4bf..ac4e802c2 100644
--- a/src/NzbDrone.Core/Notifications/NotificationBase.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationBase.cs
@@ -10,9 +10,11 @@ namespace NzbDrone.Core.Notifications
     {
         protected const string ALBUM_GRABBED_TITLE = "Album Grabbed";
         protected const string TRACK_DOWNLOADED_TITLE = "Track Downloaded";
+        protected const string ALBUM_DOWNLOADED_TITLE = "Album Downloaded";
 
         protected const string ALBUM_GRABBED_TITLE_BRANDED = "Lidarr - " + ALBUM_GRABBED_TITLE;
         protected const string TRACK_DOWNLOADED_TITLE_BRANDED = "Lidarr - " + TRACK_DOWNLOADED_TITLE;
+        protected const string ALBUM_DOWNLOADED_TITLE_BRANDED = "Lidarr - " + ALBUM_DOWNLOADED_TITLE;
 
         public abstract string Name { get; }
 
@@ -32,12 +34,17 @@ namespace NzbDrone.Core.Notifications
 
         }
 
-        public virtual void OnDownload(DownloadMessage message)
+        public virtual void OnDownload(TrackDownloadMessage message)
         {
 
         }
 
-        public virtual void OnRename(Artist series)
+        public virtual void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+
+        }
+
+        public virtual void OnRename(Artist artist)
         {
 
         }
@@ -45,6 +52,7 @@ namespace NzbDrone.Core.Notifications
         public bool SupportsOnGrab => HasConcreteImplementation("OnGrab");
         public bool SupportsOnRename => HasConcreteImplementation("OnRename");
         public bool SupportsOnDownload => HasConcreteImplementation("OnDownload");
+        public bool SupportsOnAlbumDownload => HasConcreteImplementation("OnAlbumDownload");
         public bool SupportsOnUpgrade => SupportsOnDownload;
 
         protected TSettings Settings => (TSettings)Definition.Settings;
diff --git a/src/NzbDrone.Core/Notifications/NotificationDefinition.cs b/src/NzbDrone.Core/Notifications/NotificationDefinition.cs
index 4673a63a9..6b29f2cac 100644
--- a/src/NzbDrone.Core/Notifications/NotificationDefinition.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationDefinition.cs
@@ -7,13 +7,15 @@ namespace NzbDrone.Core.Notifications
 
         public bool OnGrab { get; set; }
         public bool OnDownload { get; set; }
+        public bool OnAlbumDownload { get; set; }
         public bool OnUpgrade { get; set; }
         public bool OnRename { get; set; }
         public bool SupportsOnGrab { get; set; }
         public bool SupportsOnDownload { get; set; }
+        public bool SupportsOnAlbumDownload { get; set; }
         public bool SupportsOnUpgrade { get; set; }
         public bool SupportsOnRename { get; set; }
 
-        public override bool Enable => OnGrab || OnDownload || (OnDownload && OnUpgrade);
+        public override bool Enable => OnGrab || OnDownload || OnAlbumDownload || (OnDownload && OnUpgrade);
     }
 }
diff --git a/src/NzbDrone.Core/Notifications/NotificationFactory.cs b/src/NzbDrone.Core/Notifications/NotificationFactory.cs
index 235a6ba3c..9879638b5 100644
--- a/src/NzbDrone.Core/Notifications/NotificationFactory.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationFactory.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Composition;
@@ -11,6 +11,7 @@ namespace NzbDrone.Core.Notifications
     {
         List<INotification> OnGrabEnabled();
         List<INotification> OnDownloadEnabled();
+        List<INotification> OnAlbumDownloadEnabled();
         List<INotification> OnUpgradeEnabled();
         List<INotification> OnRenameEnabled();
     }
@@ -32,6 +33,11 @@ namespace NzbDrone.Core.Notifications
             return GetAvailableProviders().Where(n => ((NotificationDefinition)n.Definition).OnDownload).ToList();
         }
 
+        public List<INotification> OnAlbumDownloadEnabled()
+        {
+            return GetAvailableProviders().Where(n => ((NotificationDefinition)n.Definition).OnAlbumDownload).ToList();
+        }
+
         public List<INotification> OnUpgradeEnabled()
         {
             return GetAvailableProviders().Where(n => ((NotificationDefinition)n.Definition).OnUpgrade).ToList();
@@ -48,8 +54,9 @@ namespace NzbDrone.Core.Notifications
 
             definition.SupportsOnGrab = provider.SupportsOnGrab;
             definition.SupportsOnDownload = provider.SupportsOnDownload;
+            definition.SupportsOnAlbumDownload = provider.SupportsOnAlbumDownload;
             definition.SupportsOnUpgrade = provider.SupportsOnUpgrade;
             definition.SupportsOnRename = provider.SupportsOnRename;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs
index 47f1a4210..b6e3eb651 100644
--- a/src/NzbDrone.Core/Notifications/NotificationService.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationService.cs
@@ -9,12 +9,14 @@ using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Music;
+using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Notifications
 {
     public class NotificationService
         : IHandle<AlbumGrabbedEvent>,
           IHandle<TrackImportedEvent>,
+          IHandle<AlbumImportedEvent>,
           IHandle<ArtistRenamedEvent>
     {
         private readonly INotificationFactory _notificationFactory;
@@ -62,6 +64,14 @@ namespace NzbDrone.Core.Notifications
                                     qualityString);
         }
 
+        private string GetAlbumDownloadMessage(Artist artist, Album album, List<LocalTrack> tracks)
+        {
+            return string.Format("{0} - {1} ({2} Tracks Imported)",
+                artist.Name,
+                album.Title,
+                tracks.Count);
+        }
+
         private bool ShouldHandleArtist(ProviderDefinition definition, Artist artist)
         {
             if (definition.Tags.Empty())
@@ -115,7 +125,7 @@ namespace NzbDrone.Core.Notifications
                 return;
             }
 
-            var downloadMessage = new DownloadMessage
+            var downloadMessage = new TrackDownloadMessage
 
             {
                 Message = GetTrackMessage(message.TrackInfo.Artist, message.TrackInfo.Tracks, message.TrackInfo.Quality),
@@ -147,6 +157,40 @@ namespace NzbDrone.Core.Notifications
             }
         }
 
+        public void Handle(AlbumImportedEvent message)
+        {
+            if (!message.NewDownload)
+            {
+                return;
+            }
+
+            var downloadMessage = new AlbumDownloadMessage
+
+            {
+                Message = GetAlbumDownloadMessage(message.Artist, message.Album, message.ImportedTracks),
+                Artist = message.Artist,
+                Album = message.Album,
+                DownloadClient = message.DownloadClient,
+                DownloadId = message.DownloadId
+            };
+
+            foreach (var notification in _notificationFactory.OnAlbumDownloadEnabled())
+            {
+                try
+                {
+                    if (ShouldHandleArtist(notification.Definition, message.Artist))
+                    {
+                        notification.OnAlbumDownload(downloadMessage);
+                    }
+                }
+
+                catch (Exception ex)
+                {
+                    _logger.Warn(ex, "Unable to send OnDownload notification to: " + notification.Definition.Name);
+                }
+            }
+        }
+
         public void Handle(ArtistRenamedEvent message)
         {
             foreach (var notification in _notificationFactory.OnRenameEnabled())
diff --git a/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs b/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs
index 995d994ac..c642ad360 100644
--- a/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs
+++ b/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation.Results;
 using NzbDrone.Common.Extensions;
 
@@ -21,11 +21,16 @@ namespace NzbDrone.Core.Notifications.NotifyMyAndroid
             _proxy.SendNotification(ALBUM_GRABBED_TITLE, grabMessage.Message, Settings.ApiKey, (NotifyMyAndroidPriority)Settings.Priority);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             _proxy.SendNotification(TRACK_DOWNLOADED_TITLE, message.Message, Settings.ApiKey, (NotifyMyAndroidPriority)Settings.Priority);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            _proxy.SendNotification(ALBUM_DOWNLOADED_TITLE, message.Message, Settings.ApiKey, (NotifyMyAndroidPriority)Settings.Priority);
+        }
+
         public override ValidationResult Test()
         {
             var failures = new List<ValidationFailure>();
diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs b/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs
index 3641ed416..f300ed2a6 100644
--- a/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs
@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Notifications.Plex
             _plexClientService.Notify(Settings, ALBUM_GRABBED_TITLE_BRANDED, grabMessage.Message);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             _plexClientService.Notify(Settings, TRACK_DOWNLOADED_TITLE_BRANDED, message.Message);
         }
diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs b/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs
index c0ca2766a..d343c90dc 100644
--- a/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs
@@ -26,7 +26,7 @@ namespace NzbDrone.Core.Notifications.Plex
             Notify(Settings, ALBUM_GRABBED_TITLE_BRANDED, grabMessage.Message);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             Notify(Settings, TRACK_DOWNLOADED_TITLE_BRANDED, message.Message);
         }
diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexServer.cs b/src/NzbDrone.Core/Notifications/Plex/PlexServer.cs
index 4d34cba3c..356221e78 100644
--- a/src/NzbDrone.Core/Notifications/Plex/PlexServer.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/PlexServer.cs
@@ -17,7 +17,7 @@ namespace NzbDrone.Core.Notifications.Plex
         public override string Link => "https://www.plex.tv/";
         public override string Name => "Plex Media Server";
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             UpdateIfEnabled(message.Artist);
         }
diff --git a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs
index 6d2876d4e..967639fd9 100644
--- a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs
+++ b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs
@@ -22,11 +22,16 @@ namespace NzbDrone.Core.Notifications.Prowl
             _prowlService.SendNotification(ALBUM_GRABBED_TITLE, grabMessage.Message, Settings.ApiKey, (NotificationPriority)Settings.Priority);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             _prowlService.SendNotification(TRACK_DOWNLOADED_TITLE, message.Message, Settings.ApiKey, (NotificationPriority)Settings.Priority);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            _prowlService.SendNotification(ALBUM_DOWNLOADED_TITLE, message.Message, Settings.ApiKey, (NotificationPriority)Settings.Priority);
+        }
+
         public override ValidationResult Test()
         {
             var failures = new List<ValidationFailure>();
diff --git a/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs b/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs
index aee178a50..9b5ca8d27 100644
--- a/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs
+++ b/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation.Results;
 using NzbDrone.Common.Extensions;
 
@@ -22,11 +22,16 @@ namespace NzbDrone.Core.Notifications.PushBullet
             _proxy.SendNotification(ALBUM_GRABBED_TITLE_BRANDED, grabMessage.Message, Settings);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             _proxy.SendNotification(TRACK_DOWNLOADED_TITLE_BRANDED, message.Message, Settings);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            _proxy.SendNotification(ALBUM_DOWNLOADED_TITLE_BRANDED, message.Message, Settings);
+        }
+
         public override ValidationResult Test()
         {
             var failures = new List<ValidationFailure>();
diff --git a/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs b/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs
index aa5985dd2..2929d465b 100644
--- a/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs
+++ b/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs
@@ -21,11 +21,15 @@ namespace NzbDrone.Core.Notifications.Pushalot
             _proxy.SendNotification(ALBUM_GRABBED_TITLE, grabMessage.Message, Settings);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             _proxy.SendNotification(TRACK_DOWNLOADED_TITLE, message.Message, Settings);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            _proxy.SendNotification(ALBUM_DOWNLOADED_TITLE, message.Message, Settings);
+        }
 
         public override ValidationResult Test()
         {
diff --git a/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs b/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs
index 6755d77c0..dadac64d0 100644
--- a/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs
+++ b/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation.Results;
 using NzbDrone.Common.Extensions;
 
@@ -21,11 +21,16 @@ namespace NzbDrone.Core.Notifications.Pushover
             _proxy.SendNotification(ALBUM_GRABBED_TITLE, grabMessage.Message, Settings);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             _proxy.SendNotification(TRACK_DOWNLOADED_TITLE, message.Message, Settings);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            _proxy.SendNotification(ALBUM_DOWNLOADED_TITLE, message.Message, Settings);
+        }
+
         public override ValidationResult Test()
         {
             var failures = new List<ValidationFailure>();
diff --git a/src/NzbDrone.Core/Notifications/Slack/Slack.cs b/src/NzbDrone.Core/Notifications/Slack/Slack.cs
index fdec42749..d44e6b6c0 100644
--- a/src/NzbDrone.Core/Notifications/Slack/Slack.cs
+++ b/src/NzbDrone.Core/Notifications/Slack/Slack.cs
@@ -45,7 +45,7 @@ namespace NzbDrone.Core.Notifications.Slack
             _proxy.SendPayload(payload, Settings);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             var attachments = new List<Attachment>
                               {
@@ -62,6 +62,23 @@ namespace NzbDrone.Core.Notifications.Slack
             _proxy.SendPayload(payload, Settings);
         }
 
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            var attachments = new List<Attachment>
+            {
+                new Attachment
+                {
+                    Fallback = message.Message,
+                    Title = message.Artist.Name,
+                    Text = message.Message,
+                    Color = "good"
+                }
+            };
+            var payload = CreatePayload($"Imported: {message.Message}", attachments);
+
+            _proxy.SendPayload(payload, Settings);
+        }
+
         public override void OnRename(Artist artist)
         {
             var attachments = new List<Attachment>
diff --git a/src/NzbDrone.Core/Notifications/Synology/SynologyIndexer.cs b/src/NzbDrone.Core/Notifications/Synology/SynologyIndexer.cs
index 8631f030d..d89f8227a 100644
--- a/src/NzbDrone.Core/Notifications/Synology/SynologyIndexer.cs
+++ b/src/NzbDrone.Core/Notifications/Synology/SynologyIndexer.cs
@@ -20,7 +20,7 @@ namespace NzbDrone.Core.Notifications.Synology
         public override string Name => "Synology Indexer";
 
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             if (Settings.UpdateLibrary)
             {
diff --git a/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs b/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs
index e44308bb7..8f14f2d84 100644
--- a/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs
+++ b/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation.Results;
 using NzbDrone.Common.Extensions;
 
@@ -21,7 +21,12 @@ namespace NzbDrone.Core.Notifications.Telegram
             _proxy.SendNotification(ALBUM_GRABBED_TITLE, grabMessage.Message, Settings);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
+        {
+            _proxy.SendNotification(TRACK_DOWNLOADED_TITLE, message.Message, Settings);
+        }
+
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
         {
             _proxy.SendNotification(TRACK_DOWNLOADED_TITLE, message.Message, Settings);
         }
diff --git a/src/NzbDrone.Core/Notifications/DownloadMessage.cs b/src/NzbDrone.Core/Notifications/TrackDownloadMessage.cs
similarity index 93%
rename from src/NzbDrone.Core/Notifications/DownloadMessage.cs
rename to src/NzbDrone.Core/Notifications/TrackDownloadMessage.cs
index b88cb4694..228cadd43 100644
--- a/src/NzbDrone.Core/Notifications/DownloadMessage.cs
+++ b/src/NzbDrone.Core/Notifications/TrackDownloadMessage.cs
@@ -4,7 +4,7 @@ using NzbDrone.Core.Music;
 
 namespace NzbDrone.Core.Notifications
 {
-    public class DownloadMessage
+    public class TrackDownloadMessage
     {
         public string Message { get; set; }
         public Artist Artist { get; set; }
diff --git a/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs b/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs
index e517d1902..2eae0ecde 100644
--- a/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs
+++ b/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentValidation.Results;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Exceptions;
@@ -24,7 +24,12 @@ namespace NzbDrone.Core.Notifications.Twitter
             _twitterService.SendNotification($"Grabbed: {message.Message}", Settings);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
+        {
+            _twitterService.SendNotification($"Imported: {message.Message}", Settings);
+        }
+
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
         {
             _twitterService.SendNotification($"Imported: {message.Message}", Settings);
         }
diff --git a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs
index 252503071..3f3a667c6 100644
--- a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs
+++ b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Notifications.Webhook
             _proxy.SendWebhook(payload, Settings);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnDownload(TrackDownloadMessage message)
         {
             var trackFile = message.TrackFile;
 
diff --git a/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs b/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs
index e5aaf6b44..e2a64e5f4 100644
--- a/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs
+++ b/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs
@@ -28,7 +28,14 @@ namespace NzbDrone.Core.Notifications.Xbmc
             Notify(Settings, header, grabMessage.Message);
         }
 
-        public override void OnDownload(DownloadMessage message)
+        public override void OnAlbumDownload(AlbumDownloadMessage message)
+        {
+            const string header = "Lidarr - Downloaded";
+
+            Notify(Settings, header, message.Message);
+        }
+
+        public override void OnDownload(TrackDownloadMessage message)
         {
             const string header = "Lidarr - Downloaded";
 
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index 6bc7201a1..21b2a05f0 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -179,6 +179,7 @@
     <Compile Include="Datastore\Migration\003_add_medium_support.cs" />
     <Compile Include="Datastore\Migration\006_separate_automatic_and_interactive_search.cs" />
     <Compile Include="Datastore\Migration\007_change_album_path_to_relative.cs" />
+    <Compile Include="Datastore\Migration\013_album_download_notification.cs" />
     <Compile Include="Datastore\Migration\009_album_releases.cs" />
     <Compile Include="Datastore\Migration\010_album_releases_fix.cs" />
     <Compile Include="Datastore\Migration\011_import_lists.cs" />
@@ -684,6 +685,7 @@
     <Compile Include="MediaFiles\Commands\CleanUpRecycleBinCommand.cs" />
     <Compile Include="MediaFiles\Commands\DownloadedAlbumsScanCommand.cs" />
     <Compile Include="MediaFiles\Commands\RenameArtistCommand.cs" />
+    <Compile Include="MediaFiles\Events\AlbumImportedEvent.cs" />
     <Compile Include="MediaFiles\Events\TrackFileRenamedEvent.cs" />
     <Compile Include="MediaFiles\Events\TrackFolderCreatedEvent.cs" />
     <Compile Include="MediaFiles\Events\TrackImportFailedEvent.cs" />
@@ -858,6 +860,7 @@
     <Compile Include="Music\Track.cs" />
     <Compile Include="Music\TrackRepository.cs" />
     <Compile Include="Music\TrackService.cs" />
+    <Compile Include="Notifications\AlbumDownloadMessage.cs" />
     <Compile Include="Notifications\Join\JoinAuthException.cs" />
     <Compile Include="Notifications\Join\JoinInvalidDeviceException.cs" />
     <Compile Include="Notifications\Join\JoinResponseModel.cs" />
@@ -953,7 +956,7 @@
     <Compile Include="RemotePathMappings\RemotePathMappingRepository.cs" />
     <Compile Include="RemotePathMappings\RemotePathMappingService.cs" />
     <Compile Include="MediaFiles\TorrentInfo\TorrentFileInfoReader.cs" />
-    <Compile Include="Notifications\DownloadMessage.cs" />
+    <Compile Include="Notifications\TrackDownloadMessage.cs" />
     <Compile Include="Notifications\Email\Email.cs">
       <SubType>Code</SubType>
     </Compile>