dircat 0.1.12 → 0.2.0

data/lib/dircat/cat_on_sqlite_cli/cmd_server.rb

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+module SimpleCataloger
+
+  class CmdServer < OptParseCommand::Command
+
+    CliCat.register_command(self)
+
+    def self.command
+      "server"
+    end
+
+    def self.description
+      "start server"
+    end
+
+    def self.usage
+      "#{command} <catalog name> <directory>"
+      "Create a catalog with name <catalog name> starting from structure of <directory>"
+    end
+
+    def defaults(options)
+      options.force = false
+      options
+    end
+
+    def option_parser(options)
+      parser = super(options)
+      parser
+    end
+
+    def exec(main, options, rest)
+      if rest.length < 1
+        puts "too few arguments"
+        puts "-h to print help"
+        return 0
+      end
+
+      catalog_name = rest[0]
+      cat_opts     = { }
+
+      #
+      # option verbose
+      #
+
+#    if options.has_key?(:verbose)
+#      if options[:verbose]
+#        cat_opts[:verbose_level] = 1
+#      end
+#    end
+
+      #
+      # main
+      #
+
+      catalog = SimpleCataloger::CatOnSqlite.new(catalog_name).open
+      SimpleCataloger::WebServer.run! :host => 'localhost', :port => 9091, :catalog => catalog
+
+      0
+    end
+
+  end
+end

data/lib/dircat/cat_on_sqlite_cli/cmd_update.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+include SimpleCataloger
+
+module SimpleCataloger
+  class CmdUpdate < OptParseCommand::Command
+
+    CliCat.register_command(self)
+
+    def self.command
+      "update"
+    end
+
+    def self.description
+      "update the content of catalog"
+    end
+
+    def self.usage
+      "#{command} <catalog name> <directory>"
+      "Create a catalog with name <catalog name> starting from structure of <directory>"
+    end
+
+    def defaults(options)
+      options.force = false
+      options
+    end
+
+    def option_parser(options)
+      parser = super(options)
+      parser
+    end
+
+    def exec(main, options, rest)
+      if rest.length < 1
+        puts "too few arguments"
+        puts "-h to print help"
+        return 0
+      end
+
+      catalog_name = rest[0]
+
+      catalog = CatOnSqlite.new(catalog_name)
+      catalog.update
+
+      0
+    end
+
+  end
+end

data/lib/dircat/{cat.rb → cat_on_yaml/cat_on_yaml.rb}

@@ -4,7 +4,7 @@ module DirCat
   #
   # Catalog of files (contained into directory :-))
   #
-  class Cat
+  class CatOnYaml
 
     #
     # Directory name
@@ -20,11 +20,13 @@ module DirCat
     # verbose level used to print message on $stdout
     #
     attr_reader :verbose_level
+    attr_reader :show_progress
 
     # @param [Hash] options
     #   @option options [Number] :verbose list of ignore pattern
     def initialize(options = {})
       @verbose_level = options.delete(:verbose) || 0
+      @show_progress = options.delete(:show_progress)
       @dirname = ""
       @ctime = DateTime.now
       @entries = Array.new
@@ -55,7 +57,7 @@ module DirCat
 
     # Build a catalog from a directory
     def from_dir(dirname)
-      if not File.directory?(dirname)
+      unless File.directory?(dirname)
         raise "'#{dirname}' is not a directory or doesn't exists"
       end
       @dirname = File.expand_path dirname
@@ -66,14 +68,14 @@ module DirCat
 
     # Load catalog from a file
     def from_file(filename)
-      if not File.exist?(filename)
+      unless File.exist?(filename)
         raise DirCatException.new, "'#{filename}' not exists"
       end
       dircat_ser = File.open(filename) { |f| YAML::load(f) }
       @dirname = dircat_ser.dirname
       @ctime = dircat_ser.ctime
       dircat_ser.entries.each do |entry_ser|
-        add_entry(Entry.new.from_ser(entry_ser))
+        add_entry(Entry.from_ser(entry_ser))
       end
       self
     end
@@ -92,7 +94,7 @@ module DirCat
     # @return [DirCatSer] serialized catalog
     def to_ser
       dircat_ser = DirCatSer.new
-      dircat_ser.version = 0.1
+      dircat_ser.dircat_version = DirCat::VERSION
       dircat_ser.dirname = @dirname
       dircat_ser.ctime = @ctime
       dircat_ser.entries = []
@@ -109,14 +111,24 @@ module DirCat
     # @private
     #
     def _load_from_dir
+      start = Time.now
       me = self
-      TreeVisitor::DirTreeWalker.new.run @dirname do
+      bytes = 0
+      TreeRb::DirTreeWalker.new.run @dirname do
+
         on_leaf do |filename|
-          me.add_entry(Entry.new.from_filename(filename))
+          entry = Entry.from_filename(filename)
+          me.add_entry(entry)
+          bytes += entry.size
           if me.verbose_level > 0
             print "#{CR}#{filename}#{CLEAR}"
           end
+          if me.show_progress
+            sec = Time.now - start
+            print "#{CR}bytes: #{bytes.to_human} time: #{sec} bytes/sec #{bytes/sec} #{CLEAR}"
+          end
         end
+
       end
       self
     end
@@ -192,9 +204,9 @@ module DirCat
     #
     # return differences from this catalog and right catalog
     # param [Cat] right
-    # @return [Cat]
+    # @return [CatOnYaml]
     def -(right)
-      result = Cat.new
+      result = CatOnYaml.new
       @entries.each do |e|
         result.add_entry(e) unless right.contains(e)
       end
@@ -214,7 +226,7 @@ module DirCat
     # print a complex report on stdout
     #
     def fmt_report(*columns)
-      columns = [:md5, :name, :path, :size] unless columns
+      columns = [:md5, :name, :path, :size] if columns.empty?
       OptParseCommand::report(@entries, *columns)
     end
 

data/lib/dircat/cat_on_yaml/entry.rb

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+module DirCat
+
+  class EntrySer < OpenStruct
+  end
+
+  class DirCatSer < OpenStruct
+  end
+
+  class DirCatException < RuntimeError
+  end
+
+  #
+  # Entry
+  #
+  class Entry
+
+    # TODO: must be attr_reader
+    attr_accessor :md5
+    attr_accessor :name
+    attr_accessor :path
+    attr_accessor :size
+    attr_accessor :mtime
+
+    def self.from_filename( filename )
+      entry = new
+      entry.name = File.basename(filename)
+      entry.path = File.dirname(filename)
+      stat = File.lstat(filename)
+      entry.size = stat.size
+      entry.mtime = stat.mtime
+      # self.md5 = Digest::MD5.hexdigest(File.read( f ))
+      entry.md5 = MD5.file( filename ).hexdigest unless stat.symlink?
+      entry
+    end
+
+    def self.from_ser( entry_ser )
+      entry = new
+      entry.md5   = entry_ser.md5
+      entry.name  = entry_ser.name
+      entry.path  = entry_ser.path
+      entry.size  = entry_ser.size
+      entry.mtime = entry_ser.mtime
+      entry
+    end
+
+    def to_ser
+      entry_ser = EntrySer.new
+      entry_ser.md5   = @md5
+      entry_ser.name  = @name
+      entry_ser.path  = @path
+      entry_ser.size  = @size
+      entry_ser.mtime = @mtime
+      entry_ser
+    end
+
+    def to_s
+      @md5 + "  " + @name + "\t " + @path + "\n"
+    end
+
+  end
+
+
+end

data/lib/dircat/{cli → cat_on_yaml_cli}/command_build.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 module DirCat
-#
-# Build a catalogue starting from a directory
-#
+  #
+  # Build a catalogue starting from a directory
+  #
   class CommandBuild < OptParseCommand::Command
 
     CliDirCat.register_command(self)
@@ -38,33 +38,66 @@ module DirCat
         options.output = v
       end
 
+      # TODO: progress is true for default
+      options.show_progress = true
+      parser.on("-p", "--show-progress", "show progress during catalog building") do
+        options.show_progress = true
+      end
+
+      parser.on("--find", "try to find a catalog from this directory to path") do
+        options.find = true
+      end
+
       parser
     end
 
     def exec(main, options, rest)
+
       if rest.length < 1
         $stderr.puts "directory (from which build catalog) is missing"
         $stderr.puts "-h to print help"
         return false
       end
 
