uricp 0.0.3 → 0.0.4

data/lib/uricp.rb

@@ -2,7 +2,6 @@ require 'uricp/version'
 require 'uricp/curl_primitives'
 require 'uricp/strategy/common'
 require 'uricp/strategy/cache_common'
-require 'uricp/strategy/local_convert_common'
 require 'uricp/strategy/local_convert'
 require 'uricp/strategy/local_link'
 require 'uricp/strategy/piped_cache'
@@ -25,6 +24,7 @@ module Uricp
 
   UnsupportedURLtype = Class.new(ArgumentError)
   MissingCache = Class.new(ArgumentError)
+  UnsupportedConversion = Class.new(ArgumentError)
 
 end
 

data/lib/uricp/strategy/local_convert.rb

@@ -2,11 +2,16 @@ module Uricp::Strategy
   
   class LocalConvert
 
-    include Uricp::Strategy::LocalConvertCommon
+    include Uricp::Strategy::Common
 
     def appropriate?
       if conversion_required? && file_source? && supported_source?
-	return proposal
+	if new_qemu? || supported_conversion?
+	  return proposal
+	else
+	  raise Uricp::UnsupportedConversion,
+	    "qemu-img does not support required conversion"
+	end
       end
       debug "#{self.class.name}: not appropriate"
       false
@@ -30,6 +35,37 @@ module Uricp::Strategy
       self
     end
 
+    def new_qemu?
+      @new_qemu ||= !!(`qemu-img convert -O qcow2 -o ? a b` =~ /^compat/m)
+    end
+
+    def supported_conversion?
+      ([:qcow3, :qcow2v3] & [options['source-format'], options['target-format']]).empty?
+    end
+
+    def qemu_img_command(target)
+      "qemu-img convert #{conversion_options} #{from.path} #{target};"
+    end
+
+    def conversion_options
+      case options['target-format']
+      when :raw
+        '-O raw'
+      when :qcow2
+        "#{compress_option} -O qcow2 #{compat_option}"
+      when :qcow3, :qcow2v3
+        "#{compress_option} -O qcow2 -o compat=1.1"
+      end
+    end
+
+    def compat_option
+      "-o compat=0.10" if new_qemu?
+    end
+
+    def compress_option
+      options['compress'] && '-c'
+    end
+
   end
 
 end

data/lib/uricp/version.rb

@@ -1,4 +1,4 @@
 module Uricp
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
   DEFAULT_SEGMENT_SIZE = "5 GiB"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -224,7 +224,6 @@ files:
 - lib/uricp/strategy/cleaner.rb
 - lib/uricp/strategy/common.rb
 - lib/uricp/strategy/local_convert.rb
-- lib/uricp/strategy/local_convert_common.rb
 - lib/uricp/strategy/local_link.rb
 - lib/uricp/strategy/piped_cache.rb
 - lib/uricp/strategy/piped_cache_convert.rb

data/lib/uricp/strategy/local_convert_common.rb

@@ -1,29 +0,0 @@
-module Uricp::Strategy
-  
-  module LocalConvertCommon
-
-    include Uricp::Strategy::Common
-
-    def qemu_img_command(target)
-      "qemu-img convert #{conversion_options} #{from.path} #{target};"
-    end
-      
-    def conversion_options
-      case options['target-format']
-      when :raw
-        '-O raw'
-      when :qcow2
-        "#{compress_option} -O qcow2 -o compat=0.10"
-      when :qcow3, :qcow2v3
-        "#{compress_option} -O qcow2 -o compat=1.1"
-      end
-    end
-
-    def compress_option
-      options['compress'] && '-c'
-    end
-
-  end
-
-end
-