ZMediumToMarkdown 2.5.0 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e2329fa42690e35efea3b0231c03949d460484e821f27b9a3da53fe43908906
-  data.tar.gz: 9636ba2e044114cda97780db906014f4bbe7859af23c3236cc79d8928040fffa
+  metadata.gz: 71e19d6c888e760923f2bf919d3fc34b29bd30835cc5c563da057369108b18a2
+  data.tar.gz: '03862c8cf6f9dc3b894470f918b0247bb8457f0bebe7299da4cceea0816bc17c'
 SHA512:
-  metadata.gz: 1aad74dfa4a903110456dd1fab95ba2b4c2b88e4e355a39312b7dd1924bdf8fb2c9e38581c92ad3651f91ba5ffd0c385ed172fa4834d0aed3d605e89f3b7bc70
-  data.tar.gz: 31ba0e2502cc5d10ed64ab69ae15864526dd90b698962ba05054f22f1c20d0d518416e0fce86f61980cdc5f3466db9d7dfa1e4f313cec876ea664a1ca4d1306d
+  metadata.gz: 4290ca60752a6033ee16dd75c8c537b0cd4030c89d3765d92ca596dfae87c69da6a780f3608eea8cfa62a3897374f77141b3f83243b44860acbe5736247d46d2
+  data.tar.gz: 39e4d1d11db6cd81a309e476f7bc63024cc2d32401fb4ef1649fb68989c6f45759dd1214d2a6040fd0694e53fed905edc554bc5e16d8b6769b5ef8a3dc30347c

data/bin/ZMediumToMarkdown

@@ -8,8 +8,7 @@ require "ZMediumFetcher"
 require "Helper"
 require "optparse"
 
-$cookie_sid = nil
-$cookie_uid = nil
+$cookies = {}
 
 class Main
     def initialize
@@ -23,11 +22,11 @@ class Main
             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
+                $cookies['sid'] = cookie_sid
             end
 
             opts.on('-d', '--cookie_uid COOKIEUID', 'Your logged-in Medium cookie uid value') do |cookie_uid|
-                $cookie_uid = cookie_uid
+                $cookies['uid'] = cookie_uid
             end
 
             opts.on('-u', '--username USERNAME', 'Downloading all posts from user') do |username|

data/lib/Request.rb

@@ -22,32 +22,38 @@ class Request
             end
         end
 
-        if !$cookie_sid.nil? && !$cookie_uid.nil?
-          request['Cookie'] = "sid=#{$cookie_sid}; uid=#{$cookie_uid}";
+        cookiesString = $cookies.reject { |_, value| value.nil? }
+        .map { |key, value| "#{key}=#{value}" }
+        .join("; ");
+
+        if !cookiesString.nil? && cookiesString != ""
+          request['Cookie'] = cookiesString;
         end
 
         response = https.request(request);
           
-        cookies = response.get_fields('set-cookie').map { |cookie| cookie.split('; ').first }.each_with_object({}) do |cookie, hash|
-          key, value = cookie.split('=', 2) # Split by '=' into key and value
-          hash[key] = value
-        end;
-
-        if !cookies['uid'].nil?
-          $cookie_uid = cookies['uid'];
-        end
+        setCookieString = response.get_fields('set-cookie');
+        if !setCookieString.nil? && setCookieString != ""
+          setCookies = setCookieString.map { |cookie| cookie.split('; ').first }.each_with_object({}) do |cookie, hash|
+            key, value = cookie.split('=', 2) # Split by '=' into key and value
+            hash[key] = value
+          end;
 
-        if !cookies['sid'].nil?
-          $cookie_sid = cookies['sid'];
+          setCookies.each do |key, value|
+            $cookies[key] = value
+          end
         end
 
-        puts response
         # 3XX Redirect
         if response.code.to_i == 429
-          raise "Error: Too Manay Reqeust, blocked by Medium.\n####################\n### Please try again later.\n### Ref: https://zhgchg.li/posts/en-medium-to-jekyll/#paywall-posts-require-a-medium-account-with-access-permissions-and-cookies-author-or-medium-member \n####################\n### ERROR URL: #{url}"
+          if retryCount >= 10
+            raise "Error: Too Manay Reqeust, blocked by Medium. URL: #{url}";
+          else
+            response = self.URL(url, method, data, retryCount);
+          end
         elsif 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}"
+                raise "Error: Retry limit reached. URL: #{url}"
             else
                 location = response['location']
                 if !location.match? /^(http)/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.2
 platform: ruby
 authors:
 - ZhgChgLi