rmega 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6555304d89d2e8b375962e427881c16873ab8311088dee76e9ad2dd719af7d01
-  data.tar.gz: 7808a4295238d240540af37b99f6d05a8f6c05b0ee7a558b9c1ba101836a8a4f
+  metadata.gz: 5ed425ea5b0da557c00e5e2abd80b00ddb72f7d32e4a12c6ee3e79d65a0e4a34
+  data.tar.gz: d4ddf7dcb5e5b40433da1e03eec12ccf91c3b400009493158c2b5055c5bc6119
 SHA512:
-  metadata.gz: 99c86e71c98452e6510a7338dc9ef168f69e27bf239f9149a1cb62af58ff0c1768289354ab6e02bb5e1c71fd92eab3e188a61af0cfe8a4245902b5d9ecf8c047
-  data.tar.gz: 389dfb0808a4ccbead5565ddcc46ab0555616b936bd7a2ef3e18d47d8c49d635d4d10f22936a1dbd046d9eb80c97c3dc4f29264e81f25dd385922dd577d3df71
+  metadata.gz: 466832e6ceedaf3df21715c17bec1a507dde658db7821aae46f6427bda5e1031ed34d454f97b0ef90b4a5ee9f86da877af51cfbfd78f0b64cb36fd93be957b2a
+  data.tar.gz: f3928e47b107ab5693c3daa73c9d6725e94f622e539e4d30e96b3fff8c2af0b4394e38068b5f7508c6dc4b3802c45a5a3c8014ba2a967ba3e8da6b56fa07fa2f

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.2.6
+
+### New Features
+* Support new links format, e.g. `https://mega.nz/#!foo!bar` is now `https://mega.nz/file/foo#bar`
+* Add `--get-link` flag to `rmega-up`: generate and print the sharable link of the new file
+
+## 0.2.5
+
+### Changes
+* \#27 The error raised when the free quota is exceeded is now properly handled
+* \#27 Improved detection of mega link when a generic url is given to ```rmega-dl``` (see cmd line usage)
+
 ## 0.2.4
 
 ### Changes

data/Dockerfile

@@ -0,0 +1,14 @@
+FROM ruby
+
+RUN apt-get install -y
+
+RUN mkdir app
+
+COPY . /app
+
+RUN cd /app && \
+    gem install bundler && \
+    bundle install
+
+WORKDIR /app
+ENTRYPOINT ["rspec", "-f", "d"]

data/README.md

