Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed corrupt Update History due to date-time notation

This commit is contained in:
Taloth Saldono 2020-06-07 23:50:39 +02:00
parent 6a51f081ac
commit e66b28fb87
2 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/NzbDrone.Core/Datastore/Migration/141_add_update_history.cs
View File

@ -18,14 +18,6 @@ namespace NzbDrone.Core.Datastore.Migration
.WithColumn("Date").AsDateTime().NotNullable().Indexed() .WithColumn("Date").AsDateTime().NotNullable().Indexed()
.WithColumn("Version").AsString().NotNullable() .WithColumn("Version").AsString().NotNullable()
.WithColumn("EventType").AsInt32().NotNullable(); .WithColumn("EventType").AsInt32().NotNullable();
Insert.IntoTable("UpdateHistory")
.Row(new
{
Date = new UtcConverter().ToDB(DateTime.UtcNow).ToString(),
Version = BuildInfo.Version.ToString(),
EventType = 2
});
} }
} }
} }

57
src/NzbDrone.Core/Update/History/UpdateHistoryService.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using NLog;
using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Lifecycle; using NzbDrone.Core.Lifecycle;
using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Messaging.Events;
@ -17,24 +18,42 @@ namespace NzbDrone.Core.Update.History
{ {
private readonly IUpdateHistoryRepository _repository; private readonly IUpdateHistoryRepository _repository;
private readonly IEventAggregator _eventAggregator; private readonly IEventAggregator _eventAggregator;
private readonly Logger _logger;
private Version _prevVersion; private Version _prevVersion;
public UpdateHistoryService(IUpdateHistoryRepository repository, IEventAggregator eventAggregator) public UpdateHistoryService(IUpdateHistoryRepository repository, IEventAggregator eventAggregator, Logger logger)
{ {
_repository = repository; _repository = repository;
_eventAggregator = eventAggregator; _eventAggregator = eventAggregator;
_logger = logger;
} }
public Version PreviouslyInstalled() public Version PreviouslyInstalled()
{ {
var history = _repository.PreviouslyInstalled(); try
{
var history = _repository.PreviouslyInstalled();
return history?.Version; return history?.Version;
}
catch (Exception ex)
{
_logger.Warn(ex, "Failed to determine previously installed version");
return null;
}
} }
public List<UpdateHistory> InstalledSince(DateTime dateTime) public List<UpdateHistory> InstalledSince(DateTime dateTime)
{ {
return _repository.InstalledSince(dateTime); try
{
return _repository.InstalledSince(dateTime);
}
catch (Exception ex)
{
_logger.Warn(ex, "Failed to get list of previously installed versions");
return new List<UpdateHistory>();
}
} }
public void Handle(ApplicationStartedEvent message) public void Handle(ApplicationStartedEvent message)
@ -45,19 +64,29 @@ namespace NzbDrone.Core.Update.History
return; return;
} }
var history = _repository.LastInstalled(); UpdateHistory history;
try
{
history = _repository.LastInstalled();
}
catch (Exception ex)
{
_logger.Warn(ex, "Cleaning corrupted update history");
_repository.Purge();
history = null;
}
if (history == null || history.Version != BuildInfo.Version) if (history == null || history.Version != BuildInfo.Version)
{
_prevVersion = history.Version;
_repository.Insert(new UpdateHistory
{ {
Date = DateTime.UtcNow, _prevVersion = history?.Version;
Version = BuildInfo.Version,
EventType = UpdateHistoryEventType.Installed _repository.Insert(new UpdateHistory
}); {
} Date = DateTime.UtcNow,
Version = BuildInfo.Version,
EventType = UpdateHistoryEventType.Installed
});
}
} }
public void HandleAsync(ApplicationStartedEvent message) public void HandleAsync(ApplicationStartedEvent message)