ZMediumToMarkdown 1.9.5 → 1.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d96b986a3f8f82236b20c8db706b3a6b4451b5822ab4c940e855ee6e819a0087
-  data.tar.gz: 6cb9b1e76ba0486d4f96394c9153850185ddd9397f5b99ce29d896ad2f638e42
+  metadata.gz: cc121cbe8d2f06e2e6421872ff2f6950addd4affd46fe928172b9848da8e1517
+  data.tar.gz: 62e35936912a730a37c2424d6028fd3a780fe41aa0048ed717e81df02910dff2
 SHA512:
-  metadata.gz: bdfdfc9d261bfc62114b799b657af0635f8c72415c040cd08934fd0fd84c7bcf73855f3204f5c6ce9248245d95e159ce4fda715f2460167f57ba53169d3b7f90
-  data.tar.gz: e7555c35a30e63794f00be2503d345d44ea90d432da99ed2769fb6b348825eec4663ee74ccc21831d218ac26501268a3dbfb1cf70800c0839699cd8e280fdc18
+  metadata.gz: 6e76c68cc1c4f1f56bf35bc6517a0814c8263367f6ebda4e33591dd29667ae597a7a0b6da1ca1485245522e45d1a7dfbe739e9e996c0addb8ffc6d1600b1940b
+  data.tar.gz: cfe0bce95d184b67fb1afb2c84407478384b617665162dae9908fda1cfd8ff68094bbde65016b2872eea9d91e5e5987890f04e41e572175712cf0cdfa6210064

data/bin/ZMediumToMarkdown

@@ -65,7 +65,6 @@ class Main
 
             opts.on('-v', '--version', 'Print current ZMediumToMarkdown Version & Output Path') do
                 puts "Version:#{Helper.getLocalVersion().to_s}"
-                puts "Output Path:#{outputFilePath.getAbsolutePath(nil)}"
                 
                 Helper.printNewVersionMessageIfExists()
             end

data/lib/Helper.rb

@@ -98,7 +98,7 @@ class Helper
         end
     end
 
-    def self.createPostInfo(postInfo)
+    def self.createPostInfo(postInfo, isForJekyll)
 
         title = postInfo.title.gsub("[","")
         title = title.gsub("]","")
@@ -109,6 +109,10 @@ class Helper
         result += "date: #{postInfo.firstPublishedAt.strftime('%Y-%m-%dT%H:%M:%S.%LZ')}\n"
         result += "categories: #{postInfo.collectionName}\n"
         result += "tags: [#{postInfo.tags.join(",")}]\n"
+        result += "description: #{postInfo.description}\n"
+        if isForJekyll
+            result += "render_with_liquid: false\n"
+        end
         result += "---\n"
         result += "\r\n"
 
@@ -182,16 +186,19 @@ class Helper
 
         
     def self.createWatermark(postURL)
-        text = "\r\n\r\n\r\n"
-        text += "+-----------------------------------------------------------------------------------+"
-        text += "\r\n"
-        text += "\r\n"
-        text += "| **[View original post on Medium](#{postURL}) - Converted by [ZhgChgLi](https://zhgchg.li)/[ZMediumToMarkdown](https://github.com/ZhgChgLi/ZMediumToMarkdown)** |"
-        text += "\r\n"
-        text += "\r\n"
-        text += "+-----------------------------------------------------------------------------------+"
-        text += "\r\n"
+        text = ""
+
+        # text += "\r\n\r\n\r\n"
+        # text += "+-----------------------------------------------------------------------------------+"
+        # text += "\r\n"
+        # text += "\r\n"
+        # text += "| **[View original post on Medium](#{postURL}) - Converted by [ZhgChgLi](https://zhgchg.li)/[ZMediumToMarkdown](https://github.com/ZhgChgLi/ZMediumToMarkdown)** |"
+        # text += "\r\n"
+        # text += "\r\n"
+        # text += "+-----------------------------------------------------------------------------------+"
+        # text += "\r\n"
         
+        # no need to show any watermark :)
         text
     end
 end

data/lib/Parsers/CodeBlockParser.rb

@@ -4,7 +4,11 @@ require "Parsers/Parser"
 require 'Models/Paragraph'
 
 class CodeBlockParser < Parser
-    attr_accessor :nextParser
+    attr_accessor :nextParser, :isForJekyll
+
+    def initialize(isForJekyll)
+        @isForJekyll = isForJekyll
+    end
 
     def self.getTypeString()
         'CODE_BLOCK'
@@ -20,7 +24,11 @@ class CodeBlockParser < Parser
 
     def parse(paragraph)
         if CodeBlockParser.isCodeBlock(paragraph)
