ZMediumToMarkdown 1.7.4 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f0456e760bcd742867a97de33738cefa1f58fadd03a2bcb3ec8488bd82a043b
-  data.tar.gz: ab014836dcc1216baed216ffc928a05eed8a368489284d1b13dfb9cb4156c8e8
+  metadata.gz: 6f34b1b96683e25673872ff046d9baaeda079d595d5163fbcf894e0fc3bf340c
+  data.tar.gz: e852a11256fe0789472182bb43d0cb9a15f75439676043703dc368e0a153e06a
 SHA512:
-  metadata.gz: b6fc090b46f1b20de4298762cef0e8c71f5eecd9ee672db669ac6392d617c4e259668e199666be92d4514967210c1e3e6500d843467d3588b8de19dec0333488
-  data.tar.gz: ea38435d80577a2c253b93f49aec296ea4e4b9eed2220b0f0b3695dfb1ba3bc1f6869ba35bb1b254bea47f2e350c42be30744a471814dadb011738efb8618aa9
+  metadata.gz: 7ba230c20dfd3f9638ed837f7a989de1c0fa0309db3865390d6b7616c6f2dcc0321c70acc49875128fb83225d8a892e51ffe7726d06c7311aae30830841d843d
+  data.tar.gz: f8936158de2a595047cf989f7fabaed2602aec4502f2e2480bef81659980f08ead77e0647a024d1eb4efb72cf4614448abada9d7cecec5741960a8aeb98f5048

data/bin/ZMediumToMarkdown

@@ -48,14 +48,6 @@ class Main
                 Helper.printNewVersionMessageIfExists()
             end
 
-            opts.on('-cPOST_URL', '--jekyllPostURL=POST_URL', 'Downloading single post with Jekyll friendly') do |postURL|
-                outputFilePath = PathPolicy.new(filePath, "/")
-                fetcher.isForJekyll = true
-                fetcher.downloadPost(postURL, outputFilePath)
-
-                Helper.printNewVersionMessageIfExists()
-            end
-
             opts.on('-n', '--new', 'Update to latest version') do
                 if Helper.getRemoteVersionFromGithub() > Helper.getLocalVersion()
                     Helper.downloadLatestVersion()

data/lib/Helper.rb

@@ -11,6 +11,20 @@ require 'zip'
 
 class Helper
 
