5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-12-20 17:13:31 +00:00
Code Issues Projects Releases Wiki Activity

Attributs

Browse source
This commit is contained in:
Yan Maniez 2019-04-14 14:32:50 +02:00
parent 47c761b7bd
commit d02e6d78cf
734 changed files with 6052 additions and 5678 deletions
Download patch file Download diff file Expand all files Collapse all files

7
AideDeJeu/AideDeJeu/MarkdownView/MarkdownView.cs
View file

@ -560,7 +560,8 @@
case EmphasisInline emphasis:
var childAttributes = attributes | (emphasis.DelimiterCount == 2 /*.IsDouble*/ ? FontAttributes.Bold : FontAttributes.Italic);
return emphasis.SelectMany(x => CreateSpans(x, family, childAttributes, foregroundColor, backgroundColor, size)).ToArray();
var espans = emphasis.SelectMany(x => CreateSpans(x, family, childAttributes, foregroundColor, backgroundColor, size));
return espans.ToArray();
case LineBreakInline breakline:
return new[] { new Span { Text = "\n" } };
@ -647,11 +648,11 @@
},
};
}
return null;
return new Span[0];
default:
Debug.WriteLine($"Can't render {inline.GetType()} inlines.");
return null;
return new Span[0];
}
}

21
AideDeJeu/AideDeJeu/Models/Items/Item.cs
View file

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
@ -381,6 +382,26 @@ namespace AideDeJeuLib
}
}
public void SetAttribute(string name, string value)
{
var prop = this.GetType().GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
if (null != prop && prop.CanWrite)
{
prop.SetValue(this, prop.GetValue(this) + value, null);
}
else
{
if (this.Attributes.ContainsKey(name))
{
this.Attributes[name] += value;
}
else
{
this.Attributes[name] = value;
}
}
}
[DataMember]
public string Description { get; set; }
}

107
AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs
View file

@ -181,8 +181,15 @@ namespace AideDeJeu.ViewModels
var md = block.ToMarkdownString();
foreach (var propkv in props)
{
var prop = propkv.Value;
prop.SetValue(currentItem, prop.GetValue(currentItem) + md, null);
if (propkv.Value.PropertyType == typeof(string))
{
currentItem.SetAttribute(propkv.Key, md);
}
else
{
var prop = propkv.Value;
prop.SetValue(currentItem, prop.GetValue(currentItem) + md, null);
}
}
}
@ -220,9 +227,10 @@ namespace AideDeJeu.ViewModels
{
return;
}
PropertyInfo prop = null;
string propertyName = null;
var ilist = inlines.ToList();
var properties = new HashSet<string>();
//PropertyInfo prop = null;
//string propertyName = null;
//var ilist = inlines.ToList();
foreach (var inline in inlines.ToList())
{
if(inline is ContainerInline)
@ -233,85 +241,64 @@ namespace AideDeJeu.ViewModels
if (inline is HtmlInline)
{
var tag = (inline as HtmlInline).Tag;
Debug.WriteLine(tag);
if(tag.EndsWith("Key-->"))
{
Debug.WriteLine("break");
}
//Debug.WriteLine(tag);
//if(tag.EndsWith("Key-->"))
//{
// Debug.WriteLine("break");
//}
if (tag.StartsWith("<!--"))
{
var parsedComment = new ParsedComment(tag, true);
if(parsedComment.Type == ParsedCommentType.Property)
{
if(parsedComment.Name.EndsWith("Value"))
{
Debug.WriteLine("break");
}
//if(parsedComment.Name.EndsWith("Value"))
//{
// Debug.WriteLine("break");
//}
if(!parsedComment.IsClosing)
{
propertyName = parsedComment.Name;
if (propertyName == "Name")
properties.Add(parsedComment.Name);
//propertyName = parsedComment.Name;
if (parsedComment.Name == "Name")
{
if (headingBlock != null)
{
item.NameLevel = headingBlock.Level;
}
}
prop = item.GetType().GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance);
//prop = item.GetType().GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance);
}
else
{
prop = null;
propertyName = null;
properties.Remove(parsedComment.Name);
//prop = null;
//propertyName = null;
}
}
}
//if (tag == "<!--br-->" || tag == "<br>")
//{
//}
//else if (tag.StartsWith("<!--/"))
//{
// prop = null;
// propertyName = null;
//}
//else if (tag.StartsWith("<!--") && !tag.StartsWith("<!--/"))
//{
// propertyName = tag.Substring(4, tag.Length - 7);
// if(propertyName == "Name")
// {
// if (headingBlock != null)
// {
// item.NameLevel = headingBlock.Level;
// }
// }
// prop = item.GetType().GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance);
//}
}
else
{
if (null != prop && prop.CanWrite)
foreach(var prop in properties)
{
prop.SetValue(item, prop.GetValue(item) + inline.ToMarkdownString(), null);
}
else if(propertyName != null)
{
Debug.WriteLine(propertyName);
if (item.Attributes.ContainsKey(propertyName))
{
item.Attributes[propertyName] += inline.ToMarkdownString();
}
else
{
item.Attributes[propertyName] = inline.ToMarkdownString();
}
if (propertyName.EndsWith("Value"))
{
//Debug.WriteLine(item.AttributesKeyValue);
//Debug.WriteLine(item.AttributesDictionary);
Debug.WriteLine("break");
}
item.SetAttribute(prop, inline.ToMarkdownString());
}
//if (null != prop && prop.CanWrite)
//{
// prop.SetValue(item, prop.GetValue(item) + inline.ToMarkdownString(), null);
//}
//else if(propertyName != null)
//{
// Debug.WriteLine(propertyName);
// if (item.Attributes.ContainsKey(propertyName))
// {
// item.Attributes[propertyName] += inline.ToMarkdownString();
// }
// else
// {
// item.Attributes[propertyName] = inline.ToMarkdownString();
// }
//}
}
}
}