From e457003a919cd8be142dd238432811d2324f9a25 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Thu, 11 Dec 2014 16:50:42 -0800
Subject: [PATCH] Fixed: Sonarr as default Release Group instead of DRONE

---
 .../OrganizerTests/FileNameBuilderFixture.cs     | 16 +++++++++++++---
 src/NzbDrone.Core/Organizer/FileNameBuilder.cs   |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs
index 61527779a..8106f6b87 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs
@@ -61,7 +61,7 @@ namespace NzbDrone.Core.Test.OrganizerTests
                             .With(e => e.AbsoluteEpisodeNumber = 102)
                             .Build();
 
-            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "DRONE" };
+            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "SonarrTest" };
             
             Mocker.GetMock<IQualityDefinitionService>()
                 .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
@@ -646,7 +646,7 @@ namespace NzbDrone.Core.Test.OrganizerTests
             _namingConfig.MultiEpisodeStyle = (int) MultiEpisodeStyle.Duplicate;
 
             Subject.BuildFileName(new List<Episode> { _episode1, _episode2 }, _series, _episodeFile)
-                   .Should().Be("South Park - S15E06 - S15E07 - (HDTV-720p, , DRONE) - City Sushi");
+                   .Should().Be("South Park - S15E06 - S15E07 - (HDTV-720p, , SonarrTest) - City Sushi");
         }
 
         [Test]
@@ -836,7 +836,7 @@ namespace NzbDrone.Core.Test.OrganizerTests
             _namingConfig.AnimeEpisodeFormat = "[{Release Group}]{Series.CleanTitle}.{absolute:000}";
 
             Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
-                   .Should().Be("[DRONE]South.Park.100");
+                   .Should().Be("[SonarrTest]South.Park.100");
         }
 
         [Test]
@@ -864,5 +864,15 @@ namespace NzbDrone.Core.Test.OrganizerTests
             Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
                    .Should().Be("30 Rock - S01E01 - Test");
         }
+
+        [Test]
+        public void should_use_Sonarr_as_release_group_when_not_available()
+        {
+            _episodeFile.ReleaseGroup = null;
+            _namingConfig.StandardEpisodeFormat = "{Release Group}";
+
+            Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
+                   .Should().Be("Sonarr");
+        }
     }
 }
\ No newline at end of file
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 2a1842372..baa1bb622 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -417,7 +417,7 @@ namespace NzbDrone.Core.Organizer
         {
             tokenHandlers["{Original Title}"] = m => GetOriginalTitle(episodeFile);
             tokenHandlers["{Original Filename}"] = m => GetOriginalFileName(episodeFile);
-            tokenHandlers["{Release Group}"] = m => episodeFile.ReleaseGroup ?? "DRONE";
+            tokenHandlers["{Release Group}"] = m => episodeFile.ReleaseGroup ?? "Sonarr";
         }
 
         private void AddQualityTokens(Dictionary<String, Func<TokenMatch, String>> tokenHandlers, Series series, EpisodeFile episodeFile)