mirrors
/
OpenLiveWriter
mirror of https://github.com/OpenLiveWriter/OpenLiveWriter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ssg: StaticSiteItemFrontMatter: take StaticSiteConfigFrontMatterKeys in constructor, adjust static methods to suit

This commit is contained in:
Nick Vella 2019-07-30 17:12:11 +10:00
parent 7622f29124
commit e2fd2bffb9
2 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/managed/OpenLiveWriter.BlogClient/Clients/StaticSite/StaticSiteItem.cs
View File

@ -38,7 +38,7 @@ namespace OpenLiveWriter.BlogClient.Clients.StaticSite
public virtual StaticSiteItemFrontMatter FrontMatter public virtual StaticSiteItemFrontMatter FrontMatter
{ {
get => StaticSiteItemFrontMatter.GetFromBlogPost(BlogPost); get => StaticSiteItemFrontMatter.GetFromBlogPost(SiteConfig.FrontMatterKeys, BlogPost);
} }
/// <summary> /// <summary>
@ -215,7 +215,7 @@ namespace OpenLiveWriter.BlogClient.Clients.StaticSite
// Create a new BlogPost // Create a new BlogPost
BlogPost = new BlogPost(); BlogPost = new BlogPost();
// Parse front matter and save in // Parse front matter and save in
StaticSiteItemFrontMatter.GetFromYaml(frontMatterYaml).SaveToBlogPost(BlogPost); StaticSiteItemFrontMatter.GetFromYaml(SiteConfig.FrontMatterKeys, frontMatterYaml).SaveToBlogPost(BlogPost);
// Throw error if post does not have an ID // Throw error if post does not have an ID
if (Id == null || Id == string.Empty) throw new BlogClientException("Post load error", "Post does not have an ID"); if (Id == null || Id == string.Empty) throw new BlogClientException("Post load error", "Post does not have an ID");

51
src/managed/OpenLiveWriter.BlogClient/Clients/StaticSite/StaticSiteItemFrontMatter.cs
View File

