-
Notifications
You must be signed in to change notification settings - Fork 50
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixes #1939 template db auto update #2043
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,65 +3,53 @@ | |
using System.Net; | ||
using System.Threading.Tasks; | ||
using OSPSuite.Core.Domain; | ||
using OSPSuite.Utility.Exceptions; | ||
using PKSim.Core.Services; | ||
|
||
namespace PKSim.Infrastructure.Services | ||
{ | ||
public class VersionChecker : IVersionChecker | ||
{ | ||
private readonly IJsonSerializer _jsonSerializer; | ||
private IReadOnlyList<VersionInfo> _allVersions = new List<VersionInfo>(); | ||
public string ProductName { get; set; } | ||
public string CurrentVersion { get; set; } | ||
public string VersionFileUrl { get; set; } | ||
public VersionInfo LatestVersion { get; private set; } | ||
|
||
public VersionChecker(IJsonSerializer jsonSerializer) | ||
{ | ||
_jsonSerializer = jsonSerializer; | ||
} | ||
|
||
public async Task<bool> NewVersionIsAvailableAsync() | ||
public VersionInfo LatestVersion => LatestVersionFor(ProductName); | ||
|
||
public VersionInfo LatestVersionFor(string productName) => _allVersions.FindByName(productName); | ||
|
||
public async Task DownloadLatestVersionInfoAsync() | ||
{ | ||
try | ||
{ | ||
await retrieveLatestVersion(); | ||
return newVersionIsAvailable(); | ||
|
||
using (var wc = new WebClient()) | ||
{ | ||
var jsonContent = await wc.DownloadStringTaskAsync(VersionFileUrl); | ||
_allVersions = await _jsonSerializer.DeserializeAsArrayFromString<VersionInfo>(jsonContent); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Saving all possible software version available (and not only the one for PKSim). This service is in fact independent from PKSim and could be moved to core |
||
} | ||
} | ||
catch (Exception) | ||
{ | ||
return false; | ||
//we do nothing if we cannot download the file | ||
} | ||
} | ||
|
||
private async Task retrieveLatestVersion() | ||
{ | ||
using (var wc = new WebClient()) | ||
{ | ||
var jsonContent = await wc.DownloadStringTaskAsync(VersionFileUrl); | ||
var versions = await _jsonSerializer.DeserializeAsArrayFromString<VersionInfo>(jsonContent); | ||
LatestVersion = retrieveVersionFrom(versions); | ||
} | ||
} | ||
public bool NewVersionIsAvailable => NewVersionIsAvailableFor(ProductName, CurrentVersion); | ||
|
||
private bool newVersionIsAvailable() | ||
public bool NewVersionIsAvailableFor(string productName, string currentVersion) | ||
{ | ||
if (LatestVersion == null) | ||
var latestVersion = LatestVersionFor(productName); | ||
if (latestVersion == null) | ||
return false; | ||
|
||
var curVersion = new Version(CurrentVersion); | ||
return curVersion.CompareTo(new Version(LatestVersion.Version)) < 0; | ||
} | ||
|
||
|
||
private VersionInfo retrieveVersionFrom(IEnumerable<VersionInfo> allVersionInfos) | ||
{ | ||
var versionInfo = allVersionInfos.FindByName(ProductName); | ||
if (versionInfo == null) | ||
throw new OSPSuiteException($"{ProductName} node not available"); | ||
|
||
return versionInfo; | ||
var curVersion = new Version(currentVersion); | ||
return curVersion.CompareTo(new Version(latestVersion.Version)) < 0; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the path of the latest file released. When we release a new file, we need to remember to also update the version file in the suite that will be the trigger for the update
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should setup the develop branch as default in the templates repo then, to make sure that only released versions are merged into main.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep. Can you create an issue for this in the repo?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done