dir-to-xml 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4612af405a2a24d589028a583d28b3217c7c44db120ad68d015c412efe86b16
-  data.tar.gz: 8d66e4b320b585972be52e6085186858b2fd99dbd369b3d3c0919cc0cd36afa2
+  metadata.gz: a3383c2c66c62fb7de0316da47639a9416de37ac18907c12dbba947603237ffa
+  data.tar.gz: 5886daf349f5ac8b0fa13c1ddaa37cf76890a7a8a9117de5495f01642f2fe516
 SHA512:
-  metadata.gz: bd2821ac72de327ed54318f5d2ac63c14c184dae26181e6ff38ba455466a067de75dffd48b3749ce5b9ba03ca542d98db4ac94818e929f9e6ce86df43406a4ff
-  data.tar.gz: 48852e32ca730dc65bc3a4363bf87eb8d365742ea20add65ec22adf97e9e80fabf59716cf1cdcea171a234bda6f3dc7dac4ecf994314e26241863b66f3957380
+  metadata.gz: 978914ab049ad0660a667295c63bf994f26358fd975e10fbd7390a063322caee77a30d645bfc672598da58b8d3ed87385412dda8643d18809b55424669513c75
+  data.tar.gz: ce2768f88448e621d886f01aadc6964b16a1d9deab82879482e56d95e72dec36d724cc6a557e0b05b376e69e22b88a136624cff7b3536b39fdc7b8513edc46b9

data/lib/dir-to-xml.rb

@@ -16,6 +16,7 @@ class DirToXML
     @debug = debug
     
     @dx = nil
+    @activity = {new: [], modified: []}
     
     if x.is_a? DxLite then
       
@@ -37,17 +38,19 @@ class DirToXML
     if File.exists? filepath then
     
       @dx = DxLite.new(File.join(@path, @index), debug: @debug)
-    
-    end
-
-    # has the directory been modified since last time?
-    #
-    if @dx and @dx.respond_to? :last_modified and \
-        @dx.last_modified.length > 0 then
       
-      return if Time.parse(@dx.last_modified) >= \
-          File.mtime(File.expand_path(path))
-    end
+    else
+      
+      @dx = DxLite.new('directory[title, file_path, last_modified, ' + \
+              'description]/file(name, type, ext, ctime, mtime, atime, ' + \
+              'description, owner, group, permissions)')
+
+      puts 'before title' if @debug
+      @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
     
@@ -74,18 +77,47 @@ class DirToXML
 
     end    
     
-    if @dx and @dx.respond_to? :last_modified \
-        and @dx.last_modified.length > 0 then
+    # has the directory been modified since last time?
+    #
+    if @dx and @dx.respond_to? :last_modified and \
+        @dx.last_modified.length > 0 then
       
-      t = Time.parse(@dx.last_modified)
+      puts 'nothing to do' if @debug
       
-      # find the most recently modified cur_files
-      recent = a2.select {|x| x[:mtime] > t }.map {|x| x[:name]} \
-          - %w(dir.xml dir.json)
+      file = a2.max_by {|x| x[:mtime]}
       
-      # is it a new file or recently modified?
-      new_files = recent - @dx.to_a.map {|x| x[:name]}
-      modified = recent - new_files
+      if @debug then
+        puts 'file: ' + file.inspect 
+        puts 'd1: '  + Time.parse(@dx.last_modified).inspect
+        puts 'd2: ' + (file[:mtime]).inspect
+      end
+      
+      return if Time.parse(@dx.last_modified) >= file[:mtime]
+      
+    end    
+    
+    puts 'stage 2'
+    
+    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}
       
@@ -94,7 +126,10 @@ class DirToXML
 
     command = File.exists?(File.join(path, index)) ? :refresh : :dxify
 
-    @dx  = self.method(command).call a2
+    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    
     
@@ -160,6 +195,8 @@ class DirToXML
   
   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?
     
@@ -170,9 +207,15 @@ class DirToXML
   end
   
   def sort_by(sym)
-    procs = [[:mtime, lambda{|obj| obj.sort_by{|x| x[:mtime]}}]]
+    
+    puts 'inside sort_by' if @debug
+    procs = [[:mtime, lambda{|obj| obj.sort_by{|x| Time.parse(x[:mtime])}}]]
     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()
@@ -203,26 +246,15 @@ class DirToXML
       
   def dxify(a)
     
-    dx = DxLite.new('directory[title, file_path, last_modified, description]/file(name, ' + \
-            'type, ext, ctime, mtime, atime, description, owner, ' + \
-                                        'group, permissions)')
-
-    dx.title = 'Index of ' + File.expand_path(@path)
-    dx.file_path = File.expand_path(@path)
-    dx.last_modified = Time.now.to_s
-    
-    dx.import a
-
-    dx.save File.join(@path, @index)
-
-    return dx
+    @dx.last_modified = Time.now.to_s  if @dx.respond_to? :last_modified
+    @dx.import a
+    @dx.save File.join(@path, @index)
 
   end
 
   def refresh(cur_files)
 
-    puts 'inside refresh' if @debug
-    
+    puts 'inside refresh' if @debug    
 
     prev_files = @dx.to_a
     

metadata

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