filecluster 0.3.10 → 0.3.11

data/bin/fc-manage

@@ -64,6 +64,15 @@ Command:
    list                show all FC::Var-s
    show <variable>     show current value for variable   
    change <variable>   change variable       
+}],
+  'item' => [
+    'show and manage items', 
+    %q{Usage: fc-manage [options] item <command>
+Command:
+   info <name>                                       show item info, name can contain ? and * 
+   add_local <storage name> <path> <policy id/name>  add file in local storage as item (as <path> name) with policy 
+   add <path> <name> <policy id/name>                add file as item <name> with policy
+   rm <name>                                         delete item
 }]
 }
 desc = %q{Get info and manage for storages, policies and items.

data/lib/daemon/global_daemon_thread.rb

@@ -60,9 +60,6 @@ class GlobalDaemonThread < BaseThread
             storage = src_storage.get_proper_storage_for_copy(row['size'], item_storages) unless storage
           end
           if storage
-            puts row
-            puts src_storage.name+'>'
-            puts storage.name
             FC::Item.new(:id => row['item_id']).make_item_storage(storage, 'copy')
           else
             error 'No available storage', :item_id => row['item_id']

data/lib/fc/item.rb

@@ -24,7 +24,7 @@ module FC
       raise 'Name is empty' if item_params[:name].empty?
       raise 'Zero size path' if item_params[:size] == 0
 
-      if local_path.include?(item_name)
+      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, '') == item_params[:name]
         end

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

data/lib/manage/item.rb

@@ -0,0 +1,96 @@
+def item_info
+  name = ARGV[2] || ''
+  name = name.gsub('_', '\\_').gsub('%', '\\%').gsub('?', '_').gsub('*', '%')
+  count = FC::DB.query("SELECT count(*) as cnt FROM #{FC::Item.table_name} WHERE name like '#{name}'").first['cnt']
+  puts "Find #{count} items:"
+  if (count > 1)
+    items = FC::DB.query("SELECT name FROM #{FC::Item.table_name} WHERE name like '#{name}' ORDER BY id DESC LIMIT 100")
+    items.each{|r| puts r["name"]}
+    puts "Last item:"
+  end
+  item = FC::DB.query("SELECT i.id, i.name, tag, outer_id, p.name as policy, size, status, time, i.copies FROM #{FC::Item.table_name} as i, #{FC::Policy.table_name} as p WHERE i.name like '#{name}' AND p.id=policy_id ORDER BY i.id DESC LIMIT 1").first
+  if item
+    item_storages = FC::DB.query("SELECT storage_name, status, time FROM #{FC::ItemStorage.table_name} WHERE item_id=#{item["id"]}")
+    puts %Q{
+    ID:               #{item["id"]}
+    Outer id:         #{item["outer_id"]}
+    Name:             #{item["name"]}
+    Status:           #{item["status"]}
+    Tag:              #{item["tag"]}
+    Policy:           #{item["policy"]}
+    Size:             #{size_to_human(item["size"])}
+    Time:             #{Time.at(item["time"])}
+    Copies:           #{item["copies"]}}
+    if item_storages.size > 0
+      puts "Item on storages:"
+      item_storages.each do |r|
+        s = "    #{r["storage_name"]}:"
+        s << " "*[(22-s.length), 1].max
+        s << case r["status"]
+          when "ready" then colorize_string("ready", :green)
+          when "error" then colorize_string("ready", :red)
+          else r["status"]
+        end
+        s << " - #{Time.at(r["time"])}"
+        puts s
+      end
+    end
+  end
+end
+
+def item_add
+  path = ARGV[2] || ''
+  name = ARGV[3] || ''
+  policy = FC::Policy.where('id = ?', ARGV[4]).first
+  policy = FC::Policy.where('name = ?', ARGV[4]).first unless policy
+  puts "Policy #{ARGV[4]} not found." unless policy
+  
+  if policy
+    begin
+      item = FC::Item.create_from_local(path, name, policy, :tag => 'fc-manage-add', :replace => true, :not_local => true)
+      item_storage = item.get_item_storages.first
+      storage = FC::Storage.where('name = ?', item_storage.storage_name).first
+      puts "Saved as #{storage.name+':'+storage.path+item.name}"
+    rescue Exception => e
+      puts e.message
+    end
+  end
+end
+
+def item_add_local
+  storage = FC::Storage.where('name = ?', ARGV[2]).first
+  puts "Storage #{ARGV[2]} not found." unless storage
+  name = ARGV[3] || ''
+  policy = FC::Policy.where('id = ?', ARGV[4]).first
+  policy = FC::Policy.where('name = ?', ARGV[4]).first unless policy
+  puts "Policy #{ARGV[4]} not found." unless policy
+  
+  if policy && storage
+    path = (storage.path+name).gsub('//', '/') unless name.index(storage.path) == 0
+    begin
+      item = FC::Item.create_from_local(path, name, policy, :tag => 'fc-manage-add-local', :replace => true)
+      item_storage = item.get_item_storages.first
+      storage = FC::Storage.where('name = ?', item_storage.storage_name).first
+      puts "Saved as #{storage.name+':'+storage.path+item.name}"
+    rescue Exception => e
+      puts e.message
+    end
+  end
+end
+
+def item_rm
+  name = ARGV[2] || ''
+  item = FC::Item.where('name = ?', name).first
+  if !item
+    puts "Item #{name} not found."
+  else
+    s = Readline.readline("Delete? (y/n) ", false).strip.downcase
+    puts ""
+    if s == "y" || s == "yes"
+      item.mark_deleted
+      puts "ok"
+    else
+      puts "Canceled."
+    end
+  end
+end

data/lib/manage.rb

@@ -4,3 +4,4 @@ require "manage/storages"
 require "manage/show"
 require "manage/copy_rules"
 require "manage/var"
+require "manage/item"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -148,6 +148,7 @@ files:
 - lib/filecluster.rb
 - lib/manage.rb
 - lib/manage/copy_rules.rb
+- lib/manage/item.rb
 - lib/manage/policies.rb
 - lib/manage/show.rb
 - lib/manage/storages.rb
@@ -180,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3207562445207537797
+      hash: -2994617914936702479
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3207562445207537797
+      hash: -2994617914936702479
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24