mirror of
https://github.com/dnwSilver/tld.git
synced 2024-11-25 16:42:07 +00:00
✨ Add command line.
This commit is contained in:
parent
440fd4d5d4
commit
ee490fb84e
@ -5,7 +5,7 @@ namespace TUI.Controls;
|
|||||||
|
|
||||||
public class Copyright : IControl<string>
|
public class Copyright : IControl<string>
|
||||||
{
|
{
|
||||||
public void Render(string author, Position position)
|
public void Render(string author, Position position, int? height = 0)
|
||||||
{
|
{
|
||||||
const string icon = "© ";
|
const string icon = "© ";
|
||||||
Console.SetCursorPosition(position.Left - icon.Width(), position.Top);
|
Console.SetCursorPosition(position.Left - icon.Width(), position.Top);
|
||||||
|
@ -6,39 +6,42 @@ namespace TUI.Controls;
|
|||||||
|
|
||||||
public class Dashboard : IControl<string>
|
public class Dashboard : IControl<string>
|
||||||
{
|
{
|
||||||
public void Render(string title, Position position)
|
public bool IsFocused { get; set; }
|
||||||
|
|
||||||
|
public void Render(string title, Position position, int? height = 0)
|
||||||
{
|
{
|
||||||
Console.SetCursorPosition(position.Left, position.Top);
|
Console.SetCursorPosition(position.Left, position.Top);
|
||||||
|
|
||||||
RenderTopLine(title);
|
RenderTopLine(title, IsFocused);
|
||||||
|
|
||||||
var marginTop = Theme.BorderWidth + Theme.Padding + position.Top;
|
var marginTop = position.Top;
|
||||||
var dashboardHeight = Console.WindowHeight - Theme.BorderWidth;
|
|
||||||
|
|
||||||
for (var top = marginTop; top < dashboardHeight; top++)
|
var dashboardHeight = height == 0 ? Console.WindowHeight - marginTop : height + Theme.Padding * 2;
|
||||||
{
|
|
||||||
RenderMiddleLine();
|
for (var top = marginTop;
|
||||||
|
top < dashboardHeight + marginTop - Theme.BorderWidth * 2 - Theme.Padding * 2;
|
||||||
|
top++)
|
||||||
|
RenderMiddleLine(IsFocused);
|
||||||
|
|
||||||
|
RenderBottomLine(IsFocused);
|
||||||
}
|
}
|
||||||
|
|
||||||
RenderBottomLine();
|
private static void RenderMiddleLine(bool isFocused)
|
||||||
}
|
|
||||||
|
|
||||||
private static void RenderMiddleLine()
|
|
||||||
{
|
{
|
||||||
Console.Write("│".Primary());
|
Console.Write("│".Primary(isFocused));
|
||||||
Console.Write(new string(' ', Console.WindowWidth - Theme.BorderWidth * 2));
|
Console.Write(new string(' ', Console.WindowWidth - Theme.BorderWidth * 2));
|
||||||
Console.WriteLine("│".Primary());
|
Console.WriteLine("│".Primary(isFocused));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void RenderBottomLine()
|
private static void RenderBottomLine(bool isFocused)
|
||||||
{
|
{
|
||||||
var lineWidth = Console.WindowWidth - Theme.BorderWidth * 2;
|
var lineWidth = Console.WindowWidth - Theme.BorderWidth * 2;
|
||||||
Console.Write("└".Primary());
|
Console.Write("└".Primary(isFocused));
|
||||||
Console.Write('─'.Repeat(lineWidth).Primary());
|
Console.Write('─'.Repeat(lineWidth).Primary(isFocused));
|
||||||
Console.WriteLine("┘".Primary());
|
Console.WriteLine("┘".Primary(isFocused));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void RenderTopLine(string title)
|
private static void RenderTopLine(string title, bool isFocused)
|
||||||
{
|
{
|
||||||
var lineWidth =
|
var lineWidth =
|
||||||
(Console.WindowWidth - title.Width() - Theme.BorderWidth * 2 - Theme.Padding * 2) /
|
(Console.WindowWidth - title.Width() - Theme.BorderWidth * 2 - Theme.Padding * 2) /
|
||||||
@ -48,13 +51,10 @@ public class Dashboard : IControl<string>
|
|||||||
topLine.Append("┌");
|
topLine.Append("┌");
|
||||||
topLine.Append('─'.Repeat(lineWidth));
|
topLine.Append('─'.Repeat(lineWidth));
|
||||||
topLine.AppendFormat("{0}{1}{0}", ' '.Repeat(Theme.Padding), title);
|
topLine.AppendFormat("{0}{1}{0}", ' '.Repeat(Theme.Padding), title);
|
||||||
if (title.Width() % 2 == 1)
|
if (title.Width() % 2 == 1) topLine.Append('─');
|
||||||
{
|
|
||||||
topLine.Append('─');
|
|
||||||
}
|
|
||||||
|
|
||||||
topLine.Append('─'.Repeat(lineWidth));
|
topLine.Append('─'.Repeat(lineWidth));
|
||||||
topLine.Append("┐");
|
topLine.Append("┐");
|
||||||
Console.WriteLine(topLine.ToString().Primary());
|
Console.WriteLine(topLine.ToString().Primary(isFocused));
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -7,33 +7,43 @@ namespace TUI.Controls;
|
|||||||
|
|
||||||
public class Display
|
public class Display
|
||||||
{
|
{
|
||||||
private bool _headerInDisplay = true;
|
public readonly CommandLine CommandLine;
|
||||||
public readonly Header Header;
|
|
||||||
|
|
||||||
public readonly Copyright Copyright;
|
public readonly Copyright Copyright;
|
||||||
|
|
||||||
public readonly DependencyDashboard DependencyDashboard;
|
public readonly DependencyDashboard DependencyDashboard;
|
||||||
|
public readonly Header Header;
|
||||||
|
private bool _commandLineInDisplay;
|
||||||
|
|
||||||
private Project _currentProject;
|
private Project _currentProject;
|
||||||
|
private bool _headerInDisplay = true;
|
||||||
|
|
||||||
public Display()
|
public Display()
|
||||||
{
|
{
|
||||||
Header = new Header();
|
Header = new Header();
|
||||||
Copyright = new Copyright();
|
Copyright = new Copyright();
|
||||||
|
CommandLine = new CommandLine();
|
||||||
DependencyDashboard = new DependencyDashboard();
|
DependencyDashboard = new DependencyDashboard();
|
||||||
|
|
||||||
Render();
|
Render();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string FocusedElement { get; set; } = "";
|
||||||
|
|
||||||
public void OpenDeps(Project project)
|
public void OpenDeps(Project project)
|
||||||
{
|
{
|
||||||
_currentProject = project;
|
_currentProject = project;
|
||||||
var dashboardPosition = new Position(0, Header.Height);
|
var dashboardPosition = new Position(0, Header.Height);
|
||||||
|
DependencyDashboard.IsFocused = true;
|
||||||
|
CommandLine.IsFocused = false;
|
||||||
DependencyDashboard.Render(_currentProject, dashboardPosition);
|
DependencyDashboard.Render(_currentProject, dashboardPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ResizeDependencies(bool full)
|
private void ResizeDependencies()
|
||||||
{
|
{
|
||||||
var dashboardPosition = new Position(0, full ? 0 : Header.Height);
|
var topPosition = 0;
|
||||||
|
topPosition += _commandLineInDisplay ? CommandLine.Height : 0;
|
||||||
|
topPosition += _headerInDisplay ? Header.Height : 0;
|
||||||
|
var dashboardPosition = new Position(0, topPosition);
|
||||||
DependencyDashboard.Render(_currentProject, dashboardPosition);
|
DependencyDashboard.Render(_currentProject, dashboardPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,7 +68,7 @@ public class Display
|
|||||||
Header.Render(headerPosition);
|
Header.Render(headerPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
ResizeDependencies(!_headerInDisplay);
|
ResizeDependencies();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Next()
|
public void Next()
|
||||||
@ -70,4 +80,18 @@ public class Display
|
|||||||
{
|
{
|
||||||
DependencyDashboard.Previous();
|
DependencyDashboard.Previous();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void OpenCommandLine()
|
||||||
|
{
|
||||||
|
var commandLinePosition = new Position(0, _headerInDisplay ? Header.Height : 0);
|
||||||
|
CommandLine.IsFocused = true;
|
||||||
|
DependencyDashboard.IsFocused = false;
|
||||||
|
FocusedElement = nameof(CommandLine);
|
||||||
|
CommandLine.Render(commandLinePosition);
|
||||||
|
_commandLineInDisplay = true;
|
||||||
|
ResizeDependencies();
|
||||||
|
Console.SetCursorPosition(commandLinePosition.Left + Theme.Padding + Theme.BorderWidth + 2,
|
||||||
|
commandLinePosition.Top + Theme.BorderWidth);
|
||||||
|
Console.CursorVisible = true;
|
||||||
|
}
|
||||||
}
|
}
|
@ -7,5 +7,7 @@ public interface IControl
|
|||||||
|
|
||||||
public interface IControl<in TProps>
|
public interface IControl<in TProps>
|
||||||
{
|
{
|
||||||
void Render(TProps props, Position position);
|
// bool IsFocused { get; }
|
||||||
|
|
||||||
|
void Render(TProps props, Position position, int? height);
|
||||||
}
|
}
|
@ -11,22 +11,19 @@ public record TableProps(IEnumerable<string> HeaderCells,
|
|||||||
|
|
||||||
public class Table : IControl<TableProps>
|
public class Table : IControl<TableProps>
|
||||||
{
|
{
|
||||||
|
private readonly Dictionary<int, string> _rows = new();
|
||||||
private Position _position;
|
private Position _position;
|
||||||
private int _selectedRowId;
|
private int _selectedRowId;
|
||||||
|
|
||||||
public void Render(TableProps props, Position position)
|
public void Render(TableProps props, Position position, int? height = 0)
|
||||||
{
|
{
|
||||||
_position = position;
|
_position = position;
|
||||||
Console.SetCursorPosition(_position.Left, _position.Top);
|
Console.SetCursorPosition(_position.Left, _position.Top);
|
||||||
|
|
||||||
Console.Write(' '.Repeat(props.TitleWidth));
|
Console.Write(' '.Repeat(props.TitleWidth));
|
||||||
foreach (var headerCell in props.HeaderCells)
|
foreach (var headerCell in props.HeaderCells)
|
||||||
{
|
|
||||||
Console.Write(' '.Repeat(props.ColumnWidth - headerCell.Width()) + headerCell);
|
Console.Write(' '.Repeat(props.ColumnWidth - headerCell.Width()) + headerCell);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private readonly Dictionary<int, string> _rows = new();
|
|
||||||
|
|
||||||
public void RenderRow(int rowId, string rowText, string? bgColor = default)
|
public void RenderRow(int rowId, string rowText, string? bgColor = default)
|
||||||
{
|
{
|
||||||
@ -39,10 +36,7 @@ public class Table : IControl<TableProps>
|
|||||||
|
|
||||||
public void Next()
|
public void Next()
|
||||||
{
|
{
|
||||||
if (_selectedRowId >= _rows.Count)
|
if (_selectedRowId >= _rows.Count) return;
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
RemoveHoverFromCurrentRow();
|
RemoveHoverFromCurrentRow();
|
||||||
RenderRow(++_selectedRowId, _rows[_selectedRowId], Palette.HoverColor);
|
RenderRow(++_selectedRowId, _rows[_selectedRowId], Palette.HoverColor);
|
||||||
@ -50,23 +44,14 @@ public class Table : IControl<TableProps>
|
|||||||
|
|
||||||
private void RemoveHoverFromCurrentRow()
|
private void RemoveHoverFromCurrentRow()
|
||||||
{
|
{
|
||||||
if (_rows.TryGetValue(_selectedRowId, out var row))
|
if (_rows.TryGetValue(_selectedRowId, out var row)) RenderRow(_selectedRowId, row);
|
||||||
{
|
|
||||||
RenderRow(_selectedRowId, row);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Previous()
|
public void Previous()
|
||||||
{
|
{
|
||||||
if (_selectedRowId == 0)
|
if (_selectedRowId == 0) Next();
|
||||||
{
|
|
||||||
Next();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_selectedRowId == 1)
|
if (_selectedRowId == 1) return;
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
RemoveHoverFromCurrentRow();
|
RemoveHoverFromCurrentRow();
|
||||||
RenderRow(--_selectedRowId, _rows[_selectedRowId], Palette.HoverColor);
|
RenderRow(--_selectedRowId, _rows[_selectedRowId], Palette.HoverColor);
|
||||||
|
@ -15,13 +15,20 @@ public class DependencyDashboard : IControl<Project>
|
|||||||
private const int TitleWidth = 25;
|
private const int TitleWidth = 25;
|
||||||
private const int ColumnWidth = 10;
|
private const int ColumnWidth = 10;
|
||||||
|
|
||||||
|
private readonly static Dictionary<string, Package> Packages = new();
|
||||||
|
private readonly Dashboard _dashboard = new();
|
||||||
|
|
||||||
private readonly Table _table = new();
|
private readonly Table _table = new();
|
||||||
|
|
||||||
public void Render(Project project, Position position)
|
public bool IsFocused
|
||||||
{
|
{
|
||||||
var dashboard = new Dashboard();
|
get => _dashboard.IsFocused;
|
||||||
dashboard.Render(project.Icon, position);
|
set => _dashboard.IsFocused = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Render(Project project, Position position, int? height = 0)
|
||||||
|
{
|
||||||
|
_dashboard.Render(project.Icon + " Dependencies", position);
|
||||||
var header = project.Dependencies.Select(GetConventionVersion).ToArray();
|
var header = project.Dependencies.Select(GetConventionVersion).ToArray();
|
||||||
var rows = project.Sources.Select(GetTitle).ToArray();
|
var rows = project.Sources.Select(GetTitle).ToArray();
|
||||||
|
|
||||||
@ -77,10 +84,7 @@ public class DependencyDashboard : IControl<Project>
|
|||||||
{
|
{
|
||||||
var currentVersion = package.ParseVersion(dependency.Name);
|
var currentVersion = package.ParseVersion(dependency.Name);
|
||||||
|
|
||||||
if (currentVersion == null)
|
if (currentVersion == null) return Icons.NotFound;
|
||||||
{
|
|
||||||
return Icons.NotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
var conventionVersion = dependency.Version?.ToVersion();
|
var conventionVersion = dependency.Version?.ToVersion();
|
||||||
return PaintingVersion(currentVersion, conventionVersion);
|
return PaintingVersion(currentVersion, conventionVersion);
|
||||||
@ -90,30 +94,20 @@ public class DependencyDashboard : IControl<Project>
|
|||||||
{
|
{
|
||||||
var textVersion = current.ToString();
|
var textVersion = current.ToString();
|
||||||
|
|
||||||
if (current > convention)
|
if (current > convention) return textVersion.Info();
|
||||||
{
|
|
||||||
return textVersion.Info();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (current < convention)
|
if (current < convention)
|
||||||
{
|
|
||||||
return current.Major == convention.Major ? textVersion.Primary() : textVersion.Warning();
|
return current.Major == convention.Major ? textVersion.Primary() : textVersion.Warning();
|
||||||
}
|
|
||||||
|
|
||||||
return textVersion.Hint();
|
return textVersion.Hint();
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly static Dictionary<string, Package> Packages = new();
|
|
||||||
|
|
||||||
private static Package DownloadPackage(SourceDto sourceDto)
|
private static Package DownloadPackage(SourceDto sourceDto)
|
||||||
{
|
{
|
||||||
if (Packages.TryGetValue(sourceDto.Repo, out var downloadPackage))
|
var endpoint = sourceDto.Tags.Have("gitlab") ? GetGitlabEndpoint(sourceDto) : sourceDto.Repo;
|
||||||
{
|
if (Packages.TryGetValue(endpoint, out var downloadPackage)) return downloadPackage;
|
||||||
return downloadPackage;
|
|
||||||
}
|
|
||||||
|
|
||||||
using HttpClient client = new();
|
using HttpClient client = new();
|
||||||
var endpoint = sourceDto.Tags.Have("gitlab") ? GetGitlabEndpoint(sourceDto) : sourceDto.Repo;
|
|
||||||
var json = client.GetStringAsync(endpoint).GetAwaiter().GetResult();
|
var json = client.GetStringAsync(endpoint).GetAwaiter().GetResult();
|
||||||
var package = JsonSerializer.Deserialize<Package>(json);
|
var package = JsonSerializer.Deserialize<Package>(json);
|
||||||
Packages.Add(endpoint, package);
|
Packages.Add(endpoint, package);
|
||||||
@ -135,10 +129,7 @@ public class DependencyDashboard : IControl<Project>
|
|||||||
private static string RenderCurrentVersion(string version)
|
private static string RenderCurrentVersion(string version)
|
||||||
{
|
{
|
||||||
var versionWidth = version.Width();
|
var versionWidth = version.Width();
|
||||||
if (versionWidth == 0)
|
if (versionWidth == 0) return ' '.Repeat(ColumnWidth - 1) + Icons.NotFound.Hint();
|
||||||
{
|
|
||||||
return ' '.Repeat(ColumnWidth - 1) + Icons.NotFound.Hint();
|
|
||||||
}
|
|
||||||
|
|
||||||
return ' '.Repeat(ColumnWidth - versionWidth) + version;
|
return ' '.Repeat(ColumnWidth - versionWidth) + version;
|
||||||
}
|
}
|
||||||
@ -188,20 +179,21 @@ public class DependencyDashboard : IControl<Project>
|
|||||||
private static string GetApplicationType(SourceDto sourceDto)
|
private static string GetApplicationType(SourceDto sourceDto)
|
||||||
{
|
{
|
||||||
foreach (var application in Icons.Applications)
|
foreach (var application in Icons.Applications)
|
||||||
{
|
|
||||||
if (sourceDto.Tags.Have(application.Value))
|
if (sourceDto.Tags.Have(application.Value))
|
||||||
return application.Key;
|
return application.Key;
|
||||||
}
|
|
||||||
|
|
||||||
return Icons.Undefined;
|
return Icons.Undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string GetGitApplication(SourceDto sourceDto) => sourceDto.Repo switch
|
private static string GetGitApplication(SourceDto sourceDto)
|
||||||
|
{
|
||||||
|
return sourceDto.Repo switch
|
||||||
{
|
{
|
||||||
{ } url when url.Contains("gitlab") => Icons.GitLab,
|
{ } url when url.Contains("gitlab") => Icons.GitLab,
|
||||||
{ } url when url.Contains("github") => Icons.GitHub,
|
{ } url when url.Contains("github") => Icons.GitHub,
|
||||||
_ => Icons.Git
|
_ => Icons.Git
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public void Next()
|
public void Next()
|
||||||
{
|
{
|
||||||
|
53
src/TUI/Domain/NewFile1.txt
Normal file
53
src/TUI/Domain/NewFile1.txt
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
|
||||||
|
1 releases select prev
|
||||||
|
2 competencies select next
|
||||||
|
3 dependencies toggle head
|
||||||
|
4 quit
|
||||||
|
|
||||||
|
too new Auth package
|
||||||
|
so good WWW image
|
||||||
|
be nice SEO site
|
||||||
|
too old VCS api
|
||||||
|
|
||||||
|
wait build release
|
||||||
|
reopen testing hotfix
|
||||||
|
in progress done publish
|
||||||
|
review cancel
|
||||||
|
|
||||||
|
releases Fact 2023
|
||||||
|
releases Fact
|
||||||
|
releases Planned
|
||||||
|
releases Planned 2024-12-31 xfirm
|
||||||
|
competencies
|
||||||
|
growth zone
|
||||||
|
dependencies
|
||||||
|
|
||||||
|
┌──────────────────────────────────────────────────────────────────────── Planned release ─────────────────────────────────────────────────────────────────┐
|
||||||
|
│ 2024-12-31 4/11 xfirm [############# ] //green - done, blue - test, pink review/build, orange WIP
|
||||||
|
│ 2024-12-31 xfirm 4/11 [###############.......] //green - done, blue - test, pink review/build
|
||||||
|
│ 2024-12-31 xfirm 4/11 [############..........] //green - done, blue - test, pink review/build
|
||||||
|
│ 2024-12-31 xfirm 4/11 [############..........] //green - done, blue - test, pink review/build
|
||||||
|
│ 2024-12-31 xfirm 4/11 [############..........] //green - done, blue - test, pink review/build
|
||||||
|
│ 2024-12-31 xfirm 4/11 [############..........] //green - done, blue - test, pink review/build
|
||||||
|
│ 2024-12-31 xfirm 4/11 [############..........] //green - done, blue - test, pink review/build
|
||||||
|
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
|
||||||
|
┌──────────────────────────────────────────────────────────────────────── checkperson-site ────────────────────────────────────────────────────────────────┐
|
||||||
|
│ ELK-3628 Create new menu. Petrov A. Ivanov I.
|
||||||
|
│ XF-12 Change input hover. Ivanov I. Petrov A., Petrov B.
|
||||||
|
│ ELK-3628 Crete new project with menu, profile, issues and # Ivanov I. Petrov A., Petrov B.
|
||||||
|
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
|
||||||
|
|
||||||
|
┌─────────────────────────────────────────────────────────────────────────── Actual releases 2023 ─────────────────────────────────────────────────────────┐
|
||||||
|
│ Jan Feb Mar Apl May Jun Jul Aug Sep Oct Nov Dec
|
||||||
|
│ ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤
|
||||||
|
│ LK
|
||||||
|
│ CP
|
||||||
|
│ RR
|
||||||
|
└──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -17,25 +17,16 @@ public class Package
|
|||||||
|
|
||||||
public Version? ParseVersion(string? dependencyName)
|
public Version? ParseVersion(string? dependencyName)
|
||||||
{
|
{
|
||||||
if (dependencyName == null)
|
if (dependencyName == null) return null;
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonNode? version = null;
|
JsonNode? version = null;
|
||||||
|
|
||||||
var lowerDependencyName = dependencyName.ToLower();
|
var lowerDependencyName = dependencyName.ToLower();
|
||||||
Dependencies?.TryGetPropertyValue(lowerDependencyName, out version);
|
Dependencies?.TryGetPropertyValue(lowerDependencyName, out version);
|
||||||
|
|
||||||
if (version == null)
|
if (version == null) Engines?.TryGetPropertyValue(lowerDependencyName, out version);
|
||||||
{
|
|
||||||
Engines?.TryGetPropertyValue(lowerDependencyName, out version);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (version == null)
|
if (version == null) DevDependencies?.TryGetPropertyValue(lowerDependencyName, out version);
|
||||||
{
|
|
||||||
DevDependencies?.TryGetPropertyValue(lowerDependencyName, out version);
|
|
||||||
}
|
|
||||||
|
|
||||||
return version?.GetValue<string>().ToVersion();
|
return version?.GetValue<string>().ToVersion();
|
||||||
}
|
}
|
||||||
|
@ -7,6 +7,9 @@ namespace TUI.Domain;
|
|||||||
[YamlSerializable]
|
[YamlSerializable]
|
||||||
public class Settings
|
public class Settings
|
||||||
{
|
{
|
||||||
|
[YamlMember]
|
||||||
|
public Project[] Projects { get; set; }
|
||||||
|
|
||||||
public static Settings Init()
|
public static Settings Init()
|
||||||
{
|
{
|
||||||
var deserializer = new DeserializerBuilder()
|
var deserializer = new DeserializerBuilder()
|
||||||
@ -16,7 +19,4 @@ public class Settings
|
|||||||
using var sr = new StreamReader("settings.yaml");
|
using var sr = new StreamReader("settings.yaml");
|
||||||
return deserializer.Deserialize<Settings>(sr.ReadToEnd());
|
return deserializer.Deserialize<Settings>(sr.ReadToEnd());
|
||||||
}
|
}
|
||||||
|
|
||||||
[YamlMember]
|
|
||||||
public Project[] Projects { get; set; }
|
|
||||||
}
|
}
|
@ -1,3 +1,4 @@
|
|||||||
|
using System.Globalization;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
|
|
||||||
@ -17,18 +18,15 @@ public static class Extensions
|
|||||||
|
|
||||||
public static string RemoveColors(this string text)
|
public static string RemoveColors(this string text)
|
||||||
{
|
{
|
||||||
return Regex.Replace(text, @"\S\[(\d{0,3}[;m][_]?){0,5}", "");
|
return Regex.Replace(text, @"\S\[(\d{0,3}[;m]_?){0,5}", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int Width(this string text)
|
public static int Width(this string text)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(text))
|
if (string.IsNullOrEmpty(text)) return 0;
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
var clearText = text.RemoveColors();
|
var clearText = text.RemoveColors();
|
||||||
var stringInfo = new System.Globalization.StringInfo(clearText);
|
var stringInfo = new StringInfo(clearText);
|
||||||
return stringInfo.LengthInTextElements;
|
return stringInfo.LengthInTextElements;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
using TUI.Controls;
|
using TUI.Controls;
|
||||||
using Settings = TUI.Domain.Settings;
|
using TUI.Domain;
|
||||||
|
|
||||||
|
|
||||||
Console.Clear();
|
Console.Clear();
|
||||||
@ -10,10 +10,39 @@ var settings = Settings.Init();
|
|||||||
var display = new Display();
|
var display = new Display();
|
||||||
display.OpenDeps(settings.Projects[0]);
|
display.OpenDeps(settings.Projects[0]);
|
||||||
|
|
||||||
var hotKey = ConsoleKey.NoName;
|
var key = new ConsoleKeyInfo('1', ConsoleKey.NoName, false, false, false);
|
||||||
|
var waitCommand = true;
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
switch (hotKey)
|
if (key.Key == ConsoleKey.Q && !display.CommandLine.IsFocused)
|
||||||
|
{
|
||||||
|
waitCommand = false;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (display.CommandLine.IsFocused)
|
||||||
|
{
|
||||||
|
switch (key.Key)
|
||||||
|
{
|
||||||
|
case ConsoleKey.Escape:
|
||||||
|
display.CommandLine.IsFocused = false;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
Console.Write(key.KeyChar);
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (key.KeyChar)
|
||||||
|
{
|
||||||
|
case ':':
|
||||||
|
display.OpenCommandLine();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (key.Key)
|
||||||
{
|
{
|
||||||
case ConsoleKey.DownArrow:
|
case ConsoleKey.DownArrow:
|
||||||
display.Next();
|
display.Next();
|
||||||
@ -25,8 +54,9 @@ do
|
|||||||
display.ToggleHeader();
|
display.ToggleHeader();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
hotKey = Console.ReadKey(intercept: true).Key;
|
key = Console.ReadKey(true);
|
||||||
} while (hotKey != ConsoleKey.Q);
|
} while (waitCommand);
|
||||||
|
|
||||||
Console.Clear();
|
Console.Clear();
|
@ -9,8 +9,8 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Pastel" Version="4.1.0" />
|
<PackageReference Include="Pastel" Version="4.1.0"/>
|
||||||
<PackageReference Include="YamlDotNet" Version="13.1.1" />
|
<PackageReference Include="YamlDotNet" Version="13.1.1"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
17
src/TUI/UserInterface/CommandLine.cs
Normal file
17
src/TUI/UserInterface/CommandLine.cs
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
using TUI.Controls;
|
||||||
|
|
||||||
|
|
||||||
|
namespace TUI.UserInterface;
|
||||||
|
|
||||||
|
public class CommandLine : Dashboard
|
||||||
|
{
|
||||||
|
public const int Height = 3;
|
||||||
|
|
||||||
|
public void Render(Position position)
|
||||||
|
{
|
||||||
|
base.Render("Command", position, Height);
|
||||||
|
|
||||||
|
Console.SetCursorPosition(position.Left + Theme.BorderWidth + Theme.Padding, position.Top + Theme.BorderWidth);
|
||||||
|
Console.Write(">");
|
||||||
|
}
|
||||||
|
}
|
@ -9,15 +9,6 @@ public class Header : IControl
|
|||||||
public const int Height = 6;
|
public const int Height = 6;
|
||||||
public const int MaxHeaderBlocksWidth = 16;
|
public const int MaxHeaderBlocksWidth = 16;
|
||||||
|
|
||||||
|
|
||||||
private readonly Dictionary<string, string> _hotKeys = new()
|
|
||||||
{
|
|
||||||
{ "", "select prev" },
|
|
||||||
{ "", "select next" },
|
|
||||||
{ "", "toggle head" },
|
|
||||||
{ "", "quit" },
|
|
||||||
};
|
|
||||||
|
|
||||||
private readonly Dictionary<string, string> _hints = new()
|
private readonly Dictionary<string, string> _hints = new()
|
||||||
{
|
{
|
||||||
{ "", "too new".Info() },
|
{ "", "too new".Info() },
|
||||||
@ -26,22 +17,28 @@ public class Header : IControl
|
|||||||
{ "", "too old".Warning() }
|
{ "", "too old".Warning() }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
private readonly Dictionary<string, string> _hotKeys = new()
|
||||||
|
{
|
||||||
|
{ "", "select prev" },
|
||||||
|
{ "", "select next" },
|
||||||
|
{ "", "toggle head" },
|
||||||
|
{ "", "quit" }
|
||||||
|
};
|
||||||
|
|
||||||
private readonly Dictionary<string, string> _tags = new()
|
private readonly Dictionary<string, string> _tags = new()
|
||||||
{
|
{
|
||||||
{ Icons.Auth, "Auth" },
|
{ Icons.Auth, "Auth" },
|
||||||
{ Icons.NetworkPublic, "WWW" },
|
{ Icons.NetworkPublic, "WWW" },
|
||||||
{ Icons.SEO, "SEO" },
|
{ Icons.SEO, "SEO" },
|
||||||
{ Icons.GitLab, "VCS" },
|
{ Icons.GitLab, "VCS" }
|
||||||
};
|
};
|
||||||
|
|
||||||
public void Render(Position position)
|
public void Render(Position position)
|
||||||
{
|
{
|
||||||
Console.SetCursorPosition(position.Left, position.Top);
|
Console.SetCursorPosition(position.Left, position.Top);
|
||||||
|
|
||||||
for (var i = 1; i <= Height; i++)
|
for (var i = 1; i <= Height; i++) Console.WriteLine(new string(' ', Console.WindowWidth - LogoWidth));
|
||||||
{
|
|
||||||
Console.WriteLine(new string(' ', Console.WindowWidth - LogoWidth));
|
|
||||||
}
|
|
||||||
|
|
||||||
RenderBlock(0, _hints);
|
RenderBlock(0, _hints);
|
||||||
RenderBlock(1, _tags);
|
RenderBlock(1, _tags);
|
||||||
|
@ -5,6 +5,14 @@ namespace TUI.UserInterface;
|
|||||||
|
|
||||||
public static class Icons
|
public static class Icons
|
||||||
{
|
{
|
||||||
|
public readonly static Dictionary<string, string> Applications = new()
|
||||||
|
{
|
||||||
|
{ NpmPackage, "package" },
|
||||||
|
{ DockerImage, "image" },
|
||||||
|
{ Site, "site" },
|
||||||
|
{ Api, "api" }
|
||||||
|
};
|
||||||
|
|
||||||
public static string GitLab => GetIcon("", "E24329");
|
public static string GitLab => GetIcon("", "E24329");
|
||||||
public static string GitHub => GetIcon("", "ADBAC7");
|
public static string GitHub => GetIcon("", "ADBAC7");
|
||||||
public static string Git => GetIcon("", "F14E32");
|
public static string Git => GetIcon("", "F14E32");
|
||||||
@ -19,14 +27,8 @@ public static class Icons
|
|||||||
public static string Auth => GetIcon("", "FFD700");
|
public static string Auth => GetIcon("", "FFD700");
|
||||||
public static string NotFound => GetIcon("");
|
public static string NotFound => GetIcon("");
|
||||||
|
|
||||||
public readonly static Dictionary<string, string> Applications = new()
|
private static string GetIcon(string icon, string? activeColor = null)
|
||||||
{
|
{
|
||||||
{ NpmPackage, "package" },
|
return icon.Pastel(activeColor ?? Palette.HintColor);
|
||||||
{ DockerImage, "image" },
|
}
|
||||||
{ Site, "site" },
|
|
||||||
{ Api, "api" },
|
|
||||||
};
|
|
||||||
|
|
||||||
private static string GetIcon(string icon, string? activeColor = null) =>
|
|
||||||
icon.Pastel(activeColor ?? Palette.HintColor);
|
|
||||||
}
|
}
|
@ -12,10 +12,35 @@ public static class Palette
|
|||||||
public const string WarningColor = "EC9706";
|
public const string WarningColor = "EC9706";
|
||||||
public const string InfoColor = "25799F";
|
public const string InfoColor = "25799F";
|
||||||
|
|
||||||
public static string Primary(this string currentText) => currentText.Pastel(PrimaryColor);
|
public static string Primary(this string currentText, bool isFocused = true)
|
||||||
public static string Hint(this string currentText) => currentText.Pastel(HintColor);
|
{
|
||||||
public static string Disable(this string currentText) => currentText.RemoveColors().Pastel(HintColor);
|
return isFocused
|
||||||
public static string Warning(this string currentText) => currentText.Pastel(WarningColor);
|
? currentText.Pastel(PrimaryColor)
|
||||||
public static string Error(this string currentText) => currentText.Pastel(ErrorColor);
|
: Hint(currentText);
|
||||||
public static string Info(this string currentText) => currentText.Pastel(InfoColor);
|
}
|
||||||
|
|
||||||
|
public static string Hint(this string currentText)
|
||||||
|
{
|
||||||
|
return currentText.Pastel(HintColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string Disable(this string currentText)
|
||||||
|
{
|
||||||
|
return currentText.RemoveColors().Pastel(HintColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string Warning(this string currentText)
|
||||||
|
{
|
||||||
|
return currentText.Pastel(WarningColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string Error(this string currentText)
|
||||||
|
{
|
||||||
|
return currentText.Pastel(ErrorColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string Info(this string currentText)
|
||||||
|
{
|
||||||
|
return currentText.Pastel(InfoColor);
|
||||||
|
}
|
||||||
}
|
}
|
@ -11,6 +11,9 @@ public static class Panel
|
|||||||
private const int TagCount = 5;
|
private const int TagCount = 5;
|
||||||
private const int TagWidth = 2;
|
private const int TagWidth = 2;
|
||||||
|
|
||||||
|
|
||||||
|
private static int _marginTop;
|
||||||
|
|
||||||
public static void RenderRows(SourceDto[] sources, int selectedRowNumber)
|
public static void RenderRows(SourceDto[] sources, int selectedRowNumber)
|
||||||
{
|
{
|
||||||
for (var index = 0; index < sources.Length; index++)
|
for (var index = 0; index < sources.Length; index++)
|
||||||
@ -28,7 +31,6 @@ public static class Panel
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (var index = 0; index < sources.Length; index++)
|
for (var index = 0; index < sources.Length; index++)
|
||||||
{
|
|
||||||
Console.SetCursorPosition(TitleWidth,
|
Console.SetCursorPosition(TitleWidth,
|
||||||
6 + index + _marginTop + BorderWidth + Theme.Padding);
|
6 + index + _marginTop + BorderWidth + Theme.Padding);
|
||||||
// var source = sources[index];
|
// var source = sources[index];
|
||||||
@ -41,7 +43,6 @@ public static class Panel
|
|||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
// Console.Write(resultText);
|
// Console.Write(resultText);
|
||||||
}
|
|
||||||
// for (var index = 0; index < sources.Length; index++)
|
// for (var index = 0; index < sources.Length; index++)
|
||||||
// {
|
// {
|
||||||
// var loading = true;
|
// var loading = true;
|
||||||
@ -74,9 +75,6 @@ public static class Panel
|
|||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static int _marginTop;
|
|
||||||
|
|
||||||
// private static Package DownloadPackage(Source source)
|
// private static Package DownloadPackage(Source source)
|
||||||
// {
|
// {
|
||||||
// if (Packages.TryGetValue(source.Repo, out var downloadPackage))
|
// if (Packages.TryGetValue(source.Repo, out var downloadPackage))
|
||||||
|
Loading…
Reference in New Issue
Block a user