niky81-s3rbackup 0.2.0 → 0.2.1

data/README

@@ -8,6 +8,9 @@ Local database with metadata of every file, database can be also automatically
 saved to S3.
 Query to database for file searching.
 
+- Install
+sudo gem install niky81-s3rbackup -s http://gems.github.com
+
 - Configure
 You need a file called ~/.s3rbackup/config.yml in your home directory with:
 
@@ -40,8 +43,10 @@ To query your database and get backup files it's based on command:
 
 To search a word on database:
 	s3query.rb search test
-To search a only by name on database:
+To search file only by name on database:
 	s3query.rb search name=test
+To search only file bigger than 1Mb on database:
+	s3query.rb search size>1000000
 to get all file that match name=test:
 	s3query.rb get name=test
 to get and extract all file that match name=test

data/s3dbsync.rb

@@ -122,8 +122,14 @@ class S3SyncDb
 		crea_bucket()
 		name = dirs[0] if !name
 		tf = Tempfile.new("s3rbackup")
-		tar = `tar -c #{dirs.join(" ")} | bzip2 -9 > #{tf.path}`
-		
+		tf_l = Tempfile.new("s3rbackup-listfile")
+		tar = `tar -cv #{dirs.join(" ")}  2>#{tf_l.path} | bzip2 -9 > #{tf.path}`
+
+		filez = []
+		File.open(tf_l.path, 'r').each_line do |fh|
+    	filez << fh
+		end
+
 		doc = {}
 		doc["name"] = name
 		doc["bucket"] = @config["bucket"]
@@ -135,21 +141,32 @@ class S3SyncDb
 		doc["size"] = File.size(tf.path)
 		doc["compression"] = "bz2"
 		doc["archive"] = "tar"
+		doc["files"] = filez.join("")
 		@db << doc
 		aws_name = "#{doc["name"]}_#{`date +%Y%m%d_%H.%M.%S`}_#{@db.find_index(doc)}".gsub("\n","")
 		doc["aws_name"] = aws_name
 		#FIXME Controllare che in db venga salvato aws_name
 
-		store = S3Object.store(aws_name, open(tf.path), @config["bucket"])
+  # Store it!
+		options = {}
+		#options[:access] = :public_read if @public
+		options["x-amz-meta-host"] = doc["host"]
+		options["x-amz-meta-user"] = doc["user"]
+		options["x-amz-meta-descrizione"] = doc["description"]
+		options["x-amz-meta-current_path"] = doc["current_path"]
+		options["x-amz-meta-size"] = doc["size"]
+		options["x-amz-meta-compression"] = doc["compression"]
+		options["x-amz-meta-archive"] = doc["archive"]
+		#options["x-amz-meta-files"] = doc["files"]
+
+
+	#       options["x-amz-meta-sha1_hash"] = `sha1sum #{file}`.split[0] if @save_hash
+	#         options["x-amz-meta-mtime"] = fstat.mtime.getutc.to_i if @save_time
+	#           options["x-amz-meta-size"] = fstat.size if @save_size
+
+		store = S3Object.store(aws_name, open(tf.path), @config["bucket"], options)
 		obj = S3Object.find(aws_name, @config["bucket"])
-		obj.metadata[:host] = doc["host"]
-		obj.metadata[:user] = doc["user"]
-		obj.metadata[:descrizione] = doc["description"]
-		obj.metadata[:current_path] = doc["current_path"]
-		obj.metadata[:size] = doc["size"]
-		obj.metadata[:compression] = doc["compression"]
-		obj.metadata[:archive] = doc["archive"]
-		obj.store
+		#obj.store
 		obj.about.each do |key,val|
 			doc[key] = val
 		end
@@ -161,18 +178,56 @@ class S3SyncDb
 		option = {}
 		words_search = []
 		words.each do |word|
-			if word =~ /.*=.*/
-				#opzione
-				option[word.split("=")[0]] = word.split("=")[1]
-			else
-				words_search << word
+			case word 
+				when /.*=.*/
+					#opzione
+					option["="] ||= {}
+					option["="][word.split("=")[0]] = word.split("=")[1]
+				when /.*>.*/
+					#opzione
+					option[">"] ||= {}
+					option[">"][word.split(">")[0]] = word.split(">")[1]
+				when /.*<.*/
+					#opzione
+					option["<"] ||= {}
+					option["<"][word.split("<")[0]] = word.split("<")[1]
+				else
+					words_search << word
 			end
 		end
 		results = []
 		@db.each do |item|
-			option.each do |key,val|
-				if item[key] =~ /#{val}/
-					results << item
+			option.each do |key,opts|
+				opts.each do |campo,val|
+					case key
+						when "="
+							case item[campo].class.to_s
+								when "Time"
+									results << item if item[campo] = Time.parse(val) 
+								when "Fixnum"
+									results << item if item[campo] = val.to_i
+								else
+									results << item if item[campo] =~ /.*#{val}.*/
+							end
+						when "<"
+							case item[campo].class.to_s
+								when "Time"
+									results << item if item[campo] < Time.parse(val) 
+								when "Fixnum"
+									results << item if item[campo] < val.to_i
+								else
+									results << item if item[campo] < val
+							end
+						when ">"
+							case item[campo].class.to_s
+								when "Time"
+									results << item if item[campo] > Time.parse(val) 
+								when "Fixnum"
+									results << item if item[campo] > val.to_i
+								else
+									results << item if item[campo] > val
+							end
+					end
 				end
 			end
 			words_search.each do |word|

data/s3query.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/ruby
+
 require 'rubygems'
 require 'optparse'
 
@@ -60,6 +62,10 @@ class OptS3rquery
 				options[:first] = true
 			end
 
+			opts.on("--detail", "Detailed output (stats)") do |name|
+				options[:detail] = true
+			end
+	
 			opts.on("--size", "Get size") do |name|
 				options[:first] = true
 			end
@@ -150,12 +156,18 @@ case command
 	when 'stats'
 		#get size
 		bucks_s = {}
-		results.each do |ret|
-			bucks_s[ret["bucket"]] ||= 0
-			bucks_s[ret["bucket"]] += ret["size"]
-		end
-		bucks_s.each do |key,val|
-			puts "#{key}:\t#{sprintf("%.2fMb", val / (1024.0 * 1024.0))}"
+		if options[:detail]
+			results.each do |ret|
+				puts "#{ret["name"]}\t#{sprintf("%.2fMb", ret["size"].to_i / (1024.0 * 1024.0))}"
+			end
+		else
+			results.each do |ret|
+				bucks_s[ret["bucket"]] ||= 0
+				bucks_s[ret["bucket"]] += ret["size"]
+			end
+			bucks_s.each do |key,val|
+				puts "#{key}:\t#{sprintf("%.2fMb", val / (1024.0 * 1024.0))}"
+			end
 		end
 	when 'logs'
 		case sub_cmd

data/s3rbackup.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/ruby
+
 require 'rubygems'
 require 'optparse'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: niky81-s3rbackup
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Nicola Sacchi