support tag ref

OpportunityLiu · OpportunityLiu · commit 7a4fd8683d5e · 2020-05-30T21:23:30.000+08:00
diff --git a/EhDbReleaseBuilder/Properties/launchSettings.json b/EhDbReleaseBuilder/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "EhDbReleaseBuilder": {
       "commandName": "Project",
-      "commandLineArgs": "--source C:/Users/lzy/Documents/Source/EhTagTranslation/EhTagConnector/EHTT-DB/ --target C:/Users/lzy/Documents/Source/EhTagTranslation/EhTagConnector/EHTT-DB/publish --check-tags Parody,Character,Group,Artist"
+      "commandLineArgs": "--source C:\\Users\\lzy\\Documents\\Source\\EhTagTranslation\\Database --target C:\\Users\\lzy\\Documents\\Source\\EhTagTranslation\\Database\\publish "
     }
   }
 }
diff --git a/EhTagApi/Controllers/ToolsController.cs b/EhTagApi/Controllers/ToolsController.cs
@@ -25,6 +25,7 @@ public IActionResult Status()
         [HttpPost("normalize")]
         public IActionResult Normalize([FromBody] Record record)
         {
+            record.Render("");
             return Ok(record);
         }
 
@@ -53,6 +54,7 @@ public IActionResult Parse([FromBody][Required] string tableRow)
                 error.AddModelError(nameof(tableRow), "Failed to parse it as a markdown table row.");
                 return BadRequest(error);
             }
+            r.Value.Render(r.Key);
             return Ok(r);
         }
     }
diff --git a/EhTagApi/Controllers/WebhookController.cs b/EhTagApi/Controllers/WebhookController.cs
@@ -49,6 +49,7 @@ public IActionResult Post(
                 log = $"Pulled form github in {(DateTimeOffset.Now - start).TotalMilliseconds}ms.";
                 logger.LogInformation(log);
                 database.Load();
+                database.Render();
             }
             else
             {
diff --git a/EhTagClient/Context.cs b/EhTagClient/Context.cs
@@ -0,0 +1,14 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace EhTagClient
+{
+    static class Context
+    {
+        public static Database Database { get; set; }
+        public static Namespace Namespace { get; set; }
+        public static string Raw { get; set; }
+        public static Record Record { get; set; }
+    }
+}
diff --git a/EhTagClient/DataBase.cs b/EhTagClient/DataBase.cs
@@ -37,8 +37,18 @@ public void Load()
             }
         }
 
+        public void Render()
+        {
+            Context.Database = this;
+            foreach (var item in Values)
+            {
+                item.Render();
+            }
+        }
+
         public void Save()
         {
+            Context.Database = this;
             foreach (var item in Values)
             {
                 item.Save();
diff --git a/EhTagClient/MarkdigExt/Extension.cs b/EhTagClient/MarkdigExt/Extension.cs
@@ -38,5 +38,26 @@ public static (string url, string title, string isNsfw) GetData(this LinkInline
 
             return (url, title, null);
         }
+        public static Record GetTag(string tag, Namespace ns)
+        {
+            var table = Context.Database[ns];
+            return table.Data[tag];
+        }
+
+        public static Record GetTag(string tag)
+        {
+            var record = GetTag(tag, Context.Namespace);
+            if (record != null) return record;
+            foreach (var item in Context.Database.Keys)
+            {
+                if (item != Context.Namespace)
+                {
+                    record = GetTag(tag, item);
+                    if (record != null) return record;
+                }
+            }
+            Console.WriteLine($"Invalid tag ref {tag}");
+            return null;
+        }
     }
 }
