mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-19 21:03:17 -07:00
parent
b47213a2a7
commit
7c8d0b269a
7 changed files with 25 additions and 14 deletions
|
@ -24,6 +24,8 @@
|
||||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
// ************************************************************************/
|
// ************************************************************************/
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
using System;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
|
|
||||||
namespace PlexRequests.Core.Tests
|
namespace PlexRequests.Core.Tests
|
||||||
|
|
|
@ -63,10 +63,10 @@ namespace PlexRequests.Core
|
||||||
|
|
||||||
var latestRelease = GetLatestRelease();
|
var latestRelease = GetLatestRelease();
|
||||||
|
|
||||||
var latestVersionArray = latestRelease.Result.Name.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
|
var latestVersionArray = latestRelease.Result.Name.Split(new[] { 'v' }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
var latestVersion = latestVersionArray.Length > 1 ? latestVersionArray[1] : string.Empty;
|
var latestVersion = latestVersionArray.Length > 1 ? latestVersionArray[1] : string.Empty;
|
||||||
|
|
||||||
if (!latestVersion.Equals(AssemblyHelper.GetReleaseVersion(), StringComparison.InvariantCultureIgnoreCase))
|
if (!latestVersion.Equals(AssemblyHelper.GetProductVersion(), StringComparison.InvariantCultureIgnoreCase))
|
||||||
{
|
{
|
||||||
model.UpdateAvailable = true;
|
model.UpdateAvailable = true;
|
||||||
model.UpdateUri = latestRelease.Result.HtmlUrl;
|
model.UpdateUri = latestRelease.Result.HtmlUrl;
|
||||||
|
|
|
@ -34,9 +34,8 @@ namespace PlexRequests.Helpers.Tests
|
||||||
[Test]
|
[Test]
|
||||||
public void GetReleaseVersionTest()
|
public void GetReleaseVersionTest()
|
||||||
{
|
{
|
||||||
var result = AssemblyHelper.GetReleaseVersion();
|
var result = AssemblyHelper.GetProductVersion();
|
||||||
Assert.That(result, Contains.Substring("v"));
|
Assert.That(result, Is.Not.Null);
|
||||||
Assert.That(result, Is.Not.EqualTo("1.0.0.0"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -38,11 +38,11 @@ namespace PlexRequests.Helpers
|
||||||
return fvi.FileVersion;
|
return fvi.FileVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string GetReleaseVersion()
|
public static string GetProductVersion()
|
||||||
{
|
{
|
||||||
var assembly = Assembly.GetExecutingAssembly();
|
var assembly = Assembly.GetExecutingAssembly();
|
||||||
var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
|
var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
|
||||||
var retVersion = "v" + fvi.FileVersion.Substring(0, fvi.FileVersion.Length - 2);
|
var retVersion = fvi.ProductVersion;
|
||||||
return retVersion;
|
return retVersion;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,11 +6,21 @@
|
||||||
|
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="portNumber" class="control-label">Latest Version</label>
|
<label class="control-label">Version: </label>
|
||||||
|
<label class="control-label">@Model.Version</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="control-label">Update Available: </label>
|
||||||
|
@if (Model.UpdateAvailable)
|
||||||
|
{
|
||||||
|
<label class="control-label"><a href="@Model.UpdateUri" target="_blank"><i class="fa fa-check"></i> Click Here!</a></label>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<label class="control-label"><i class="fa fa-times"></i></label>
|
||||||
|
}
|
||||||
|
|
||||||
<div class="">
|
|
||||||
<input type="text" class="form-control form-control-custom " id="portNumber" name="Port" placeholder="Port Number" value="@port">
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
|
|
||||||
@if (Context.Request.Path == "/admin/status")
|
@if (Context.Request.Path == "/admin/status")
|
||||||
{
|
{
|
||||||
<a class="list-group-item active" href="/admin/status">Status/a>
|
<a class="list-group-item active" href="/admin/status">Status</a>
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
version: 1.2.{build}
|
version: 1.2.0
|
||||||
configuration: Release
|
configuration: Release
|
||||||
assembly_info:
|
assembly_info:
|
||||||
patch: true
|
patch: true
|
||||||
file: '**\AssemblyInfo.*'
|
file: '**\AssemblyInfo.*'
|
||||||
assembly_version: '1.2.0'
|
assembly_version: '1.2.0'
|
||||||
assembly_file_version: '{version}'
|
assembly_file_version: '1.2.{build}'
|
||||||
assembly_informational_version: '1.2.0'
|
assembly_informational_version: '1.2.0'
|
||||||
before_build:
|
before_build:
|
||||||
- cmd: appveyor-retry nuget restore
|
- cmd: appveyor-retry nuget restore
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue