filecluster 0.5.27 → 0.5.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 188408c3ea713d2fcf6477c68833adc0225b54f02f97b52c77af9502e3a7a61c
-  data.tar.gz: 6ad9c93d932d360284d7d42da40d35e736b277991767354b9fcf132cf83ef98c
+  metadata.gz: 9de6ac005874dd4c6bcb167cc9c71b6417f384c4116668ebcda03f6741f3a2ce
+  data.tar.gz: ec2aff79aff42a1b27d68168d2260e8720b676542bf2563ffcbc03a6880c7d37
 SHA512:
-  metadata.gz: 2b61bf7130e74cf5c94531f12269b873639ba2e1c440340249e06c4fd446cf4abb38e1eba69cc89794890a01fcbc5342dccae29ec1cfb20387adb10effca79d9
-  data.tar.gz: 27f24880144776bf678fab2e0c572897c1f0a7dcfce22396adb76490f16f9f936ef1ca1feef761bb01268ccfb1a4e3a9e24cf384394baee8db2e6a9f938e7440
+  metadata.gz: bf0c2a5c574e188f9af197b0acf9d328cf49eee1b89708b52f96b63cd3b60c974c2d9f832790619648cf3e67ec8904072965623b2afad01149668e9f13b9d4da
+  data.tar.gz: 96e31037d021574d7e6c033dea7a7c5fe685c8166b72ed257d41d8b115c23d0fe3d8892a94ed43bd8cdca31ce6fc1d222242aff297c55c762cfe56c51f9bd649

data/lib/fc/item.rb

@@ -13,6 +13,7 @@ module FC
     #   :additional_fields - hash of additional FC:Item fields 
     #   :no_md5 - don't use md5
     #   :speed_limit - limit copy speed
+    #   :force_local_storage_name
     # If item_name is part of local_path it processed as inplace - local_path is valid path to the item for policy
     def self.create_from_local(local_path, item_name, policy, options={}, &block)
       raise 'Path not exists' unless File.exists?(local_path)
@@ -32,14 +33,25 @@ module FC
       item_params.delete(:not_local)
       item_params.delete(:no_md5)
       item_params.delete(:speed_limit)
+      item_params.delete(:force_local_storage_name)
       raise 'Name is empty' if item_params[:name].empty?
       raise 'Zero size path' if item_params[:size] == 0
 
       if local_path.include?(item_name) && !options[:not_local]
-        storage = policy.get_create_storages.detect do |s|
-          s.host == FC::Storage.curr_host && local_path.index(s.path) == 0 && local_path.sub(s.path, '').sub(/\/$/, '').sub(/^\//, '') == item_params[:name]
+        if options[:force_local_storage_name]
+          storage = policy.get_create_storages.detect do |s|
+            s.name == options[:force_local_storage_name]
+          end
+          FC::Error.raise "force_local_storage #{storage.name} is not valid path for policy ##{policy.id}" unless storage
+          if local_path.index(storage.path) != 0 || local_path.sub(storage.path, '').sub(/\/$/, '').sub(/^\//, '') != item_params[:name]
+            FC::Error.raise "force_local_storage #{storage.name} is not valid path for local path ##{local_path}"
+          end
+        else
+          storage = policy.get_create_storages.detect do |s|
+            s.host == FC::Storage.curr_host && local_path.index(s.path) == 0 && local_path.sub(s.path, '').sub(/\/$/, '').sub(/^\//, '') == item_params[:name]
+          end
+          FC::Error.raise "local_path #{local_path} is not valid path for policy ##{policy.id}" unless storage
         end
-        FC::Error.raise "local_path #{local_path} is not valid path for policy ##{policy.id}" unless storage
       end
 
       # new item?

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = '0.5.27'.freeze
+  VERSION = '0.5.28'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.5.27
+  version: 0.5.28
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2