@ -13,19 +13,7 @@ namespace OpenLiveWriter.BlogClient.Clients.StaticSite
{ {
public class StaticSiteItemFrontMatter public class StaticSiteItemFrontMatter
{ {
/// Hardcode these to Jekyll defaults for now private StaticSiteConfigFrontMatterKeys _frontMatterKeys;
/// TODO Load from StaticSiteConfig
private StaticSiteConfigFrontMatterKeys frontMatterKeys
= new StaticSiteConfigFrontMatterKeys()
{
IdKey = "id",
TitleKey = "title",
DateKey = "date",
LayoutKey = "layout",
TagsKey = "tags",
ParentIdKey = "parent_id",
PermalinkKey = "permalink"
};
public string Id { get; set; } public string Id { get; set; }
public string Title { get; set; } public string Title { get; set; }
@ -36,8 +24,9 @@ namespace OpenLiveWriter.BlogClient.Clients.StaticSite
public string ParentId { get; set; } = ""; public string ParentId { get; set; } = "";
public string Permalink { get; set; } public string Permalink { get; set; }
public StaticSiteItemFrontMatter() public StaticSiteItemFrontMatter(StaticSiteConfigFrontMatterKeys frontMatterKeys)
{ {
_frontMatterKeys = frontMatterKeys;
Tags = new string[] { }; // Initialize Tags to empty array Tags = new string[] { }; // Initialize Tags to empty array
} }
@ -49,15 +38,15 @@ namespace OpenLiveWriter.BlogClient.Clients.StaticSite
{ {
var root = new YamlMappingNode(); var root = new YamlMappingNode();
if (Id != null && Id.Length > 0) root.Add(frontMatterKeys.IdKey, Id); if (Id != null && Id.Length > 0) root.Add(_frontMatterKeys.IdKey, Id);
if (Title != null) root.Add(frontMatterKeys.TitleKey, Title); if (Title != null) root.Add(_frontMatterKeys.TitleKey, Title);
if(Date != null) root.Add(frontMatterKeys.DateKey, Date); if(Date != null) root.Add(_frontMatterKeys.DateKey, Date);
if(Layout != null) root.Add(frontMatterKeys.LayoutKey, Layout); if(Layout != null) root.Add(_frontMatterKeys.LayoutKey, Layout);
if (Tags != null && Tags.Length > 0) if (Tags != null && Tags.Length > 0)
root.Add(frontMatterKeys.TagsKey, new YamlSequenceNode(Tags.Select( root.Add(_frontMatterKeys.TagsKey, new YamlSequenceNode(Tags.Select(
tag => new YamlScalarNode(tag)))); tag => new YamlScalarNode(tag))));
if (!string.IsNullOrEmpty(ParentId)) root.Add(frontMatterKeys.ParentIdKey, ParentId); if (!string.IsNullOrEmpty(ParentId)) root.Add(_frontMatterKeys.ParentIdKey, ParentId);
if (!string.IsNullOrEmpty(Permalink)) root.Add(frontMatterKeys.PermalinkKey, Permalink); if (!string.IsNullOrEmpty(Permalink)) root.Add(_frontMatterKeys.PermalinkKey, Permalink);
var stream = new YamlStream(new YamlDocument(root)); var stream = new YamlStream(new YamlDocument(root));
var stringWriter = new StringWriter(); var stringWriter = new StringWriter();
@ -79,28 +68,28 @@ namespace OpenLiveWriter.BlogClient.Clients.StaticSite
var root = (YamlMappingNode)stream.Documents[0].RootNode; var root = (YamlMappingNode)stream.Documents[0].RootNode;
// Load id // Load id
var idNodes = root.Where(kv => kv.Key.ToString() == frontMatterKeys.IdKey); var idNodes = root.Where(kv => kv.Key.ToString() == _frontMatterKeys.IdKey);
if (idNodes.Count() > 0) Id = idNodes.First().Value.ToString(); if (idNodes.Count() > 0) Id = idNodes.First().Value.ToString();
// Load title // Load title
var titleNodes = root.Where(kv => kv.Key.ToString() == frontMatterKeys.TitleKey); var titleNodes = root.Where(kv => kv.Key.ToString() == _frontMatterKeys.TitleKey);
if (titleNodes.Count() > 0) Title = titleNodes.First().Value.ToString(); if (titleNodes.Count() > 0) Title = titleNodes.First().Value.ToString();
// Load date // Load date
var dateNodes = root.Where(kv => kv.Key.ToString() == frontMatterKeys.DateKey); var dateNodes = root.Where(kv => kv.Key.ToString() == _frontMatterKeys.DateKey);
if (dateNodes.Count() > 0) Date = dateNodes.First().Value.ToString(); if (dateNodes.Count() > 0) Date = dateNodes.First().Value.ToString();
// Load layout // Load layout
var layoutNodes = root.Where(kv => kv.Key.ToString() == frontMatterKeys.LayoutKey); var layoutNodes = root.Where(kv => kv.Key.ToString() == _frontMatterKeys.LayoutKey);
if (layoutNodes.Count() > 0) Layout = layoutNodes.First().Value.ToString(); if (layoutNodes.Count() > 0) Layout = layoutNodes.First().Value.ToString();
// Load tags // Load tags
var tagNodes = root.Where(kv => kv.Key.ToString() == frontMatterKeys.TagsKey); var tagNodes = root.Where(kv => kv.Key.ToString() == _frontMatterKeys.TagsKey);
if (tagNodes.Count() > 0 && tagNodes.First().Value.NodeType == YamlNodeType.Sequence) if (tagNodes.Count() > 0 && tagNodes.First().Value.NodeType == YamlNodeType.Sequence)
Tags = ((YamlSequenceNode)tagNodes.First().Value).Select(node => node.ToString()).ToArray(); Tags = ((YamlSequenceNode)tagNodes.First().Value).Select(node => node.ToString()).ToArray();
// Load parent ID // Load parent ID
var parentIdNodes = root.Where(kv => kv.Key.ToString() == frontMatterKeys.ParentIdKey); var parentIdNodes = root.Where(kv => kv.Key.ToString() == _frontMatterKeys.ParentIdKey);
if (parentIdNodes.Count() > 0) ParentId = parentIdNodes.First().Value.ToString(); if (parentIdNodes.Count() > 0) ParentId = parentIdNodes.First().Value.ToString();
// Permalink is never loaded, only saved // Permalink is never loaded, only saved
@ -128,16 +117,16 @@ namespace OpenLiveWriter.BlogClient.Clients.StaticSite
} }
public static StaticSiteItemFrontMatter GetFromBlogPost(BlogPost post) public static StaticSiteItemFrontMatter GetFromBlogPost(StaticSiteConfigFrontMatterKeys frontMatterKeys, BlogPost post)
{ {
var frontMatter = new StaticSiteItemFrontMatter(); var frontMatter = new StaticSiteItemFrontMatter(frontMatterKeys);
frontMatter.LoadFromBlogPost(post); frontMatter.LoadFromBlogPost(post);
return frontMatter; return frontMatter;
} }
public static StaticSiteItemFrontMatter GetFromYaml(string yaml) public static StaticSiteItemFrontMatter GetFromYaml(StaticSiteConfigFrontMatterKeys frontMatterKeys, string yaml)
{ {
var frontMatter = new StaticSiteItemFrontMatter(); var frontMatter = new StaticSiteItemFrontMatter(frontMatterKeys);
frontMatter.Deserialize(yaml); frontMatter.Deserialize(yaml);
return frontMatter; return frontMatter;
} }