optimzie

ZhgChgLi · Jun 12, 2022 · a0759d9 · a0759d9
1 parent c075d70
commit a0759d9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/ZMediumToMarkdown.gemspec b/ZMediumToMarkdown.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
     gem.files         = Dir['lib/**/*.*']
     gem.executables   = ['ZMediumToMarkdown']
     gem.name          = 'ZMediumToMarkdown'
-    gem.version       = '1.7.3'
+    gem.version       = '1.7.4'
 
     gem.license       = "MIT"
 

diff --git a/ZMediumToMarkdown_Github.gemspec b/ZMediumToMarkdown_Github.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
     gem.files         = Dir['lib/**/*.*']
     gem.executables   = ['ZMediumToMarkdown']
     gem.name          = 'zmediumtomarkdown'
-    gem.version       = '1.7.3'
+    gem.version       = '1.7.4'
 
     gem.license       = "MIT"
 

diff --git a/bin/ZMediumToMarkdown b/bin/ZMediumToMarkdown
@@ -40,7 +40,7 @@ class Main
                 Helper.printNewVersionMessageIfExists()
             end
 
-            opts.on('-kpPOST_URL', '--jekyllPostURL=POST_URL', 'Downloading single post with Jekyll friendly') do |postURL|
+            opts.on('-kPOST_URL', '--jekyllPostURL=POST_URL', 'Downloading single post with Jekyll friendly') do |postURL|
                 outputFilePath = PathPolicy.new(filePath, "/")
                 fetcher.isForJekyll = true
                 fetcher.downloadPost(postURL, outputFilePath)

diff --git a/lib/Parsers/IMGParser.rb b/lib/Parsers/IMGParser.rb
@@ -23,21 +23,28 @@ def parse(paragraph)
             imagePathPolicy = PathPolicy.new(pathPolicy.getAbsolutePath(nil), paragraph.postID)
             absolutePath = imagePathPolicy.getAbsolutePath(fileName)
 
+            result = ""
             comment = ""
-            if paragraph.text != ""
-                comment = " \"#{paragraph.text}\""
+            if paragraph.orgText != ""
+                comment = " \"#{paragraph.orgText}\""
             end
 
             if  ImageDownloader.download(absolutePath, imageURL)
                 relativePath = "#{pathPolicy.getRelativePath(nil)}/#{imagePathPolicy.getRelativePath(fileName)}"
                 if isForJekyll
-                    "\r\n![#{paragraph.text}](/#{relativePath}#{comment})\r\n"
+                    result = "\r\n![#{paragraph.text}](/#{relativePath}#{comment})\r\n"
                 else
-                    "\r\n![#{paragraph.text}](#{relativePath}#{comment})\r\n"
+                    result = "\r\n![#{paragraph.text}](#{relativePath}#{comment})\r\n"
                 end
             else
-                "\r\n![#{paragraph.text}](#{imageURL}#{comment})\r\n"
+                result = "\r\n![#{paragraph.text}](#{imageURL}#{comment})\r\n"
             end
+
+            if paragraph.text != ""
+                result += "#{paragraph.text}\r\n"
+            end
+
+            result
         else
             if !nextParser.nil?
                 nextParser.parse(paragraph)

diff --git a/lib/Parsers/PQParser.rb b/lib/Parsers/PQParser.rb
@@ -7,10 +7,12 @@ class PQParser < Parser
     attr_accessor :nextParser
     def parse(paragraph)
         if paragraph.type == 'PQ'
-            result = ""
+            result = "\r\n\r\n"
             paragraph.text.each_line do |p|
                 result += "> #{p}"
             end
+            result += "\r\n\r\n"
+
             result
         else
             if !nextParser.nil?