diff --git a/EhTagClient/MarkdigExt/Html/CodeInlineRenderer.cs b/EhTagClient/MarkdigExt/Html/CodeInlineRenderer.cs
@@ -0,0 +1,40 @@
+﻿using Markdig.Renderers;
+using Markdig.Renderers.Html;
+using Markdig.Syntax.Inlines;
+using System;
+
+namespace EhTagClient.MarkdigExt.Html
+{
+    class CodeInlineRenderer : HtmlObjectRenderer<CodeInline>
+    {
+        protected override void Write(HtmlRenderer renderer, CodeInline obj)
+        {
+            var content = obj.Content;
+            var tag = Extension.GetTag(content);
+            if (renderer.EnableHtmlForInline)
+                renderer.Write("<ruby>");
+            if (tag != null)
+            {
+                renderer.WriteEscape(tag.Name.Text);
+                if (renderer.EnableHtmlForInline)
+                {
+                    renderer.Write("<rp>(</rp><rt>");
+                    renderer.WriteEscape(content);
+                    renderer.Write("</rt><rp>)</rp>");
+                }
+                else
+                {
+                    renderer.Write('(');
+                    renderer.WriteEscape(content);
+                    renderer.Write(')');
+                }
+            }
+            else
+            {
+                renderer.WriteEscape(content);
+            }
+            if (renderer.EnableHtmlForInline)
+                renderer.Write("</ruby>");
+        }
+    }
+}
diff --git a/EhTagClient/MarkdigExt/Html/EhLinkInlineRenderer.cs b/EhTagClient/MarkdigExt/Html/EhLinkInlineRenderer.cs
@@ -1,13 +1,11 @@
 ﻿using Markdig.Renderers;
 using Markdig.Renderers.Html;
 using Markdig.Syntax.Inlines;
-using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace EhTagClient.MarkdigExt.Html
 {
-
     class EhLinkInlineRenderer : HtmlObjectRenderer<LinkInline>
     {
         protected override void Write(HtmlRenderer renderer, LinkInline link)
diff --git a/EhTagClient/MarkdigExt/Json/JsonRenderer.cs b/EhTagClient/MarkdigExt/Json/JsonRenderer.cs
@@ -147,9 +147,22 @@ protected override void WriteData(JsonRenderer renderer, AutolinkInline obj)
 
     sealed class CodeInlineRenderer : JsonObjectRenderer<CodeInline>
     {
-        protected override string GetType(JsonRenderer renderer, CodeInline obj) => "code";
+        protected override string GetType(JsonRenderer renderer, CodeInline obj) => "tagref";
 
-        protected override void WriteContent(JsonRenderer renderer, CodeInline obj) => renderer.WriteProperty("text", obj.Content);
+        protected override void WriteContent(JsonRenderer renderer, CodeInline obj)
+        {
+            var content = obj.Content;
+            var tag = Extension.GetTag(content);
+            if (tag != null)
+            {
+                renderer.WriteProperty("tag", content);
+                renderer.WriteProperty("text", tag.Name.Text);
+            }
+            else
+            {
+                renderer.WriteProperty("text", content);
+            }
+        }
     }
 
     sealed class DelimiterInlineRenderer : JsonTextRender<DelimiterInline>
diff --git a/EhTagClient/MarkdigExt/Renderer.cs b/EhTagClient/MarkdigExt/Renderer.cs
@@ -62,6 +62,7 @@ private static HtmlRenderer _CreateHtmlRenderer(TextWriter writer, bool enableHt
                 htmlRenderer.EnableHtmlForBlock = false;
                 htmlRenderer.EnableHtmlForInline = false;
             }
+            htmlRenderer.ObjectRenderers.Replace<Hr.Inlines.CodeInlineRenderer>(new Html.CodeInlineRenderer());
             htmlRenderer.ObjectRenderers.Replace<Hr.Inlines.LinkInlineRenderer>(new Html.EhLinkInlineRenderer());
             htmlRenderer.ObjectRenderers.Replace<Hr.Inlines.HtmlEntityInlineRenderer>(new Html.HtmlEntityInlineRenderer());
             htmlRenderer.ObjectRenderers.Replace<Hr.Inlines.LiteralInlineRenderer>(new Html.LiteralInlineRenderer());
diff --git a/EhTagClient/MarkdownText.cs b/EhTagClient/MarkdownText.cs
@@ -17,16 +17,20 @@ public MarkdownText(string rawString, bool singleLine)
             rawString = (rawString ?? "").Trim();
             rawString = Regex.Replace(rawString, "(\r\n|\r|\n)", singleLine ? " " : "\n").Trim();
             Raw = rawString;
+        }
+
+        public string Raw { get; private set; }
+        public string Text { get; private set; }
+        public string Html { get; private set; }
+        public Newtonsoft.Json.Linq.JRaw Ast { get; private set; }
+
+        public void Render()
+        {
             var ast = MarkdigExt.Renderer.Parse(Raw);
             Text = MarkdigExt.Renderer.ToPlainText(ast);
             Raw = MarkdigExt.Renderer.ToNormalizedMarkdown(ast);
             Html = MarkdigExt.Renderer.ToHtml(ast);
             Ast = new Newtonsoft.Json.Linq.JRaw(MarkdigExt.Renderer.ToJson(ast));
         }
-
-        public string Raw { get; }
-        public string Text { get; }
-        public string Html { get; }
-        public Newtonsoft.Json.Linq.JRaw Ast { get; }
     }
 }
