rmega 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0861e3b68280695813f70b8ee46e63e7dc66084c
-  data.tar.gz: c3cc58126f747db8807c3e0cdd811b961c006a64
+  metadata.gz: c5220ae63878c82e2e72cb324a5277347dfebee7
+  data.tar.gz: 0055c65dcaca525127fe46a228885eb84100a8c7
 SHA512:
-  metadata.gz: 9df582d7a167366705ca029154fea91c8333e33f0a200ac8b87cf2af1233f30c98decf18fe3064b2859d063427ae81453d28c78750084f08aaa834c35ef87508
-  data.tar.gz: a70d8d931a432b73f3f6d2b40939d0bdda2ed34e644a083f44f83360eeb8d27b5c1a47bcf42240e15d85d24c061b5c21de1f6df9a3b0a66f3904bd1620e2de0f
+  metadata.gz: 8051f36840c086b719974538d37b770824663a26ce84177316b0945b9acf6a8ba311668164a0ab23e3b1377a1f18a642b49669d167b43244ac1f7ffde5261ad8
+  data.tar.gz: eb1cbced4fa134640d631cceca5d03c400bfb1c88499fbc768310f74fbeea09ae416875627fd2e397b9c4025bca17c0f0175646039b842a1a6efe02e4d9b1913

data/.travis.yml

@@ -6,4 +6,5 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.4
   - ruby-head

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.2.4
+
+### Changes
+* \#25 Fix connection reset on file upload
+* \#24 Speed up aes_cbc_mac func
+
+## 0.2.3
+
+### Changes
+* Fixed reading options from the configuration file (~/.rmega)
+* The max number of parallel threads is now 8
+
+### New Features
+* If `rmega-dl` receive a local file as the main args, that file is treated as a text file that must contains a list of mega links
+* The download progress bar now distinguishes between allocate, verify and download phase
+
 ## 0.2.2
 
 ### Changes

data/README.md

@@ -88,7 +88,7 @@ end
 folder.download("~/Downloads/my_folder")
 
 # Download a file by url
