dir-to-xml 0.9.4 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1b0b52b39b76fef5f6121037c8959b445e4deb29
-  data.tar.gz: 98d16e6a817b200395bda374d1cc0a4bc948d7ae
+SHA256:
+  metadata.gz: 0af1114575e0707f202c03b2660d623e91f34422b607bfec18e688d658a44740
+  data.tar.gz: bda192469bb816b363a1a9725da3c134ec40fce2a29bcb8777baa253df8e4920
 SHA512:
-  metadata.gz: ba80cee7df999730c99adb3d4c6367b087bbb4224c4cf1da8183de0d81c1c7615aab1a48d79686d907ed55e58dc702a26d54fab97f29488a103b18eb3daa04bb
-  data.tar.gz: 1a9f6e5e8ab725f1e27f73c5814bb2f925adf83d89817ac0a4b2dda25595c43af6cc761af7499db3a43eb0998ea5ef3532c6aadde0e95695c18028de71e311ef
+  metadata.gz: e411adb17ec8d8b92bc1180bced2f7975a957bcb1ac811647732b18ebd402aab598349f10a2258a1b9d5a02b5acbb0e1c21ecd9b654049a37a20f51e6e2ce256
+  data.tar.gz: 78dfc760cd59ba6b525ee4fca05e56a7b1f8150f3fd877256234d309c7e28ce547e60430ad6bc1180786105940cb07cda02d4403092d890c125b0590875ee237

data/lib/dir-to-xml.rb

@@ -2,18 +2,22 @@
 
 # file: dir-to-xml.rb
 
-require 'dynarex'
+require 'dxlite'
 
 
 class DirToXML
 
-  attr_reader :dx
+  attr_reader :dx, :activity
   
-  def initialize(x= '.', recursive: false, index: 'dir.xml')
-
+  def initialize(x= '.', recursive: false, index: 'dir.xml', debug: false)
+    
     super()
     
-    if x.is_a? Dynarex then
+    @debug = debug
+    
+    @dx = nil
+    
+    if x.is_a? DxLite then
       
       @dx = x      
       @a = @dx.to_a    
@@ -27,9 +31,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]/fi`le(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|
@@ -50,10 +75,45 @@ 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]}
+      return if Time.parse(@dx.last_modified) >= (file[:mtime])
+      
+    end    
+    
+
+    
+    if @dx and @dx.respond_to? :last_modified \
+        and @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
+      
+      @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    
     
@@ -117,14 +177,15 @@ class DirToXML
     @dx.save File.join(@path, @index)
   end
   
-  def select_by_ext(ext)
+  def select_by_ext(ext, &blk)
     
-    @object = ext != '*' ? @a.select{|x| x[:ext][/#{ext}/]} : @a
+    @object = ext != '*' ? @a.select{|x| x[:ext][/#{ext}$/]} : @a
     return if @object.empty?
     
-    dx = Dynarex.new json_out: false
+    dx = DxLite.new
     dx.import @object
-    DirToXML.new(dx)
+    dtx = DirToXML.new(dx)
+    block_given? ? dtx.dx.all.map(&:name).each(&blk) : dtx
   end
   
   def sort_by(sym)
@@ -161,31 +222,25 @@ class DirToXML
       
   def dxify(a)
     
-    dx = Dynarex.new('directory[title, file_path, description]/file(name, ' + \
-            'type, ext, ctime, mtime, atime, description, owner, ' + \
-                                        'group, permissions)', json_out: false)
-
-    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  
+    @dx.import a
+    @dx.save File.join(@path, @index)
 
   end
 
   def refresh(cur_files)
 
-    dx = Dynarex.new(File.join(@path, @index), json_out: false)
+    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
             
     cur_files.each do |x|
 
       file = prev_files.find {|item| item[:name] == x[:name] }
-
+      #puts 'found : ' + file.inspect if @debug
       x[:description] = file[:description] if file and file[:description]
     end
 
@@ -193,4 +248,4 @@ class DirToXML
     
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 1.0.3
 platform: ruby
 authors:
 - James Robertson
@@ -10,50 +10,55 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMTE3MTkxNTU3WhcN
-  MTkwMTE3MTkxNTU3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC61F7V
-  dZnw6KeDdok4UCd2kAEeRRQRDeqjbNIB0Z+1mF+nTm79LPHyRbBC/k68nVNcobfS
-  uZ5pjKzEeoNFZ+hloYxKkuzgf2chbLdlO0Z4ImZ8CBB9y9CIsm2y83b51Dr0wRoZ
-  OZJT68w/4Qt2ZWwUge9cPZ0kWSA6PJDzwPFpjapYZGckAcEpeoUjf3uijd4DMgOm
-  hEpkAUFm5LIcbJV+GcB6CHktLZITGysWwHt4XLocidJQoTzeGJmrpSKdwBsbDVse
-  LXseAEoqdB6UWbqpXHE2AnaqTRtWWrN3jtPu/TRU60H/e6t1M058VgCCXMVsT+3P
-  ZEB6nnSWuVh/B45FAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFIASNzbdo4501UHsZJFkFmaEQVElMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBACNAHk9kLmkbG9KEGPu1
-  iYietA0FZnGEBSbo8TKqH76MOUFB6m2j1RPQBm+Lfo0gVkyMyGjxlExmLCZ5GBU6
-  Y/wnq8AlzU3QVSjaSPG4DIKMTxXT9+0sM99ZNjIh8FmZTk4evgfttB3v3ypxr+4b
-  QHFIfWFQQECrFa0ChG/FLG1jUiJhPZEcwyvjWxXq/y2anABAaNmpdCVoeER6YtM1
-  vq4mU9wyMV1t7hS9KA/el1ASJgc56Y0clXVIIP0Zg2W537AQhcv1x+JmbjhKVmHB
-  6HujQ+e2GfzNqHImdS/2E7ycYjbDf2xoR+vSALw49aP2FKxHjB/H0sXaVR9iIFk9
-  9KY=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMTIzMTgwNTQ4WhcN
+  MjIwMTIzMTgwNTQ4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC3/Li6
+  /b2XI6+wLVA57zxSEu6RtQqu94GlPisH87ziQS+xYDYq8MqrlqHwA2O6GyK+dnCS
+  V0pdXagOSMj27drmy9j6AhdOGxZTvB4M+q2uxxSt1AU8jAlKVBhRiKt15sbSF43K
+  3cY/PrccN4XpJT1YD44WU4+FwaGatFwcAsHtPpxYZgYMZj1sY+wnlKklqBrcWo6H
+  21+fRAVgHi5dqypH6Yez5Rc2rUKEg72OIU76iSjyx9XP8CiX4sxSqw+HRwyCkjKx
+  d5Onb6vhlSyWpBwRmPRP1bbiztxho4Pla28HM+qVvLIqHpCYoWZi2xmKBoJ5oKPx
+  cUj1ThI5nucnixrbg5dUjhJF9Ews4PukHtG2uIc/7WG+vCbZHn2CZNqH4HfB8cW5
+  yoeD4sBFEJwzK8nfGZuAwJ0yOi8yZTqcW8HyK/IVXH+fqC1NsQVEL5yYhnaCCVvx
+  ShG2g5rh48kNN5CsIQb87WP3J/YnsXhIz3+dwJPmLt+QuWE6sI1NkGWHQFECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUEmUqvmku
+  azMk41rHySinmAUmae8wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAUyL0Sh3Ld6sK0fldg057McECcaOIyB/nKJApz1er
+  ET9qYthBvhpcaNNo19NFuf9W9UyaE6RI9Eb07DvGYyVP/b0yTrIKyzXzSAwFmrek
+  3VUVAhdqOIrIrf16Zpm4NoOGTOst+6sXZ9KQ52DPPwxdLbRCL7HkUFBMIVf2x2LV
+  XflA8IOlSUPH2vmHJnE0yfs7Lzd5+xYpKeOzQSHo0p+SBDzIim3mOZ3ryf4IZQhv
+  wh0fYGJ2iC/w3rPA78Awm6FNPlGCPjgPIz4mliMicRI/sZmFQvn8+2HYWEzDDOO8
+  zYvUB7rkjDGXYqN1Ft3N6EOuNworOFjUlcPrDFCQHf4UgPjD6Z8WbYkI9c7LWtjc
+  HJCyl/PVyS0Srbl8IPn7JsgUCS7S02KOnVzukQ7PTc1wBlAZ4mNb7N9EOp90GP9a
+  YSREEphg3phQsU9LV4Dlc2Id4gB3W+//c1Ek6TFieKoVemKMkbtB1lgqsEpTCfwh
+  oNUg84DlSmZ2z9LKagBVAlDy
   -----END CERTIFICATE-----
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dynarex
+  name: dxlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.22
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.22
+        version: 0.3.2
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -71,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.2
+      version: 2.5.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -79,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Dir-to-xml saves a directory listing in the Dynarex XML format