cloudapp-export 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1579ad02b2a2789e95e6e5c743765006091e9c67
-  data.tar.gz: bfac4398babc3afc70aa4d1a44c57085128c0d52
+SHA256:
+  metadata.gz: 76ec7d3deb5e44184022937ced41ddc7438bfebbb6729225de2476b7d647aa58
+  data.tar.gz: 1b967386965f333aa271ac6f2928c5c524849d4871379fa24b39392aae02a43c
 SHA512:
-  metadata.gz: d20379fcab2828e82ee1e70e6fd35c246c9f00804b9b85a78a7e2fe680ae278d1c6e32c9905ab0e4636cc3f6bcb08e242973e6a0930749c45b82803e49361b7d
-  data.tar.gz: 9ea24ea8e415140425fe60c9c16e522acea2b3e4c8c5b4514e68ef38f734f51ebda8da9c294f50d4ab021b8e332f34298be468cf15f5de4073063bf2dbe54cfc
+  metadata.gz: 8c85a8fbcd7ccf4cc19fcf5fcccdd1d2685dab6439975613eee4c2ed585f9a4aa5dadf3ac6a7873c765a047df070d143bba5068cff4070ff8680e01c9835ccad
+  data.tar.gz: 8c871fdfe40a82e3cc04d18f40be11329714f31fe14dcb634c09ea781dae5f9ce9562cd73ae8ab89887a7f0e300ca3030b2d00c53f82676f3ca6bd1aff132cf9

data/.rubocop.yml

@@ -27,6 +27,10 @@ Style/MultilineTernaryOperator:
 Style/RegexpLiteral:
   Enabled: false
 
+# TODO: Figure out how to do this without URI.encode
+Lint/UriEscapeUnescape:
+  Enabled: false
+
 # Screens are big, even when they're small
 Metrics/LineLength:
   Enabled: false
@@ -44,7 +48,7 @@ Style/ClassAndModuleChildren:
   Exclude:
     - '**/*_test.rb'
 Metrics/MethodLength:
-  Max: 16
+  Max: 18
   Exclude:
     - '**/*_test.rb'
 

data/lib/cloudapp_export/api.rb

@@ -12,6 +12,13 @@ module CloudappExport
       @options = options
     end
 
+    def authenticate!
+      response = request("items?per_page=1")
+      return true if response.status_code == 200
+      # TODO: Use custom exception classes
+      raise response.body.strip
+    end
+
     def request(path)
       digest_auth = Net::HTTP::DigestAuth.new
       uri = URI.parse("https://#{host}/v3/#{path}")
@@ -57,8 +64,16 @@ module CloudappExport
       @http_response.body
     end
 
+    def status_code
+      @http_response.code.to_i
+    end
+
     def data
       JSON.parse(@http_response.body)['data']
     end
+
+    def meta
+      JSON.parse(@http_response.body)['meta']
+    end
   end
 end

data/lib/cloudapp_export/cli.rb

@@ -10,13 +10,18 @@ module CloudappExport
     desc :all, "Export all data from your Cloudapp account"
     option :limit, default: 5, type: :numeric
     option :dir, default: "#{ENV['HOME']}/Downloads/CloudappExport", type: :string, desc: "Directory to download all files to"
-    option :cache, type: :boolean, default: true
+    option :cache, type: :boolean, default: false
     def all
+      authenticate!
+
       items = CloudappExport::ItemList.new(
         api,
         'limit' => options['limit'],
-        'cache' => options['cache'],
+        'use_cache' => options['cache'],
+        'cache_key' => "#{username}:#{options['limit']}",
       )
+      say("Account contains #{set_color items.total_count, :bold} items")
+      say("", nil, true)
 
       exporter = ::CloudappExport::Exporter.new(
         items,
@@ -29,27 +34,31 @@ module CloudappExport
     end
 
     # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Layout/TrailingWhitespace
     desc :stats, "Show stats for CloudApp items"
     option :dir, default: "#{ENV['HOME']}/Downloads/CloudappExport", type: :string, desc: "Directory where your files were downloaded to"
-    option :cache, type: :boolean, default: true
+    option :cache, type: :boolean, default: false
     def stats
+      authenticate!
+
       items = CloudappExport::ItemList.new(
         api,
-        'cache' => options['cache'],
       )
-      
+      say("Account contains #{set_color items.total_count, :bold} items")
+      say("", nil, true)
+
+      say("Dir         #{options['dir']}")
+      say("", nil, true)
+
+      # TODO: Just count files directly in local folder
       downloaded_items = items.data.select { |item| File.exist?("#{options['dir']}/#{item.filename}") }
       downloaded_items_size = downloaded_items.inject(0) { |sum, item| sum + File.size("#{options['dir']}/#{item.filename}") }
-      
-      say("Dir         #{options['dir']}")
-      say("Items       #{items.count}")
+
       say("Downloaded  #{downloaded_items.count}")
       say("            #{(downloaded_items_size.to_f / 1_000_000).round 2} mb")
     end
     # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Layout/TrailingWhitespace
 
+    # rubocop:disable Metrics/BlockLength
     no_commands do
       def api
         @api ||= begin
@@ -60,6 +69,14 @@ module CloudappExport
         end
       end
 
+      def authenticate!
+        api.authenticate!
+        say("Successfully authenticated!", :green)
+      rescue StandardError => error
+        say("Could not authenticate with Cloudapp (#{error.message})", :red)
+        Kernel.exit
+      end
+
       def username
         @username ||= begin
           username = options['username']
@@ -74,10 +91,11 @@ module CloudappExport
         @password ||= begin
           password = options['password']
           password ||= ENV['CLOUDAPP_PASSWORD']
-          password ||= (ask("Password:", echo: false) && say('*' * 20))
+          (password ||= ask("Password:", echo: false)) && say('*' * 20)
           password || raise("Password is required")
         end
       end
     end
+    # rubocop:enable Metrics/BlockLength
   end
 end

data/lib/cloudapp_export/exporter.rb

@@ -25,13 +25,16 @@ module CloudappExport
       filepath = "#{download_dir}/#{item.filename}"
       if File.exist?(filepath)
         log "  SK  #{item_filesize_human(item)}"
+      elsif item['remote_url'].nil? || item['item_type'] == 'pending'
+        log "  SK  No Remote URL"
       else
         begin
           log "  DL"
           copy_file(item['remote_url'], filepath)
           log "  #{item_filesize_human(item)}"
         rescue StandardError => error
-          log "  ER #{error.message}"
+          log "  ER #{error.message}\n"
+          error.backtrace.each { |line| log "          #{line}\n" }
         end
       end
       log "\n"
@@ -44,10 +47,13 @@ module CloudappExport
     protected
 
     def copy_file(remote_url, local_path)
-      remote_uri = URI(remote_url)
+      remote_uri = URI.parse(URI.encode(remote_url, '[]'))
       File.open(local_path, 'wb') do |file|
         file << Net::HTTP.get(remote_uri)
       end
+    rescue StandardError => error
+      File.delete(local_path)
+      raise error
     end
 
     def item_filesize(item)

data/lib/cloudapp_export/item_list.rb

@@ -1,11 +1,13 @@
 require "json"
+require "digest"
 
 module CloudappExport
   class ItemList
     def initialize(api, options = {})
       @api = api
       @items = []
-      @use_cache = !!options['cache']
+      @cache_key = options['cache_key']
+      @use_cache = options['use_cache']
       @limit = (options['limit'] || 999_999_999).to_i
       @offset = (options['offset'] || 0).to_i
     end
@@ -16,8 +18,12 @@ module CloudappExport
     end
 
     def count
-      load
-      [@items.count, @limit].min
+      [total_count, @limit].min
+    end
+
+    def total_count
+      load_meta
+      @meta['count'].to_i
     end
 
     def each(&block)
@@ -42,9 +48,9 @@ module CloudappExport
         if @use_cache && File.exist?(cache_file_path)
           items = ::JSON.parse(::File.read(cache_file_path))
         else
-          response = @api.request("items?per_page=100000")
+          response = @api.request("items?per_page=#{@limit}")
           items = response.data
-          ::File.write(cache_file_path, ::JSON.dump(items))
+          ::File.write(cache_file_path, ::JSON.dump(items)) if @cache_key
         end
         items.map do |attributes|
           ::CloudappExport::Item.new(attributes)
@@ -52,8 +58,16 @@ module CloudappExport
       end
     end
 
+    def load_meta
+      @load_meta ||= begin
+        response = @api.request("items?per_page=1")
+        @meta = response.meta
+      end
+    end
+
     def cache_file_path
-      "#{ENV['HOME']}/.cloudapp-export-items.json"
+      hashed_cache_key = Digest::MD5.hexdigest(@cache_key)
+      "/tmp/cloudapp-export-items-cache-#{hashed_cache_key}.json"
     end
   end
 end

data/lib/cloudapp_export/version.rb

@@ -1,3 +1,3 @@
 module CloudappExport
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudapp-export
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Marc Qualie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A quick way to export all the data you have stored in CloudApp