file_crawler 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663f7b97d589d043cf9d9467f466c5740c494b68
-  data.tar.gz: a93c71887ad38ef8154b986838a7b0a1621b5ee8
+  metadata.gz: b18468fb9ef26484e074f797eca9d4323ea34012
+  data.tar.gz: b970cc673130d37e5f46b6b59b2eb000b7dd8789
 SHA512:
-  metadata.gz: 88ed5c4b6a96bac111c6bf5d338ef35f3e1affcf192f910a1eb505455a88d53396e085576e8444b2ddd0f80bc233d8b9a786f87fe137d595768237d90371dba4
-  data.tar.gz: 18016ed7d0b2c27c5b0cc3918f1294914bb69e564698a3e467fee92b185840e99dd3bf06c4c905887220a26a3fea087af00d0c872410154e3c554817caff285e
+  metadata.gz: b2d1fadd395355fbda390bbc1683a0752077fd3cec402f15512b0613a9e0201cfd16fed8ad99aa715f328e941dd58ff748ae401cb6122e280fcf58685fdca405
+  data.tar.gz: 7fbb2d29b40af52deb561cabf703a9bd768e822eb54a05c2596b5bd8b436ccc4ea6bbe83136208a1365f8af0be97f7e26e6764162f2980c3efdad690faf51e69

data/lib/file_crawler/finder.rb

@@ -3,18 +3,14 @@ require_relative 'finder/command'
 module FileCrawler
 
   class Finder
-    attr_accessor :path
     attr_reader :rows
 
     include Command::Collect
     include Command::Move
-    include Command::Organize
     include Command::Search
 
-    def initialize(path = nil)
-      @path = path
+    def initialize
       @rows = []
-      select_in_path(path) unless path.nil?
     end
   end
 
@@ -23,18 +19,8 @@ module FileCrawler
   #   exntesion [Array]
   #   extension_in_directory [Array]
   def self.search(path, conditions = {})
-    finder = FileCrawler::Finder.new(path)
-
-    case
-    when !conditions[:extension].nil?
-      finder.select_with_extension(conditions[:extension])
-    when conditions[:directory] == true
-      finder.select_directories
-    when conditions[:directory] == false
-      finder.select_files
-    when !conditions[:extension_in_directory].nil?
-      finder.select_with_extension_in_directory(conditions[:extension_in_directory])
-    end
+    finder = FileCrawler::Finder.new
+    finder.search(path, conditions)
 
     finder.rows
   end
@@ -45,37 +31,15 @@ module FileCrawler
   def self.move(path, destination, conditions = {})
     raise ArgumentError unless File.directory?(destination)
 
-    search_conditions = {
-      directory: true,
-      extension_in_directory: conditions[:extension_in_directory]
-    }
-    search_conditions[:directory] = nil unless search_conditions[:extension_in_directory].nil?
-
-    directories = search(path, search_conditions)
-
     finder = FileCrawler::Finder.new
+    finder.search(path).move(destination)
 
-    case
-    when conditions[:numbering] == true
-      finder.move_directories_with_numbering(directories, destination)
-    else
-      finder.move_directories_not_exist_destination(directories, destination)
-    end
+    finder.rows
   end
 
   # conditions
   # - if dont have extension_in_directory, directory true
-  def self.collect(directories, conditions = {})
-    search_conditions = {
-      directory: true,
-      extension_in_directory: conditions[:extension_in_directory]
-    }
-    search_conditions[:directory] = nil unless search_conditions[:extension_in_directory].nil?
-
-    files = directories.map {|path|
-      search(path, search_conditions)
-    }.flatten
-
+  def self.collect(path, conditions = {})
     finder = FileCrawler::Finder.new
     unless conditions[:regexs].nil?
       conditions[:regexs].each {|regex|
@@ -83,18 +47,23 @@ module FileCrawler
       }
     end
 
-    finder.collect(files, conditions)
+    finder.search(path).collect(conditions)
+
+    finder.rows
   end
 
-  def self.organize(directories, destination, conditions = {})
+  def self.organize(path, destination, conditions = {})
     finder = FileCrawler::Finder.new
 
-    result = collect(directories, conditions).map {|key, value|
-      directory = destination + '/' + key
-      finder.move_directories_with_numbering(value, directory)
-    }.flatten
+    unless conditions[:regexs].nil?
+      conditions[:regexs].each {|regex|
+        finder.regexs << regex
+      }
+    end
+
+    finder.search(path).collect(conditions).move_from_collection(destination)
 
-    result
+    finder.rows
   end
 
 end

data/lib/file_crawler/finder/command.rb

@@ -1,4 +1,3 @@
 require_relative 'command/collect'
 require_relative 'command/move'
-require_relative 'command/organize'
 require_relative 'command/search'

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

@@ -26,21 +26,10 @@ module FileCrawler
           @regexs ||= []
         end
 
-        def collect(file_paths, conditions = {})
-          collection = collect_into_filename(file_paths)
-
-          collection
-        end
-
-        def decide_index_for_collect(string)
-          if !regexs.empty?
-            regexs.each {|regex|
-              return $1 unless regex.pattern.match(string).nil?
-            }
-          end
-
-          pattern = /[\p{Hiragana}|\p{Katakana}|\p{Han}|[a-zA-Z0-9]ー 　]+/
-          return string.strip.scan(pattern).first
+        def collect(conditions = {})
+          tap {
+            @rows = collect_into_filename(@rows)
+          }
         end
 
         def collect_into_filename(file_paths)
@@ -56,6 +45,20 @@ module FileCrawler
           hash
         end
 
+        def decide_index_for_collect(string)
+          if !regexs.empty?
+            regexs.each {|regex|
+              return $1 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 unless result.nil?
+
+          string
+        end
+
       end
     end
   end

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

@@ -5,28 +5,24 @@ module FileCrawler
     module Command
       module Move
 
-        def move_directories_not_exist_destination(directories, destination)
-          move_targets = directories.select {|directory|
-            valiable_to_move?(directory, destination)
+        def move(destination)
+          tap {
+            @rows = move_with_numbering(@rows, destination)
           }
-          not_move_targets = directories.select {|directory|
-            !valiable_to_move?(directory, destination)
-          }
-
-          create_directory_if_needed(destination)
-          FileUtils.mv(move_targets, destination)
+        end
 
-          move_targets.map {|directory|
-            destination + '/' + File.basename(directory)
-          } + not_move_targets
+        def move_from_collection(destination)
+          tap {
+            @rows = move_from_collection_with_numbering(@rows, destination)
+          }
         end
 
-        def move_directories_with_numbering(directories, destination)
+        def move_with_numbering(source, destination)
           move_targets = []
           not_move_targets = []
           rename_targets = []
 
-          directories.each {|directory|
+          source.each {|directory|
             if is_same?(directory, destination)
               not_move_targets << directory
               next
@@ -57,6 +53,15 @@ module FileCrawler
           } + not_move_targets + renamed_targets
         end
 
+        def move_from_collection_with_numbering(source, destination)
+          result = source.map {|key, value|
+            directory = destination + '/' + key
+            move_with_numbering(value, directory)
+          }.flatten
+
+          result
+        end
+
         def create_directory_if_needed(directory)
           Dir.mkdir(directory, 0777) unless File.exist?(directory)
         end
@@ -66,8 +71,8 @@ module FileCrawler
 
           index = 1
           new_filename = "#{filename} (#{index})"
-          while File.exist?(new_filename)
-            i += 1
+          while exist_file?(new_filename, destination)
+            index += 1
             new_filename = "#{filename} (#{index})"
           end
 

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

@@ -3,80 +3,36 @@ module FileCrawler
     module Command
       module Search
 
-        def select_in_path(path)
+        def search(path, conditions = {})
           tap {
-            @rows = find_rows_in_path(path)
+            @rows = search_directories(path)
           }
         end
 
-        def find_rows_in_path(path)
-          Dir.entries(path).select {|item|
-            !item.start_with?('.')
-          }.map {|item|
-            path + '/' + item
-          }
-        end
-
-        def select_with_extension(extension)
-          tap {
-            @rows = find_rows_with_extension(extension, rows)
-          }
-        end
-
-        def find_rows_with_extension(extension, resource)
-          find_rows_files(resource).select {|item|
-            extension.any? {|e|
-              extname = File.extname(item).downcase
-              extname == ".#{e.downcase}"
-            }
-          }
-        end
-
-        def select_files
-          tap {
-            @rows = find_rows_files(rows)
-          }
-        end
+        def search_directories(path)
+          directories = search_directories_in_path(path)
+          return [path] if directories.empty?
 
-        def find_rows_files(resource)
-          resource.select {|item|
-            !File.directory?(item)
+          result = []
+          directories.each {|item|
+            result += search_directories(item)
           }
-        end
 
-        def select_directories
-          tap {
-            @rows = find_rows_directories(rows)
-          }
+          result
         end
 
-        def find_rows_directories(resource)
-          resource.select {|item|
+        def search_directories_in_path(path)
+          find_files_in_path(path).select {|item|
             File.directory?(item)
           }
         end
 
-        def select_with_extension_in_directory(extension)
-          tap {
-            @rows = find_rows_with_extension_in_directories(extension, find_rows_directories(rows))
-          }
-        end
-
-        def find_rows_with_extension_in_directories(extension, directories)
-          directories.select {|directory|
-            variable_to_exist_with_extension_in_directory(extension, directory)
-          }
-        end
-
-        def variable_to_exist_with_extension_in_directory(extension, directory)
-          subfiles = find_rows_in_path(directory)
-          result = find_rows_with_extension(extension, subfiles)
-          return true if result.size > 0
-
-          subdirectories = find_rows_directories(subfiles).select {|subdirectory|
-            variable_to_exist_with_extension_in_directory(extension, subdirectory)
+        def find_files_in_path(path)
+          Dir.entries(path).select {|item|
+            !item.start_with?('.')
+          }.map {|item|
+            path + '/' + item
           }
-          subdirectories.size > 0
         end
       end
     end

data/lib/file_crawler/version.rb

@@ -1,3 +1,3 @@
 module FileCrawler
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_crawler
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Hirohisa Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-06-10 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/organize.rb
 - lib/file_crawler/finder/command/search.rb
 - lib/file_crawler/version.rb
 homepage: https://github.com/hirohisa/file_crawler

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

@@ -1,8 +0,0 @@
-module FileCrawler
-  class Finder
-    module Command
-      module Organize
-      end
-    end
-  end
-end