ZMediumToMarkdown 2.4.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57f5610ede891d1c9677db7c4c3c0345bb5d309f5825538524d238db5b991c4
-  data.tar.gz: d06da63e8bb12bb776959d93d9dddff1f407a9654cec1883916b94c7ddd6b2d9
+  metadata.gz: b853d78f150d3134ac412b310a53a864fa4808a7c6dd476c28f534ecc607de18
+  data.tar.gz: 886dcd5efb04f28a033eb6ca80ed2babaa2f37c9afc4d524a776b3f154d96f35
 SHA512:
-  metadata.gz: 2437e85b4184dfe4e72e8923af91a7ae4f849e973f618c4a66d8ff7edd3fc09122f32cc11152f8a947fc74d0fbec1f751eff57d94e036ef3b19060252c08d088
-  data.tar.gz: d374e8169f365f4934b2911a96028680dc2ab0f57edd3a3a07469876ec131d0429679b45f9ba52202544c048792551d2f9bca47478a4c79fbed102f75a11ee00
+  metadata.gz: 7492890c6dbacf64ea895246224692d73925359489fd97383c6331eb613201dc64963631a72eaa2ae708470ebf912199057f800428ca847284300da1bb091b46
+  data.tar.gz: 869962271b377b7e258bf013d7136befba33bb8a72272f5aee15e10af209e1be276028c344bfb2335d094f28bffaabff723c6fd8f600a6a5051e7baa0b5a9bf0

data/bin/ZMediumToMarkdown

@@ -16,14 +16,14 @@ class Main
         fetcher = ZMediumFetcher.new
         ARGV << '-h' if ARGV.empty?
 
+        options = {}
         filePath = ENV['PWD'] || ::Dir.pwd
-
+        
         OptionParser.new do |opts|
             opts.banner = "Usage: ZMediumFetcher [options]"
-
+            
             opts.on('-s', '--cookie_sid COOKIESID', 'Your logged-in Medium cookie sid value') do |cookie_sid|
                 $cookie_sid = cookie_sid
-                puts $cookie_sid
             end
 
             opts.on('-d', '--cookie_uid COOKIEUID', 'Your logged-in Medium cookie uid value') do |cookie_uid|
@@ -31,58 +31,83 @@ class Main
             end
 
             opts.on('-u', '--username USERNAME', 'Downloading all posts from user') do |username|
-                outputFilePath = PathPolicy.new("#{filePath}/Output", "Output")
-                fetcher.downloadPostsByUsername(username, outputFilePath)
-
-                Helper.printNewVersionMessageIfExists()
+                options[:u] = username
             end
         
             opts.on('-p', '--postURL POST_URL', 'Downloading single post') do |postURL|
-                outputFilePath = PathPolicy.new("#{filePath}/Output", "Output")
-                fetcher.downloadPost(postURL, outputFilePath, nil)
-
-                Helper.printNewVersionMessageIfExists()
+                options[:p] = postURL
             end
 
             opts.on('-j', '--jekyllUsername USERNAME', 'Downloading all posts from user with Jekyll friendly') do |username|
-                outputFilePath = PathPolicy.new(filePath, "")
-                fetcher.isForJekyll = true
-                fetcher.downloadPostsByUsername(username, outputFilePath)
-
-                Helper.printNewVersionMessageIfExists()
+                options[:j] = username
             end
         
             opts.on('-k', '--jekyllPostURL POST_URL', 'Downloading single post with Jekyll friendly') do |postURL|
-                outputFilePath = PathPolicy.new(filePath, "")
-                fetcher.isForJekyll = true
-                fetcher.downloadPost(postURL, outputFilePath, nil)
-
-                Helper.printNewVersionMessageIfExists()
+                options[:k] = postURL
             end
 
             opts.on('-n', '--new', 'Update to latest version') do
-                if Helper.getRemoteVersionFromGithub() > Helper.getLocalVersion()
-                    Helper.downloadLatestVersion()
-                else
-                    puts "You're using the latest version :)"
-                end
+                options[:n] = true
             end
 
             opts.on('-c', '--clean', 'Remove all downloaded posts data') do
-                outputFilePath = PathPolicy.new(filePath, "")
-                FileUtils.rm_rf(Dir[outputFilePath.getAbsolutePath(nil)])
-                puts "All downloaded posts data has been removed."
-
-                Helper.printNewVersionMessageIfExists()
+                options[:c] = true
             end
 
             opts.on('-v', '--version', 'Print current ZMediumToMarkdown Version & Output Path') do