diff --git a/EhTagClient/Record.cs b/EhTagClient/Record.cs
@@ -80,7 +80,8 @@ public static KeyValuePair<string, Record> TryParse(string line)
             var name = match.Groups[nameof(Name)].Value;
             var intro = match.Groups[nameof(Intro)].Value;
             var links = match.Groups[nameof(Links)].Value;
-            return KeyValuePair.Create(raw, new Record(_Unescape(name), _Unescape(intro), _Unescape(links)));
+            var record = new Record(_Unescape(name), _Unescape(intro), _Unescape(links));
+            return KeyValuePair.Create(raw, record);
         }
 
         private static readonly Regex _UnescapeRe1 = new Regex(@"<br\s*/?>", RegexOptions.Compiled);
@@ -113,7 +114,19 @@ public Record(string name, string intro, string links)
 
         public MarkdownText Links { get; }
 
+        public void Render(string raw)
+        {
+            Context.Raw = raw;
+            Context.Record = this;
+            Name.Render();
+            Intro.Render();
+            Links.Render();
+        }
+
         public string ToString(string raw)
-            => $"| {raw.Trim().ToLower()} | {_Escape(Name.Raw)} | {_Escape(Intro.Raw)} | {_Escape(Links.Raw)} |";
+        {
+            Render(raw);
+            return $"| {raw.Trim().ToLower()} | {_Escape(Name.Raw)} | {_Escape(Intro.Raw)} | {_Escape(Links.Raw)} |";
+        }
     }
 }
diff --git a/EhTagClient/RecordDictionary.cs b/EhTagClient/RecordDictionary.cs
@@ -189,8 +189,20 @@ public void Load()
             }
         }
 
+        public void Render()
+        {
+            Context.Namespace = Namespace;
+            foreach (var item in RawData)
+            {
+                if (item.Key is null)
+                    continue;
+                item.Value.Render(item.Key);
+            }
+        }
+
         public void Save()
         {
+            Context.Namespace = Namespace;
             using (var sw = new StreamWriter(FilePath) { NewLine = "\n" })
             {
                 sw.Write(Prefix);
@@ -208,7 +220,10 @@ public Record Find(string key)
         {
             if (!MapData.TryGetValue(key, out var index))
                 return null;
-            return RawData[index].Value;
+            Context.Namespace = Namespace;
+            var record = RawData[index].Value;
+            record.Render(key);
+            return record;
         }
 
         public void Add(string key, Record record)

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"profiles": {`
`3`	`3`	`"EhDbReleaseBuilder": {`
`4`	`4`	`"commandName": "Project",`
`5`		`- "commandLineArgs": "--source C:/Users/lzy/Documents/Source/EhTagTranslation/EhTagConnector/EHTT-DB/ --target C:/Users/lzy/Documents/Source/EhTagTranslation/EhTagConnector/EHTT-DB/publish --check-tags Parody,Character,Group,Artist"`
	`5`	`+ "commandLineArgs": "--source C:\\Users\\lzy\\Documents\\Source\\EhTagTranslation\\Database --target C:\\Users\\lzy\\Documents\\Source\\EhTagTranslation\\Database\\publish "`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public IActionResult Status()`
`25`	`25`	`[HttpPost("normalize")]`
`26`	`26`	`public IActionResult Normalize([FromBody] Record record)`
`27`	`27`	`{`
	`28`	`+ record.Render("");`
`28`	`29`	`return Ok(record);`
`29`	`30`	`}`
`30`	`31`
`@@ -53,6 +54,7 @@ public IActionResult Parse([FromBody][Required] string tableRow)`
`53`	`54`	`error.AddModelError(nameof(tableRow), "Failed to parse it as a markdown table row.");`
`54`	`55`	`return BadRequest(error);`
`55`	`56`	`}`
	`57`	`+ r.Value.Render(r.Key);`
`56`	`58`	`return Ok(r);`
`57`	`59`	`}`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public IActionResult Post(`
`49`	`49`	`log = $"Pulled form github in {(DateTimeOffset.Now - start).TotalMilliseconds}ms.";`
`50`	`50`	`logger.LogInformation(log);`
`51`	`51`	`database.Load();`
	`52`	`+ database.Render();`
`52`	`53`	`}`
`53`	`54`	`else`
`54`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,18 @@ public void Load()`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ public void Render()`
	`41`	`+ {`
	`42`	`+ Context.Database = this;`
	`43`	`+ foreach (var item in Values)`
	`44`	`+ {`
	`45`	`+ item.Render();`
	`46`	`+ }`
	`47`	`+ }`
	`48`	`+`
`40`	`49`	`public void Save()`
`41`	`50`	`{`
	`51`	`+ Context.Database = this;`
`42`	`52`	`foreach (var item in Values)`
`43`	`53`	`{`
`44`	`54`	`item.Save();`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`	`1`	`using Markdig.Renderers;`
`2`	`2`	`using Markdig.Renderers.Html;`
`3`	`3`	`using Markdig.Syntax.Inlines;`
`4`		`-using System;`
`5`	`4`	`using System.Collections.Generic;`
`6`	`5`	`using System.Text;`
`7`	`6`
`8`	`7`	`namespace EhTagClient.MarkdigExt.Html`
`9`	`8`	`{`
`10`		`-`
`11`	`9`	`class EhLinkInlineRenderer : HtmlObjectRenderer<LinkInline>`
`12`	`10`	`{`
`13`	`11`	`protected override void Write(HtmlRenderer renderer, LinkInline link)`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ private static HtmlRenderer _CreateHtmlRenderer(TextWriter writer, bool enableHt`
`62`	`62`	`htmlRenderer.EnableHtmlForBlock = false;`
`63`	`63`	`htmlRenderer.EnableHtmlForInline = false;`
`64`	`64`	`}`
	`65`	`+ htmlRenderer.ObjectRenderers.Replace<Hr.Inlines.CodeInlineRenderer>(new Html.CodeInlineRenderer());`
`65`	`66`	`htmlRenderer.ObjectRenderers.Replace<Hr.Inlines.LinkInlineRenderer>(new Html.EhLinkInlineRenderer());`
`66`	`67`	`htmlRenderer.ObjectRenderers.Replace<Hr.Inlines.HtmlEntityInlineRenderer>(new Html.HtmlEntityInlineRenderer());`
`67`	`68`	`htmlRenderer.ObjectRenderers.Replace<Hr.Inlines.LiteralInlineRenderer>(new Html.LiteralInlineRenderer());`