file_crawler 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2ae7e681e01e25bc786d86234309988d8209d53c
-  data.tar.gz: 34e1cdc41285a4638de2907752500d65adde5c60
+SHA256:
+  metadata.gz: df450fdad5aebd14ecd141e4264d9057df597798173557a2739fe7a6776f3fb6
+  data.tar.gz: 02d972b1d68d21fe2614f4bc46f717b5b064718a5c6369d1473567f53681586f
 SHA512:
-  metadata.gz: cd2e9b07a4f4bc36b3ebe53622fd0edc5a62ef80930ce472c046d01ecba9d7d7ab26fe0a2a281666a2f88958b404a6343a64ede44844057e7164a40f8d02fc12
-  data.tar.gz: 91d89b2fb72fd4deaaf49ea1591c6965c563919bba22a13d64565166f5e6b3a5a61cabee06e6a582376c587ee15dc31fe902eb56d6b5d01a0cd3718e25ed26fa
+  metadata.gz: 3f218741b1df108a251c0c782724f4438b919017b8908f8394dd74a615a863036a586fd2e7a357a1fcccaefcdbe2224c6ce34781e9fa3a980642a7f0c149828f
+  data.tar.gz: 0ffac33279d95fb1fa917be2b91afe188c2f0310808dd5cd8abc029eb27b8d2840d06a460be31dac713bfef991e62f1509282b80ac1512c86a753a97c8031932

data/lib/file_crawler/finder/command/collect.rb

@@ -1,4 +1,5 @@
 module FileCrawler
+
   class Regex
     attr_accessor :regexp_start, :regexp_end
 
@@ -16,50 +17,62 @@ module FileCrawler
     end
   end
 
-  class Finder
-    module Command
-      module Collect
 
-        attr_accessor :regexs
+end
+
+module FileCrawler::Finder::Command
 
-        def regexs
-          @regexs ||= []
-        end
+  module Collect
+    include Base
 
-        def collect(conditions = {})
-          tap {
-            @rows = collect_into_filename(@rows)
+    attr_accessor :regexs
+
+    def regexs
+      @regexs ||= []
+    end
+
+    def collect(options={})
+      tap {
+        if options[:regexs].is_a?(Array)
+          options[:regexs].each {|o|
+            regexs << FileCrawler::Regex.new(o[0], o[1]) if o.size == 2
           }
         end
 
-        def collect_into_filename(file_paths)
-          hash = {}
+        @collections = Organizer.new.run(@files, regexs)
+      }
+    end
 
-          file_paths.each {|file_path|
-            filename = File.basename(file_path)
-            term = decide_index_for_collect(filename)
-            hash[term] ||= []
-            hash[term] << file_path
-          }
+    class Organizer
 
-          hash
-        end
+      def run(filepaths, regexs)
+        hash = {}
 
-        def decide_index_for_collect(string)
-          if !regexs.empty?
-            regexs.each {|regex|
-              return $1.strip unless regex.pattern.match(string).nil?
-            }
-          end
+        filepaths.each {|filepath|
+          filename = File.basename(filepath)
+          term = decide_index(filename, regexs)
+          hash[term] ||= []
+          hash[term] << filepath
+        }
 
-          pattern = /[\p{Hiragana}|\p{Katakana}|\p{Han}|[a-zA-Z0-9]ー 　]+/
-          result = string.strip.scan(pattern).first
-          return result.strip unless result.nil?
+        hash
+      end
 
-          string.strip
+      def decide_index(string, regexs=[])
+        if !regexs.empty?
+          regexs.each {|regex|
+            return $1.strip unless regex.pattern.match(string).nil?
+          }
         end
 
+        pattern = /[\p{Hiragana}|\p{Katakana}|\p{Han}|[a-zA-Z0-9]ー 　]+/
+        result = string.strip.scan(pattern).first
+        return result.strip unless result.nil?
+
+        string.strip
       end
     end
+
   end
+
 end

data/lib/file_crawler/finder/command/move.rb

@@ -1,105 +1,107 @@
 require 'fileutils'
 
-module FileCrawler
-  class Finder
-    module Command
-      module Move
-
-        def move(destination)
-          tap {
-            @rows = move_with_numbering(@rows, destination)
-          }
-        end
+module FileCrawler::Finder::Command
+
+  module Move
+
+    def move(destination, options={dry_run: true})
+      tap {
+        target = @collections.empty? ? @files : @collections
+        fixer = Fixer.new
+        @targets = fixer.make_new_path(target, destination)
 
-        def move_from_collection(destination)
-          tap {
-            @rows = move_from_collection_with_numbering(@rows, destination)
+        if !options[:dry_run]
+          fixer.make_mv(@targets).each {|cmd|
+            exec(cmd)
           }
         end
+      }
+    end
 
-        def move_with_numbering(source, destination)
-          move_targets = []
-          not_move_targets = []
-          rename_targets = []
-
-          source.each {|directory|
-            if is_same?(directory, destination)
-              not_move_targets << directory
-              next
-            end
+    def cmds
+      return nil if @targets.nil?
 
-            if exist_file?(directory, destination)
-              rename_targets << directory
-              next
-            end
+      fixer = Fixer.new
+      fixer.make_mv(@targets)
+    end
 
-            if move_targets.include?(directory)
-              rename_targets << directory
-              next
-            end
+    class Fixer
 
-            move_targets << directory
-          }
-
-          create_directory_if_needed(destination)
-          FileUtils.mv(move_targets, destination)
+      def make_new_path(sources, destination)
+        case sources
+        when Hash
+          return make_new_path_for_collection(sources, destination)
+        when Array
+          return make_new_path_for_array(sources, destination)
+        when String
+          return make_new_path_for_array([sources], destination)
+        end
 
-          renamed_targets = []
-          rename_targets.each {|directory|
-            filename = find_free_filename(directory, destination)
-            to = destination + '/' + filename
-            FileUtils.mv(directory, to)
+        ArgumentError
+      end
 
-            renamed_targets << to
-          }
+      def make_mv(filepaths)
+        cmds = []
+        make_fixed_paths(filepaths).map {|file|
+          cmds << "mv #{file[0]} #{file[1]}"
+        }
 
-          move_targets.map {|directory|
-            destination + '/' + File.basename(directory)
-          } + not_move_targets + renamed_targets
-        end
+        cmds
+      end
 
-        def move_from_collection_with_numbering(source, destination)
-          result = source.map {|key, value|
-            directory = destination + '/' + key
-            move_with_numbering(value, directory)
-          }.flatten
+      def make_fixed_paths(filepaths)
+        dest = []
+        filepaths.each {|filepath|
+          fixed_path = fix_path(filepath[1], dest)
+          filepath[1] = fixed_path
+          dest << fixed_path
+        }
 
-          result
-        end
+        filepaths
+      end
 
-        def create_directory_if_needed(directory)
-          Dir.mkdir(directory, 0777) unless File.exist?(directory)
-        end
+      def fix_path(filepath, check_array, index=0)
+        newpath = filepath
+        newpath = "#{filepath} (#{index})" if index > 0
+        return fix_path(filepath, check_array, index + 1) if exist?(newpath, check_array)
 
-        def find_free_filename(current, destination)
-          filename = File.basename(current)
+        newpath
+      end
 
-          index = 1
-          new_filename = "#{filename} (#{index})"
-          while exist_file?(new_filename, destination)
-            index += 1
-            new_filename = "#{filename} (#{index})"
-          end
+      private
+      def exist?(filepath, check_array)
+        return true if File.exist?(filepath)
 
-          new_filename
-        end
+        check_array.include?(filepath)
+      end
 
-        def valiable_to_move?(current, destination)
-          return false if is_same?(current, destination)
+      def make_new_path_for_array(sources, destination)
+        result = []
+        sources.each {|path|
+          result << [path, new_path(path, destination)]
+        }
 
-          !exist_file?(current, destination)
-        end
+        result
+      end
 
-        def is_same?(current, destination)
-          current == destination
-        end
+      def make_new_path_for_collection(sources, destination)
+        result = []
+        sources.each {|dirname, paths|
+          new_dir = destination + '/' + dirname.to_s
+          paths.each {|path|
+            result << [path, new_path(path, new_dir)]
+          }
+        }
 
-        def exist_file?(current, destination)
-          next_path = destination + '/' + File.basename(current)
-          File.exist?(next_path)
-        end
+        result
+      end
 
+      def new_path(source, destination)
+        destination + '/' + File.basename(source)
       end
+
     end
+
   end
+
 end

data/lib/file_crawler/finder/command/search.rb

@@ -1,41 +1,33 @@
-module FileCrawler
-  class Finder
-    module Command
-      module Search
+module FileCrawler::Finder::Command
 
-        def search(path, conditions = {})
-          tap {
-            @rows = search_directories(path)
-          }
-        end
-
-        def search_directories(path)
-          directories = search_directories_in_path(path)
-          return [path] if directories.empty?
+  module Search
+    include Base
 
-          result = []
-          directories.each {|item|
-            result += search_directories(item)
-          }
+    def search(path, options={})
+      tap {
+        @files = search_directories(path, options)
+      }
+    end
 
-          result
-        end
+    def search_directories(path, options={})
+      result = []
+      cmd = "find #{path} -type d"
+      if options[:maxdepth] && options[:maxdepth] > 0
+        cmd = "find #{path} -maxdepth #{options[:maxdepth]} -type d"
+      end
 
-        def search_directories_in_path(path)
-          find_files_in_path(path).select {|item|
-            File.directory?(item)
-          }
+      exec(cmd).each_line(chomp: true) {|item|
+        valid = true
+        if options[:exclude_invisible_file]
+          filename = File.basename(item)
+          valid = !filename.start_with?('.')
         end
+        result << item if valid
+      }
 
-        def find_files_in_path(path)
-          Dir.entries(path).select {|item|
-            !item.start_with?('.')
-          }.map {|item|
-            path + '/' + item
-          }
-        end
-      end
+      result
     end
+
   end
 
 end

data/lib/file_crawler/finder/command.rb

@@ -1,4 +1,20 @@
+
+class FileCrawler::Finder
+
+  module Command
+
+    module Base
+
+      def exec(str)
+        `#{str}`
+      end
+
+    end
+
+  end
+
+end
+
 require_relative 'command/collect'
 require_relative 'command/move'
-require_relative 'command/resemble'
 require_relative 'command/search'

data/lib/file_crawler/finder.rb

@@ -3,76 +3,16 @@ require_relative 'finder/command'
 module FileCrawler
 
   class Finder
-    attr_reader :rows
+    attr_accessor :files, :collections
 
     include Command::Collect
     include Command::Move
-    include Command::Resemble
     include Command::Search
 
     def initialize
       @rows = []
+      @collections = []
     end
   end
 
-  # @param conditions
-  #   directory [Boolean]
-  #   exntesion [Array]
-  #   extension_in_directory [Array]
-  def self.search(path, conditions = {})
-    finder = FileCrawler::Finder.new
-    finder.search(path, conditions)
-
-    finder.rows
-  end
-
-  # conditions
-  # - if dont have extension_in_directory, directory true
-  # - move check? if include, need condition[:force]
-  def self.move(path, destination, conditions = {})
-    raise ArgumentError unless File.directory?(destination)
-
-    finder = FileCrawler::Finder.new
-    finder.search(path).move(destination)
-
-    finder.rows
-  end
-
-  # conditions
-  # - if dont have extension_in_directory, directory true
-  def self.collect(path, conditions = {})
-    finder = FileCrawler::Finder.new
-    unless conditions[:regexs].nil?
-      conditions[:regexs].each {|regex|
-        finder.regexs << regex
-      }
-    end
-
-    finder.search(path).collect(conditions)
-
-    finder.rows
-  end
-
-  def self.organize(path, destination, conditions = {})
-    finder = FileCrawler::Finder.new
-
-    unless conditions[:regexs].nil?
-      conditions[:regexs].each {|regex|
-        finder.regexs << regex
-      }
-    end
-
-    finder.search(path).collect(conditions).move_from_collection(destination)
-
-    finder.rows
-  end
-
-  def self.resemble(path, conditions = {})
-    finder = FileCrawler::Finder.new
-
-    finder.search(path).collect(conditions).resemble()
-
-    finder.rows
-  end
-
 end

data/lib/file_crawler/version.rb

@@ -1,3 +1,3 @@
 module FileCrawler
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/file_crawler.rb

@@ -1,2 +1,5 @@
 require "file_crawler/version"
 require "file_crawler/finder"
+
+module FileCrawler
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_crawler
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Hirohisa Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,6 @@ files:
 - lib/file_crawler/finder/command.rb
 - lib/file_crawler/finder/command/collect.rb
 - lib/file_crawler/finder/command/move.rb
-- lib/file_crawler/finder/command/resemble.rb
 - lib/file_crawler/finder/command/search.rb
 - lib/file_crawler/version.rb
 homepage: https://github.com/hirohisa/file_crawler
@@ -90,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: FileCrawler searches and controls files in local directory

data/lib/file_crawler/finder/command/resemble.rb

@@ -1,31 +0,0 @@
-module FileCrawler
-  class Finder
-    module Command
-      module Resemble
-
-        def resemble()
-          tap {
-            @rows = resemble_in_collection(@rows.values)
-          }
-        end
-
-        # use rows after using #collect
-        def resemble_in_collection(collection)
-          files = []
-
-          pattern = /\(\d+\)$/
-
-          collection.each {|files_in_same_directory|
-            files_in_same_directory.each {|file|
-              filename = File.basename(file)
-              files << file unless pattern.match(filename).nil?
-            }
-          }
-
-          files
-        end
-
-      end
-    end
-  end
-end