-                puts "Version:#{Helper.getLocalVersion().to_s}"
-                
-                Helper.printNewVersionMessageIfExists()
+                options[:v] = true
             end
-            
         end.parse!
+
+        #
+        if !options[:v].nil? && options[:v] == true
+            puts "Version:#{Helper.getLocalVersion().to_s}"
+
+            Helper.printNewVersionMessageIfExists()
+        elsif !options[:c].nil? && options[:c] == true
+            outputFilePath = PathPolicy.new(filePath, "")
+            FileUtils.rm_rf(Dir[outputFilePath.getAbsolutePath(nil)])
+            puts "All downloaded posts data has been removed."
+
+            Helper.printNewVersionMessageIfExists()
+        elsif !options[:n].nil? && options[:n] == true
+            if Helper.getRemoteVersionFromGithub() > Helper.getLocalVersion()
+                Helper.downloadLatestVersion()
+            else
+                puts "You're using the latest version :)"
+            end
+        elsif !options[:k].nil?
+            postURL = options[:k]
+
+            outputFilePath = PathPolicy.new(filePath, "")
+            fetcher.isForJekyll = true
+            fetcher.downloadPost(postURL, outputFilePath, nil)
+
+            Helper.printNewVersionMessageIfExists()
+        elsif !options[:j].nil?
+            username = options[:j]
+
+            outputFilePath = PathPolicy.new(filePath, "")
+            fetcher.isForJekyll = true
+            fetcher.downloadPostsByUsername(username, outputFilePath)
+
+            Helper.printNewVersionMessageIfExists()
+        elsif !options[:p].nil?
+            postURL = options[:p]
+
+            outputFilePath = PathPolicy.new("#{filePath}/Output", "Output")
+            fetcher.downloadPost(postURL, outputFilePath, nil)
+
+            Helper.printNewVersionMessageIfExists()
+        elsif !options[:u].nil?
+            username = options[:u]
+
+            outputFilePath = PathPolicy.new("#{filePath}/Output", "Output")
+            fetcher.downloadPostsByUsername(username, outputFilePath)
+
+            Helper.printNewVersionMessageIfExists()
+        end
+
     end
 end
 

data/lib/Helper.rb

@@ -99,7 +99,7 @@ class Helper
         end
     end
 
-    def self.createPostInfo(postInfo, isPin, isForJekyll)
+    def self.createPostInfo(postInfo, isPin, isLockedPreviewOnly, isForJekyll)
         title = postInfo.title&.gsub("[","")
         title = title&.gsub("]","")
 
@@ -123,6 +123,9 @@ class Helper
         if !isPin.nil? && isPin == true
             result += "pin: true\r\n"
         end
+        if !isLockedPreviewOnly.nil? && isLockedPreviewOnly == true
+            result += "lockedPreviewOnly: true\r\n"
+        end
 
         if isForJekyll
             result += "render_with_liquid: false\n"
@@ -211,4 +214,17 @@ class Helper
 
         text
     end
+
+    def self.createViewFullPost(postURL, isForJekyll)
+        jekyllOpen = ""
+        if isForJekyll
+            jekyllOpen = "{:target=\"_blank\"}"
+        end
+
+        text = "\r\n\r\n\r\n"
+        text += "**This [post](#{postURL})#{jekyllOpen} is behind Medium's paywall, View the full [post](#{postURL})#{jekyllOpen} on Medium, converted by [ZMediumToMarkdown](https://github.com/ZhgChgLi/ZMediumToMarkdown)#{jekyllOpen}.**"
+        text += "\r\n"
+
+        text
+    end
 end

data/lib/Parsers/IframeParser.rb

@@ -76,20 +76,28 @@ class IframeParser < Parser
                     gist.gsub! '\"', '"'
                     gist.gsub! '<\/', '</'
                     gistHTML = Nokogiri::HTML(gist)
-                    lang = gistHTML.search('table').first['data-tagsearch-lang'].downcase
-                    if isForJekyll and lang == "objective-c"
-                        lang = "objectivec"
-                    end
-                    gistHTML.search('a').each do |a|
-                        if a.text == 'view raw'
-                            gistRAW = Request.body(Request.URL(a['href']))
+                    
+                    lang = gistHTML.search('table').first['data-tagsearch-lang']
 
