ZMediumToMarkdown 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a289a9d9178f9001eb97db354501e6112331be901a629719c775a28098268cc9
-  data.tar.gz: f116778fbd8a33287c289a905eb9026620f6d601953446cf946858ed3d108576
+  metadata.gz: ff9b27bae7ac1365701ccb1b3174a8b7a2d3b7b2fa12771d10665368636c1733
+  data.tar.gz: 0f68f9aca2a902694898560c82b689bc10b0e45d6c2d181b279002fb263f74d4
 SHA512:
-  metadata.gz: c4efcdb20c64941fc5b800c4029088179a65e0298a78a21ee68d6a967738a487395948cade619dd6420e075c882df5744373e7c661e7d47cc92b5a3ac1e8722b
-  data.tar.gz: 133737ccac50e0d5cddac1ea10ef10cb6e46ca972a195160b6451a04f38d6a18171fd62849769ad159bbd227614495fe4a6d7c59b5a0d60892cb0373f44b5b16
+  metadata.gz: a397b8860995b6fe0e7f4aea405c352d5ce05de20de0d9dc041001bc8af3c8509ac01387f5ea7ae5ecedc844ba41e70ade1ac6f6f58d4d9baca02cce0783c28d
+  data.tar.gz: 532bcf53a46474d897bb27dcdfe3153dfd3103cc43de01a9588608776284ddb0f23f89e836797bf453469168c38ed041a1c63f1a607c0b16616bafd002df75f1

data/bin/ZMediumToMarkdown

@@ -14,18 +14,35 @@ class Main
         ARGV << '-h' if ARGV.empty?
 
         filePath = ENV['PWD'] || ::Dir.pwd
-        outputFilePath = PathPolicy.new(filePath, "Output")
 
         OptionParser.new do |opts|
             opts.banner = "Usage: ZMediumFetcher [options]"
         
             opts.on('-uUSERNAME', '--username=USERNAME', 'Downloading all posts from user') do |username|
+                outputFilePath = PathPolicy.new(filePath, "/")
                 fetcher.downloadPostsByUsername(username, outputFilePath)
 
                 Helper.printNewVersionMessageIfExists()
             end
         
             opts.on('-pPOST_URL', '--postURL=POST_URL', 'Downloading single post') do |postURL|
+                outputFilePath = PathPolicy.new(filePath, "/")
+                fetcher.downloadPost(postURL, outputFilePath)
+
+                Helper.printNewVersionMessageIfExists()
+            end
+
+            opts.on('-jUSERNAME', '--jekyllUsername=USERNAME', 'Downloading all posts from user with Jekyll friendly') do |username|
+                outputFilePath = PathPolicy.new(filePath, "Output")
+                fetcher.isForJekyll = true
+                fetcher.downloadPostsByUsername(username, outputFilePath)
+
+                Helper.printNewVersionMessageIfExists()
+            end
+        
+            opts.on('-kpPOST_URL', '--jekyllPostURL=POST_URL', 'Downloading single post with Jekyll friendly') do |postURL|
+                outputFilePath = PathPolicy.new(filePath, "Output")
+                fetcher.isForJekyll = true
                 fetcher.downloadPost(postURL, outputFilePath)
 
                 Helper.printNewVersionMessageIfExists()

data/lib/Helper.rb

@@ -159,17 +159,7 @@ class Helper
     end
 
         
-    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
+    def self.createWatermark(postURL)        
+        text = "\r\n[Medium 原文](#{postURL})"
     end
 end

data/lib/Parsers/IMGParser.rb

@@ -7,7 +7,12 @@ require 'ImageDownloader'
 require 'PathPolicy'
 
 class IMGParser < Parser
-    attr_accessor :nextParser, :pathPolicy
+    attr_accessor :nextParser, :pathPolicy, :isForJekyll
+    
+    def initialize(isForJekyll)
+        @isForJekyll = isForJekyll
+    end
+
     def parse(paragraph)
         if paragraph.type == 'IMG'
 
@@ -25,7 +30,11 @@ class IMGParser < Parser
 
             if  ImageDownloader.download(absolutePath, imageURL)
                 relativePath = "#{pathPolicy.getRelativePath(nil)}/#{imagePathPolicy.getRelativePath(fileName)}"
-                "\r\n![#{paragraph.text}](#{relativePath}#{comment})\r\n"
+                if isForJekyll
+                    "\r\n![#{paragraph.text}](/#{relativePath}#{comment})\r\n"
+                else
+                    "\r\n![#{paragraph.text}](#{relativePath}#{comment})\r\n"
+                end
             else
                 "\r\n![#{paragraph.text}](#{imageURL}#{comment})\r\n"
             end

data/lib/Parsers/IframeParser.rb

@@ -11,7 +11,12 @@ require 'ImageDownloader'
 require 'PathPolicy'
 
 class IframeParser < Parser
-    attr_accessor :nextParser, :pathPolicy
+    attr_accessor :nextParser, :pathPolicy, :isForJekyll
+
+    def initialize(isForJekyll)
+        @isForJekyll = isForJekyll
+    end
+
     def parse(paragraph)
         if paragraph.type == 'IFRAME'
             if !paragraph.iframe.src.nil? && paragraph.iframe.src != ""
@@ -35,7 +40,11 @@ class IframeParser < Parser
                     title = paragraph.iframe.title
                     if  ImageDownloader.download(absolutePath, imageURL)
                         relativePath = "#{pathPolicy.getRelativePath(nil)}/#{imagePathPolicy.getRelativePath(fileName)}"
