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

Finished #659

Browse source 
#236 has been modified slightly. Needs testing on Different systems
This commit is contained in:
Jamie.Rees 2016-11-08 13:35:35 +00:00
commit 1c7fb2e93e
9 changed files with 160 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PlexRequests.Core/Models/StatusModel.cs
View file

@ -28,7 +28,8 @@ namespace PlexRequests.Core.Models
{
public class StatusModel
{
public string Version { get; set; }
public string CurrentVersion { get; set; }
public string NewVersion { get; set; }
public bool UpdateAvailable { get; set; }
public string UpdateUri { get; set; }
public string DownloadUri { get; set; }

1
PlexRequests.Core/PlexRequests.Core.csproj
View file

@ -59,6 +59,7 @@
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />

26
PlexRequests.Core/SettingModels/SystemSettings.cs
View file

@ -25,14 +25,38 @@
// ************************************************************************/
#endregion
using System.Collections.Generic;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using PlexRequests.Core.Models;
namespace PlexRequests.Core.SettingModels
{
public class SystemSettings : Settings
{
public bool UseEarlyAccessPreviewBuilds { get; set; }
public Branches Branch { get; set; }
public StatusModel Status { get; set; }
public List<BranchDropdown> BranchDropdown { get; set; }
}
public class BranchDropdown
{
public bool Selected { get; set; }
public string Name { get; set; }
public Branches Value { get; set; }
}
public enum Branches
{
[Display(Name = "Stable")]
Stable,
[Display(Name = "Early Access Preview")]
EarlyAccessPreview,
[Display(Name = "Development")]
Dev,
}
}

48
PlexRequests.Core/StatusChecker/StatusChecker.cs
View file

@ -59,12 +59,12 @@ namespace PlexRequests.Core.StatusChecker
public async Task<StatusModel> GetStatus()
{
var settings = await SystemSettings.GetSettingsAsync();
var isEap = settings.UseEarlyAccessPreviewBuilds;
var stable = settings.Branch == Branches.Stable;
if (isEap)
if (!stable)
{
// Early Access Preview Releases
return GetLatestEapRelease();
return GetAppveyorRelease(settings.Branch);
}
// Stable releases
@ -76,7 +76,7 @@ namespace PlexRequests.Core.StatusChecker
var assemblyVersion = AssemblyHelper.GetProductVersion();
var model = new StatusModel
{
Version = assemblyVersion,
CurrentVersion = assemblyVersion,
};
var releases = await Git.Repository.Release.GetAll(Owner, RepoName);
@ -84,7 +84,7 @@ namespace PlexRequests.Core.StatusChecker
if (latestRelease == null)
{
return new StatusModel { Version = "Unknown" };
return new StatusModel { NewVersion = "Unknown" };
}
var latestVersionArray = latestRelease.Name.Split(new[] { 'v' }, StringSplitOptions.RemoveEmptyEntries);
var latestVersion = latestVersionArray.Length > 1 ? latestVersionArray[1] : string.Empty;
@ -93,6 +93,7 @@ namespace PlexRequests.Core.StatusChecker
{
model.UpdateAvailable = true;
model.UpdateUri = latestRelease.HtmlUrl;
model.NewVersion = latestVersion;
}
model.ReleaseNotes = latestRelease.Body;
@ -102,17 +103,27 @@ namespace PlexRequests.Core.StatusChecker
return model;
}
private StatusModel GetLatestEapRelease()
private StatusModel GetAppveyorRelease(Branches branch)
{
var request = new ApiRequest();
// Get latest EAP Build
var eapBranchRequest = new RestRequest
{
Resource = "/projects/tidusjar/requestplex/branch/EAP",
Method = Method.GET
};
switch (branch)
{
case Branches.Dev:
eapBranchRequest.Resource = "/projects/tidusjar/requestplex/branch/dev";
break;
case Branches.EarlyAccessPreview:
eapBranchRequest.Resource = "/projects/tidusjar/requestplex/branch/EAP";
break;
}
var api = StringCipher.Decrypt(Api,"Appveyor");
eapBranchRequest.AddHeader("Authorization", $"Bearer {api}");
eapBranchRequest.AddHeader("Content-Type", "application/json");
@ -139,15 +150,26 @@ namespace PlexRequests.Core.StatusChecker
var downloadLink = $"{AppveyorApiUrl}/buildjobs/{jobId}/artifacts/{artifactResult.fileName}";
return new StatusModel
var branchDisplay = EnumHelper<Branches>.GetDisplayValue(branch);
var localVersion = AssemblyHelper.GetProductVersion();
var localVersionExtended = $"{localVersion.Remove(localVersion.Length - 2, 2)}00";
var model = new StatusModel
{
DownloadUri = downloadLink,
ReleaseNotes = "Early Access Preview (See recent commits for details)",
ReleaseTitle = "Plex Requests Early Access Preview",
Version = branchResult.build.version,
UpdateAvailable = true,
UpdateUri = downloadLink
ReleaseNotes = $"{branchDisplay} (See recent commits for details)",
ReleaseTitle = $"Plex Requests {branchDisplay}",
NewVersion = branchResult.build.version,
UpdateUri = downloadLink,
CurrentVersion = localVersionExtended
};
if (!localVersionExtended.Equals(branchResult.build.version, StringComparison.CurrentCultureIgnoreCase))
{
model.UpdateAvailable = true;
}
return model;
}
}
}