-publid_url = 'https://mega.co.nz/#!MAkg2Iab!bc9Y2U6d93IlRRKVYpcC9hLZjS4G278OPdH6nTFPDNQ'
+public_url = 'https://mega.co.nz/#!MAkg2Iab!bc9Y2U6d93IlRRKVYpcC9hLZjS4G278OPdH6nTFPDNQ'
 Rmega.download(public_url, '~/Downloads')
 ```
 

data/bin/rmega-dl

@@ -18,6 +18,7 @@ OptionParser.new do |opts|
   opts.banner << "Examples:\n"
   opts.banner << "\t#{File.basename(__FILE__)} 'https://mega.nz/#!aBkHBKLX!n4kqzbJooqc3o_s96PZjN1tEJzQ4QQwskHf7YqKa'\n"
   opts.banner << "\t#{File.basename(__FILE__)} https://www.reddit.com/r/megalinks\n"
+  opts.banner << "\t#{File.basename(__FILE__)} mylinks.txt\n"
   opts.banner << "\t#{File.basename(__FILE__)} /remote/docs/myfile.txt -u email@localhost\n"
   opts.banner << "Options:"
 
@@ -36,14 +37,31 @@ cli_rescue do
     raise("Node not found - #{cli_options[:url]}") unless node
     node.download(cli_options[:output] || Dir.pwd)
   else
-    urls = [cli_options[:url]]
+    urls = []
 
-    unless mega_url?(cli_options[:url])
-      html = Rmega::Session.new.http_get_content(cli_options[:url])
-      urls = html.scan(Rmega::Nodes::Factory::URL_REGEXP).flatten.uniq
-      raise("Nothing to download") if urls.empty?
+    if mega_url?(cli_options[:url])
+      # a valid MEGA urls
+      urls = [cli_options[:url]]
+    else
+      # A text file with a list of MEGA urls (considering only files < 1 Mb)
+      if File.exists?(cli_options[:url])
+        if File.size(cli_options[:url]) < 1_000_000
+          File.open(cli_options[:url], "rb") do |file|
+            file.each_line do |line|
+              line.strip!
+              urls << line if mega_url?(line)
+            end
+          end
+        end
+      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
+      end
     end
 
+    raise("Nothing to download") if urls.empty?
+
     urls.each_with_index do |url, index|
       node = Rmega::Nodes::Factory.build_from_url(url)
       print "[#{index+1}/#{urls.size}] " if urls.size > 1

data/lib/rmega/cli.rb

@@ -6,7 +6,7 @@ module Rmega
   module CLI
     module Helpers
       def cli_options
-        $cli_options ||= {}
+        $cli_options ||= read_configuration_file
       end
 
       def cli_prompt_password
@@ -27,12 +27,14 @@ module Rmega
       end
 
       def read_configuration_file
-        return unless File.exists?(configuration_filepath)
-        cli_options = YAML.load_file(configuration_filepath)
-        cli_options.keys.each { |k| cli_options[k.to_sym] = cli_options.delete(k) }
-        puts "Loaded configuration file #{configuration_filepath}" if cli_options[:debug]
+        return {} unless File.exists?(configuration_filepath)
+
+        opts = YAML.load_file(configuration_filepath)
+        opts.keys.each { |k| opts[k.to_sym] = opts.delete(k) } # symbolize_keys!
+
+        return opts
       rescue Exception => ex
-        raise(ex) if cli_options[:debug]
+        raise(ex)
       end
 
       def apply_cli_options
@@ -44,8 +46,16 @@ module Rmega
       end
 
       def apply_opt_parser_options(opts)
-        opts.on("-t NUM", "--thread_pool_size", "Number of threads to use") { |n|
-          cli_options[:thread_pool_size] = n.to_i
+        opts.on("-t NUM", "--thread_pool_size", "Number of threads to use [1-8], default and recommended is #{Rmega.options.thread_pool_size}") { |num|
+          num = num.to_i
+
+          if num <= 0
+            num = 1
+          elsif num > 8
+            num = 8
+          end
+
+          cli_options[:thread_pool_size] = num
         }
 
         opts.on("--proxy-addr ADDRESS", "Http proxy address") { |value|
@@ -71,7 +81,7 @@ module Rmega
         opts.on("-v", "--version", "Print the version number") {
           puts Rmega::VERSION
           puts Rmega::HOMEPAGE
-          exit!(0)
+          exit(0)
         }
       end
 
@@ -99,7 +109,6 @@ module Rmega
       end
 
       def cli_rescue
-        read_configuration_file
         apply_cli_options
         yield
       rescue Interrupt

data/lib/rmega/crypto/aes_cbc.rb

@@ -28,18 +28,21 @@ module Rmega
         cipher.iv = iv if iv
         cipher.key = key
 
-        n = 0
-        mac = nil
+        # n = 0
+        # mac = nil
 
-        loop do
-          block = data[n..n+15]
-          break if !block or block.empty?
-          block << "\x0"*(16-block.size) if block.size < 16
-          n += 16
-          mac = cipher.update(block)
-        end
+        # loop do
+        #   block = data[n..n+15]
+        #   break if !block or block.empty?
+        #   block << "\x0"*(16-block.size) if block.size < 16
+        #   n += 16
+        #   mac = cipher.update(block)
+        # end
 
-        return mac
+        # return mac
+
+        block = data + "\x0" * ((16 - data.bytesize % 16) % 16)
+        return cipher.update(block)[-16..-1]
       end
     end
   end

data/lib/rmega/net.rb

@@ -18,7 +18,7 @@ module Rmega
     def http_get_content(url)
       uri = URI(url)
       req = ::Net::HTTP::Get.new(uri.request_uri)
-      return send_http_request(uri, req).body
+      return net_http(uri).request(req).body
     end
 
     def http_post(url, data)
@@ -26,30 +26,36 @@ module Rmega
       req = ::Net::HTTP::Post.new(uri.request_uri)
       req.body = data
       logger.debug("REQ POST #{url} #{cut_string(data)}")
-      response = send_http_request(uri, req)
+
+      # if you don't use Net::Http#start it will not keep the socket open even if you set
+      # the connection header BUT setting the connection header to 'keep-alive' its enough
+      # to fool MEGA servers and don't let them reset your connection!
+      req['Connection'] = 'keep-alive'
+
+      response = net_http(uri).request(req)
       logger.debug("REP #{response.code} #{cut_string(response.body)}")
       return response
     end
 
     private
 
-    def send_http_request(uri, req)
+    def net_http(uri)
       http = ::Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true if uri.scheme == 'https'
-      apply_http_options(http)
-      return http.request(req)
-    end
 
-    def apply_http_options(http)
+      # apply common http options
       http.proxy_from_env = false if options.http_proxy_address
 
       options.marshal_dump.each do |name, value|
         setter_method = name.to_s.split('http_')[1]
         http.__send__("#{setter_method}=", value) if setter_method and value
       end
+
+      return http
     end
 
     def cut_string(string, max = 50)
+      return "<binary data, #{string.size} bytes>" if string.encoding == ::Encoding::ASCII_8BIT
       string.size <= max ? string : string[0..max-1]+"..."
     end
   end

data/lib/rmega/nodes/downloadable.rb

@@ -69,7 +69,7 @@ module Rmega
         path = ::File.expand_path(path)
         path = Dir.exists?(path) ? ::File.join(path, name) : path
 
-        progress = Progress.new(filesize, caption: 'Download', filename: self.name)
+        progress = Progress.new(filesize, caption: 'Allocate', filename: self.name)
         pool = Pool.new
 
         @resumed_download = allocated?(path)
@@ -84,12 +84,12 @@ module Rmega
 
             if data
               chunk_macs[start] = calculate_chunck_mac(data) if options.file_integrity_check
-              progress.increment(size, real: false)
+              progress.increment(size, real: false, caption: "Verify")
             else
               data = decrypt_chunk(start, download_chunk(start, size))
               chunk_macs[start] = calculate_chunck_mac(data) if options.file_integrity_check
               write_chunk(start, data)
-              progress.increment(size)
+              progress.increment(size, caption: "Download")
             end
           end
         end

data/lib/rmega/progress.rb

@@ -72,6 +72,7 @@ module Rmega
 
     def increment(bytes, options = {})
       @mutex.synchronize do
+        @caption = options[:caption] if options[:caption]
         @bytes += bytes
         @real_bytes += bytes unless options[:real] == false
         show

data/lib/rmega/version.rb

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

data/lib/rmega.rb

@@ -7,6 +7,7 @@ require 'base64'
 require 'openssl'
 require 'digest/md5'
 require 'json'
+require 'securerandom'
 
 # Used only in specs
 require 'yaml'

data/spec/integration/file_upload_spec.rb

@@ -8,7 +8,7 @@ describe 'File upload' do
       @storage = login
     end
 
-    [12, 6_000].each do |size|
+    [12, 6_000, 2_000_000].each do |size|
 
       context "when a file (#{size} bytes) is uploaded" do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmega
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - topac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2018-02-05 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.4.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: mega.co.nz ruby api