fofa 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d86dc3a20f95741a8017d70c145960ce2bfd447a
-  data.tar.gz: a7d6c254a64791a34f5752eaa53d58de03eef102
+  metadata.gz: 51b78658d768160754f6f32ebd1eb38f9c9a1f90
+  data.tar.gz: 3b9634e71a8b0d1911e3febef7956ab384ccf6a3
 SHA512:
-  metadata.gz: 24ab2152dc8fb32d66d7bf3f969c585cd575e895c47567bf80b2e371b0174fc203d4e7d1d0b27bde721c04e9daf84e09cbcaed5a80667a085a32acb866362b3d
-  data.tar.gz: 9033da1b6c70978b1b91854f4ad669c7af408a3562680251e73e3b719a9f9d9d1edb09e857aed3a39786922d7bcf8f0e0fca082a396f299113aacc5f8c1a8e65
+  metadata.gz: edc85325d980675819fb60ae281d4286eaf39576c787fb96a8fc5f43093a14a9c1f6c2a2caa788f60d9da45252f7f1653e972b552e0aa626cf78ebb83ac13dee
+  data.tar.gz: 06e0b7ab86fcaa6bd7608d5039cc983baeda3bc7075bbc804deefe3fcf28400d20185ae23160b343a56b453d04be5f6cc6256ab0ac2705b57f0ef47acdf4a6a4

data/.gitignore

@@ -1 +1,2 @@
 # Created by .ignore support plugin (hsz.mobi)
+.idea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fofa (0.3.6)
+    fofa (0.3.7)
 
 GEM
   remote: https://rubygems.org/

data/bin/fofacli

@@ -8,12 +8,13 @@ require "colorize"
 options = {
 	email: ENV['FOFA_EMAIL'],
 	apikey: ENV['FOFA_KEY'],
-	page: 1,
+	page: nil,
 	verbose: false,
 	file: nil,
 	mode: :search,
 	split_size: 100,
-	limit: 100,
+  size_per_page: 100,
+	limit: 1000,
   fields: 'host'
 }
 
@@ -45,10 +46,14 @@ ARGV.options do |opts|
 
 	opts.on('-s', '--limit=SIZE', Integer, "Limit size to fetch, default to #{options[:limit]}") do |val|
 		options[:limit] = val.to_i
-	end
+  end
+
+  opts.on('-s', '--limit=SIZE', Integer, "Limit size to fetch, default to #{options[:limit]}") do |val|
+    options[:limit] = val.to_i
+  end
 
-	opts.on('-l', '--split_size=SIZE', Integer, "Used at [import_service] mode, default to #{options[:split_size]}") do |val|
-			options[:split_size] = val.to_i
+	opts.on(nil, '--size_per_page=SIZE', Integer, "API fetch size per page, default to #{options[:size_per_page]}") do |val|
+			options[:size_per_page] = val.to_i
 	end
 
 	opts.on('-d', '--fields=FIELDS', String, "Fields to return, split with ',', default to #{options[:fields]}") do |val|
@@ -99,7 +104,22 @@ when :search
 	end
 	query = ARGV.join(' ')
 	puts "Query: '#{query}'"
-	puts Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]}).search(query, {page:options[:page], size:options[:limit], fields:options[:fields]})
+  if options[:page] #search one page
+    puts Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
+             .search(query, {
+                 page:options[:page],
+                 size:options[:limit],
+                 fields:options[:fields]
+             })
+  else
+    puts Fofa::API.new(options[:email], options[:apikey], {debug:options[:verbose]})
+             .search_all(query, {
+                 size:options[:limit],
+                 page_size:options[:size_per_page],
+                 fields:options[:fields]
+             })
+  end
+
 when :import_service
 	unless options[:file]
 		puts "File not specified.".red

data/lib/fofa.rb

@@ -71,6 +71,8 @@ module Fofa
             all_res = all_res[0..all_size-1]
             break
           end
+
+          break if all_res.size >= res['size'].to_i
         else
           break
         end

data/lib/fofa/version.rb

@@ -1,8 +1,11 @@
+# 0.3.8
+#   fix N+1 API request to N
+#
 # 0.3.7
 #   add page_size in search_all
 #
 # 0.3.6
 #   add fields
 module Fofa
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fofa
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - fofa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler