cleaned code

This commit is contained in:
danijoo
2016-02-13 03:25:07 +01:00
parent faac0575e4
commit 93a22fd37b

View File

@@ -1,7 +1,6 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
require 'ADB' require 'ADB'
require 'ipaddr' require 'ipaddr'
require 'thread'
ip_range = IPAddr.new(ARGV[0]).to_range.to_a ip_range = IPAddr.new(ARGV[0]).to_range.to_a
abort "Please pass an ip range as first arg" unless ip_range abort "Please pass an ip range as first arg" unless ip_range
@@ -29,22 +28,18 @@ puts "Scan started..."
queue = Queue.new queue = Queue.new
ip_range.each { |ip| queue << ip} ip_range.each { |ip| queue << ip}
threads = Array.new
# (queue.size / 10).times do begin
# threads << Thread.new do ip = queue.pop(true)
begin print "#{ip}\r"
ip = queue.pop(true) adb.connect(ip.to_s, port, timeout)
print "#{ip}\r" puts "Device found! #{ip}"
adb.connect(ip.to_s, port, timeout) rescue ThreadError
puts "Device found! #{ip}" nil
rescue ThreadError rescue
nil retry
rescue end
retry
end
# end
# end
puts "\nScan complete" puts "\nScan complete"
puts "Connected devices: #{adb.devices}" puts "Connected devices: #{adb.devices}"