From f87c04a8353aab81fce831f6898df2f59d4dfd04 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 6 Sep 2019 17:25:51 -0500 Subject: [PATCH] refactor add_missing_columns extension --- .../Controls/DIYGrid/Settings/GridSettings.cs | 32 +-------------- .../DIYGrid/Settings/GridSettingsHelper.cs | 40 ++++++++++++++++++- 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettings.cs b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettings.cs index 8597635e9..ceb9c92ea 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettings.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettings.cs @@ -1,5 +1,4 @@ -using bts.collections; -using bts.proto; +using bts.proto; using bts.utils; using mbts.ui.controls; using mbts.ui.converters; @@ -7,7 +6,6 @@ using ProtoBuf; using System; using System.Collections.Generic; using System.ComponentModel; -using System.Linq; using System.Windows; using System.Windows.Data; using System.Windows.Media; @@ -185,32 +183,4 @@ namespace mbts.ui.settings { EqualityComparer.safe_aggregate_hash(sorting_criterion)); #pragma warning restore CS0612 // Type or member is obsolete } - - static class GridSettingsExtensions { - public static bool add_missing_columns(this GridSettings grid, IEnumerable required_columns, out GridSettings result) { - var col_lookup = new Lazy>(() => required_columns.ToLookup(c => c.id)); - return add_missing_columns(grid, required_columns.Select(c => c.id), id => col_lookup.Value.TryGetValue(id, out var matches) ? matches.FirstOrDefault() : null, out result); - } - - public static bool add_missing_columns(this GridSettings grid, IEnumerable col_ids, Func col_factory, out GridSettings result) { - // add the new column (RawDayPos), if absent. - var cols_to_add = new List(0); - foreach (var col_id in col_ids) { - if (!grid.columns.Any(c => c.id == col_id)) { - var default_col = col_factory(col_id); - if (default_col != null) - cols_to_add.Add(default_col); - } - } - if (cols_to_add.Count > 0) { - var col_list = grid.columns.ToList(); - col_list.AddRange(cols_to_add); - grid = grid.with(col_list); - result = grid; - return true; - } - result = grid; - return false; - } - } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsHelper.cs b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsHelper.cs index bab9fc9a5..e59a4c126 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsHelper.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsHelper.cs @@ -1,4 +1,5 @@ -using mbts.ui.controls; +using bts.collections; +using mbts.ui.controls; using System; using System.Collections.Generic; using System.Linq; @@ -7,6 +8,43 @@ using System.Windows.Media; namespace mbts.ui.settings { static class GridSettingsHelper { + public static bool add_missing_columns(this GridSettings grid, IEnumerable required_columns, out GridSettings result) { + var col_lookup = new Lazy>(() => required_columns.ToLookup(c => c.id)); + return add_missing_columns(grid, required_columns.Select(c => c.id), id => col_lookup.Value.TryGetValue(id, out var matches) ? matches.FirstOrDefault() : null, out result); + } + + public static bool add_missing_columns(this GridSettings grid, IEnumerable col_ids, Func col_factory, out GridSettings result) { + if (add_missing_columns(grid.columns, col_ids, col_factory, out var new_cols)) { + result = grid.with(new_cols); + return true; + } + result = null; + return false; + } + + public static bool add_missing_columns(IEnumerable columns, IEnumerable required_columns, out IEnumerable result) { + var col_lookup = new Lazy>(() => required_columns.ToLookup(c => c.id)); + return add_missing_columns(columns, required_columns.Select(c => c.id), id => col_lookup.Value.TryGetValue(id, out var matches) ? matches.FirstOrDefault() : null, out result); + } + + public static bool add_missing_columns(IEnumerable columns, IEnumerable col_ids, Func col_factory, out IEnumerable result) { + // add the new column (RawDayPos), if absent. + var cols_to_add = new List(0); + foreach (var col_id in col_ids) { + if (!columns.Any(c => c.id == col_id)) { + var default_col = col_factory(col_id); + if (default_col != null) + cols_to_add.Add(default_col); + } + } + if (cols_to_add.Count > 0) { + result = columns.Concat(cols_to_add); + return true; + } + result = null; + return false; + } + public static TColKey? parse_col_id(string id) where TColKey : struct => Enum.TryParse(id, true, out TColKey key) ? key : (TColKey?)null;