-                        result = "\r\n[![#{title}](#{relativePath} \"#{title}\")](#{params["url"]})\r\n"
+                        if isForJekyll
+                            result = "\r\n[![#{title}](/#{relativePath} \"#{title}\")](#{params["url"]})\r\n"
+                        else
+                            result = "\r\n[![#{title}](#{relativePath} \"#{title}\")](#{params["url"]})\r\n"
+                        end
                     else
                         result = "\r\n[#{title}](#{params["url"]})\r\n"
                     end

data/lib/Parsers/LinkParser.rb

@@ -3,10 +3,11 @@ $lib = File.expand_path('../', File.dirname(__FILE__))
 require 'Models/Paragraph'
 
 class LinkParser
-    attr_accessor :usersPostURLs
+    attr_accessor :usersPostURLs, :isForJekyll
 
-    def initialize(usersPostURLs)
+    def initialize(usersPostURLs, isForJekyll)
         @usersPostURLs = usersPostURLs
+        @isForJekyll = isForJekyll
     end
 
     def parse(markdownString, markupLinks)
@@ -21,9 +22,18 @@ class LinkParser
                         # if have provide user's post urls
                         # find & replace medium url to local post url if matched
 
-                        postPath = link.split("/").last
+                        if isForJekyll
+                            postPath = link.split("/").last.split("-").last
+                        else
+                            postPath = link.split("/").last
+                        end
+                        
                         if !usersPostURLs.find { |usersPostURL| usersPostURL.split("/").last.split("-").last == postPath.split("-").last }.nil?
-                            markdownString = markdownString.sub! link, "#{postPath}"
+                            if isForJekyll
+                                markdownString = markdownString.sub! link, "../#{postPath}"
+                            else
+                                markdownString = markdownString.sub! link, "#{postPath}"
+                            end
                         end
                     end
                 end

data/lib/ZMediumFetcher.rb

@@ -30,7 +30,7 @@ require 'date'
 
 class ZMediumFetcher
 
-    attr_accessor :progress, :linkParser
+    attr_accessor :progress, :linkParser, :isForJekyll
 
     class Progress
         attr_accessor :username, :postPath, :currentPostIndex, :totalPostsLength, :currentPostParagraphIndex, :totalPostParagraphsLength, :message
@@ -71,7 +71,8 @@ class ZMediumFetcher
 
     def initialize
         @progress = Progress.new()
-        @linkParser = LinkParser.new(nil)
+        @linkParser = LinkParser.new(nil, false)
+        @isForJekyll = false
     end
 
     def buildParser(imagePathPolicy)
@@ -92,10 +93,10 @@ class ZMediumFetcher
             oliParser.setNext(mixtapeembedParser)
         pqParser = PQParser.new()
             mixtapeembedParser.setNext(pqParser)
-        iframeParser = IframeParser.new()
+        iframeParser = IframeParser.new(isForJekyll)
         iframeParser.pathPolicy = imagePathPolicy
             pqParser.setNext(iframeParser)
-        imgParser = IMGParser.new()
+        imgParser = IMGParser.new(isForJekyll)
         imgParser.pathPolicy = imagePathPolicy
             iframeParser.setNext(imgParser)
         bqParser = BQParser.new()
@@ -113,7 +114,12 @@ class ZMediumFetcher
 
     def downloadPost(postURL, pathPolicy)
         postID = Post.getPostIDFromPostURLString(postURL)
-        postPath = Post.getPostPathFromPostURLString(postURL)
+
+        if isForJekyll
+            postPath = postID # use only post id is more friendly for url seo
+        else
+            postPath = Post.getPostPathFromPostURLString(postURL)
+        end
 
         progress.postPath = postPath
         progress.message = "Downloading Post..."
@@ -203,9 +209,14 @@ class ZMediumFetcher
             previousParagraph = paragraph
         end
 
-        postPathPolicy = PathPolicy.new(pathPolicy.getAbsolutePath(nil), "posts")
-
-        imagePathPolicy = PathPolicy.new(postPathPolicy.getAbsolutePath(nil), "assets")
+        if isForJekyll
+            postPathPolicy = PathPolicy.new(pathPolicy.getAbsolutePath(nil), "_posts")
+            imagePathPolicy = PathPolicy.new(pathPolicy.getAbsolutePath(nil), "assets")
+        else
+            postPathPolicy = PathPolicy.new(pathPolicy.getAbsolutePath(nil), "posts")
+            imagePathPolicy = PathPolicy.new(postPathPolicy.getAbsolutePath(nil), "assets")
+        end
+        
         startParser = buildParser(imagePathPolicy)
 
         progress.totalPostParagraphsLength = paragraphs.length
@@ -231,6 +242,7 @@ class ZMediumFetcher
                 
                 index = 0
                 paragraphs.each do |paragraph|
+
                     if !(CodeBlockParser.isCodeBlock(paragraph) || PREParser.isPRE(paragraph))
                         markupParser = MarkupParser.new(paragraph)
                         paragraph.text = markupParser.parse()
@@ -241,6 +253,10 @@ class ZMediumFetcher
                     if !linkParser.nil?
                         result = linkParser.parse(result, paragraph.markupLinks)
                     end
+
+                    if paragraph.orgText == "延伸閱讀" or result.include? "Like Z Realm" or paragraph.orgText == "有任何問題及指教歡迎與我聯絡。"
+                        break
+                    end
                     
                     file.puts(result)
     
@@ -284,7 +300,7 @@ class ZMediumFetcher
             nextID = postPageInfo["nextID"]
         end while !nextID.nil?
 
-        @linkParser = LinkParser.new(postURLS)
+        @linkParser = LinkParser.new(postURLS, isForJekyll)
 
         progress.totalPostsLength = postURLS.length
         progress.currentPostIndex = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri