-
Notifications
You must be signed in to change notification settings - Fork 3
Implement loading of Analysis into memory upon startup #13
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
Open
Szpoti
wants to merge
2
commits into
turbolay:main
Choose a base branch
from
Szpoti:loadAnalysesWhenStart
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 |
|---|---|---|
| @@ -1,24 +1,27 @@ | ||
| using Newtonsoft.Json; | ||
| using WabiSabiMonitor.ApplicationCore.Data; | ||
| using WabiSabiMonitor.ApplicationCore.Interfaces; | ||
| using WabiSabiMonitor.ApplicationCore.Utils.Bases; | ||
| using WabiSabiMonitor.ApplicationCore.Utils.Helpers; | ||
| using WabiSabiMonitor.ApplicationCore.Utils.Logging; | ||
| using WabiSabiMonitor.ApplicationCore.Utils.WabiSabi.Models.Serialization; | ||
| using static WabiSabiMonitor.ApplicationCore.Data.Analyzer; | ||
|
|
||
| namespace WabiSabiMonitor.ApplicationCore | ||
| { | ||
| public class AnalysisStoreManager : PeriodicRunner | ||
| { | ||
| private static readonly string _directoryPath = Path.Combine(EnvironmentHelpers.GetDataDir(Path.Combine("WabiSabiMonitor", "DataStore", "Analysis"))); | ||
| private readonly IAnalyzer _analyzer; | ||
| private readonly IRoundsDataFilter _roundsDataFilter; | ||
| private DateTime _lastDate; | ||
| private Dictionary<DateTime, Analyzer.Analysis> Analysis { get; } = new(); | ||
| private Dictionary<DateTime, Analysis> Analysis { get; } | ||
|
|
||
| public AnalysisStoreManager(IAnalyzer analyzer, IRoundsDataFilter roundsDataFilter, TimeSpan period) : base(period) | ||
| { | ||
| _analyzer = analyzer; | ||
| _roundsDataFilter = roundsDataFilter; | ||
| _lastDate = DateTime.UtcNow; | ||
| Analysis = LoadFromFile(); | ||
| } | ||
|
|
||
| protected override async Task ActionAsync(CancellationToken cancel) | ||
|
|
@@ -37,8 +40,10 @@ protected override async Task ActionAsync(CancellationToken cancel) | |
|
|
||
| if (now.Date != _lastDate.Date) | ||
| { | ||
| IoHelpers.EnsureDirectoryExists(_directoryPath); | ||
|
|
||
|
Comment on lines
+43
to
+44
Collaborator
Author
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. Just a sanity check. |
||
| // Save the last 24 hours data to file at the end of the day. | ||
| var path = Path.Combine(EnvironmentHelpers.GetDataDir(Path.Combine("WabiSabiMonitor", "DataStore", "Analysis")), $"Analysis_{_lastDate:yyyy-MM-dd}.json"); | ||
| var path = Path.Combine(_directoryPath, $"Analysis_{_lastDate:yyyy-MM-dd}.json"); | ||
|
|
||
| // Compute a new Analysis object for these ones to have exactly the adequate rounds. | ||
| var lastDayRounds = _roundsDataFilter.GetRoundsFinishedInInterval(startTime, now.Date); | ||
|
|
@@ -61,5 +66,43 @@ private void CleanupOldAnalysisData(DateTime now) | |
| Analysis.Remove(data); | ||
| } | ||
| } | ||
|
|
||
| private static Dictionary<DateTime, Analysis> LoadFromFile() | ||
| { | ||
| if (!Directory.Exists(_directoryPath)) | ||
| { | ||
| return new(); | ||
| } | ||
|
|
||
| var analyses = new Dictionary<DateTime, Analysis>(); | ||
| var dataFiles = Directory.EnumerateFiles(_directoryPath); | ||
|
|
||
| // Get Analysis from the past 15 days. Start with 1 as there supposed to be no daily analisys yet for UtcNow. | ||
| for (int days = 1; days <= 15; days++) | ||
| { | ||
| var date = DateTime.UtcNow.Subtract(TimeSpan.FromDays(days)); | ||
| var dateString = date.ToString("yyyy-MM-dd"); | ||
| var file = dataFiles.SingleOrDefault(filename => filename.Contains(dateString)); | ||
| if (file == null) continue; | ||
| var data = ReadFromFile(file); | ||
| if (data == null) continue; | ||
| analyses.Add(date, data); | ||
| } | ||
| return analyses; | ||
| } | ||
|
|
||
| public static Analysis? ReadFromFile(string path) | ||
| { | ||
| try | ||
| { | ||
| var json = File.ReadAllText(path); | ||
| return JsonConvert.DeserializeObject<Analysis>(json); | ||
| } | ||
| catch (Exception exc) | ||
| { | ||
| Logger.LogError($"Error while reading Analysis from file {path}.", exc); | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
| } | ||
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.
Moved variable to readonly field.