-                            result = "```#{lang}\n"
+                    if !lang.nil?
+                        lang = lang.downcase
+                        if isForJekyll and lang == "objective-c"
+                            lang = "objectivec"
+                        end
+                        gistHTML.search('a').each do |a|
+                            if a.text == 'view raw'
+                                gistRAW = Request.body(Request.URL(a['href']))
 
-                            result += gistRAW.chomp
-                            
-                            result += "\n```"
+                                result = "```#{lang}\n"
+
+                                result += gistRAW.chomp
+                                
+                                result += "\n```"
+                            end
                         end
+                    else
+                        clean_url = srce.to_s.gsub(/\.js$/, '')
+                        result = "[#{clean_url}](#{clean_url})#{jekyllOpen}"
                     end
                 else
                     ogURL = url

data/lib/ZMediumFetcher.rb

@@ -156,11 +156,6 @@ class ZMediumFetcher
 
         isLockedPreviewOnly = contentInfo&.dig("isLockedPreviewOnly")
 
-        if isLockedPreviewOnly
-            puts "Skip: This post is listed in Medium's paywall. You need to provide Medium Member vaild logged-in cookies to access it (refer to Readme.md). PostURL: #{postURL}"
-            return
-        end
-
         sourceParagraphs = contentInfo&.dig("bodyModel", "paragraphs")
 
         if sourceParagraphs.nil?
@@ -249,6 +244,7 @@ class ZMediumFetcher
         
         fileLatestPublishedAt = nil
         filePin = false
+        fileLockedPreviewOnly = false
         if File.file?(absolutePath)
             lines = File.foreach(absolutePath).first(15)
             if lines.first&.start_with?("---")
@@ -261,10 +257,15 @@ class ZMediumFetcher
                 if !pinLine.nil?
                     filePin = pinLine[/^(pin:)\s+(\S*)/, 2].downcase == "true"
                 end
+
+                lockedPreviewOnlyLine = lines.select { |line| line.start_with?("lockedPreviewOnly:") }.first
+                if !lockedPreviewOnlyLine.nil?
+                    fileLockedPreviewOnly = lockedPreviewOnlyLine[/^(lockedPreviewOnly:)\s+(\S*)/, 2].downcase == "true"
+                end
             end
         end
 
-        if (!fileLatestPublishedAt.nil? && fileLatestPublishedAt >= postInfo.latestPublishedAt.to_i) && (!isPin.nil? && isPin == filePin)
+        if (!fileLatestPublishedAt.nil? && fileLatestPublishedAt >= postInfo.latestPublishedAt.to_i) && (!isPin.nil? && isPin == filePin) && (!isLockedPreviewOnly.nil? && isLockedPreviewOnly == fileLockedPreviewOnly)
             # Already downloaded and nothing has changed!, Skip!
             progress.currentPostParagraphIndex = paragraphs.length
             progress.message = "Skip, Post already downloaded and nothing has changed!"
@@ -273,7 +274,7 @@ class ZMediumFetcher
             Helper.createDirIfNotExist(postPathPolicy.getAbsolutePath(nil))
             File.open(absolutePath, "w+") do |file|
                 # write postInfo into top
-                postMetaInfo = Helper.createPostInfo(postInfo, isPin, isForJekyll)
+                postMetaInfo = Helper.createPostInfo(postInfo, isPin, isLockedPreviewOnly, isForJekyll)
                 if !postMetaInfo.nil?
                     file.puts(postMetaInfo)
                 end
@@ -296,15 +297,29 @@ class ZMediumFetcher
                     progress.message = "Converting Post..."
                     progress.printLog()
                 end
-    
-                postWatermark = Helper.createWatermark(postURL, isForJekyll)
-                if !postWatermark.nil?
-                    file.puts(postWatermark)
+
+                if isLockedPreviewOnly
+                    viewFullPost = Helper.createViewFullPost(postURL, isForJekyll)
+                    if !viewFullPost.nil?
+                        file.puts(viewFullPost)
+                    end
+                else
+                    postWatermark = Helper.createWatermark(postURL, isForJekyll)
+                    if !postWatermark.nil?
+                        file.puts(postWatermark)
+                    end
                 end
+    
+
             end
             FileUtils.touch absolutePath, :mtime => postInfo.latestPublishedAt
 
-            progress.message = "Post Successfully Downloaded!"
+            if isLockedPreviewOnly
+                progress.message =  "This post is behind Medium's paywall. You need to provide valid Medium Member login cookies to download the full post."
+            else
+                progress.message = "Post Successfully Downloaded!"
+            end
+
             progress.printLog()
         end
         

metadata

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