diff --git a/src/wp2hugo/internal/hugogenerator/hugopage/hugo_page.go b/src/wp2hugo/internal/hugogenerator/hugopage/hugo_page.go index ec1cf57..78ee486 100644 --- a/src/wp2hugo/internal/hugogenerator/hugopage/hugo_page.go +++ b/src/wp2hugo/internal/hugogenerator/hugopage/hugo_page.go @@ -64,8 +64,9 @@ var _hugoParallaxBlurLinks = regexp.MustCompile(`{{< parallaxblur.*?src="(.+?)". func NewPage(provider ImageURLProvider, pageURL url.URL, author string, title string, publishDate *time.Time, isDraft bool, categories []string, tags []string, footnotes []wpparser.Footnote, - htmlContent string, guid *rss.GUID, featuredImageID *string, postFormat string) (*Page, error) { - metadata, err := getMetadata(provider, pageURL, author, title, publishDate, isDraft, categories, tags, guid, featuredImageID, postFormat) + htmlContent string, guid *rss.GUID, featuredImageID *string, postFormat *string) (*Page, error) { + metadata, err := getMetadata(provider, pageURL, author, title, publishDate, isDraft, categories, tags, guid, + featuredImageID, postFormat) if err != nil { return nil, err } @@ -119,7 +120,8 @@ func getMarkdownLinks(regex *regexp.Regexp, markdown string) []string { } func getMetadata(provider ImageURLProvider, pageURL url.URL, author string, title string, publishDate *time.Time, - isDraft bool, categories []string, tags []string, guid *rss.GUID, featuredImageID *string, postFormat string) (map[string]any, error) { + isDraft bool, categories []string, tags []string, guid *rss.GUID, featuredImageID *string, + postFormat *string) (map[string]any, error) { metadata := make(map[string]any) metadata["url"] = pageURL.Path // Relative URL metadata["author"] = author @@ -163,8 +165,8 @@ func getMetadata(provider ImageURLProvider, pageURL url.URL, author string, titl metadata["cover"] = coverInfo } } - if postFormat != "" { - metadata["type"] = postFormat + if postFormat != nil { + metadata["type"] = *postFormat } return metadata, nil } diff --git a/src/wp2hugo/internal/hugogenerator/hugopage/hugo_page_test.go b/src/wp2hugo/internal/hugogenerator/hugopage/hugo_page_test.go index 0a52c28..1cf1a4d 100644 --- a/src/wp2hugo/internal/hugogenerator/hugopage/hugo_page_test.go +++ b/src/wp2hugo/internal/hugogenerator/hugopage/hugo_page_test.go @@ -62,7 +62,7 @@ func TestManualLineBreaks(t *testing.T) { func testMarkdownExtractor(t *testing.T, htmlInput string, markdownOutput string) { url1, err := url.Parse("https://example.com") assert.Nil(t, err) - page, err := NewPage(nil, *url1, "author", "Title", nil, false, nil, nil, nil, htmlInput, nil, nil) + page, err := NewPage(nil, *url1, "author", "Title", nil, false, nil, nil, nil, htmlInput, nil, nil, nil) assert.Nil(t, err) md, err := page.getMarkdown(nil, htmlInput, nil) assert.Nil(t, err) diff --git a/src/wp2hugo/internal/wpparser/wp_parser_setup.go b/src/wp2hugo/internal/wpparser/wp_parser_setup.go index 8fcdcb7..d0f90be 100644 --- a/src/wp2hugo/internal/wpparser/wp_parser_setup.go +++ b/src/wp2hugo/internal/wpparser/wp_parser_setup.go @@ -93,7 +93,7 @@ type CommonFields struct { LastModifiedDate *time.Time PublishStatus PublishStatus // "publish", "draft", "pending" etc. may be make this a custom type GUID *rss.GUID - PostFormat string + PostFormat *string Description string // how to use this? Content string @@ -309,7 +309,7 @@ func getCommonFields(item *rss.Item) (*CommonFields, error) { } pageCategories := make([]string, 0, len(item.Categories)) pageTags := make([]string, 0, len(item.Categories)) - var postFormat string + var postFormat *string for _, category := range item.Categories { if isCategory(category) { @@ -317,7 +317,8 @@ func getCommonFields(item *rss.Item) (*CommonFields, error) { } else if isTag(category) { pageTags = append(pageTags, NormalizeCategoryName(category.Value)) } else if isPostFormat(category) { - postFormat = NormalizeCategoryName(category.Value) + tmp := NormalizeCategoryName(category.Value) + postFormat = &tmp } else { log.Warn(). Str("link", item.Link).