-            "```\n#{paragraph.text}\n```"
+            result = "```\n"
+            
+            result += paragraph.text.chomp
+
+            result += "\n```"
         else
             if !nextParser.nil?
                 nextParser.parse(paragraph)

data/lib/Parsers/IframeParser.rb

@@ -74,7 +74,12 @@ class IframeParser < Parser
                     gistHTML.search('a').each do |a|
                         if a.text == 'view raw'
                             gistRAW = Request.body(Request.URL(a['href']))
-                            result = "```#{lang}\n#{gistRAW}\n```"
+
+                            result = "```#{lang}\n"
+
+                            result += gistRAW.chomp
+                            
+                            result += "\n```"
                         end
                     end
                 else

data/lib/Parsers/PREParser.rb

@@ -4,7 +4,11 @@ require "Parsers/Parser"
 require 'Models/Paragraph'
 
 class PREParser < Parser
-    attr_accessor :nextParser
+    attr_accessor :nextParser, :isForJekyll
+
+    def initialize(isForJekyll)
+        @isForJekyll = isForJekyll
+    end
 
     def self.isPRE(paragraph)
         if paragraph.nil? 
@@ -17,10 +21,14 @@ class PREParser < Parser
     def parse(paragraph)
         if PREParser.isPRE(paragraph)
             result = "```\n"
+            
             paragraph.text.each_line do |p|
                 result += p
             end
+
+            result = result.chomp
             result += "\n```"
+
             result
         else
             if !nextParser.nil?

data/lib/Post.rb

@@ -9,7 +9,7 @@ require 'date'
 class Post
 
   class PostInfo
-    attr_accessor :title, :tags, :creator, :firstPublishedAt, :latestPublishedAt, :collectionName
+    attr_accessor :title, :tags, :creator, :firstPublishedAt, :latestPublishedAt, :collectionName, :description
   end
 
   def self.getPostIDFromPostURLString(postURLString)
@@ -60,6 +60,7 @@ class Post
 
   def self.parsePostInfoFromPostContent(content, postID)
     postInfo = PostInfo.new()
+    postInfo.description = content&.dig("Post:#{postID}", "previewContent", "subtitle")
     postInfo.title = content&.dig("Post:#{postID}", "title")
     postInfo.tags = content&.dig("Post:#{postID}", "tags").map{ |tag| tag["__ref"].gsub! 'Tag:', '' }
     

data/lib/ZMediumFetcher.rb

@@ -50,9 +50,9 @@ class ZMediumFetcher
                     info += "-"
                 end
                 if !currentPostParagraphIndex.nil? && !totalPostParagraphsLength.nil?
-                    info += "[#{postPath[0..10]}...(#{currentPostParagraphIndex}/#{totalPostParagraphsLength})]"
+                    info += "[#{postPath[0..15]}...(#{currentPostParagraphIndex}/#{totalPostParagraphsLength})]"
                 else
-                    info += "[#{postPath[0..10]}...]"
+                    info += "[#{postPath[0..15]}...]"
                 end
             end
 
@@ -101,9 +101,9 @@ class ZMediumFetcher
             iframeParser.setNext(imgParser)
         bqParser = BQParser.new()
             imgParser.setNext(bqParser)
-        preParser = PREParser.new()
+        preParser = PREParser.new(isForJekyll)
             bqParser.setNext(preParser)
-        codeBlockParser = CodeBlockParser.new()
+        codeBlockParser = CodeBlockParser.new(isForJekyll)
             preParser.setNext(codeBlockParser)
         fallbackParser = FallbackParser.new()
             codeBlockParser.setNext(fallbackParser)
@@ -230,7 +230,7 @@ class ZMediumFetcher
         absolutePath = postPathPolicy.getAbsolutePath("#{postWithDatePath}.md")
         
         # if markdown file is exists and last modification time is >= latestPublishedAt(last update post time on medium)
-        if File.file?(absolutePath) && File.mtime(absolutePath) >= postInfo.latestPublishedAt
+        if File.file?(absolutePath) && File.mtime(absolutePath).to_time.to_i >= postInfo.latestPublishedAt.to_i
             # Already downloaded and nothing has changed!, Skip!
             progress.currentPostParagraphIndex = paragraphs.length
             progress.message = "Skip, Post already downloaded and nothing has changed!"
@@ -239,7 +239,7 @@ class ZMediumFetcher
             Helper.createDirIfNotExist(postPathPolicy.getAbsolutePath(nil))
             File.open(absolutePath, "w+") do |file|
                 # write postInfo into top
-                file.puts(Helper.createPostInfo(postInfo))
+                file.puts(Helper.createPostInfo(postInfo, isForJekyll))
                 
                 index = 0
                 paragraphs.each do |paragraph|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.8
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri