mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 20:12:41 +02:00
New: Show previously installed version in Updates UI
Co-Authored-By: Taloth <Taloth@users.noreply.github.com>
This commit is contained in:
parent
c892b827af
commit
553a8f2a0a
@ -11,9 +11,43 @@ import UpdateChanges from 'System/Updates/UpdateChanges';
|
||||
import translate from 'Utilities/String/translate';
|
||||
import styles from './AppUpdatedModalContent.css';
|
||||
|
||||
function mergeUpdates(items, version, prevVersion) {
|
||||
let installedIndex = items.findIndex((u) => u.version === version);
|
||||
let installedPreviouslyIndex = items.findIndex((u) => u.version === prevVersion);
|
||||
|
||||
if (installedIndex === -1) {
|
||||
installedIndex = 0;
|
||||
}
|
||||
|
||||
if (installedPreviouslyIndex === -1) {
|
||||
installedPreviouslyIndex = items.length;
|
||||
} else if (installedPreviouslyIndex === installedIndex && items.size()) {
|
||||
installedPreviouslyIndex += 1;
|
||||
}
|
||||
|
||||
const appliedUpdates = items.slice(installedIndex, installedPreviouslyIndex);
|
||||
|
||||
if (!appliedUpdates.length) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const appliedChanges = { new: [], fixed: [] };
|
||||
appliedUpdates.forEach((u) => {
|
||||
if (u.changes) {
|
||||
appliedChanges.new.push(... u.changes.new);
|
||||
appliedChanges.fixed.push(... u.changes.fixed);
|
||||
}
|
||||
});
|
||||
|
||||
const mergedUpdate = Object.assign({}, appliedUpdates[0], { changes: appliedChanges });
|
||||
|
||||
return mergedUpdate;
|
||||
}
|
||||
|
||||
function AppUpdatedModalContent(props) {
|
||||
const {
|
||||
version,
|
||||
prevVersion,
|
||||
isPopulated,
|
||||
error,
|
||||
items,
|
||||
@ -21,7 +55,7 @@ function AppUpdatedModalContent(props) {
|
||||
onModalClose
|
||||
} = props;
|
||||
|
||||
const update = items[0];
|
||||
const update = mergeUpdates(items, version, prevVersion);
|
||||
|
||||
return (
|
||||
<ModalContent onModalClose={onModalClose}>
|
||||
@ -89,6 +123,7 @@ function AppUpdatedModalContent(props) {
|
||||
|
||||
AppUpdatedModalContent.propTypes = {
|
||||
version: PropTypes.string.isRequired,
|
||||
prevVersion: PropTypes.string,
|
||||
isPopulated: PropTypes.bool.isRequired,
|
||||
error: PropTypes.object,
|
||||
items: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
|
@ -8,8 +8,9 @@ import AppUpdatedModalContent from './AppUpdatedModalContent';
|
||||
function createMapStateToProps() {
|
||||
return createSelector(
|
||||
(state) => state.app.version,
|
||||
(state) => state.app.prevVersion,
|
||||
(state) => state.system.updates,
|
||||
(version, updates) => {
|
||||
(version, prevVersion, updates) => {
|
||||
const {
|
||||
isPopulated,
|
||||
error,
|
||||
@ -18,6 +19,7 @@ function createMapStateToProps() {
|
||||
|
||||
return {
|
||||
version,
|
||||
prevVersion,
|
||||
isPopulated,
|
||||
error,
|
||||
items
|
||||
|
@ -117,6 +117,9 @@ export const reducers = createHandleActions({
|
||||
};
|
||||
|
||||
if (state.version !== version) {
|
||||
if (!state.prevVersion) {
|
||||
newState.prevVersion = state.version;
|
||||
}
|
||||
newState.isUpdated = true;
|
||||
}
|
||||
|
||||
|
@ -10,6 +10,7 @@ import PageContent from 'Components/Page/PageContent';
|
||||
import PageContentBody from 'Components/Page/PageContentBody';
|
||||
import { icons, kinds } from 'Helpers/Props';
|
||||
import formatDate from 'Utilities/Date/formatDate';
|
||||
import formatDateTime from 'Utilities/Date/formatDateTime';
|
||||
import translate from 'Utilities/String/translate';
|
||||
import UpdateChanges from './UpdateChanges';
|
||||
import styles from './Updates.css';
|
||||
@ -32,6 +33,8 @@ class Updates extends Component {
|
||||
isDocker,
|
||||
updateMechanismMessage,
|
||||
shortDateFormat,
|
||||
longDateFormat,
|
||||
timeFormat,
|
||||
onInstallLatestPress
|
||||
} = this.props;
|
||||
|
||||
@ -138,7 +141,12 @@ class Updates extends Component {
|
||||
<div className={styles.info}>
|
||||
<div className={styles.version}>{update.version}</div>
|
||||
<div className={styles.space}>—</div>
|
||||
<div className={styles.date}>{formatDate(update.releaseDate, shortDateFormat)}</div>
|
||||
<div
|
||||
className={styles.date}
|
||||
title={formatDateTime(update.releaseDate, longDateFormat, timeFormat)}
|
||||
>
|
||||
{formatDate(update.releaseDate, shortDateFormat)}
|
||||
</div>
|
||||
|
||||
{
|
||||
update.branch === 'master' ?
|
||||
@ -155,11 +163,24 @@ class Updates extends Component {
|
||||
<Label
|
||||
className={styles.label}
|
||||
kind={kinds.SUCCESS}
|
||||
title={formatDateTime(update.installedOn, longDateFormat, timeFormat)}
|
||||
>
|
||||
{translate('CurrentlyInstalled')}
|
||||
</Label> :
|
||||
null
|
||||
}
|
||||
|
||||
{
|
||||
update.version !== currentVersion && update.installedOn ?
|
||||
<Label
|
||||
className={styles.label}
|
||||
kind={kinds.INVERSE}
|
||||
title={formatDateTime(update.installedOn, longDateFormat, timeFormat)}
|
||||
>
|
||||
Previously Installed
|
||||
</Label> :
|
||||
null
|
||||
}
|
||||
</div>
|
||||
|
||||
{
|
||||
@ -222,6 +243,8 @@ Updates.propTypes = {
|
||||
updateMechanism: PropTypes.string,
|
||||
updateMechanismMessage: PropTypes.string,
|
||||
shortDateFormat: PropTypes.string.isRequired,
|
||||
longDateFormat: PropTypes.string.isRequired,
|
||||
timeFormat: PropTypes.string.isRequired,
|
||||
onInstallLatestPress: PropTypes.func.isRequired
|
||||
};
|
||||
|
||||
|
@ -48,7 +48,9 @@ function createMapStateToProps() {
|
||||
isDocker: systemStatus.isDocker,
|
||||
updateMechanism: generalSettings.item.updateMechanism,
|
||||
updateMechanismMessage: status.packageUpdateMechanismMessage,
|
||||
shortDateFormat: uiSettings.shortDateFormat
|
||||
shortDateFormat: uiSettings.shortDateFormat,
|
||||
longDateFormat: uiSettings.longDateFormat,
|
||||
timeFormat: uiSettings.timeFormat
|
||||
};
|
||||
}
|
||||
);
|
||||
|
@ -45,7 +45,7 @@ public void should_get_recent_updates()
|
||||
{
|
||||
const string branch = "nightly";
|
||||
UseRealHttp();
|
||||
var recent = Subject.GetRecentUpdates(branch, new Version(2, 0));
|
||||
var recent = Subject.GetRecentUpdates(branch, new Version(2, 0), null);
|
||||
var recentWithChanges = recent.Where(c => c.Changes != null);
|
||||
|
||||
recent.Should().NotBeEmpty();
|
||||
|
@ -0,0 +1,24 @@
|
||||
using System;
|
||||
using System.Data;
|
||||
using Dapper;
|
||||
|
||||
namespace NzbDrone.Core.Datastore.Converters
|
||||
{
|
||||
public class SystemVersionConverter : SqlMapper.TypeHandler<Version>
|
||||
{
|
||||
public override Version Parse(object value)
|
||||
{
|
||||
if (value is string version)
|
||||
{
|
||||
return Version.Parse((string)value);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public override void SetValue(IDbDataParameter parameter, Version value)
|
||||
{
|
||||
parameter.Value = value.ToString();
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,20 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using FluentMigrator;
|
||||
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||
|
||||
namespace NzbDrone.Core.Datastore.Migration
|
||||
{
|
||||
[Migration(189)]
|
||||
public class add_update_history : NzbDroneMigrationBase
|
||||
{
|
||||
protected override void LogDbUpgrade()
|
||||
{
|
||||
Create.TableForModel("UpdateHistory")
|
||||
.WithColumn("Date").AsDateTime().NotNullable().Indexed()
|
||||
.WithColumn("Version").AsString().NotNullable()
|
||||
.WithColumn("EventType").AsInt32().NotNullable();
|
||||
}
|
||||
}
|
||||
}
|
@ -41,6 +41,7 @@
|
||||
using NzbDrone.Core.RootFolders;
|
||||
using NzbDrone.Core.Tags;
|
||||
using NzbDrone.Core.ThingiProvider;
|
||||
using NzbDrone.Core.Update.History;
|
||||
using static Dapper.SqlMapper;
|
||||
|
||||
namespace NzbDrone.Core.Datastore
|
||||
@ -150,6 +151,8 @@ public static void Map()
|
||||
Mapper.Entity<CustomFilter>("CustomFilters").RegisterModel();
|
||||
|
||||
Mapper.Entity<DownloadHistory>("DownloadHistory").RegisterModel();
|
||||
|
||||
Mapper.Entity<UpdateHistory>("UpdateHistory").RegisterModel();
|
||||
}
|
||||
|
||||
private static void RegisterMappers()
|
||||
@ -181,6 +184,7 @@ private static void RegisterMappers()
|
||||
SqlMapper.RemoveTypeMap(typeof(Guid?));
|
||||
SqlMapper.AddTypeHandler(new GuidConverter());
|
||||
SqlMapper.AddTypeHandler(new CommandConverter());
|
||||
SqlMapper.AddTypeHandler(new SystemVersionConverter());
|
||||
}
|
||||
|
||||
private static void RegisterProviderSettingConverter()
|
||||
|
17
src/NzbDrone.Core/Update/Events/UpdateInstalledEvent.cs
Normal file
17
src/NzbDrone.Core/Update/Events/UpdateInstalledEvent.cs
Normal file
@ -0,0 +1,17 @@
|
||||
using System;
|
||||
using NzbDrone.Common.Messaging;
|
||||
|
||||
namespace NzbDrone.Core.Update.History.Events
|
||||
{
|
||||
public class UpdateInstalledEvent : IEvent
|
||||
{
|
||||
public Version PreviousVerison { get; set; }
|
||||
public Version NewVersion { get; set; }
|
||||
|
||||
public UpdateInstalledEvent(Version previousVersion, Version newVersion)
|
||||
{
|
||||
PreviousVerison = previousVersion;
|
||||
NewVersion = newVersion;
|
||||
}
|
||||
}
|
||||
}
|
12
src/NzbDrone.Core/Update/History/UpdateHistory.cs
Normal file
12
src/NzbDrone.Core/Update/History/UpdateHistory.cs
Normal file
@ -0,0 +1,12 @@
|
||||
using System;
|
||||
using NzbDrone.Core.Datastore;
|
||||
|
||||
namespace NzbDrone.Core.Update.History
|
||||
{
|
||||
public class UpdateHistory : ModelBase
|
||||
{
|
||||
public DateTime Date { get; set; }
|
||||
public Version Version { get; set; }
|
||||
public UpdateHistoryEventType EventType { get; set; }
|
||||
}
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
namespace NzbDrone.Core.Update.History
|
||||
{
|
||||
public enum UpdateHistoryEventType
|
||||
{
|
||||
Unknown = 0,
|
||||
Initiated = 1,
|
||||
Installed = 2
|
||||
}
|
||||
}
|
55
src/NzbDrone.Core/Update/History/UpdateHistoryRepository.cs
Normal file
55
src/NzbDrone.Core/Update/History/UpdateHistoryRepository.cs
Normal file
@ -0,0 +1,55 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using NzbDrone.Core.Datastore;
|
||||
using NzbDrone.Core.Messaging.Events;
|
||||
|
||||
namespace NzbDrone.Core.Update.History
|
||||
{
|
||||
public interface IUpdateHistoryRepository : IBasicRepository<UpdateHistory>
|
||||
{
|
||||
UpdateHistory LastInstalled();
|
||||
UpdateHistory PreviouslyInstalled();
|
||||
List<UpdateHistory> InstalledSince(DateTime dateTime);
|
||||
}
|
||||
|
||||
public class UpdateHistoryRepository : BasicRepository<UpdateHistory>, IUpdateHistoryRepository
|
||||
{
|
||||
public UpdateHistoryRepository(ILogDatabase logDatabase, IEventAggregator eventAggregator)
|
||||
: base(logDatabase, eventAggregator)
|
||||
{
|
||||
}
|
||||
|
||||
public UpdateHistory LastInstalled()
|
||||
{
|
||||
var history = Query(x => x.EventType == UpdateHistoryEventType.Installed)
|
||||
.OrderBy(v => v.Date)
|
||||
.Take(1)
|
||||
.FirstOrDefault();
|
||||
|
||||
return history;
|
||||
}
|
||||
|
||||
public UpdateHistory PreviouslyInstalled()
|
||||
{
|
||||
var history = Query(x => x.EventType == UpdateHistoryEventType.Installed)
|
||||
.OrderBy(v => v.Date)
|
||||
.Skip(1)
|
||||
.Take(1)
|
||||
.FirstOrDefault();
|
||||
|
||||
return history;
|
||||
}
|
||||
|
||||
public List<UpdateHistory> InstalledSince(DateTime dateTime)
|
||||
{
|
||||
var history = Query(v => v.EventType == UpdateHistoryEventType.Installed && v.Date >= dateTime)
|
||||
.OrderBy(v => v.Date)
|
||||
.ToList();
|
||||
|
||||
return history;
|
||||
}
|
||||
}
|
||||
}
|
71
src/NzbDrone.Core/Update/History/UpdateHistoryService.cs
Normal file
71
src/NzbDrone.Core/Update/History/UpdateHistoryService.cs
Normal file
@ -0,0 +1,71 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using NzbDrone.Common.EnvironmentInfo;
|
||||
using NzbDrone.Core.Lifecycle;
|
||||
using NzbDrone.Core.Messaging.Events;
|
||||
using NzbDrone.Core.Update.History.Events;
|
||||
|
||||
namespace NzbDrone.Core.Update.History
|
||||
{
|
||||
public interface IUpdateHistoryService
|
||||
{
|
||||
Version PreviouslyInstalled();
|
||||
List<UpdateHistory> InstalledSince(DateTime dateTime);
|
||||
}
|
||||
|
||||
public class UpdateHistoryService : IUpdateHistoryService, IHandle<ApplicationStartedEvent>, IHandleAsync<ApplicationStartedEvent>
|
||||
{
|
||||
private readonly IUpdateHistoryRepository _repository;
|
||||
private readonly IEventAggregator _eventAggregator;
|
||||
private Version _prevVersion;
|
||||
|
||||
public UpdateHistoryService(IUpdateHistoryRepository repository, IEventAggregator eventAggregator)
|
||||
{
|
||||
_repository = repository;
|
||||
_eventAggregator = eventAggregator;
|
||||
}
|
||||
|
||||
public Version PreviouslyInstalled()
|
||||
{
|
||||
var history = _repository.PreviouslyInstalled();
|
||||
|
||||
return history?.Version;
|
||||
}
|
||||
|
||||
public List<UpdateHistory> InstalledSince(DateTime dateTime)
|
||||
{
|
||||
return _repository.InstalledSince(dateTime);
|
||||
}
|
||||
|
||||
public void Handle(ApplicationStartedEvent message)
|
||||
{
|
||||
if (BuildInfo.Version.Major == 10)
|
||||
{
|
||||
// Don't save dev versions, they change constantly
|
||||
return;
|
||||
}
|
||||
|
||||
var history = _repository.LastInstalled();
|
||||
|
||||
if (history == null || history.Version != BuildInfo.Version)
|
||||
{
|
||||
_prevVersion = history.Version;
|
||||
|
||||
_repository.Insert(new UpdateHistory
|
||||
{
|
||||
Date = DateTime.UtcNow,
|
||||
Version = BuildInfo.Version,
|
||||
EventType = UpdateHistoryEventType.Installed
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public void HandleAsync(ApplicationStartedEvent message)
|
||||
{
|
||||
if (_prevVersion != null)
|
||||
{
|
||||
_eventAggregator.PublishEvent(new UpdateInstalledEvent(_prevVersion, BuildInfo.Version));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,6 +1,8 @@
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using NzbDrone.Common.EnvironmentInfo;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.Update.History;
|
||||
|
||||
namespace NzbDrone.Core.Update
|
||||
{
|
||||
@ -13,18 +15,23 @@ public class RecentUpdateProvider : IRecentUpdateProvider
|
||||
{
|
||||
private readonly IConfigFileProvider _configFileProvider;
|
||||
private readonly IUpdatePackageProvider _updatePackageProvider;
|
||||
private readonly IUpdateHistoryService _updateHistoryService;
|
||||
|
||||
public RecentUpdateProvider(IConfigFileProvider configFileProvider,
|
||||
IUpdatePackageProvider updatePackageProvider)
|
||||
IUpdatePackageProvider updatePackageProvider,
|
||||
IUpdateHistoryService updateHistoryService)
|
||||
{
|
||||
_configFileProvider = configFileProvider;
|
||||
_updatePackageProvider = updatePackageProvider;
|
||||
_updateHistoryService = updateHistoryService;
|
||||
}
|
||||
|
||||
public List<UpdatePackage> GetRecentUpdatePackages()
|
||||
{
|
||||
var branch = _configFileProvider.Branch;
|
||||
return _updatePackageProvider.GetRecentUpdates(branch, BuildInfo.Version);
|
||||
var version = BuildInfo.Version;
|
||||
var prevVersion = _updateHistoryService.PreviouslyInstalled();
|
||||
return _updatePackageProvider.GetRecentUpdates(branch, version, prevVersion);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -11,7 +11,7 @@ namespace NzbDrone.Core.Update
|
||||
public interface IUpdatePackageProvider
|
||||
{
|
||||
UpdatePackage GetLatestUpdate(string branch, Version currentVersion);
|
||||
List<UpdatePackage> GetRecentUpdates(string branch, Version currentVersion);
|
||||
List<UpdatePackage> GetRecentUpdates(string branch, Version currentVersion, Version previousVersion = null);
|
||||
}
|
||||
|
||||
public class UpdatePackageProvider : IUpdatePackageProvider
|
||||
@ -56,7 +56,7 @@ public UpdatePackage GetLatestUpdate(string branch, Version currentVersion)
|
||||
return update.UpdatePackage;
|
||||
}
|
||||
|
||||
public List<UpdatePackage> GetRecentUpdates(string branch, Version currentVersion)
|
||||
public List<UpdatePackage> GetRecentUpdates(string branch, Version currentVersion, Version previousVersion)
|
||||
{
|
||||
var request = _requestBuilder.Create()
|
||||
.Resource("/update/{branch}/changes")
|
||||
@ -67,6 +67,11 @@ public List<UpdatePackage> GetRecentUpdates(string branch, Version currentVersio
|
||||
.AddQueryParam("runtimeVer", _platformInfo.Version)
|
||||
.SetSegment("branch", branch);
|
||||
|
||||
if (previousVersion != null && previousVersion != currentVersion)
|
||||
{
|
||||
request.AddQueryParam("prevVersion", previousVersion);
|
||||
}
|
||||
|
||||
if (_analyticsService.IsEnabled)
|
||||
{
|
||||
// Send if the system is active so we know which versions to deprecate/ignore
|
||||
|
@ -1,7 +1,9 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NzbDrone.Common.EnvironmentInfo;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Core.Update;
|
||||
using NzbDrone.Core.Update.History;
|
||||
using Radarr.Http;
|
||||
|
||||
namespace Radarr.Api.V3.Update
|
||||
@ -9,10 +11,12 @@ namespace Radarr.Api.V3.Update
|
||||
public class UpdateModule : RadarrRestModule<UpdateResource>
|
||||
{
|
||||
private readonly IRecentUpdateProvider _recentUpdateProvider;
|
||||
private readonly IUpdateHistoryService _updateHistoryService;
|
||||
|
||||
public UpdateModule(IRecentUpdateProvider recentUpdateProvider)
|
||||
public UpdateModule(IRecentUpdateProvider recentUpdateProvider, IUpdateHistoryService updateHistoryService)
|
||||
{
|
||||
_recentUpdateProvider = recentUpdateProvider;
|
||||
_updateHistoryService = updateHistoryService;
|
||||
GetResourceAll = GetRecentUpdates;
|
||||
}
|
||||
|
||||
@ -38,6 +42,18 @@ private List<UpdateResource> GetRecentUpdates()
|
||||
{
|
||||
installed.Installed = true;
|
||||
}
|
||||
|
||||
var installDates = _updateHistoryService.InstalledSince(resources.Last().ReleaseDate)
|
||||
.DistinctBy(v => v.Version)
|
||||
.ToDictionary(v => v.Version);
|
||||
|
||||
foreach (var resource in resources)
|
||||
{
|
||||
if (installDates.TryGetValue(resource.Version, out var installDate))
|
||||
{
|
||||
resource.InstalledOn = installDate.Date;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return resources;
|
||||
|
@ -17,6 +17,7 @@ public class UpdateResource : RestResource
|
||||
public string FileName { get; set; }
|
||||
public string Url { get; set; }
|
||||
public bool Installed { get; set; }
|
||||
public DateTime? InstalledOn { get; set; }
|
||||
public bool Installable { get; set; }
|
||||
public bool Latest { get; set; }
|
||||
public UpdateChanges Changes { get; set; }
|
||||
|
Loading…
Reference in New Issue
Block a user