dir-to-xml 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6496a0f8c9d61c424059f610d41ec4694af6b0978becff48d288fa69f6e92a1
-  data.tar.gz: 727f869e42d65809b44ae09fa8047d8489b861030545dfc4697823bf0803f7f0
+  metadata.gz: 001e83927dbcc6a8bbde99e4eca19b904a5344b02f5ab8ad2b1fc63a7e55a24b
+  data.tar.gz: 67404d3cec0b93c5c2a4fbea8ff01e3e18ea24df2176c6ac4dcaaf6495a97c69
 SHA512:
-  metadata.gz: 66b044181149d1560fe343c4de959667475322503ac124a522b33a2b6ad8625b2325d7c949ec1dca2adc01c0fc03413d8b273b35ae973297afec99cb9bb95beb
-  data.tar.gz: 2e04fe70291f883a0c165baa5dd4337841682f34888d36a3a57763e4b1867d1746650ae2375a525eece11c576b75bdbd5503b21b263be691b5f9e7384e241840
+  metadata.gz: 64ed16618d5d1bdd857b1cf1739b59f9964e90ce315437cc0e5dbe995e87b258dcfbde302cdd5f47233f95b8b55324801af65884b6aef1fd6b5e72b6a62295ed
+  data.tar.gz: d0ab3ede67051850dada5596979063397a875f1a25655acd5242f0ffe5899fefe30a71605c26fe437bfb451dc49c7a3bff518b006392834d3885ac72bd7b62e3

data.tar.gz.sig

@@ -1,3 +1,2 @@
-<�򈎼�����H����?v:w��7v��^܇|�p
-0�7z�bݹ�[w�m*��LO�绝�x_�������V�զ@q�j��k��s�!��\�������������޸z0
-w7+=]$�UlBe&�7���N7D�Ѷ�l�����=y�L��5´՚�WNU��a��Z�}a��hH3+��TJTJ{�t�>�à�] :U=d�e��򭏱LČ�Boq�����`��/��2.Rш{:'ƣ�]�!7���u���z�1ۻ�� ��I�A1~���՜*]�M�?0�@��ڕ��jA=xy�K��޴VV�X��E��ľ�o-�⯿��,�m��g��r
+D����")xefc=cw��n��
xf��bE{�gcϽ�}�X�
FI6!1D_+�)�y0��מSL��E_�qԺ�?�CIQ�Ǻ&x&뼘�C���ſ�m/�0V�X{LDt�.��',�6Wk����<��]��ր@bߢWbhh,+���.1dD �Zj��ī0Og�|����xz���& �ׂβ��65�i=����nR�Dy+���3�b-��#��F�{CK������sz�z��"�J6�D��0�$a`����
+����]!�{r�,�\8I�a�.���+���b�S0���D;�;+�v����K�̸��]���>��n�:P@-���~x��o^I�3b�`�B�x9����6�����_Bq��Ik{:u�^

data/lib/dir-to-xml.rb

@@ -7,7 +7,7 @@ require 'dxlite'
 
 class DirToXML
 
-  attr_reader :dx
+  attr_reader :dx, :activity
   
   def initialize(x= '.', recursive: false, index: 'dir.xml', debug: false)
     
@@ -15,6 +15,9 @@ class DirToXML
     
     @debug = debug
     
+    @dx = nil
+    @activity = {new: [], modified: []}
+    
     if x.is_a? DxLite then
       
       @dx = x      
@@ -29,9 +32,30 @@ 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)
+      
+    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
+    
     a = Dir.glob(File.join(path, "*")).map{|x| File.basename(x) }.sort
-
+        
     a.delete index
 
     a2 = a.inject([]) do |r, filename|
@@ -52,10 +76,54 @@ class DirToXML
       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
+      
+      file = a2.max_by {|x| x[:mtime]}
+      puts 'file: ' + file.inspect if @debug
+      return if Time.parse(@dx.last_modified) >= (file[:mtime])
+      
+    end    
+    
+
+    
+    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
 
-    @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    
     
@@ -131,9 +199,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()
@@ -164,27 +238,17 @@ class DirToXML
       
   def dxify(a)
     
-    dx = DxLite.new('directory[title, file_path, 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.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
-    dx = DxLite.new(File.join(@path, @index), debug: @debug)
+    puts 'inside refresh' if @debug    
 
-    prev_files = dx.to_a
+    prev_files = @dx.to_a
     
     #puts 'prev_files: ' + prev_files.inspect
     #puts 'cur_files: ' + cur_files.inspect

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,28 @@ cert_chain:
   YSREEphg3phQsU9LV4Dlc2Id4gB3W+//c1Ek6TFieKoVemKMkbtB1lgqsEpTCfwh
   oNUg84DlSmZ2z9LKagBVAlDy
   -----END CERTIFICATE-----
-date: 2021-01-23 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: []