mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Prepping for git flow, changed update branch to master

This commit is contained in:
Mark McDowall 2013-08-09 22:00:07 -07:00
parent 649f666a3a
commit 2e108620d6
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NzbDrone.Core.Test/UpdateTests/UpdatePackageProviderFixture.cs
View File

@ -14,7 +14,7 @@ namespace NzbDrone.Core.Test.UpdateTests
{ {
UseRealHttp(); UseRealHttp();
Mocker.GetMock<IConfigFileProvider>().SetupGet(c => c.UpdateUrl).Returns("http://update.nzbdrone.com/_release/"); Mocker.GetMock<IConfigFileProvider>().SetupGet(c => c.Branch).Returns("master");
var updates = Subject.GetAvailablePackages().ToList(); var updates = Subject.GetAvailablePackages().ToList();

6
NzbDrone.Core/Configuration/ConfigFileProvider.cs
View File

@ -22,7 +22,7 @@ namespace NzbDrone.Core.Configuration
string Username { get; } string Username { get; }
string Password { get; } string Password { get; }
string LogLevel { get; } string LogLevel { get; }
string UpdateUrl { get; } string Branch { get; }
} }
public class ConfigFileProvider : IConfigFileProvider public class ConfigFileProvider : IConfigFileProvider
@ -96,9 +96,9 @@ namespace NzbDrone.Core.Configuration
get { return GetValueBoolean("AuthenticationEnabled", false); } get { return GetValueBoolean("AuthenticationEnabled", false); }
} }
public string UpdateUrl public string Branch
{ {
get { return GetValue("UpdateUrl", "http://update.nzbdrone.com/vnext/"); } get { return GetValue("Branch", "master"); }
} }
public string Username public string Username

1
NzbDrone.Core/Update/InstallUpdateService.cs
View File

@ -71,7 +71,6 @@ namespace NzbDrone.Core.Update
_diskProvider.MoveFolder(_appFolderInfo.GetUpdateClientFolder(), _diskProvider.MoveFolder(_appFolderInfo.GetUpdateClientFolder(),
updateSandboxFolder); updateSandboxFolder);
_logger.Info("Starting update client"); _logger.Info("Starting update client");
var startInfo = new ProcessStartInfo var startInfo = new ProcessStartInfo
{ {

9
NzbDrone.Core/Update/UpdatePackageProvider.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using NLog; using NLog;
using NzbDrone.Common; using NzbDrone.Common;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
namespace NzbDrone.Core.Update namespace NzbDrone.Core.Update
@ -20,7 +21,8 @@ namespace NzbDrone.Core.Update
private readonly IHttpProvider _httpProvider; private readonly IHttpProvider _httpProvider;
private readonly Logger _logger; private readonly Logger _logger;
private static readonly Regex ParseRegex = new Regex(@"(?:\>)(?<filename>NzbDrone.+?(?<version>\d+\.\d+\.\d+\.\d+).+?)(?:\<\/A\>)", RegexOptions.IgnoreCase); private static readonly Regex ParseRegex = new Regex(@"(?:\>)(?<filename>NzbDrone.+?(?<version>(?<=\.)\d+\.\d+\.\d+\.\d+).+?)(?:\<\/a\>)",
RegexOptions.IgnoreCase);
public UpdatePackageProvider(IConfigFileProvider configService, IHttpProvider httpProvider, Logger logger) public UpdatePackageProvider(IConfigFileProvider configService, IHttpProvider httpProvider, Logger logger)
{ {
@ -32,7 +34,10 @@ namespace NzbDrone.Core.Update
public IEnumerable<UpdatePackage> GetAvailablePackages() public IEnumerable<UpdatePackage> GetAvailablePackages()
{ {
var updateList = new List<UpdatePackage>(); var updateList = new List<UpdatePackage>();
var updateUrl = _configService.UpdateUrl;
var branch = _configService.Branch;
var version = BuildInfo.Version;
var updateUrl = String.Format("http://update.nzbdrone.com/v{0}/{1}/", version.Major, branch);
_logger.Debug("Getting a list of updates from {0}", updateUrl); _logger.Debug("Getting a list of updates from {0}", updateUrl);