-      dirname  = rest[0]
-      dirname  = File.expand_path(dirname)
-      cat_opts = {}
+      dirname = rest[0]
+      dirname = File.expand_path(dirname)
 
-      if not FileTest.directory?(dirname)
+      #
+      # experimental find
+      #
+      if options.find
+        f = File.join(dirname, ".dircat.yml")
+        until File.exist?(f) or dirname == "/"
+          dirname = File.split(dirname)[0]
+        end
+        if File.exist?(f)
+          puts "file exists!!"
+        else
+          puts "don't exists"
+        end
+        exit
+      end
+      #
+      # end experimental find
+      #
+
+      unless FileTest.directory?(dirname)
         $stderr.puts "'#{dirname}' not exists or is not a directory"
         return 0
       end
 
+      cat_opts = { }
+
       #
-      # option verbose
+      # option verbose, progress
       #
-
+      cat_opts[:verbose_level] = 0
       if options.verbose
         cat_opts[:verbose_level] = 1
       end
 
+      cat_opts[:show_progress] = options.show_progress
+
       #
       # option: output, force
       #
@@ -79,16 +112,24 @@ module DirCat
         return 0
       end
 
+      #
+      # go!
+      #
+
+      Signal.trap('INT') { puts "intercepted ctr+c"; exit }
+
+      $stderr.puts "Writing file '#{filename}'"
+
       output     = File.open(filename, "w")
       start_time = Time.now
-      s          = Cat.from_dir(dirname)
+      cat        = CatOnYaml.from_dir(dirname, cat_opts)
       end_time   = Time.now
-      s.save_to(output)
+      cat.save_to(output)
 
       if output != $stdout
         output.close
       end
-      $stderr.puts s.report
+      $stderr.puts cat.report
       $stderr.puts "elapsed: #{end_time - start_time}"
       $stderr.puts "written to #{filename}" if output != $stdout
 

data/lib/dircat/{cli → cat_on_yaml_cli}/command_diff.rb

@@ -43,10 +43,10 @@ and then print the difference with the format specified on output
       #
       if File.directory?(cat_filename1)
         puts "build first set from directory #{cat_filename1}"
-        s1 = Cat.from_dir(cat_filename1)
+        s1 = CatOnYaml.from_dir(cat_filename1)
       elsif File.exists?(cat_filename1)
         puts "load catalog #{cat_filename1}"
-        s1 = Cat.from_file(cat_filename1)
+        s1 = CatOnYaml.from_file(cat_filename1)
       else
         puts "#{cat_filename1} is not a catalog file or directory"
         return 1
@@ -57,10 +57,10 @@ and then print the difference with the format specified on output
       #
       if File.directory?(cat_filename2)
         puts "build first set from directory #{cat_filename2}"
-        s2 = Cat.from_dir(cat_filename2)
+        s2 = CatOnYaml.from_dir(cat_filename2)
       elsif File.exists?(cat_filename2)
         puts "load catalog #{cat_filename2}"
-        s2 = Cat.from_file(cat_filename2)
+        s2 = CatOnYaml.from_file(cat_filename2)
       else
         puts "#{cat_filename2} is not a catalog file or directory"
         return 1

data/lib/dircat/{cli → cat_on_yaml_cli}/command_query.rb

@@ -13,7 +13,16 @@ module DirCat
     end
 
     def self.usage
-      "Usage: query [options] <catalog> [<method>]"
+      <<-EOS
+      Usage: query [options] <catalog> [<method>]
+      where method can be:
+        report: show info on catalog
+        duplicates: list duplicates into catalog
+        list_dup
+        script_dup
+        fmt_simple
+
+      EOS
     end
 
     def exec(main, options, rest)
@@ -43,7 +52,12 @@ module DirCat
         cat_opts[:verbose_level] = 1
       end
 
-      s = Cat.from_file(cat_filename, cat_opts)
+      begin
+        s = CatOnYaml.from_file(cat_filename, cat_opts)
+      rescue Exception => e
+        $stderr.put "cannot read catalog '#{cat_filename}' maybe it is an old version?"
+        return false
+      end
 
       if s.respond_to? command.to_sym
         puts s.send(command.to_sym)