mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2025-01-03 05:25:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/mattman86/Lidarr into develop

Browse source
This commit is contained in:
Joseph Milazzo 2017-05-05 08:19:59 -05:00
commit 3f2c00410d
4 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/NzbDrone.Core/Datastore/Migration/112_Add_music_fields_to_NamingConfig.cs Normal file
View file

@ -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().Nullable();
Alter.Table("NamingConfig").AddColumn("AlbumFolderFormat").AsAnsiString().Nullable();
}
}
}

1
src/NzbDrone.Core/NzbDrone.Core.csproj
View file

@ -288,6 +288,7 @@
</Compile>
<Compile Include="Datastore\Migration\105_rename_torrent_downloadstation.cs" />
<Compile Include="Datastore\Migration\111_setup_music.cs" />
<Compile Include="Datastore\Migration\112_add_music_fields_to_namingconfig.cs" />
<Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
<Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
<Compile Include="Datastore\Migration\Framework\MigrationDbFactory.cs" />

12
src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using NLog;
using NzbDrone.Common;
@ -30,7 +30,7 @@ public StartNzbDrone(IServiceProvider serviceProvider, IProcessProvider processP
public void Start(AppType appType, string installationFolder)
{
_logger.Info("Starting NzbDrone");
_logger.Info("Starting Lidarr");
if (appType == AppType.Service)
{
try
@ -40,7 +40,7 @@ public void Start(AppType appType, string installationFolder)
}
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 @@ public void Start(AppType appType, string installationFolder)
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)

7
src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs
View file

@ -17,6 +17,13 @@
<dt>Source</dt>
<dd><a href="https://github.com/mattman86/Lidarr/">github.com/Lidarr/Lidarr</a></dd>
<dt>Contributors</dt>
<dd>DB and API - <a href="https://github.com/majora2007">Majora2007</a></dd>
<dd>UI and Website - <a href="https://github.com/mattman86">Mattman86</a></dd>
<dd>UI and Logo - <a href="https://github.com/skoden">Skoden</a></dd>
<dd>DB and Search - <a href="https://github.com/runraid">Runraid</a></dd>
<dd>Consultation - <a href="https://github.com/galli-leo">Galli-leo</a></dd>
<dt>Feature Requests</dt>
<dd><a href="http://feathub.com/mattman86/Lidarr/">feathub.com/mattman86/Lidarr</a></dd>
<dd><a href="https://github.com/mattman86/Lidarr/issues">github.com/mattman86/Lidarr/issues</a> <b>(Please post issues on the forum first and not on github)</b></dd>