From e03af773759d08b79190f888a1e0c226b463a724 Mon Sep 17 00:00:00 2001 From: Matthew Despain Date: Thu, 4 May 2017 10:16:09 -0600 Subject: [PATCH 1/4] Adding music related columns to NamingConfig table. --- .../112_Add_music_fields_to_NamingConfig.cs | 15 +++++++++++++++ src/NzbDrone.Core/NzbDrone.Core.csproj | 1 + 2 files changed, 16 insertions(+) create mode 100644 src/NzbDrone.Core/Datastore/Migration/112_Add_music_fields_to_NamingConfig.cs diff --git a/src/NzbDrone.Core/Datastore/Migration/112_Add_music_fields_to_NamingConfig.cs b/src/NzbDrone.Core/Datastore/Migration/112_Add_music_fields_to_NamingConfig.cs new file mode 100644 index 000000000..f48ce9988 --- /dev/null +++ b/src/NzbDrone.Core/Datastore/Migration/112_Add_music_fields_to_NamingConfig.cs @@ -0,0 +1,15 @@ +using FluentMigrator; +using NzbDrone.Core.Datastore.Migration.Framework; + +namespace NzbDrone.Core.Datastore.Migration +{ + [Migration(112)] + public class add_music_fields_to_namingconfig : NzbDroneMigrationBase + { + protected override void MainDbUpgrade() + { + Alter.Table("NamingConfig").AddColumn("ArtistFolderFormat").AsAnsiString(); + Alter.Table("NamingConfig").AddColumn("AlbumFolderFormat").AsAnsiString(); + } + } +} diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 606293015..678b2e8da 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -288,6 +288,7 @@ + From d14111f9147a5042be184e1cc1518f6206cda963 Mon Sep 17 00:00:00 2001 From: Matthew Despain Date: Thu, 4 May 2017 10:16:58 -0600 Subject: [PATCH 2/4] Updating links and adding credits --- src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs b/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs index 34e9bbd57..40c89af35 100644 --- a/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs +++ b/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs @@ -17,6 +17,13 @@
Source
github.com/Lidarr/Lidarr
+
Contributors
+
DB and API - Majora2007
+
UI and Website - Mattman86
+
UI and Logo - Skoden
+
DB and Search - Runraid
+
Consultation - Galli-leo
+
Feature Requests
feathub.com/mattman86/Lidarr
github.com/mattman86/Lidarr/issues (Please post issues on the forum first and not on github)
From ea01ee335bd63ccd6a2f3ff1b64599c413127834 Mon Sep 17 00:00:00 2001 From: Matthew Despain Date: Thu, 4 May 2017 10:17:43 -0600 Subject: [PATCH 3/4] Updating service provider with Lidarr name --- src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs b/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs index 279ee8a56..08ef40273 100644 --- a/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs +++ b/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using NLog; using NzbDrone.Common; @@ -30,7 +30,7 @@ namespace NzbDrone.Update.UpdateEngine public void Start(AppType appType, string installationFolder) { - _logger.Info("Starting NzbDrone"); + _logger.Info("Starting Lidarr"); if (appType == AppType.Service) { try @@ -40,7 +40,7 @@ namespace NzbDrone.Update.UpdateEngine } catch (InvalidOperationException e) { - _logger.Warn(e, "Couldn't start NzbDrone Service (Most likely due to permission issues). falling back to console."); + _logger.Warn(e, "Couldn't start Lidarr Service (Most likely due to permission issues). falling back to console."); StartConsole(installationFolder); } } @@ -56,18 +56,18 @@ namespace NzbDrone.Update.UpdateEngine private void StartService() { - _logger.Info("Starting NzbDrone service"); + _logger.Info("Starting Lidarr service"); _serviceProvider.Start(ServiceProvider.NZBDRONE_SERVICE_NAME); } private void StartWinform(string installationFolder) { - Start(installationFolder, "NzbDrone.exe"); + Start(installationFolder, "Lidarr.exe"); } private void StartConsole(string installationFolder) { - Start(installationFolder, "NzbDrone.Console.exe"); + Start(installationFolder, "Lidarr.Console.exe"); } private void Start(string installationFolder, string fileName) From bebb82ec9fc87e07f786039105dd5d37223aba5d Mon Sep 17 00:00:00 2001 From: mdespain Date: Thu, 4 May 2017 10:41:59 -0600 Subject: [PATCH 4/4] Fixing my epic fail of not setting the columns to allow null. --- .../Migration/112_Add_music_fields_to_NamingConfig.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/Datastore/Migration/112_Add_music_fields_to_NamingConfig.cs b/src/NzbDrone.Core/Datastore/Migration/112_Add_music_fields_to_NamingConfig.cs index f48ce9988..b855e1e28 100644 --- a/src/NzbDrone.Core/Datastore/Migration/112_Add_music_fields_to_NamingConfig.cs +++ b/src/NzbDrone.Core/Datastore/Migration/112_Add_music_fields_to_NamingConfig.cs @@ -8,8 +8,8 @@ namespace NzbDrone.Core.Datastore.Migration { protected override void MainDbUpgrade() { - Alter.Table("NamingConfig").AddColumn("ArtistFolderFormat").AsAnsiString(); - Alter.Table("NamingConfig").AddColumn("AlbumFolderFormat").AsAnsiString(); + Alter.Table("NamingConfig").AddColumn("ArtistFolderFormat").AsAnsiString().Nullable(); + Alter.Table("NamingConfig").AddColumn("AlbumFolderFormat").AsAnsiString().Nullable(); } } }