@@ -1,4 +1,7 @@
-# Rmega
+[![Gem Version](https://badge.fury.io/rb/rmega.svg)](https://badge.fury.io/rb/rmega)
+[![Build Status](https://travis-ci.org/topac/rmega.svg?branch=master)](https://travis-ci.org/topac/rmega)
+
+# rmega
 
 Pure ruby library for <img src="https://mega.co.nz/favicon.ico" alt=""/> **MEGA** [https://mega.nz/](https://mega.nz/).  
 Works on Linux and OSX with Ruby 1.9.3+.
@@ -9,22 +12,20 @@ Works on Linux and OSX with Ruby 1.9.3+.
   gem install rmega
 ```
 
-## Command line usage
+## Command Line Usage
+
+<img src="https://i.imgur.com/3cjgp4g.gif"/>
 
-Since version 0.2.0 you can use the commands `rmega-dl` and `rmega-up` to easily download and upload files to MEGA.
+Since version 0.2.0 you can use the commands `rmega-dl` and `rmega-up` to download and upload files to MEGA.
 
  * Downloads are resumable
+ * You can download all the links in a given file, e.g. `rmega-dl my_links.txt`
+ * Scrape a web page and download all the MEGA links, e.g. `rmega-dl https://www.reddit.com/r/megalinks/foobar`
  * HTTP proxy support
- * See the CHANGELOG file for more info
-
-<img src="https://i.imgur.com/VVl55wj.gif"/>
-
-*Pro tips:* 
-
-* Streaming: you can use a video player (e.g. VLC) to play videos while downloading them.
-* Super privacy: you can use it combined with [torsocks](https://github.com/dgoulet/torsocks/) to download and upload files through the Tor network (very slow).
+ * Streaming! :beer: You can use a video player (VLC works perfectly) to play videos while downloading them
+ * You can use it combined with [torsocks](https://github.com/dgoulet/torsocks/) to download and upload files through the Tor network (slower)
 
-## DSL usage
+## DSL Usage
 
 ### Login
 
@@ -88,7 +89,7 @@ end
 folder.download("~/Downloads/my_folder")
 
 # Download a file by url
-public_url = 'https://mega.co.nz/#!MAkg2Iab!bc9Y2U6d93IlRRKVYpcC9hLZjS4G278OPdH6nTFPDNQ'
+public_url = 'https://mega.nz/file/MAkg2Iab#bc9Y2U6d93IlRRKVYpcC9hLZjS4G278OPdH6nTFPDNQ'
 Rmega.download(public_url, '~/Downloads')
 ```
 

data/bin/rmega-dl

@@ -16,8 +16,10 @@ OptionParser.new do |opts|
   opts.banner << "\t#{File.basename(__FILE__)} url [options]\n"
   opts.banner << "\t#{File.basename(__FILE__)} path [options]\n"
   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__)} 'https://mega.nz/#!aBkHBKLX!n4kqzbJooqcPZjN1tEJzQ4QQwskHf7YqKa'\n"
+  opts.banner << "\t#{File.basename(__FILE__)} https://mega.nz/file/aBkHBKLX#n4kqzbJooqcPZjN1tEJzQ4QQwskHf7YqKa\n"
+  opts.banner << "\t#{File.basename(__FILE__)} https://mega.nz/folder/aBkHBKLX#n4kqzbJooqcPZjN1tEJzQ4QQwskHf7YqKa\n"
+  opts.banner << "\t#{File.basename(__FILE__)} https://www.reddit.com/r/megalinks3\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:"
@@ -56,7 +58,10 @@ 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.select { |u| Rmega::Nodes::Factory.url?(u) }.uniq
+
+        urls = html.scan(Rmega::Nodes::Factory::URL_REGEXP)
+        urls << html.scan(Rmega::Nodes::Factory::URL_REGEXP_NEW)
+        urls = urls.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"))

data/bin/rmega-up

@@ -22,6 +22,10 @@ OptionParser.new do |opts|
     cli_options[:remote_path] = path
   }
 
+  opts.on("-l", "--get-link", "Generate and print the sharable link (witk key)") {
+    cli_options[:get_link] = true
+  }
+
   apply_opt_parser_options(opts)
 end.parse!
 
@@ -37,5 +41,9 @@ cli_rescue do
   raise("Node not found - #{cli_options[:remote_path]}") unless node
   raise("Node cannot be a file - #{cli_options[:remote_path]}") if node.type == :file
 
-  node.upload(cli_options[:path])
+  file = node.upload(cli_options[:path])
+  
+  if cli_options[:get_link]
+    puts file.public_url
+  end
 end

data/lib/rmega/api_response.rb

@@ -2,7 +2,7 @@ module Rmega
   class APIResponse
     attr_reader :body, :code
 
-    # Check out the error codes list at https://mega.co.nz/#doc (section 11)
+    # Check out the error codes list at https://mega.nz/#doc (section 11)
     ERRORS = {
       -1  => 'An internal error has occurred. Please submit a bug report, detailing the exact circumstances in which this error occurred.',
       -2  => 'You have passed invalid arguments to this command.',

data/lib/rmega/nodes/factory.rb

@@ -16,15 +16,25 @@ module Rmega
     module Factory
       extend self
 
-      URL_REGEXP = /(http.:\/\/[w\.]*mega\.[a-z\.]+\/\#[A-Z0-9\_\-\!\=]+)/i
+      URL_REGEXP = /(https{0,1}:\/\/[w\.]*mega\.[a-z\.]+\/\#[A-Z0-9\_\-\!\=]+)/i
+      URL_REGEXP_NEW = /(https{0,1}:\/\/[w\.]*mega\.[a-z\.]+\/[a-z]{4,6}\/[a-z0-9\_\-\=]+\#[a-z0-9\_\-\=]+)/i
 
-      FOLDER_URL_REGEXP = /\#\F/
+      def public_handle_and_key_from_url(string)
+        if string.to_s =~ URL_REGEXP
+          public_handle, key = string.strip.split('!')[1, 2]
+          return [] if key and (Utils.base64urldecode(key) rescue nil).nil?
+          return [public_handle, key]
+        elsif string.to_s =~ URL_REGEXP_NEW
+          public_handle, key = *string.scan(/\/([^\/]+)\#(.+)$/).flatten
+          return [] if key and (Utils.base64urldecode(key) rescue nil).nil?
+          return [public_handle, key]
+        else
+          return []
+        end
+      end
 
       def url?(string)
-        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
+        public_handle_and_key_from_url(string).any?
       end
 
       def build(session, data)
@@ -33,11 +43,11 @@ module Rmega
       end
 
       def build_from_url(url, session = Session.new)
-        public_handle, key = url.strip.split('!')[1, 2]
+        public_handle, key = *public_handle_and_key_from_url(url)
 
         raise "Invalid url or missing file key" unless key
 
-        node = if url =~ FOLDER_URL_REGEXP
+        node = if url.include?("/folder/") or url.include?("/#F!")
           nodes_data = session.request({a: 'f', c: 1, r: 1}, {n: public_handle})
           session.master_key = Utils.base64urldecode(key)
           session.storage.nodes = nodes_data['f'].map do |data|

data/lib/rmega/nodes/node.rb

@@ -21,7 +21,7 @@ module Rmega
       end
 
       def public_url
-        @public_url ||= "https://mega.co.nz/#!#{public_handle}!#{Utils.base64urlencode(decrypted_file_key)}"
+        @public_url ||= "https://mega.nz/file/#{public_handle}\##{Utils.base64urlencode(decrypted_file_key)}"
       end
 
       def public_handle
@@ -138,7 +138,8 @@ module Rmega
         elsif file_key
           aes_ecb_decrypt(master_key, file_key)
         else
-          Utils.base64urldecode(public_url.split('!').last)
+          ary = Rmega::Nodes::Factory.public_handle_and_key_from_url(public_url)
+          Utils.base64urldecode(ary[1])
         end
       end
 

data/lib/rmega/version.rb

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

data/rmega.gemspec

@@ -3,9 +3,9 @@ require File.expand_path('../lib/rmega/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["topac"]
-  gem.email         = ["dani.m.mobile@gmail.com"]
-  gem.description   = %q{mega.co.nz ruby api}
-  gem.summary       = %q{mega.co.nz ruby api}
+  gem.email         = ["topac@users.noreply.github.com"]
+  gem.description   = %q{mega.nz ruby api}
+  gem.summary       = %q{mega.nz ruby api}
   gem.homepage      = Rmega::HOMEPAGE
 
   gem.files         = `git ls-files`.split($\)

data/spec/integration/resume_download_spec.rb

@@ -8,7 +8,8 @@ module Rmega
     let(:destination_file) { "#{temp_folder}/temp.txt" }
 
     before do
-      Thread.abort_on_exception = false
+      Thread.abort_on_exception = false if Thread.respond_to?(:abort_on_exception)
+      Thread.report_on_exception = false if Thread.respond_to?(:report_on_exception)
       allow_any_instance_of(Pool).to receive(:threads_raises_exceptions).and_return(nil)
     end
 

data/spec/integration_spec_helper.rb

@@ -23,7 +23,7 @@ def login
 end
 
 def temp_folder
-  Dir.tmpdir
+  $temp_folder ||= "#{Dir.tmpdir}/#{SecureRandom.hex(10)}"
 end
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmega
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - topac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -52,9 +52,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: mega.co.nz ruby api
+description: mega.nz ruby api
 email:
-- dani.m.mobile@gmail.com
+- topac@users.noreply.github.com
 executables:
 - rmega-dl
 - rmega-up
@@ -64,6 +64,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
@@ -138,11 +139,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: mega.co.nz ruby api
+summary: mega.nz ruby api
 test_files:
 - spec/integration/file_download_spec.rb
 - spec/integration/file_integrity_spec.rb