github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 21:03:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finished the status page #11 and some more work to #12

Browse source
This commit is contained in:
Jamie Rees 2016-03-15 18:39:43 +00:00
commit 7c8d0b269a
7 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PlexRequests.Core.Tests/StatusCheckerTests.cs
View file

@ -24,6 +24,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ************************************************************************/
#endregion
using System;
using NUnit.Framework;
namespace PlexRequests.Core.Tests

4
PlexRequests.Core/StatusChecker.cs
View file

@ -63,10 +63,10 @@ namespace PlexRequests.Core
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;
if (!latestVersion.Equals(AssemblyHelper.GetReleaseVersion(), StringComparison.InvariantCultureIgnoreCase))
if (!latestVersion.Equals(AssemblyHelper.GetProductVersion(), StringComparison.InvariantCultureIgnoreCase))
{
model.UpdateAvailable = true;
model.UpdateUri = latestRelease.Result.HtmlUrl;

5
PlexRequests.Helpers.Tests/AssemblyHelperTests.cs
View file

@ -34,9 +34,8 @@ namespace PlexRequests.Helpers.Tests
[Test]
public void GetReleaseVersionTest()
{
var result = AssemblyHelper.GetReleaseVersion();
Assert.That(result, Contains.Substring("v"));
Assert.That(result, Is.Not.EqualTo("1.0.0.0"));
var result = AssemblyHelper.GetProductVersion();
Assert.That(result, Is.Not.Null);
}
}
}

4
PlexRequests.Helpers/AssemblyHelper.cs
View file

@ -38,11 +38,11 @@ namespace PlexRequests.Helpers
return fvi.FileVersion;
}
public static string GetReleaseVersion()
public static string GetProductVersion()
{
var assembly = Assembly.GetExecutingAssembly();
var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
var retVersion = "v" + fvi.FileVersion.Substring(0, fvi.FileVersion.Length - 2);
var retVersion = fvi.ProductVersion;
return retVersion;
}
}

18
PlexRequests.UI/Views/Admin/Status.cshtml
View file

@ -6,11 +6,21 @@
<div class="form-group">
<label for="portNumber" class="control-label">Latest Version</label>
<div class="">
<input type="text" class="form-control form-control-custom " id="portNumber" name="Port" placeholder="Port Number" value="@port">
<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>

2
PlexRequests.UI/Views/Admin/_Sidebar.cshtml
View file

@ -57,7 +57,7 @@
@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
{

4
appveyor.yml
View file

@ -1,10 +1,10 @@
version: 1.2.{build}
version: 1.2.0
configuration: Release
assembly_info:
patch: true
file: '**\AssemblyInfo.*'
assembly_version: '1.2.0'
assembly_file_version: '{version}'
assembly_file_version: '1.2.{build}'
assembly_informational_version: '1.2.0'
before_build:
- cmd: appveyor-retry nuget restore