From b8ea4bd708b033d84fca2d2877babcb0b8987e91 Mon Sep 17 00:00:00 2001
From: Jiri Kalvoda <jirikalvoda@kam.mff.cuni.cz>
Date: Thu, 11 Aug 2022 21:20:55 +0200
Subject: [PATCH] Rename Element -> Block
---
Module.cs | 34 ++++++++++++++++-----------------
Parsers.cs | 56 +++++++++++++++++++++++++++---------------------------
Program.cs | 22 ++++++++++-----------
3 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/Module.cs b/Module.cs
index ca8de8f..cb02413 100644
--- a/Module.cs
+++ b/Module.cs
@@ -101,7 +101,7 @@ class GlobalModuleResource
interface Module
{
- IEnumerable<Element> Get();
+ IEnumerable<Block> Get();
void Init(ModuleParent _bar, ConfigSection section);
}
@@ -116,9 +116,9 @@ class ModuleConstant: Module
text = section.Mandatory("text");
color = section?["color"]?.AsColor() ?? System.Drawing.ColorTranslator.FromHtml("white");
}
- public IEnumerable<Element> Get()
+ public IEnumerable<Block> Get()
{
- return new Element[]{new Element(text, Color: color)};
+ return new Block[]{new Block(text, Color: color)};
}
}
@@ -151,7 +151,7 @@ text = ERR
parser = _bar.GetGlobal<ParserGetter>().ByNameFromConfig(section.Optional("parser"));
parser.Init(_bar, this, section);
}
- public IEnumerable<Element> Get()
+ public IEnumerable<Block> Get()
{
string text;
try
@@ -209,8 +209,8 @@ abstract class ModuleSourceThreadAndParser: Module
}
bar.Schedule(scheudleIn_ms);
}
- public abstract IEnumerable<Element> Get();
- protected IEnumerable<Element> parse(string _text, long _dataTick)
+ public abstract IEnumerable<Block> Get();
+ protected IEnumerable<Block> parse(string _text, long _dataTick)
{
long t = Environment.TickCount64;
if(_text == null )
@@ -261,7 +261,7 @@ abstract class ModuleAbstractPipe: ModuleSourceThreadAndParser
}
}
}
- override public IEnumerable<Element> Get()
+ override public IEnumerable<Block> Get()
{
string _text;
long _dataTick;
@@ -401,7 +401,7 @@ text = ERR
Thread.Sleep(period_ms);
}
}
- public override IEnumerable<Element> Get()
+ public override IEnumerable<Block> Get()
{
string _data;
long _dataTick;
@@ -432,7 +432,7 @@ class ModuleI3Status: Module
}
string name;
string configuration;
- Element[] elements;
+ Block[] elements;
class Global: GlobalModuleResource
{
public List<ModuleI3Status> modules = new();
@@ -484,7 +484,7 @@ class ModuleI3Status: Module
{
throw new ModuleI3StatusException();
}
- Element[] data = (Element[])parser.Parse(line[1..]);
+ Block[] data = (Block[])parser.Parse(line[1..]);
if(data.Length != modules.Count)
throw new Exception("Parse i3status error");
for(int i=0;i<modules.Count;i++)
@@ -510,7 +510,7 @@ class ModuleI3Status: Module
}
g.moduleByName[name] = this;
}
- public IEnumerable<Element> Get() => elements ?? new Element[]{};
+ public IEnumerable<Block> Get() => elements ?? new Block[]{};
}
@@ -531,7 +531,7 @@ class ModuleTime: Module
refresh = section.Optional("refresh")?.AsBool() ?? false;
round_ms = section.Optional("round")?.AsMs() ?? 1000;
}
- public IEnumerable<Element> Get()
+ public IEnumerable<Block> Get()
{
var t = DateTime.Now;
@@ -541,7 +541,7 @@ class ModuleTime: Module
string shortText = shortFormat==null?null:t.ToString(shortFormat);
if(refresh)
bar.Schedule((int)(round_ms - t_ms % round_ms + 1));
- return new Element[]{new Element(s, ShortText: shortText)};
+ return new Block[]{new Block(s, ShortText: shortText)};
}
}
@@ -567,7 +567,7 @@ class ModuleBattery: Module
timeWindow_ms = section.Optional("time_window")?.AsMs() ?? 60000;
shortFormat = section.Optional("short_format")?.AsString();
}
- public IEnumerable<Element> Get()
+ public IEnumerable<Block> Get()
{
long t = Environment.TickCount64;
while(history.Count > 0 && history.Peek().time_ms + timeWindow_ms < t)
@@ -633,16 +633,16 @@ class ModuleBattery: Module
if(percent < 10) color = Color.FromArgb(255,0,0);
else if(percent < 30) color = Color.Orange;
}
- return new Element[]{new Element(text, ShortText: shortText, Color: color)};
+ return new Block[]{new Block(text, ShortText: shortText, Color: color)};
}
catch (IOException)
{
- return new Element[]{new Element("NO BATTERY", Color:Color.Red)};
+ return new Block[]{new Block("NO BATTERY", Color:Color.Red)};
}
catch (ConfigException e)
{
Console.Error.WriteLine(e);
- return new Element[]{new Element("Battery parse error", Color:Color.Red)};
+ return new Block[]{new Block("Battery parse error", Color:Color.Red)};
}
}
}
diff --git a/Parsers.cs b/Parsers.cs
index 7f674c4..735c809 100644
--- a/Parsers.cs
+++ b/Parsers.cs
@@ -95,7 +95,7 @@ class ParserGetter: GlobalModuleResource
}
interface Parser
{
- IEnumerable<Element> Parse(string s);
+ IEnumerable<Block> Parse(string s);
void Init(ModuleParent _bar, Module _module, ConfigSection section);
}
@@ -109,10 +109,10 @@ class ParserText: Parser
{
color = section.Optional("color")?.AsColor() ?? System.Drawing.ColorTranslator.FromHtml("white");
}
- public IEnumerable<Element> Parse(string data)
+ public IEnumerable<Block> Parse(string data)
{
if(data.Length > 0 && data[^1] == '\n') data = data[..^1];
- return data.Split("\n").Select(x => new Element(x, Color: color)).ToArray();
+ return data.Split("\n").Select(x => new Block(x, Color: color)).ToArray();
}
}
@@ -122,25 +122,25 @@ class ParserOsddLast: Parser
public void Init(ModuleParent _bar, Module _module, ConfigSection section)
{
}
- public IEnumerable<Element> Parse(string data)
+ public IEnumerable<Block> Parse(string data)
{
var lines = data.Split("\n");
if(lines.Length >= 1)
{
- List<Element> output = new();
+ List<Block> output = new();
long timeEleapsed_s = DateTimeOffset.Now.ToUnixTimeSeconds()-long.Parse(lines[0]);
bool first = true;
foreach(var l in lines[1..])
{
if(l.Length > 7)
- output.Add(new Element((first?$"[{TimeShow.Show(timeEleapsed_s)}] ":"") + l[7..], Color: System.Drawing.ColorTranslator.FromHtml("#"+l[..6])));
+ output.Add(new Block((first?$"[{TimeShow.Show(timeEleapsed_s)}] ":"") + l[7..], Color: System.Drawing.ColorTranslator.FromHtml("#"+l[..6])));
first = false;
}
return output;
}
else
{
- return new Element[]{new Element("OSDD parse ERROR", Color: Color.Red)};
+ return new Block[]{new Block("OSDD parse ERROR", Color: Color.Red)};
}
}
}
@@ -153,7 +153,7 @@ class ParserCheckmailLog: Parser
{
bar = _bar;
}
- public IEnumerable<Element> Parse(string data)
+ public IEnumerable<Block> Parse(string data)
{
try
{
@@ -170,22 +170,22 @@ class ParserCheckmailLog: Parser
if(delay < -5 || delay > 90)
{
if(countNewMails > 0)
- return new Element[]{new Element($"NO CONNECTION {TimeShow.Show(delay)} [{countNewMails}]", Color: t_parity?Color.FromArgb(255, 0, 0):Color.FromArgb(0x33, 0x33, 255))};
+ return new Block[]{new Block($"NO CONNECTION {TimeShow.Show(delay)} [{countNewMails}]", Color: t_parity?Color.FromArgb(255, 0, 0):Color.FromArgb(0x33, 0x33, 255))};
else
- return new Element[]{new Element($"NO CONNECTION {TimeShow.Show(delay)}", Color: Color.Red)};
+ return new Block[]{new Block($"NO CONNECTION {TimeShow.Show(delay)}", Color: Color.Red)};
}
else
{
if(countNewMails > 0)
- return new Element[]{new Element($"[{countNewMails} NEW]", Color: t_parity?Color.FromArgb(255, 0x70, 0):Color.FromArgb(0x33, 0x33, 255))};
+ return new Block[]{new Block($"[{countNewMails} NEW]", Color: t_parity?Color.FromArgb(255, 0x70, 0):Color.FromArgb(0x33, 0x33, 255))};
else
- return new Element[]{new Element($"OK", Color: Color.FromArgb(0,255,0))};
+ return new Block[]{new Block($"OK", Color: Color.FromArgb(0,255,0))};
}
}
catch(Exception e)
{
Console.Error.WriteLine(e);
- return new Element[]{new Element("CM PE", Color: Color.Red)};
+ return new Block[]{new Block("CM PE", Color: Color.Red)};
}
}
}
@@ -195,22 +195,22 @@ class ParserOfflineimapLog: Parser
public void Init(ModuleParent _bar, Module _module, ConfigSection section)
{
}
- public IEnumerable<Element> Parse(string data)
+ public IEnumerable<Block> Parse(string data)
{
data = data.Trim();
if(data.StartsWith("DOING"))
- return new Element[]{new Element("IMAP", Color: Color.Green)};
+ return new Block[]{new Block("IMAP", Color: Color.Green)};
if(data.StartsWith("WAITING"))
- return new Element[]{new Element("IMAP", Color: Color.Orange)};
+ return new Block[]{new Block("IMAP", Color: Color.Orange)};
if(int.TryParse(data, out int n))
{
if(n == 0)
- return new Element[]{};
+ return new Block[]{};
else
- return new Element[]{new Element($"IMAP {n}", Color: Color.Red)};
+ return new Block[]{new Block($"IMAP {n}", Color: Color.Red)};
}
else
- return new Element[]{new Element("IMAP PE", Color: Color.Red)};
+ return new Block[]{new Block("IMAP PE", Color: Color.Red)};
}
}
@@ -218,7 +218,7 @@ class ParserOfflineimapLog: Parser
class ParserI3: Parser
{
public void Init(ModuleParent _bar, Module _module, ConfigSection section){}
- static Element parseElement(JsonNode _json)
+ static Block parseElement(JsonNode _json)
{
var json = _json.AsObject();
var align = Align.Left;
@@ -238,7 +238,7 @@ class ParserI3: Parser
minWidth_int = json["min_width"]?.AsValue()?.GetValue<int>();
}
catch(Exception) {}
- return new Element(
+ return new Block(
Text: json["full_text"].AsValue().GetValue<string>(),
ShortText: json["short_text"]?.AsValue()?.GetValue<string>(),
Color: json["color"]?.AsValue()?.GetValue<string>()?.ToColor(),
@@ -257,7 +257,7 @@ class ParserI3: Parser
Markup: markup
);
}
- public IEnumerable<Element> Parse(string data)
+ public IEnumerable<Block> Parse(string data)
{
JsonArray json = JsonObject.Parse(data).AsArray();
return json.Select(parseElement).ToArray();
@@ -271,17 +271,17 @@ class ParserICESpeed: Parser
public void Init(ModuleParent _bar, Module _module, ConfigSection section)
{
}
- public IEnumerable<Element> Parse(string data)
+ public IEnumerable<Block> Parse(string data)
{
try
{
JsonObject json = JsonObject.Parse(data).AsObject();
- return new Element[]{new Element($"{json["speed"].GetValue<double>()} km/h", Color: Color.White)};
+ return new Block[]{new Block($"{json["speed"].GetValue<double>()} km/h", Color: Color.White)};
}
catch(Exception e)
{
Console.Error.WriteLine(e);
- return new Element[]{new Element("Speed PE", Color: Color.Red)};
+ return new Block[]{new Block("Speed PE", Color: Color.Red)};
}
}
#pragma warning restore 8602
@@ -294,7 +294,7 @@ class ParserICENextStop: Parser
public void Init(ModuleParent _bar, Module _module, ConfigSection section)
{
}
- public IEnumerable<Element> Parse(string data)
+ public IEnumerable<Block> Parse(string data)
{
try
{
@@ -311,12 +311,12 @@ class ParserICENextStop: Parser
long nextStopArrivalScheudled = nextStop["timetable"].AsObject()["scheduledArrivalTime"].GetValue<long>()/1000;
long arrivalIn = nextStopArrival - DateTimeOffset.Now.ToUnixTimeSeconds();
string delayStr = nextStopArrivalScheudled==nextStopArrival?"":$" ({TimeShow.WithSign(nextStopArrival - nextStopArrivalScheudled)})";
- return new Element[]{new Element($"{nextStopName} in {TimeShow.Show(arrivalIn)}"+delayStr, Color: Color.White)};
+ return new Block[]{new Block($"{nextStopName} in {TimeShow.Show(arrivalIn)}"+delayStr, Color: Color.White)};
}
catch(Exception e)
{
Console.Error.WriteLine(e);
- return new Element[]{new Element("ICE PE", Color: Color.Red)};
+ return new Block[]{new Block("ICE PE", Color: Color.Red)};
}
}
#pragma warning restore 8602
diff --git a/Program.cs b/Program.cs
index 461b0f0..e6222ba 100644
--- a/Program.cs
+++ b/Program.cs
@@ -98,7 +98,7 @@ enum Markup
}
-record Element(
+record Block(
string Text,
string? ShortText=null,
Color? Color=null,
@@ -163,9 +163,9 @@ abstract class StatusBar: ModuleParent
modules.Add(module);
}
}
- public List<Element> Get()
+ public List<Block> Get()
{
- var elements = new List<Element>();
+ var elements = new List<Block>();
foreach(var m in modules)
elements.AddRange(m.Get());
return elements;
@@ -230,7 +230,7 @@ abstract class RootStatusBar: StatusBar
Print(w);
}
}
- abstract protected void format(TextWriter w, List<Element> elements);
+ abstract protected void format(TextWriter w, List<Block> elements);
virtual protected void initOutput(TextWriter w){}
public void Print(TextWriter w)
{
@@ -281,7 +281,7 @@ class StatusBarPlainText: RootStatusBar
}
return s;
}
- protected virtual string elementAsString(Element e)
+ protected virtual string elementAsString(Block e)
{
string s = RemoveMarkup(e.Text, e.Markup);
if(e.MinWidth_string != null || e.MinWidth_int != null)
@@ -302,9 +302,9 @@ class StatusBarPlainText: RootStatusBar
return s;
}
public StatusBarPlainText(FileInfo configFile):base(configFile){}
- override protected void format(TextWriter w, List<Element> elements)
+ override protected void format(TextWriter w, List<Block> elements)
{
- Element? last = null;
+ Block? last = null;
foreach(var e in elements)
{
if(last != null)
@@ -342,7 +342,7 @@ class StatusBarTerminal: StatusBarPlainText
Console.WriteLine("");
}
}
- override protected string elementAsString(Element e)
+ override protected string elementAsString(Block e)
{
string msg = base.elementAsString(e);
if(e.Urgent) msg=$"\x1B[1m{msg}\x1B[0m";
@@ -350,9 +350,9 @@ class StatusBarTerminal: StatusBarPlainText
if(e.BackgroundColor != null) msg = msg.PastelBg(e.BackgroundColor.Value);
return msg;
}
- override protected void format(TextWriter w, List<Element> elements)
+ override protected void format(TextWriter w, List<Block> elements)
{
- Element? last = null;
+ Block? last = null;
foreach(var e in elements)
{
if(last != null)
@@ -371,7 +371,7 @@ class StatusBarI3: RootStatusBar
w.WriteLine("{\"version\":1}");
w.WriteLine("[{}");
}
- override protected void format(TextWriter w, List<Element> elements)
+ override protected void format(TextWriter w, List<Block> elements)
{
JsonNode? intStringUnion(int? _int, string? _string)
{
--
GitLab