rmega 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c5220ae63878c82e2e72cb324a5277347dfebee7
-  data.tar.gz: 0055c65dcaca525127fe46a228885eb84100a8c7
+SHA256:
+  metadata.gz: 6555304d89d2e8b375962e427881c16873ab8311088dee76e9ad2dd719af7d01
+  data.tar.gz: 7808a4295238d240540af37b99f6d05a8f6c05b0ee7a558b9c1ba101836a8a4f
 SHA512:
-  metadata.gz: 8051f36840c086b719974538d37b770824663a26ce84177316b0945b9acf6a8ba311668164a0ab23e3b1377a1f18a642b49669d167b43244ac1f7ffde5261ad8
-  data.tar.gz: eb1cbced4fa134640d631cceca5d03c400bfb1c88499fbc768310f74fbeea09ae416875627fd2e397b9c4025bca17c0f0175646039b842a1a6efe02e4d9b1913
+  metadata.gz: 99c86e71c98452e6510a7338dc9ef168f69e27bf239f9149a1cb62af58ff0c1768289354ab6e02bb5e1c71fd92eab3e188a61af0cfe8a4245902b5d9ecf8c047
+  data.tar.gz: 389dfb0808a4ccbead5565ddcc46ab0555616b936bd7a2ef3e18d47d8c49d635d4d10f22936a1dbd046d9eb80c97c3dc4f29264e81f25dd385922dd577d3df71

data/.travis.yml

@@ -7,4 +7,5 @@ rvm:
   - 2.1
   - 2.2
   - 2.4
+  - 2.5
   - ruby-head

data/bin/rmega-dl

@@ -56,7 +56,11 @@ cli_rescue do
       else
         # A link to a web page with some MEGA urls in its body
         html = Rmega::Session.new.http_get_content(cli_options[:url])
-        urls = html.scan(Rmega::Nodes::Factory::URL_REGEXP).flatten.uniq
+        urls = html.scan(Rmega::Nodes::Factory::URL_REGEXP).flatten.select { |u| Rmega::Nodes::Factory.url?(u) }.uniq
+
+        if cli_options[:debug] and urls.any?
+          Rmega.logger.debug("#{urls.size} URL(s) founded:\n" + urls.join("\n"))
+        end
       end
     end
 
@@ -64,7 +68,7 @@ cli_rescue do
 
     urls.each_with_index do |url, index|
       node = Rmega::Nodes::Factory.build_from_url(url)
-      print "[#{index+1}/#{urls.size}] " if urls.size > 1
+      puts "[#{index+1}/#{urls.size}] #{url}" if urls.size > 1
       node.download(cli_options[:output] || Dir.pwd)
     end
   end

data/lib/rmega/cli.rb

@@ -43,6 +43,10 @@ module Rmega
         end
         Rmega.logger.level = ::Logger::DEBUG if cli_options[:debug]
         Rmega.options.show_progress = true
+
+        if Thread.respond_to?(:report_on_exception) and !cli_options[:debug]
+          Thread.report_on_exception = false
+        end
       end
 
       def apply_opt_parser_options(opts)

data/lib/rmega/errors.rb

@@ -4,4 +4,14 @@ module Rmega
 
   class TemporaryServerError < StandardError
   end
+
+  class BandwidthLimitExceeded < StandardError
+    def initialize(*args)
+      if args.any?
+        super
+      else
+        super("Transfer quota exceeded")
+      end
+    end
+  end
 end

data/lib/rmega/net.rb

@@ -18,7 +18,13 @@ module Rmega
     def http_get_content(url)
       uri = URI(url)
       req = ::Net::HTTP::Get.new(uri.request_uri)
-      return net_http(uri).request(req).body
+      resp = net_http(uri).request(req)
+
+      if resp.code.to_i == 509 and resp.body.to_s.empty?
+        raise BandwidthLimitExceeded.new
+      end
+
+      return resp.body
     end
 
     def http_post(url, data)

data/lib/rmega/nodes/factory.rb

@@ -21,7 +21,10 @@ module Rmega
       FOLDER_URL_REGEXP = /\#\F/
 
       def url?(string)
-        string.to_s =~ URL_REGEXP
+        return false unless string.to_s =~ URL_REGEXP
+        public_handle, key = string.strip.split('!')[1, 2]
+        return false if key and (Utils.base64urldecode(key) rescue nil).nil?
+        return true
       end
 
       def build(session, data)

data/lib/rmega/version.rb

@@ -1,4 +1,4 @@
 module Rmega
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
   HOMEPAGE = "https://github.com/topac/rmega"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmega
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - topac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: mega.co.nz ruby api