diff --git a/client/.gitignore b/client/.gitignore index 03ddbf1..30947c0 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -1 +1,4 @@ -posts/* +posts_custom/* +!posts_custom/ExamplePostCustomFormat +posts_org/* +!posts_org/ExamplePostOrgFormat.org diff --git a/client/gen.exs b/client/gen.exs index 82bfd5c..f9a5baf 100644 --- a/client/gen.exs +++ b/client/gen.exs @@ -8,22 +8,20 @@ post_feed_template = File.read!("./templates/posts.xml") # Converting handlebars in template to values fill_template = fn template, pairs -> Regex.compile!("{{(.*)}}") |> - Regex.replace(template, fn _, key -> if key != "content" do Map.get(pairs, String.to_atom(key)) else - Map.get(pairs, String.to_atom(key)) - # Converting \n to paragraphs - |> String.split("\\n") - |> Enum.reject(fn(x) -> x == "" end) - |> Enum.map(fn paragraph -> ("

" <> paragraph <> "

\n") end) - |> Enum.join("") - end - end) + Regex.replace(template, fn _, key -> Map.get(pairs, String.to_atom(key)) end) end fill_template_pretemplated = fn template -> &fill_template.(template, &1) end -post_contents = File.ls!("./posts") +wrapInParagraphs = fn content -> content + |> String.split("\\n") + |> Enum.reject(fn(x) -> x == "" end) + |> Enum.map(fn paragraph -> if String.starts_with?(paragraph, "<") do paragraph else "

" <> paragraph <> "

" end end) + |> Enum.join("") +end +post_contents_custom = File.ls!("./posts_custom") |> Enum.reject(fn(x) -> String.starts_with?(x, ".") end) - |> Enum.map(fn f -> File.read!("./posts/" <> f) end) + |> Enum.map(fn f -> File.read!("./posts_custom/" <> f) end) |> Enum.map(fn c -> String.split(c, "\n") end) |> Enum.map(fn c -> Enum.reject(c, fn(x) -> x == "" end) end) |> Enum.map(fn c -> Enum.chunk_every(c, 2) end) @@ -31,8 +29,58 @@ post_contents = File.ls!("./posts") Enum.map(c, fn [k, v] -> %{String.to_atom(k) => v} end) |> Enum.reduce(%{}, fn(x, acc) -> Map.merge(x, acc) end) end) + |> Enum.map(fn m -> Map.update!(m, :content, wrapInParagraphs) end) + +filterCutFileExtension = fn files -> + fn ext -> + Enum.filter(files, &String.ends_with?(&1, "." <> ext)) + |> Enum.map(&String.replace_suffix(&1, "." <> ext, "")) + |> (fn x -> %{String.to_atom(ext) => x} end).() + end +end + +isMeta = &String.starts_with?(&1, "#+") + +posts_org = + File.ls!("./posts_org") + |> Enum.reject(fn x -> String.starts_with?(x, ".") end) + |> (fn files -> Enum.map(["org", "html"], filterCutFileExtension.(files)) end).() + |> Enum.reduce(%{}, fn x, acc -> Map.merge(x, acc) end) + +post_contents_org = + Enum.filter(Map.get(posts_org, :org), fn el -> Enum.member?(Map.get(posts_org, :html), el) end) + |> Enum.map( + &(File.read!("./posts_org/" <> &1 <> ".org") + |> (fn fileContent -> String.split(fileContent, "\n") end).() + |> Enum.take_while(isMeta) + |> Enum.map(fn metaOrg -> + [head | tail] = String.split(metaOrg, ":") + + %{ + (String.slice(head, 2..-1) |> String.downcase() |> String.to_atom()) => + String.slice(Enum.join(tail, ":"), 1..-1) + } + end) + |> Enum.reduce(%{:content => File.read!("./posts_org/" <> &1 <> ".html")}, fn x, acc -> + Map.merge(x, acc) + end)) + ) months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] + +dateFolder = fn p -> + Map.get(p, :date) + |> String.slice(8..15) + |> String.split(" ") + |> (fn ([month, year]) -> year <> "/" <> Integer.to_string(Enum.find_index(months, &(&1 == month)) + 1) <> "/" end).() +end +normalize_title = fn title -> String.replace(String.downcase(title), " ", "-") end + +constructLocalPath = fn p -> dateFolder.(p) <> normalize_title.(Map.get(p, :title)) end + +post_contents = Enum.concat(post_contents_custom, post_contents_org) + |> Enum.map(fn postMap -> Map.merge(postMap, %{localpath: (constructLocalPath.(postMap))}) end) + index_file = post_contents |> Enum.sort_by(fn m -> Map.get(m, :date) |> (fn d -> Enum.find_index(months, &(&1 == String.slice(d, 8..10))) end).() end) |> Enum.reverse() @@ -42,7 +90,7 @@ index_file = post_contents |> Enum.reverse() |> Enum.map(fn {month, posts} -> "\n

" <> month <> "

\n" <> (posts |> Enum.map(fn post -> "

" <> (Map.get(post, :date) |> String.slice(0..6)) <> - " - Map.get(post, :id) <> ".html\">" <> Map.get(post, :title) <> "

" + " - Map.get(post, :localpath) <> ".html\">" <> Map.get(post, :title) <> "" end) |> Enum.join("\n")) end) |> Enum.join("\n") |> (fn v -> %{index: v} end).() @@ -52,14 +100,27 @@ File.open!("./public/gen/index.html", [:write]) |> IO.binwrite(index_file) |> File.close() + +prepare_path = fn path -> + File.mkdir_p!(Path.dirname(path)) + path +end + post_contents - |> Enum.each(fn post -> - File.open!("./public/gen/" <> Map.get(post, :id) <> ".html", [:write]) + |> Enum.each(fn post -> post + |> (fn p -> "./public/gen/" <> Map.get(p, :localpath) <> ".html" end).() + |> prepare_path.() + |> File.open!([:write]) |> IO.binwrite(fill_template.(post_template, post)) |> File.close() end) +stripForRSS = fn content -> content + |> String.replace("\n", "") +end + post_feed = post_contents + |> Enum.map(fn m -> Map.update!(m, :content, stripForRSS) end) |> Enum.sort_by(fn m -> Map.get(m, :date) end) |> Enum.reverse() |> Enum.map(fill_template_pretemplated.(post_feed_item_template)) diff --git a/client/posts/ExamplePost b/client/posts/ExamplePost deleted file mode 100644 index 12e9d21..0000000 --- a/client/posts/ExamplePost +++ /dev/null @@ -1,8 +0,0 @@ -id -4739537f3d29e1047a45c254 -title -Example post for my new post page! -date -Mon, 11 May 2020 13:25:00 GMT -content -My new posts page is live diff --git a/client/posts_custom/ExamplePostCustomFormat b/client/posts_custom/ExamplePostCustomFormat new file mode 100644 index 0000000..54a3b9f --- /dev/null +++ b/client/posts_custom/ExamplePostCustomFormat @@ -0,0 +1,6 @@ +title +Example post for my new custom-gen post page! +date +Mon, 11 May 2020 13:25:00 GMT +content +My new posts page is live, this post has been generated from a custom format. diff --git a/client/posts_org/ExamplePostOrgFormat.org b/client/posts_org/ExamplePostOrgFormat.org new file mode 100644 index 0000000..3235dff --- /dev/null +++ b/client/posts_org/ExamplePostOrgFormat.org @@ -0,0 +1,3 @@ +#+TITLE: Example post for my new org-gen post page! +#+DATE: Wed, 28 Apr 2021 11:25:00 GMT +My new posts page is live, this post has been generated from an org file diff --git a/client/public/index.html b/client/public/index.html index 06b9db5..1d35a69 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -30,7 +30,7 @@

Hi there, good to see you on my website. - My name is Raymon Zutekouw; Self-thaught programmer by heart. + My name is Raymon Zutekouw; Self-taught programmer by heart.

diff --git a/client/templates/post_item.xml b/client/templates/post_item.xml index fca9f40..3d9c42e 100644 --- a/client/templates/post_item.xml +++ b/client/templates/post_item.xml @@ -1,14 +1,9 @@ {{title}} - https://raymon.dev/posts/{{id}}.html - https://raymon.dev/posts/{{id}}.html - - - - - {{content}} - + https://raymon.dev/posts/{{localpath}}.html + https://raymon.dev/posts/{{localpath}}.html {{date}} + diff --git a/client/templates/post_single_page.html b/client/templates/post_single_page.html index 28a49ef..dceaa5e 100644 --- a/client/templates/post_single_page.html +++ b/client/templates/post_single_page.html @@ -26,7 +26,7 @@

{{title}}

-

For those using a RSS reader, subscribe here: rss.xml

+

For those using a RSS reader, subscribe here: rss.xml

{{content}} diff --git a/client/templates/posts.xml b/client/templates/posts.xml index fe8b854..057f7de 100644 --- a/client/templates/posts.xml +++ b/client/templates/posts.xml @@ -1,12 +1,11 @@ - - Posts - https://raymon.dev + Raymon Zutekouw Personal blog en-us - + https://raymon.dev + {{items}}