dir-to-xml 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d3847feaade1ff658c8dda0403e10b0a98c6350333b01fc4048e97d86cdcd0d
-  data.tar.gz: 99a0cad18703df51c90405b585a2aeab5820dca22b52d27acba5dc96dc5e1bb8
+  metadata.gz: a24fbbc39d5a5d420a7b67713292409a71aae25b72484c9af7f261af3b1f952f
+  data.tar.gz: 8e33e3dd2579ee7ef0c3c56144b2cc2beecb68784e20c60b73ea1f8bb1adc9fb
 SHA512:
-  metadata.gz: 37bee8d677c8a5801715d92d2d0617be2d8b559244d4f58b0d0b6fb0cef37f0e803d1a76214dcc92b09012a6fe5d15b51bfe0949feb0bdaa3af6d9e53721d515
-  data.tar.gz: 60d691388d4e8f46f15307b50e01f4358fad88ced3f6656d29b8be9e1fa408a256f20f641146b8d375041800952818ed752d78043b79d03e4bae93868781d979
+  metadata.gz: c45dfed7498b83d0918456d4deb47570cec2f6ab63e27baf0cc26f815927a161a783d3278f6ad5bb421f7d199f9332ea42fd3e9afa10c8ba1c4bd17838785ca6
+  data.tar.gz: 0dc2bdf0cc9483abf4f0ec8fc4f33c48a2d64e9e30cc1b281383c1bb3f9586b7aa4bd5db3459fed4a205e1b9c05954bdaa6629c416f78e357fbe543e4261a154

data/lib/dir-to-xml.rb

@@ -15,6 +15,9 @@ class DirToXML
     
     @debug = debug
     
+    @dx = nil
+    @activity = {new: [], modified: []}
+    
     if x.is_a? DxLite then
       
       @dx = x      
@@ -29,15 +32,25 @@ class DirToXML
     @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)
+      @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)')
 
-    # has the directory been modified since last time?
-    #
-    if @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
+      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
     
@@ -64,17 +77,47 @@ class DirToXML
 
     end    
     
-    if @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
+      
+      puts 'nothing to do' if @debug
+      
+      file = a2.max_by {|x| x[:mtime]}
       
-      t = Time.parse(@dx.last_modified)
+      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
       
-      # find the most recently modified cur_files
-      recent = a2.select {|x| x[:mtime] > t }.map {|x| x[:name]} \
-          - %w(dir.xml dir.json)
+      if @dx.last_modified.length > 0 then
       
-      # is it a new file or recently modified?
-      new_files = recent - @dx.to_a.map {|x| x[:name]}
-      modified = recent - new_files
+        t = Time.parse(@dx.last_modified)
+        
+        # find the most recently modified cur_files
+        recent = a2.select {|x| Time.parse(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}
       
@@ -83,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    
     
@@ -159,9 +205,15 @@ class DirToXML
   end
   
   def sort_by(sym)
+    
+    puts 'inside sort_by' if @debug
     procs = [[:mtime, lambda{|obj| obj.sort_by{|x| 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()
@@ -192,26 +244,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.1
+  version: 1.0.6
 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-01 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: []