dir-to-xml 1.0.4 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f155b43f7372db3ad7636b3c54f8369d78387d155ec4230f24b2ecf6a6b7d206
-  data.tar.gz: 3def96a9380e89e249275346f39ca5d6eebcbc60996e66c5d2a5786d9a250f03
+  metadata.gz: bfe35ab7508e85463cf2aeb0105e30e38372912a8a47f7d90a298caa702ff0dd
+  data.tar.gz: fff6e43ea00d6a697e0b4aaa7aedbd5ef7d38645756b01329b0f9095edea3b11
 SHA512:
-  metadata.gz: ade701a7b673a6305a73f52f10ce05e828588f4d235acc747aa5adb72a7e02a4dd11ac7312f0661ef843a8df9d848943eb8ddac53c954bc4b5176b0838efcfa0
-  data.tar.gz: a542531fdbfe27e2621c7f0db8b034b32528f0aa284e4038c9ee1239655e419a00d9e5e82c98ab5c7e86e634e1cba56677e1186318b8e58598632f08fb8b8af6
+  metadata.gz: 06ee8ffb01712045e85717db1c74f67ccd68e526ee74e18d1905800eea6d55d75e634badb9f13b00f36d5eac1204d1ea62961db5f84ad03ae49bd9f1c36dae86
+  data.tar.gz: 8243bee16134b8a3d41de944b37eff432fcd7b785f83703537ff156d4e6f127cc17c59c858e957b942fc21e24b1805d24fa0608e1f539f7226d3a16f0f4235b4

data/lib/dir-to-xml.rb

@@ -8,39 +8,39 @@ require 'dxlite'
 class DirToXML
 
   attr_reader :dx, :activity
-  
+
   def initialize(x= '.', recursive: false, index: 'dir.xml', debug: false)
-    
+
     super()
-    
+
     @debug = debug
-    
+
     @dx = nil
     @activity = {new: [], modified: []}
-    
+
     if x.is_a? DxLite then
-      
-      @dx = x      
-      @a = @dx.to_a    
-      @object = @a      
-      
+
+      @dx = x
+      @a = @dx.to_a
+      @object = @a
+
       return self
     end
-    
+
     path = x
-    
+
     @path, @index, @recursive = path, index, recursive
-    
+
     raise "Directory not found." unless File.exists? path
     filepath = File.join(path, index)
-    
-    
+
+
     if File.exists? filepath then
-    
+
       @dx = DxLite.new(File.join(@path, @index), debug: @debug)
-      
+
     else
-      
+
       @dx = DxLite.new('directory[title, file_path, last_modified, ' + \
               'description]/file(name, type, ext, ctime, mtime, atime, ' + \
               'description, owner, group, permissions)')
@@ -49,19 +49,25 @@ class DirToXML
       @dx.title = 'Index of ' + File.expand_path(@path)
       @dx.file_path = File.expand_path(@path)
       @dx.last_modified = ''
-    
-    end        
-    
-    puts 'before Dir.glob' if @debug
-    
+
+    end
+
+    if @debug then
+      puts 'before Dir.glob'
+      puts '_path: ' + File.join(path, "*").inspect
+    end
+
     a = Dir.glob(File.join(path, "*")).map{|x| File.basename(x) }.sort
-        
+    puts 'a: ' + a.inspect if @debug
+
     a.delete index
 
+    return if a.empty?
+
     a2 = a.inject([]) do |r, filename|
 
       x = File.join(path, filename)
-      
+
       begin
       r << {
         name: filename,
@@ -75,58 +81,67 @@ class DirToXML
         r
       end
 
-    end    
-    
+    end
+
     # has the directory been modified since last time?
     #
     if @dx and @dx.respond_to? :last_modified and \
         @dx.last_modified.length > 0 then
-      
+
       puts 'nothing to do' if @debug
-      
+      puts 'a2: ' + a2.inspect if @debug
       file = a2.max_by {|x| x[:mtime]}
-      puts 'file: ' + file.inspect if @debug
-      return if Time.parse(@dx.last_modified) >= (file[:mtime])
-      
-    end    
-    
 
-    
+      if @debug then
+        puts 'file: ' + file.inspect
+        puts 'd1: '  + Time.parse(@dx.last_modified).inspect
+        puts 'd2: ' + (file[:mtime]).inspect
+      end
+
+      if Time.parse(@dx.last_modified) >= file[:mtime] then
+        @a = @dx.to_a
+        return
+      end
+
+    end
+
+    puts 'stage 2' if @debug
+
     if @dx and @dx.respond_to? :last_modified  then
-      
+
       if @dx.last_modified.length > 0 then
-      
+
         t = Time.parse(@dx.last_modified)
-        
+
         # find the most recently modified cur_files
         recent = a2.select {|x| x[:mtime] > t }.map {|x| x[:name]} \
             - %w(dir.xml dir.json)
-        
+
         # is it a new file or recently modified?
         new_files = recent - @dx.to_a.map {|x| x[:name]}
         modified = recent - new_files
-        
+
       else
-        
+
         new_files = a2.select {|x| x[:type] == 'file'}.map {|x| x[:name]}
         modified = []
-        
+
       end
-      
+
       @activity = {modified: modified, new: new_files}
-      
+
     end
-      
+
 
     command = File.exists?(File.join(path, index)) ? :refresh : :dxify
 
     self.method(command).call a2
     puts '@dx: ' + @dx.inspect if @debug
     puts '@dx.last_modified: ' + @dx.last_modified.inspect if @debug
-    
-    
-    @a = @dx.to_a    
-    
+
+
+    @a = @dx.to_a
+
     if recursive then
 
       self.filter_by(type: :directory).to_a.each do |x|
@@ -135,21 +150,28 @@ class DirToXML
         DirToXML.new(path2, recursive: true)
       end
     end
-    
+
     @object = @a
 
   end
-  
+
+  def directories(&blk)
+
+    self.to_dx.all.select {|x| x.type == 'directory'}.map(&:name)
+
+  end
+
   def filter(&blk)
     @dx.filter &blk
   end
-  
-  def filter_by(pattern=/.*/, type: nil, ext: nil)
-    
-    @object = @a.select do |x| 
-            
+
+  def filter_by(pattern=/.*/, type: nil, ext: nil, &blk)
+
+    @object = @a.select do |x|
+
+      puts '_x: ' + x.inspect if @debug
       pattern_match = x[:name] =~ pattern
-      
+
       type_match = type ? x[:type] == type.to_s : true
       ext_match = ext ? x[:ext] == ext.to_s : true
 
@@ -157,82 +179,109 @@ class DirToXML
 
     end
 
-    self
+    return if @object.empty?
+
+    @dx = DxLite.new
+    @dx.import @object
+
+    block_given? ? @dx.all.map(&:name).each(&blk) : self
+
   end
-    
+
+  def find_all_by_ext(s)
+    @dx.all.select {|item| item.ext == s}
+  end
+
   def find_by_filename(s)
     @dx.all.find {|item| item.name == s}
   end
-  
+
   alias find_by_file find_by_filename
-  
+
   def last_modified(ext=nil)
 
     if ext and ext != '*' then
       @object = @a.select{|x| x[:ext][/#{ext}/] or x[:type] == 'directory'}
     end
-    
+
     a = sort_by :mtime
 
     lm =  a[-1]
-    
+
     if @recursive and lm[:type] == 'directory' then
       return [lm, DirToXML.new(File.join(@path,  lm[:name])).last_modified]
     else
       lm
     end
   end
-  
+
   def save()
     @dx.save File.join(@path, @index)
   end
-  
+
   def select_by_ext(ext, &blk)
-    
+
+    @a = @dx.to_a unless @a
+
     @object = ext != '*' ? @a.select{|x| x[:ext][/#{ext}$/]} : @a
     return if @object.empty?
-    
+
     dx = DxLite.new
     dx.import @object
     dtx = DirToXML.new(dx)
     block_given? ? dtx.dx.all.map(&:name).each(&blk) : dtx
   end
-  
+
   def sort_by(sym)
-    procs = [[:mtime, lambda{|obj| obj.sort_by{|x| x[:mtime]}}]]
+
+    puts 'inside sort_by' if @debug
+    procs = [
+      [
+        :mtime,
+        lambda do |obj|
+          obj.sort_by do |x|
+            x[:mtime].is_a?(String) ? Time.parse(x[:mtime]) : x[:mtime]
+          end
+        end
+      ]
+    ]
     proc1 = procs.assoc(sym).last
+
+    puts '@object: ' + @object.inspect if @debug
+    @object = @a = @dx.to_a if @object.nil?
     proc1.call(@object)
+
   end
-  
+
   def sort_by_last_modified()
     sort_by :mtime
   end
-  
+
   alias sort_by_lastmodified sort_by_last_modified
-  
+
   def to_a
     @object || @a
   end
-  
+
   def to_h()
     self.to_a.inject({}){|r,x| r.merge(x[:name] => x)}
   end
-  
+
   def to_xml(options=nil)
     @dx.to_xml options
   end
-  
+
   def to_dynarex
     @dx.clone
   end
-  
+
   alias to_dx to_dynarex
-  
+
   private
-      
+
   def dxify(a)
-    
-    @dx.last_modified = Time.now.to_s  
+
+    @dx.last_modified = Time.now.to_s  if @dx.respond_to? :last_modified
     @dx.import a
     @dx.save File.join(@path, @index)
 
@@ -240,13 +289,13 @@ class DirToXML
 
   def refresh(cur_files)
 
-    puts 'inside refresh' if @debug    
+    puts 'inside refresh' if @debug
 
     prev_files = @dx.to_a
-    
+
     #puts 'prev_files: ' + prev_files.inspect
     #puts 'cur_files: ' + cur_files.inspect
-            
+
     cur_files.each do |x|
 
       file = prev_files.find {|item| item[:name] == x[:name] }
@@ -255,7 +304,7 @@ class DirToXML
     end
 
     dxify(cur_files)
-    
+
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.8
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   YSREEphg3phQsU9LV4Dlc2Id4gB3W+//c1Ek6TFieKoVemKMkbtB1lgqsEpTCfwh
   oNUg84DlSmZ2z9LKagBVAlDy
   -----END CERTIFICATE-----
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxlite
@@ -43,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
 description: 
 email: digital.robertson@gmail.com
 executables: []