markdown_site 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0956d2f10ba9491c573f1c4059b713dc718ed2ed3c9795ef09ba3aa17b2673
-  data.tar.gz: 5030d58915fc8fd522847bb7fc1ecbb6e11bb7c6c349f1665853e4246c916e16
+  metadata.gz: 7ba29579ef989a99bf49ecf62193a78c25f8b9166515dcd06485a75914425dbd
+  data.tar.gz: 169651e60b49ee57a76a49c4858c3fdca1d0ab01173b13473623ecbe45405719
 SHA512:
-  metadata.gz: 542486a4e71920fb43c58966d957db601f90d90b75083da7ad651a47b9032592912285d2cfa8561067085558029981cccb68b5b73d9baca9daa3344f164ac223
-  data.tar.gz: 56052865acca00e2d7d06446a7ee5e3134fab0508185c68e7c3f5d0b7dd9ae4bb31d3bede4d513032fb85a0b3bb39cffd06ea5acd133713ef88e1490df709579
+  metadata.gz: 4c72e405b5fbd868f69928fe3b2662b32356372d10d34ad0003efb2579073f780fe1556453ede8931583aa9b713f9b7527a909dbc8a14a0c2e44f9cd3428dfda
+  data.tar.gz: c98333c1ed973f42953beb00dd3e9db005fd4547ac7b2da5644b0e5978651c518aa41ef7c75145102092bbf130ce3341fc3ea1dae0e9c63f79cc32cc2e25176a

data/lib/markdown_site/config.rb

@@ -114,6 +114,14 @@ module MarkdownSite
 
         def journals_template
             return get_template_info("journals_template")
-        end        
+        end
+
+        def root_template
+            return get_template_info("root_template")
+        end
+
+        def index_template
+            return get_template_info("index_template")
+        end
     end
 end

data/lib/markdown_site/site.rb

@@ -4,7 +4,7 @@ require "markdown_extension"
 
 module MarkdownSite
     class Site
-        attr_accessor :config, :pages, :journals, :references, :reverse_references
+        attr_accessor :config, :pages_path, :pages, :journals, :references, :reverse_references
         attr_accessor :nodes, :links, :citations, :languages
     
         def initialize(config, type)
@@ -60,10 +60,13 @@ module MarkdownSite
         def init_pages_by_lang(lang=nil)
             pages = []
             files = Dir.glob(@pages_path + lang.to_s + "/**/*.md")
+            files.sort! do |a,b|
+                folder_file_comparison(a,b)
+            end
             files.each do |file|
                 unless file == @pages_path + lang.to_s + "/summary.md"
                     unless file.index("hls_")
-                        page = MarkdownExtension::Page.new(file, self)
+                        page = MarkdownExtension::Page.new(file, self, lang)
                         pages << page
                         gen_references(page.item_name , page.markdown)
                     end
@@ -72,6 +75,24 @@ module MarkdownSite
             return pages
         end
 
+        def folder_file_comparison(a,b)
+            a_array = a.split("/")
+            b_array = b.split("/")
+            if a_array.length == 1
+                if b_array.length == 1
+                    return a<=>b
+                else
+                    return 1
+                end
+            else
+                if a_array[0]==b_array[0]
+                    return folder_file_comparison(a_array[1..-1].join("/"),b_array[1..-1].join("/"))
+                else
+                    return a_array[0]<=>b_array[0]
+                end
+            end
+        end
+
         def pages(lang=nil)
             if @pages
                 return @pages
@@ -211,6 +232,11 @@ module MarkdownSite
         end
 
         def generate_index
+            if @languages
+                template = MarkdownSite::RootTemplate.new(self)
+                template.generate()
+            else
+            end
         end
 
         def generate_pages

data/lib/markdown_site/templates/page_template.rb

@@ -1,7 +1,10 @@
+require "fileutils"
+
 module MarkdownSite
     class PageTemplate < Template
         def initialize(site)
             super(site)
+            @summary_page = {}
         end
 
         def add_page(page)
@@ -17,7 +20,51 @@ module MarkdownSite
             end
         end
 
+        def get_summary_html(lang=nil, dir=nil)
+            return nil if @site_config.type == :logseq
+            if @summary_page[lang] == nil
+                temp_file = false
+                path = @site.pages_path+"/"+lang.to_s+"summary.md"
+                unless File.exist?(path)
+                    temp_file = true
+                    f = File.new(path, 'w')
+                    parent_path = []
+                    @site_pages.each do |page|
+                        if page.path.include?("/")
+                            output_str = ""
+                            paths = page.path.split("/")
+                            0.upto(paths.length-2) do |i|
+                                if parent_path[i]
+                                    if parent_path[i] == paths[i]
+                                        output_str = output_str + "    "
+                                    else
+                                        output_str = output_str + "* " + paths[i] + "\n" + "    "*(i+1)
+                                        parent_path[i] = paths[i]
+                                        parent_path = parent_path[0..i]
+                                    end
+                                else
+                                    output_str = output_str + "* " + paths[i] + "\n" + "    "*(i+1)
+                                    parent_path << paths[i]
+                                end
+                            end
+                            output_str = output_str + "* [" + paths[-1] + "](#{page.path}.html)\n"
+                            f.puts(output_str)
+                        else
+                            f.puts("* [#{page.path}](#{page.path}.html)\n")
+                        end
+                    end
+                    f.close
+                end
+                @summary_page[lang] = MarkdownExtension::Summary.new(@site_config, lang)
+                File.delete(path) if temp_file
+                return @summary_page[lang].html(dir)
+            else
+                return @summary_page[lang].html(dir)
+            end
+        end
+
         def generate(site_pages, lang=nil)
+            @site_pages = site_pages
             template = Liquid::Template.parse(File.read(@site_config.pages_template))
             page_count = (site_pages.size / 20) + 1
             1.upto(page_count) do |page_number|
@@ -37,13 +84,38 @@ module MarkdownSite
                 f.close
             end
             template = Liquid::Template.parse(File.read(@site_config.page_template))
+            unless lang
+                if @site_config.languages
+                    default_lang = @site_config.languages.first[1]
+                else
+                    default_lang = nil
+                end
+            else
+                default_lang = @site_config.languages[lang[0..-2]]
+            end            
             site_pages.each do |page|
-                filename = "#{@site_config.publish_dir}/#{lang}#{page.item_name}.html"
+                if page.path.include?("/")
+                    dir = "#{@site_config.publish_dir}/#{lang}#{page.path.split("/")[0..-2].join("/")}"
+                    FileUtils.mkdir_p(dir)
+                end
+                filename = "#{@site_config.publish_dir}/#{lang}#{page.path}.html"
+                if @site.languages
+                    languages = []
+                    @site.languages.each do |k, v|
+                        languages << {"path"=> "../" * (filename.split("/").size-3) + k, "title"=>v}
+                    end
+                end
+                kg_url = "../" * (filename.split("/").size-3) + "kg.html"
                 f = File.new(filename, "w")
                 f.puts template.render(
                     'config'=>{'title'=>@site_config.title},
+                    'kg_url' => kg_url,
+                    'default_lang'=>default_lang,
+                    'languages' => languages,
+                    'summary_html' => get_summary_html(lang, page.path.split("/")[0..-2].join("/")),
                     'page_title' => page.item_name,
-                    'page_html' => page.html)
+                    'page_html' => page.html,
+                    'meta_html' => page.meta_html)
                 f.close
             end
         end

data/lib/markdown_site/templates/root_template.rb

@@ -0,0 +1,16 @@
+module MarkdownSite
+    class RootTemplate < Template
+        def initialize(site)
+            super(site)
+        end
+        def generate()
+            template = Liquid::Template.parse(File.read(@site_config.root_template))            
+            default_path = @site_config.languages.first[0]
+            f = File.new(@site_config.publish_dir + "/index.html", "w")
+            f.puts template.render(
+                'url'=>"#{default_path}/index.html"
+            )
+            f.close
+        end
+    end
+end

data/lib/markdown_site/version.rb

@@ -1,3 +1,3 @@
 module MarkdownSite
-    Version = '0.0.2'
-end
+    Version = '0.0.4'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown_site
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Zhuang Biaowei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-05 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -66,6 +66,7 @@ files:
 - lib/markdown_site/templates/Knowledge_graph_template.rb
 - lib/markdown_site/templates/journal_template.rb
 - lib/markdown_site/templates/page_template.rb
+- lib/markdown_site/templates/root_template.rb
 - lib/markdown_site/version.rb
 homepage: https://github.com/markdown-world/markdown_site
 licenses: