ZMediumToMarkdown 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 837c899a0d017fa83febc0f96e84a89527a517754cbee44f6e91320c7b2cd292
-  data.tar.gz: cb5c49e7a67f99ab888cb0797edaf4c0ce237da3e8c41bfda963395bd606b1cd
+  metadata.gz: 478b02a8d17067e64ef3c402640961cc75c91a560b0370e598be80ee17b27296
+  data.tar.gz: 2b01dcc7f9950271bcb0f4e59f10c2c6a1015cd1d013df796e62a4b2138ba69e
 SHA512:
-  metadata.gz: f9339415de8183d6c255bf28db437c61e8913c242e5ed3270d070285b1282717187511a974fdc6c0ef391c37a6308bcf3d7f866dd0fa508a7e00fc004d05ca87
-  data.tar.gz: 832198d0d8cf5851aedfa7f69a9193cad42f71f21f06fb29a832957140fdfd6d8e3099429b8085824eae2f19d0d05c6c2615f73d012fa16679fcf49945918862
+  metadata.gz: 3dbf24729dae8e94881fa876ef9cb2119ee1370b45160c3aa6974ee84cb6522ae85ff5380c600db2420df32ec5ec50ac00350f7e56cf41177cc56ed186845ac1
+  data.tar.gz: c62b15539cd70a2d6523f3d89ded3a88ac5220ca72896d7a163d557cc2d1ccbcfec94b548ed78920b74fbe05ef52d18c0b8f4fe57cf832a7f17e2d7f72dd2224

data/bin/ZMediumToMarkdown

@@ -12,34 +12,40 @@ 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
             
         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.0
+  version: 1.3.0
 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