refactor add_missing_columns extension
This commit is contained in:
1 parent
52a35a56de
commit
f87c04a835
2 files changed
+40
-32
No files matched your search
@@ -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<GridColumnSettings> required_columns, out GridSettings result) {
|
||||
var col_lookup = new Lazy<ILookup<string, GridColumnSettings>>(() => 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<string> col_ids, Func<string, GridColumnSettings> col_factory, out GridSettings result) {
|
||||
// add the new column (RawDayPos), if absent.
|
||||
var cols_to_add = new List<GridColumnSettings>(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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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<GridColumnSettings> required_columns, out GridSettings result) {
|
||||
var col_lookup = new Lazy<ILookup<string, GridColumnSettings>>(() => 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<string> col_ids, Func<string, GridColumnSettings> 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<GridColumnSettings> columns, IEnumerable<GridColumnSettings> required_columns, out IEnumerable<GridColumnSettings> result) {
|
||||
var col_lookup = new Lazy<ILookup<string, GridColumnSettings>>(() => 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<GridColumnSettings> columns, IEnumerable<string> col_ids, Func<string, GridColumnSettings> col_factory, out IEnumerable<GridColumnSettings> result) {
|
||||
// add the new column (RawDayPos), if absent.
|
||||
var cols_to_add = new List<GridColumnSettings>(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<TColKey>(string id) where TColKey : struct =>
|
||||
Enum.TryParse(id, true, out TColKey key) ? key : (TColKey?)null;
|
||||
|
||||
|
||||
Reference in new issue
Block a user