+    def self.escapeMarkdown(text)
+        text.gsub(/(\*|_|`|\||\\|\{|\}\[|\]|\(|\)|#|\+|\-|\.|\!)/){ |x| "\\#{x}" }
+    end
+
+    def self.escapeHTML(text)
+        if text == "<"
+            "&lt;"
+        elsif text == ">"
+            "&gt;"
+        else
+            text
+        end
+    end
+
     def self.createDirIfNotExist(dirPath)
         dirs = dirPath.split("/")
         currentDir = ""

data/lib/Models/Paragraph.rb

@@ -1,5 +1,6 @@
 $lib = File.expand_path('../', File.dirname(__FILE__))
 
+require 'Helper'
 require 'Parsers/PParser'
 require 'securerandom'
 
@@ -60,11 +61,13 @@ class Paragraph
     def initialize(json, postID)
         @name = json['name']
         @text = json['text']
-        @orgText = json['text']
         @type = json['type']
         @href = json['href']
         @postID = postID
 
+        orgText = Helper.escapeMarkdown(json['text'])
+        @orgText = orgText
+
         if json['metadata'].nil?
             @metadata = nil
         else

data/lib/Parsers/IMGParser.rb

@@ -24,20 +24,20 @@ class IMGParser < Parser
             absolutePath = imagePathPolicy.getAbsolutePath(fileName)
             
             result = ""
-            comment = ""
-            if paragraph.orgText != ""
-                comment = " \"#{paragraph.orgText}\""
+            alt = ""
+            if paragraph.orgText != "" 
+                alt = " \"#{paragraph.orgText}\""
             end
 
             if  ImageDownloader.download(absolutePath, imageURL)
                 relativePath = "#{pathPolicy.getRelativePath(nil)}/#{imagePathPolicy.getRelativePath(fileName)}"
                 if isForJekyll
-                    result = "\r\n![#{paragraph.text}](/#{relativePath}#{comment})\r\n"
+                    result = "\r\n![#{paragraph.orgText}](/#{relativePath}#{alt})\r\n"
                 else
-                    result = "\r\n![#{paragraph.text}](#{relativePath}#{comment})\r\n"
+                    result = "\r\n![#{paragraph.orgText}](#{relativePath}#{alt})\r\n"
                 end
             else
-                result = "\r\n![#{paragraph.text}](#{imageURL}#{comment})\r\n"
+                result = "\r\n![#{paragraph.orgText}](#{imageURL}#{alt})\r\n"
             end
 
             if paragraph.text != ""

data/lib/Parsers/MarkupParser.rb

@@ -7,16 +7,17 @@ require 'securerandom'
 require 'User'
 
 class MarkupParser
-    attr_accessor :body, :paragraph
-
-    def initialize(paragraph)
+    attr_accessor :body, :paragraph, :isForJekyll
+    
+    def initialize(paragraph, isForJekyll)
         @paragraph = paragraph
+        @isForJekyll = isForJekyll
     end
 
     def parse()
         result = paragraph.text
         if !paragraph.markups.nil? && paragraph.markups.length > 0
-            markupRender = MarkupStyleRender.new(paragraph)
+            markupRender = MarkupStyleRender.new(paragraph, isForJekyll)
 
             begin
                 result = markupRender.parse()

data/lib/Parsers/MarkupStyleRender.rb

@@ -2,9 +2,10 @@
 $lib = File.expand_path('../', File.dirname(__FILE__))
 
 require 'Models/Paragraph'
+require 'Helper'
 
 class MarkupStyleRender 
-    attr_accessor :paragraph, :chars, :encodeType
+    attr_accessor :paragraph, :chars, :encodeType, :isForJekyll
 
     class TextChar
         attr_accessor :chars, :type
@@ -26,8 +27,9 @@ class MarkupStyleRender
     end
 
 
-    def initialize(paragraph)
+    def initialize(paragraph, isForJekyll)
         @paragraph = paragraph
+        @isForJekyll = isForJekyll
 
         chars = {}
         index = 0
@@ -189,7 +191,12 @@ class MarkupStyleRender
                 end
 
                 if char.chars.join() != "\n"
-                    response.append(TextChar.new(char.chars, 'Text'))
+                    resultChar = Helper.escapeMarkdown(char.chars.join())
+                    if isForJekyll 
+                        resultChar = Helper.escapeHTML(resultChar)
+                    end
+
+                    response.append(TextChar.new(resultChar.chars, "Text"))
                 end
 
                 endTags = tags.select { |tag| tag.endIndex == index }
@@ -220,6 +227,20 @@ class MarkupStyleRender
                 response.push(tag.endChars)
             end
             
+            response = optimize(response)
+            result = response.map{ |response| response.chars }.join()
+
+        else
+            response = []
+            chars.each do |index, char|
+                resultChar = escapeMarkdown(char)
+                if isForJekyll 
+                    resultChar = escapeHTML(char)
+                end
+
+                response.append(resultChar)
+            end
+
             response = optimize(response)
             result = response.map{ |response| response.chars }.join()
         end

data/lib/ZMediumFetcher.rb

@@ -186,7 +186,7 @@ class ZMediumFetcher
                                 groupByText += "\n"
                             end
 
-                            markupParser = MarkupParser.new(preTypeParagraph)
+                            markupParser = MarkupParser.new(preTypeParagraph, isForJekyll)
                             groupByText += markupParser.parse()
                         end
                         
@@ -244,7 +244,7 @@ class ZMediumFetcher
                 paragraphs.each do |paragraph|
 
                     if !(CodeBlockParser.isCodeBlock(paragraph) || PREParser.isPRE(paragraph))
-                        markupParser = MarkupParser.new(paragraph)
+                        markupParser = MarkupParser.new(paragraph, isForJekyll)
                         paragraph.text = markupParser.parse()
                     end
 

metadata

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