ZMediumToMarkdown 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d175f065345508536bf819ab29db376b591c978d3b32872496f5d8a80d2fb518
-  data.tar.gz: eeb5c3c303a1daef3e05bce586240d0195f3d32999208b784530a175fe58b89e
+  metadata.gz: 462eddc4d4cd64f3eaaf52f1ccb23d84859def2d998ce633a2cd0c5e142e3323
+  data.tar.gz: a022fa3ac8d178691bf90bec98cd6a4071b4d58eb6b0ca083171f700c2d8a97e
 SHA512:
-  metadata.gz: 6b12ca00410c8946e1736fac5c328b892d5b4d8b08d5074101bb16ac869ad5ef92d7884201a19a0fcadf2e11a9450b407f0573382e81cfa875090768a27822ed
-  data.tar.gz: 396a75a07a19283d6ce215b32da304ad4f90c72131c87903b8edf04e53ac1e3cf902e61877469367dce4b749fe979c292101cfe12b167290446d3da94826a28e
+  metadata.gz: 1599289267a982ab1178993a52bbcf32baa36e442a5697557af0504d4fd5c09ff76c6b0e645f5cf9339850f4c4eb1a999df0f2606e9e36fe772385c2ca92e284
+  data.tar.gz: 99f58102d82cb920ebd1d8d2f5b751182037dbaa41362ee321b1759581f37f9fc22c9b35a24b0c05da1b73bcdb5ec4e50d93c347f436cef724d56f607ceb658b

data/bin/ZMediumToMarkdown

@@ -12,34 +12,44 @@ class Main
     def initialize
         fetcher = ZMediumFetcher.new
         ARGV << '-h' if ARGV.empty?
+
+        filePath = File.expand_path File.dirname(__FILE__)
+        outputFilePath = PathPolicy.new(filePath, "Output")
+
         OptionParser.new do |opts|
             opts.banner = "Usage: ZMediumFetcher [options]"
         
-            opts.on('-uUSERNAME', '--username=USERNAME', 'test') do |username|
-                Helper.checkNewVersion()
+            opts.on('-uUSERNAME', '--username=USERNAME', 'Downloading all posts from user') do |username|
+                fetcher.downloadPostsByUsername(username, outputFilePath)
 
-                pathPolicy = PathPolicy.new("#{File.expand_path('../', File.dirname(__FILE__))}", "Output")
-                fetcher.downloadPostsByUsername(username, pathPolicy)
+                Helper.printNewVersionMessageIfExists()
             end
         
-            opts.on('-pPOST_URL', '--postURL=POST_URL', 'test') do |postURL|
-                Helper.checkNewVersion()
+            opts.on('-pPOST_URL', '--postURL=POST_URL', 'Downloading single post') do |postURL|
+                fetcher.downloadPost(postURL, outputFilePath)
 
-                pathPolicy = PathPolicy.new("#{File.expand_path('../', File.dirname(__FILE__))}", "Output")
-                fetcher.downloadPost(postURL, pathPolicy)
+                Helper.printNewVersionMessageIfExists()
             end
 
-            opts.on('-n', '--new', 'Update to latest version') do |postURL|
+            opts.on('-n', '--new', 'Update to latest version') do
                 if Helper.compareVersion(Helper.getRemoteVersionFromGithub(), Helper.getLocalVersionFromGemspec())
                     Helper.downloadLatestVersion()
                 else
                     puts "You're using the latest version :)"
                 end
             end
+
+            opts.on('-c', '--clean', 'Remove all downloaded posts data') do
+                FileUtils.rm_rf(Dir[outputFilePath.getAbsolutePath(nil)])
+
+                Helper.printNewVersionMessageIfExists()
+            end
+
+            opts.on('-v', '--version', 'Print current ZMediumToMarkdown Version') do
+                puts "Version:#{Helper.getLocalVersionFromGemspec().to_string}"
+            end
             
         end.parse!
-
-        Helper.logLatestRunVersion()
     end
 end
 

data/lib/Helper.rb

@@ -96,7 +96,7 @@ class Helper
         result
     end
 
-    def self.checkNewVersion() 
+    def self.printNewVersionMessageIfExists() 
         if Helper.compareVersion(Helper.getRemoteVersionFromGithub(), Helper.getLocalVersionFromGemspec())
             puts "##########################################################"
             puts "#####           New Version Available!!!             #####"
@@ -118,27 +118,6 @@ class Helper
         end
     end
 
-    def self.logLatestRunVersion()
-        version = Helper.getLocalVersionFromGemspec()
-        rootPath = File.expand_path('../', File.dirname(__FILE__))
-
-        File.open("#{rootPath}/.latestRunVersion" , 'w+') do |file|
-            file.puts(version.to_string())
-        end
-    end
-
-    def self.getLocalVersionFromFile()
-        rootPath = File.expand_path('../', File.dirname(__FILE__))
-        result = File.read("#{rootPath}/.latestRunVersion")
-
-        if !result.nil?
-            versions = result.split(".")
-            Version.new(versions[0],versions[1],versions[2])
-        else
-            nil
-        end
-    end
-
     def self.getRemoteVersionFromGithub()
         apiPath = 'https://api.github.com/repos/ZhgChgLi/ZMediumToMarkdown/releases'
         versions = JSON.parse(Request.URL(apiPath).body).sort { |a,b| b["id"] <=> a["id"] }

data/lib/Request.rb

@@ -23,12 +23,17 @@ class Request
         end
 
         response = https.request(request)
+        
         # 3XX Redirect
         if response.code.to_i >= 300 && response.code.to_i <= 399 && !response['location'].nil? && response['location'] != ''
             if retryCount >= 10
                 raise "Error: Retry limit reached. path: #{url}"
             else
-                response = self.URL(response['location'], method, data)
+                location = response['location']
+                if !location.match? /^(http)/
+                    location = "#{uri.scheme}://#{uri.host}#{location}"
+                end
+                response = self.URL(location, method, data)
             end
         end
         response

data/lib/ZMediumFetcher.rb

@@ -212,12 +212,9 @@ class ZMediumFetcher
         progress.printLog()
 
         absolutePath = postPathPolicy.getAbsolutePath("#{postPath}.md")
-
-        # if user latest use's version is < latest local version than force download (don't skip, make sure bug fixed can be influenced)
-        forceDownload = Helper.compareVersion(Helper.getLocalVersionFromGemspec(), Helper.getLocalVersionFromFile())
         
         # if markdown file is exists and last modification time is >= latestPublishedAt(last update post time on medium)
-        if forceDownload == false && File.file?(absolutePath) && File.mtime(absolutePath) >= postInfo.latestPublishedAt
+        if File.file?(absolutePath) && File.mtime(absolutePath) >= postInfo.latestPublishedAt
             # Already downloaded and nothing has changed!, Skip!
             progress.currentPostParagraphIndex = paragraphs.length
             progress.message = "Skip, Post already downloaded and nothing has changed!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-30 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri