flist 0.1.30 → 0.1.32

data/lib/flist/flist/filelist.rb

@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'ykutils/debugutils'
 
 module Flist
@@ -6,70 +7,76 @@ module Flist
     class Filelist
       include Ykutils::DebugUtils
 
-      def initialize( encx , skip_dirs = {} , store = nil , dir_id = 0, top_dir = "" , top_level = 0 , mode = "" )
+      @fileinfo_class = Struct.new(:atime, :ctime, :mtime)
+      @item_class = Struct.new(:level, :kind, :repo, :path, :path_conv, :project,
+                               :desc, :comment, :atime, :ctime, :mtime)
+
+      def self.make_instance_of_fileinfo_class(atime, ctime, mtime)
+        @fileinfo_class.new(atime, ctime, mtime)
+      end
+
+      def self.make_instance_of_item_class(level = nil, kind = nil, repo = nil, path = nil,
+                                           path_conv = nil, project = nil, desc = nil,
+                                           comment = nil,
+                                           atime = nil, ctime = nil, mtime = nil)
+        @item_class.new(level, kind, repo, path, path_conv, project, desc,
+                        comment, atime, ctime, mtime)
+      end
+
+      def initialize(dbmgr, csvx, encx, skip_dirs = {}, dir_id = 0, top_dir = '',
+                     top_level = 0, mode = '')
+        @dbmgr = dbmgr
+        @csvx = csvx
         @encx = encx
-        @store = store
         @skip_dirs = skip_dirs
 
-        @hs = {}
-        @hs[:dot_directory] = @encx.make_regexp( '^(\.|_).+' )
-        @hs[:node_repository] = @encx.make_regexp( '[^_]_packages' )
-        @hs[:node_modules] = @encx.make_regexp( 'node_modules|bower_modules' )
-        @hs[:temp] = @encx.make_regexp( 'te?mp' , Regexp::IGNORECASE )
-        @hs[:cvs] = @encx.make_regexp( 'cvs' , Regexp::IGNORECASE )
+        # パス名判別用正規表現
+        @hash = {}
+        @hash[:dot_directory] = @encx.make_regexp('^(\.|_).+')
+        @hash[:node_repository] = @encx.make_regexp('[^_]_packages')
+        @hash[:node_modules] = @encx.make_regexp('node_modules|bower_modules')
+        @hash[:temp] = @encx.make_regexp('te?mp', Regexp::IGNORECASE)
+        @hash[:cvs] = @encx.make_regexp('cvs', Regexp::IGNORECASE)
 
+        # 設定ファイルの"topdirhs"で定義されたグループに含まれるサブディレクトリを表すID
         @dir_id = dir_id
-        debug_utils_init
-        set_debug(true)
+        unless @dir_id
+          p "invalid @dir_id=#{@dir_id}"
+          exit
+        end
+        # debug_utils_init
+        # set_debug(true)
+
+        # @cur_item = self.class.make_instance_of_item_class
 
-        @@fileinfo_class ||= Struct.new("Fileinfo" , :atime, :ctime, :mtime )
-        @@item_class ||= Struct.new("Itemfi" , :level , :kind, :repo, :path , :path_conv, :project, :comment , :atime, :ctime, :mtime )
-        @cur_item = @@item_class.new
+        # 全Itemを収めるハッシュ(キーはそのItemを指すパス)
         @items = {}
+        # Itemのうち、ディレクトリを収めるハッシュ(キーはそのItemを指すパス)
         @dirs = {}
+        # Itemのうち、ファイルを収めるハッシュ(キーはそのItemを指すパス)
         @files = {}
 
+        # このFilelistのトップディレクトリ(トップディレクトリより下位のディレクトリ、ファイルの情報を持つ)
         @top_dir = top_dir
+        # このFilelistのトップディレクトリの階層の深さ
         @top_level = top_level
         @mode = mode
-        @headers_sym = [:level , :kind, :repo, :path , :project, :comment , :atime, :ctime, :mtime]
-        @items = {}
-        @headers_s = @headers_sym.map{ |x| x.to_s }
       end
 
       def need_skip?(path_s)
         ret = nil
-        if @skip_dirs
-          ret = @skip_dirs.keys.find { |x| @encx.compare( path_s , x ) }
-        end
-        ret != nil
-=begin
-        d_puts "need_skip? path_s=#{path_s}"
-        ret = false
-        if @skip_dirs
-#          p "=@skip_dirs="
-#          @skip_dirs.each do |x| puts x end 
-          @skip_dirs.each do |k,v|
-            #            p v
-            puts "# need_skip?"
-            ret = @encx.compare( path_s , v)
-            if ret
-              break
-            end
-          end
-        end
-        d_puts "need_skip? ret=#{ret}"
-
-        ret
-=end
+        ret = @skip_dirs.keys.find { |x| @encx.compare(path_s, x) } if @skip_dirs
+        ret_value = !ret.nil?
+        d_puts "need_skip? path_s=#{path_s}|ret_value=#{ret_value}"
+        ret_value
       end
 
-      def time2datetime_utc( time )
+      def time2datetime_utc(time)
         # UTC
-        datetiem = DateTime.new( time.year, time.month, time.day, time.hour, time.min, time.sec , time.utc_offset )
+        DateTime.new(time.year, time.month, time.day, time.hour, time.min, time.sec, time.utc_offset)
       end
 
-      def update_item(kind, level, repo, path, project = 0)
+      def update_item(kind, level, repo, path, _project = 0)
         @items[path].kind = kind
         @items[path].level = level
         @items[path].repo = repo
@@ -77,95 +84,88 @@ module Flist
         @items[path].project = preoject
       end
 
+      # ハッシュ@itemsにpathをキーに登録する
       def register_item(kind, level, repo, path, fileinfo, project = 0)
-        d_puts "register_item"
+        d_puts 'register_item'
         d_puts "path=#{path}"
-        @cur_item.kind = kind
-        @cur_item.level = level
-        @cur_item.repo = repo
-        @cur_item.path_conv = @encx.convert(path)
-        @cur_item.path = path
-        @cur_item.project = project
-        @cur_item.comment = ""
-        @cur_item.atime = time2datetime_utc( fileinfo.atime )
-        @cur_item.ctime = time2datetime_utc( fileinfo.ctime )
-        @cur_item.mtime = time2datetime_utc( fileinfo.mtime )
-
-        @items[path] = @cur_item
-        @cur_item = @@item_class.new
+        cur_item = self.class.make_instance_of_item_class
+        # @cur_item = @@item_class.new
+        cur_item.kind = kind
+        cur_item.level = level
+        cur_item.repo = repo
+        cur_item.path_conv = @encx.convert(path)
+        cur_item.path = path
+        cur_item.project = project
+        cur_item.comment = ''
+        cur_item.atime = time2datetime_utc(fileinfo.atime)
+        cur_item.ctime = time2datetime_utc(fileinfo.ctime)
+        cur_item.mtime = time2datetime_utc(fileinfo.mtime)
+
+        @items[path] = cur_item
       end
 
       def get_config(path)
-        alist = File.open(path){ |f|
-          f.readlines.select{ |x| x !~ /^-/ }.collect{ |x|
+        alist = File.open(path) do |f|
+          f.readlines.grep_v(/^-/).collect do |x|
             x.chomp.split(/:/)
-          }
-        }
+          end
+        end
         Hash[*alist.flatten(1)]
       end
 
       def dot_directory?(basename)
-        d_puts "In dot_directory? path=#{basename}"
-        puts "# dot_directory?"
-        ret = @encx.compare(basename , @hs[:dot_directory])
+        d_puts "In dot_directory? basename=#{basename}"
+        ret = @encx.compare(basename, @hash[:dot_directory])
         if ret
           d_puts 'T'
         else
           d_puts 'F'
         end
-        p ret
+        # p ret
+        d_puts "In dot_directory? basename=#{basename}|ret=#{ret}"
         ret
       end
 
       def node_repository?(basename)
         d_puts "In node_repository? path=#{basename}"
-        puts "# need_repository? 1"
-        ret = @encx.compare( basename , @hs[:node_modules] )
+        ret = @encx.compare(basename, @hash[:node_modules])
         unless ret
-          puts "# need_repository? 2"
-          ret = @encx.compare(basename , @hs[:node_repository])
+          d_puts '# node_repository? 2'
+          ret = @encx.compare(basename, @hash[:node_repository])
         end
-        p ret
+        d_puts "# node_repository? basename=#{basename}|ret=#{ret}"
         ret
       end
 
-      def repository?(basename , bundle_repo)
-        d_puts "In repository? basename=#{basename} bundle_repo=#{bundle_repo}"
+      def repository?(basename, bundle_repo)
         ret = dot_directory?(basename) or bundle_repo == basename or node_repository?(basename)
-        p ret
+        d_puts "In repository? basename=#{basename} bundle_repo=#{bundle_repo}|ret=#{ret}"
         ret
       end
 
-      def get_bundle_repository()
+      def bundle_repository
         abs_path = nil
-        config_path = ".bundle/config"
+        config_path = '.bundle/config'
         if Dir.exist?(config_path)
           config = get_config(config_path)
-          if config
-            @skip_dirs[bundle_pn.to_s] = @encx.make_regexp( "^#{config}" )
-          end
+          @skip_dirs[bundle_pn.to_s] = @encx.make_regexp("^#{config}") if config
 
-          if config["BUNDLE_PATH"]
-            if Dir.exist?(config["BUNDLE_PATH"])
-              abs_path = Dir.open(config["BUNDLE_PATH"]){ |d| d.pwd}
-            end
-          end
+          abs_path = Dir.open(config['BUNDLE_PATH'], &:pwd) if config['BUNDLE_PATH'] && Dir.exist?(config['BUNDLE_PATH'])
         end
         abs_path
       end
 
-      def project_directory?(abs_path)
+      def project_directory?(_abs_path)
         false
       end
 
       def ignore_directory?(basename)
-        puts "# ignore_directory? 1"
-        ret = @encx.compare(basename , @hs[:temp])
+        ret = @encx.compare(basename, @hash[:temp])
         unless ret
-        puts "# ignore_directory? 2"          
-          ret = @encx.compare(basename , @hs[:cvs])
+          d_puts '# ignore_directory? 2'
+          ret = @encx.compare(basename, @hash[:cvs])
         end
-        p ret
+        d_puts "# ignore_directory? ret=#{ret}"
         ret
       end
 
@@ -173,117 +173,166 @@ module Flist
         atime = File.atime(path)
         ctime = File.ctime(path)
         mtime = File.mtime(path)
-        @@fileinfo_class.new( atime , ctime, mtime )
+        self.class.make_instance_of_fileinfo_class(atime, ctime, mtime)
+        # @@fileinfo_class.new( atime , ctime, mtime )
       end
 
-      def scanx_sub(x , bundle_repo , level, repo )
+      def repository_files(kind, level, repo, dir, x_str, path_s)
+        register_item(kind, level, repo, dir, make_fileinfo(x_str), 1)
+
+        @dirs[path_s] = @encx.make_regexp("^#{path_s}") unless @dirs[path_s]
+        @skip_dirs[path_s] = @encx.make_regexp("^#{path_s}") unless @skip_dirs[path_s]
+
+        [repo, dir]
+      end
+
+      def scanx_sub(item, bundle_repo, level, repo)
         dir = nil
-        if File.directory?(x)
-          kind = "D"
+        if File.directory?(item)
+          kind = 'D'
           dir = @encx.convert(@cur_dir)
-          x_str = @encx.convert(x)
-          path_s = File.expand_path( File.join( dir , x_str ) )
-          if repository?(x , bundle_repo)
+          x_item = @encx.convert(item)
+          path_s = File.expand_path(File.join(dir, x_item))
+          if repository?(x_item, bundle_repo)
             # カレントディレクトリの直下にリポジトリが存在すれば、カレントディレクトリをプロジェクトとして登録する。リポジトリ自体は登録しない（管理外とする）。
-            register_item(kind, level, x , dir , make_fileinfo(x_str) , 1)
-
-            unless @dirs[path_s]
-              @dirs[path_s] = @encx.make_regexp( "^#{path_s}" )
-            end
-            unless @skip_dirs[path_s]
-              @skip_dirs[path_s] = @encx.make_regexp( "^#{path_s}" )
-            end
-
-            repo = x
-            return [repo , dir]
-          elsif ignore_directory?(x)
-            @skip_dirs[path_s] = @encx.make_regexp( "^#{path_s}" )
+            d_puts "REPOSITORY #{dir}|#{path_s}"
+            # return nil
+            return repository_files(kind, level, x_item, dir, make_fileinfo(x_item), path_s)
+          elsif ignore_directory?(x_item)
+            d_puts "SKIP_DIRECTORY #{x_item}|#{path_s}"
+            @skip_dirs[path_s] = @encx.make_regexp("^#{path_s}")
           else
-            register_item(kind, level, "" , path_s , make_fileinfo(x) , 0)
+            d_puts "REGISTER_DIRECTORY #{x_item}|#{path_s}"
+            register_item(kind, level, '', path_s, make_fileinfo(x_item), 0)
             dir = path_s
           end
-        else
-          if @mode == :simple
-            kind = "F"
+        elsif @mode == :simple
+          kind = 'F'
 
-            dir = @encx.convert(@cur_dir)
+          dir = @encx.convert(@cur_dir)
+          x_item = @encx.convert(item)
+          path_s = File.expand_path(File.join(dir, x_item))
+          register_item(kind, level, '', path_s, make_fileinfo(x_item), 0)
+        end
+        # p "scan_sub"
+        # p repo
+        # p dir
+        [repo, dir]
+      end
+
+      def project_directory_files
+        dir = @encx.convert(@cur_dir)
+        x_str = @encx.convert(x)
+        d_puts "1 #{dir}"
+        register_item(kind, level, '', dir, make_fileinfo(x_str), 1)
+        @dirs[dir] = @encx.make_regexp("^#{abs_dir_path}") unless @dirs[dir]
+
+        # プロジェクトを格納するディレクトリは、今後スキップさせる
+        @skip_dirs[dir] = @encx.make_regexp("^#{abs_dir_path}") unless skip_dirs[dir]
+      end
+
+      def non_skip_files(abs_dir_path, level)
+        Dir.chdir(abs_dir_path) do
+          d_puts "non_skip_files chdir #{abs_dir_path}"
+          repo = nil
+          dirs = []
+          @cur_dir = Dir.getwd
+          bundle_repo = bundle_repository
+
+          Dir.foreach('.') do |x|
+            next if ['.', '..'].include?(x)
+
+            # d_puts "scanx x=#{x}"
+            # d_puts "=========#{x.encoding}"
+            # d_puts "@cur_dir=#{@cur_dir}"
             x_str = @encx.convert(x)
-            path_s = File.expand_path( File.join( dir , x_str) )
-            register_item(kind, level, "" , path_s , make_fileinfo(x_str) , 0)
+            repo, dir = scanx_sub(x_str, bundle_repo, level, repo)
+            dirs << dir if dir
+          end
+          unless repo.nil?
+            dirs.each do |d|
+              scanx(d, level + 1)
+            end
           end
         end
-        p "scan_sub"
-        p repo
-        p dir
-        [repo, dir]
       end
 
-      def scanx(abs_dir_path , level)
-        d_puts "=scanx====#{Dir.pwd}"
-        d_puts "abs_dir_path=#{abs_dir_path}"
-        d_puts "abs_dir_path.encoding=#{abs_dir_path.encoding}"
+      def scanx(abs_dir_path, level)
+        d_puts "######### scanx abs_dir_path=#{abs_dir_path}"
+        # d_puts "=scanx====#{Dir.pwd}"
+        # d_puts "abs_dir_path=#{abs_dir_path}"
+        # d_puts "abs_dir_path.encoding=#{abs_dir_path.encoding}"
 
         # プロジェクトを格納するディレクトリであれば、
         # (TO DO) project_directory?を実装する
         if project_directory?(abs_dir_path)
-          dir = @encx.convert(@cur_dir)
-          x_str = @encx.convert(x)
-          d_puts "1 #{dir}"
-          register_item(kind, level, "" , dir , make_fileinfo(x_str) , 1)
-          unless @dirs[dir]
-            @dirs[dir] = @encx.make_regexp( "^#{abs_dir_path}" )
-          end
-
-          # プロジェクトを格納するディレクトリは、今後スキップさせる
-          unless skip_dirs[dir]
-            @skip_dirs[dir] = @encx.make_regexp( "^#{abs_dir_path}" )
-          end
+          project_directory_files
         else
           # スッキプすべきとして登録されたディレクトリまたは、そのサブディレクトリであれば、スキップする
-          unless need_skip?(abs_dir_path)
-            Dir.chdir(abs_dir_path) do
-              repo = nil
-              dirs = []
-              kind = nil
-              @cur_dir = Dir.getwd
-              bundle_repo = get_bundle_repository( )
-
-              Dir.foreach('.') do |x|
-                next if x == '.' or x == '..'
-                d_puts "scanx x=#{x}"
-                d_puts "=========#{x.encoding}"
-                d_puts "@cur_dir=#{@cur_dir}"
-                x_str = @encx.convert(x)
-                repo , dir = scanx_sub(x_str , bundle_repo , level, repo )
-                dirs << dir if dir
-              end
-              if repo != nil
-                dirs.each do |d|
-                  scanx(d , level + 1)
-                end
-              end
-            end
-          end
+          non_skip_files(abs_dir_path, level) unless need_skip?(abs_dir_path)
         end
       end
 
       def scan
-        d_puts("In scan")
+        d_puts('In scan')
         # 調査対象のトップディレクトリ
         # @top_dirはディレクトリ名(フルパスではない)である
-        Dir.chdir(@top_dir){
+        Dir.chdir(@top_dir) do
           @topd_dir = Dir.getwd
-        }
+        end
         # 調査対象のトップディレクトリが絶対パス、相対パスで指定された時を考慮して、
         # トップディレクトリのbasename部分をとりだして調べる。
         #
         # 無視すべきディレクトリ名パターンにマッチすれば、@top_dir以下を調べない
-        unless ignore_directory?( File.basename(@top_dir))
-          Dir.chdir( File.join(@top_dir , "..") ){
-            @cur_dir = Dir.getwd
+        return if ignore_directory?(File.basename(@top_dir))
+
+        Dir.chdir(File.join(@top_dir, '..')) do
+          @cur_dir = Dir.getwd
+        end
+        d_puts "scan @cur_dir=#{@cur_dir} call scanx @top_dir=#{@top_dir}"
+        scanx(@top_dir, 0)
+        d_puts '########## scan End'
+      end
+
+      def output
+        d_puts 'In output'
+
+        @items.each do |_k, v|
+          d_puts "v.path.encoding=#{v.path.encoding}"
+
+          if @csv
+            @csvx.csv << [@dir_id, v.level, v.kind, v.repo, v.path, v.project, '', v.comment, v.atime, v.ctime,
+                          v.mtime]
+          end
+          d_puts '#### Flielist'
+          d_puts "dir_id=#{@dir_id}"
+          d_puts "level=#{v.level}"
+          d_puts "kind=#{v.kind}"
+          d_puts "repo=#{v.repo}"
+          d_puts "path=#{v.path_conv}"
+          d_puts "project=#{v.project}"
+          d_puts "desc=#{v.desc}"
+          d_puts "comment=#{v.comment}"
+          d_puts "atime=#{v.atime}"
+          d_puts "ctime=#{v.ctime}"
+          d_puts "mtime=#{v.mtime}"
+          d_puts '#### Flilelist End'
+          unless @dir_id
+            puts "invalid @dir_id=#{@dir_id}"
+            exit
+          end
+          unless v.repo
+            puts "invalid v.repo=#{v.repo}"
+            exit
+          end
+
+          unless v.comment
+            puts "invalid v.comment=#{v.comment}"
+            exit
+          end
 
-          }
-          scanx(@top_dir , 0)
+          @dbmgr.flistz_add(@dir_id, v.level, v.kind, v.repo, v.path, v.project,
+                            v.desc, v.comment, v.atime, v.ctime, v.mtime)
         end
       end
     end

data/lib/flist/flist/store.rb

@@ -1,8 +1,9 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'csv'
 
-require 'arxutils'
+require 'arxutils_sqlite3'
 require 'flist/dbutil/dbmgr'
 require 'ykutils/debugutils'
 
@@ -13,65 +14,60 @@ module Flist
 
       include Ykutils::DebugUtils
 
-      def_delegators( :@dbmgr, :dirz_add )
-
-      def initialize( kind, hs  )
-
-        debug=false
+      # def_delegators( :@dbmgr, :dirz_add )
 
-        @dbmgr = Arxutils::Store.init(kind , hs ){ | register_time |
-          Dbutil::DbMgr.new( register_time )
-        }
+      def initialize(_kind, hash, _opts)
+        # @dbmgr = Arxutils_Sqlite3::Store.init(kind , hs , opts ){ | register_time |
+        #  Dbutil::DbMgr.new( register_time )
+        # }
+        Dbutil::DbMgr.new(register_time)
 
-        @csv_fname = hs["csv_fname"]
-        @csvin_fname = hs["csvin_fname"]
+        @csv_fname = hash['csv_fname']
+        @csvin_fname = hash['csvin_fname']
 
         debug_utils_init
         d_puts("csv_fname=#{@csv_fname}")
 
         if @csv_fname
-          @csv = CSV.open( @csv_fname , "w" ,
-                           { :encoding => 'UTF-8',
-                             :headers => @headers_s,
-                             :force_quotes => true,
-                             :write_headers => true,
-
-                           } )
+          @csv = CSV.open(@csv_fname, 'w',
+                          { encoding: 'UTF-8',
+                            headers: @headers_s,
+                            force_quotes: true,
+                            write_headers: true })
         end
 
         if @csvin_fname
-          @csvin = CSV.open( @csvin_fname , "r" ,
-                             { :encoding => 'UTF-8',
-                               :headers => @headers_s,
-                             } )
+          @csvin = CSV.open(@csvin_fname, 'r',
+                            { encoding: 'UTF-8',
+                              headers: @headers_s })
         end
 
         d_puts "default_external=#{Encoding.default_external}"
-        Encoding.default_external=Encoding::UTF_8
+        Encoding.default_external = Encoding::UTF_8
         d_puts "default_external=#{Encoding.default_external}"
         d_puts "default_internal=#{Encoding.default_internal}"
-        Encoding.default_internal=Encoding::UTF_8
+        Encoding.default_internal = Encoding::UTF_8
         d_puts "default_internal=#{Encoding.default_internal}"
       end
 
       def finish
-        @csv.close if @csv
-        @csv_in.close if @csv_in
+        @csv&.close
+        @csv_in&.close
       end
 
       def post_process
-        @dbmgr.flistz_post_process(@dir_id) if @dbmgr
+        @dbmgr&.flistz_post_process(@dir_id)
       end
 
-      def output(items , dir_id)
-        d_puts "In output"
+      def output(items, dir_id)
+        d_puts 'In output'
 
-        items.each do |k,v|
+        items.each do |_k, v|
           d_puts "v.path.encoding=#{v.path.encoding}"
 
           @csv << [v.level, v.kind, v.repo, v.path, v.project, v.comment, v.atime, v.ctime, v.mtime] if @csv
-          @dbmgr.flistz_add( dir_id, v.level, v.kind, v.repo, v.path, v.project, "", v.comment, v.atime, v.ctime, v.mtime) if @dbmgr
-
+          @dbmgr&.flistz_add(dir_id, v.level, v.kind, v.repo, v.path, v.project, '', v.comment, v.atime, v.ctime,
+                             v.mtime)
         end
       end
     end