diskid 0.2.1 → 0.2.2

data/bin/diskid

@@ -7,6 +7,7 @@ require 'diskid'
 
 class DiskIDCommand < Clamp::Command
   parameter 'FILE', "Disk file", :attribute_name => 'file'
+  option '--local', :flag, "Try to identify the disk using a local qemu-img binary"
   option '--server-port', "PORT", "DiskID service port", :default => '80'
   option '--server-host', "HOST", "DiskID service host", :default => 'diskid.frameos.org'
   option '--format', "FORMAT", "Disk info output format (text, json, xml)", :default => 'text'
@@ -21,33 +22,41 @@ class DiskIDCommand < Clamp::Command
       puts "Supported formats: vvfat vpc vmdk vdi sheepdog raw host_cdrom host_floppy host_device file qed qcow2 qcow parallels nbd dmg tftp ftps ftp https http cow cloop bochs blkverify blkdebug"
       exit 1
     end
+    
+    # Use local qemu-img to identify the disk
+    if local?
+      di = DiskID::Inspector.new(file, 'qemu-img').identify
+      begin 
+        puts di.send "to_#{format}"
+      rescue NoMethodError
+        $stderr.puts "Invalid format."
+      end
+    else
+      begin
+        RestClient.get "http://#{server_host}:#{server_port}/service-check"
+      rescue => e
+        $stderr.puts "Couldn't reach http://#{server_host}."
+        exit 1
+      end
 
-    puts "\n#{server_host}\n\n"
+      fsize = File.size(file).bytes.to.megabytes.to_f.round
+      unit = 'M'
+      if fsize > 1024
+        fsize = fsize.megabytes.to.gigabytes.to_f.round
+        unit = 'G'
+      end
 
-    begin
-      RestClient.get "http://#{server_host}:#{server_port}/service-check"
-    rescue => e
-      $stderr.puts "Couldn't reach http://#{server_host}."
-      exit 1
-    end
+      fsize = "#{fsize}#{unit}"
 
-    fsize = File.size(file).bytes.to.megabytes.to_f.round
-    unit = 'M'
-    if fsize > 1024
-      fsize = fsize.megabytes.to.gigabytes.to_f.round
-      unit = 'G'
+      #out = `head -n 20 #{file}|curl -s -X POST -F client_version=#{DiskID::VERSION} -F chunk=@- -F file_size=#{fsize} -F file_name=#{File.basename(file)} http://#{server_host}:#{server_port}/?format=#{format} 2>&1`
+      out = RestClient.post "http://#{server_host}:#{server_port}/",
+                      :chunk => File.read(file, 20000),
+                      :client_version => DiskID::VERSION,
+                      :file_size => fsize,
+                      :file_name => File.basename(file),
+                      :format => format
+      puts out
     end
-
-    fsize = "#{fsize}#{unit}"
-
-    #out = `head -n 20 #{file}|curl -s -X POST -F client_version=#{DiskID::VERSION} -F chunk=@- -F file_size=#{fsize} -F file_name=#{File.basename(file)} http://#{server_host}:#{server_port}/?format=#{format} 2>&1`
-    out = RestClient.post "http://#{server_host}:#{server_port}/",
-                    :chunk => File.read(file, 20000),
-                    :client_version => DiskID::VERSION,
-                    :file_size => fsize,
-                    :file_name => File.basename(file),
-                    :format => format
-    puts out
   end
 end
 

data/bin/diskid-ws

@@ -49,7 +49,7 @@ class DiskIDWS < Sinatra::Base
     file_size = params[:file_size] || ''
     begin
       inspector = DiskID::Inspector.new(tmpfile.path)
-      di = inspector.inspect
+      di = inspector.identify
       di.file_name = file_name
       di.disk_size = file_size
       if params[:format] == 'json'

data/lib/diskid.rb

@@ -2,11 +2,12 @@ module DiskID
 
   require 'json'
 
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 
   class DiskInfo
 
     attr_accessor :file_name, :format, :virtual_size, :disk_size
+    attr_accessor :variant
 
     def initialize(params)
       @hash = params
@@ -14,6 +15,7 @@ module DiskID
       @format = @hash['format']
       @virtual_size = @hash['virtual_size']
       @disk_size = @hash['disk_size']
+      @variant = @hash['variant']
     end
 
     def to_json
@@ -25,19 +27,31 @@ module DiskID
       buf << "<disk_info>"
       buf << "<file_name>#{@file_name}</file_name>"
       buf << "<format>#{@format}</format>"
+      buf << "<variant>#{@variant}</variant>" if not @variant.empty?
       buf << "<virtual_size>#{@virtual_size}</virtual_size>"
       buf << "<disk_size>#{@disk_size}</disk_size>"
       buf << "</disk_info>"
       buf
     end
 
+    def to_text
+      t = ""
+      t << "file_name: #{@file_name}\n"
+      t << "format: #{@format}\n"
+      t << "variant: #{@variant}\n" if not @variant.empty?
+      t << "virtual_size: #{@virtual_size}\n"
+      t << "disk_size: #{@disk_size}\n"
+    end
+
     def to_hash
-      {
+      h = {
         'file_name' =>  @file_name,
         'format' => @format,
         'virtual_size' => @virtual_size,
         'disk_size' => @disk_size
       }
+      h['variant'] = @variant if not @variant.empty?
+      h
     end
 
   end
@@ -46,25 +60,43 @@ module DiskID
 
 
     def initialize(file, qemu_img_bin='qemu-img-bleeding')
-      @qemu_img_bin = qemu_img_bin
+      @qemu_img_bin = (qemu_img_bin || '').strip.chomp
+      if not @qemu_img_bin =~ /^\//
+        @qemu_img_bin = `sh -c 'command -v #{@qemu_img_bin}'`.strip.chomp
+      end
+      raise ArgumentError.new("qemu-img command not found: #{@qemu_img_bin}") if @qemu_img_bin.empty?
+
       @file = file
     end
 
-    def inspect
+    def identify 
       out = `#{@qemu_img_bin} info #{@file}`
       raise Exception.new("Error getting info from #{@file}") if $? != 0
 
       md = /image:(.*)$\nfile format:(.*)$\nvirtual size:(.*)$\ndisk size:(.*)\n/.match out
       @file_name,@format,@virtual_size,@disk_size = [md[1], md[2], md[3], md[4]].map { |e| e.strip.chomp }
       @virtual_size = @virtual_size.split()[0]
+      variant = ''
+      if @format == 'vmdk'
+        variant = read_variant @file
+      end
       DiskInfo.new({
         'file_name' =>  @file_name,
         'format' => @format,
         'virtual_size' => @virtual_size,
-        'disk_size' => @disk_size
+        'disk_size' => @disk_size,
+        'variant' => variant
       })
     end
 
+    private
+    def read_variant(file)
+      IO.read(file, 20000).each_line do |l|
+        return $1 if l =~ /createType="(.*?)"/
+      end
+      ''
+    end
 
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diskid
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &9209720 !ruby/object:Gem::Requirement
+  requirement: &24178460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9209720
+  version_requirements: *24178460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9209020 !ruby/object:Gem::Requirement
+  requirement: &24177980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *9209020
+  version_requirements: *24177980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9208280 !ruby/object:Gem::Requirement
+  requirement: &24177440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *9208280
+  version_requirements: *24177440
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &9207580 !ruby/object:Gem::Requirement
+  requirement: &24176940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9207580
+  version_requirements: *24176940
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &9206800 !ruby/object:Gem::Requirement
+  requirement: &24176380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9206800
+  version_requirements: *24176380
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &9206260 !ruby/object:Gem::Requirement
+  requirement: &23667400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9206260
+  version_requirements: *23667400
 - !ruby/object:Gem::Dependency
   name: alchemist
-  requirement: &9205780 !ruby/object:Gem::Requirement
+  requirement: &23666820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9205780
+  version_requirements: *23666820
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &9205280 !ruby/object:Gem::Requirement
+  requirement: &23666320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9205280
+  version_requirements: *23666320
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9204800 !ruby/object:Gem::Requirement
+  requirement: &23665840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9204800
+  version_requirements: *23665840
 description: Virtual Disk Identification Service
 email: rubiojr@frameos.org
 executables: