dir-to-xml 0.9.5 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5eb4944a687b83409892b6df2f1c1841383022fc70042fee18ff784a4a09702
-  data.tar.gz: 85cb703ba3fb49d41d0d22b8b8eb4d7518fc43442158825a5db8a5b26fcf8203
+  metadata.gz: f155b43f7372db3ad7636b3c54f8369d78387d155ec4230f24b2ecf6a6b7d206
+  data.tar.gz: 3def96a9380e89e249275346f39ca5d6eebcbc60996e66c5d2a5786d9a250f03
 SHA512:
-  metadata.gz: 208c4022a9adef5f4d6db07085541870a70597ccf7c44f215698ef81e21873689f8cc11b4c6d697bc6449062cd0d6d514feaab806a1402c4b50cba7289bc043a
-  data.tar.gz: 99502e1db39fa1914f2f58f6ca0412c98cfbd1d5a2ccc716262dcb99dfa9ed92a55d610e695a61ac315be8ad1f7410d987b33d47375046592f9857d459aecdb4
+  metadata.gz: ade701a7b673a6305a73f52f10ce05e828588f4d235acc747aa5adb72a7e02a4dd11ac7312f0661ef843a8df9d848943eb8ddac53c954bc4b5176b0838efcfa0
+  data.tar.gz: a542531fdbfe27e2621c7f0db8b034b32528f0aa284e4038c9ee1239655e419a00d9e5e82c98ab5c7e86e634e1cba56677e1186318b8e58598632f08fb8b8af6

data/lib/dir-to-xml.rb

@@ -2,18 +2,23 @@
 
 # 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
+    @activity = {new: [], modified: []}
+    
+    if x.is_a? DxLite then
       
       @dx = x      
       @a = @dx.to_a    
@@ -27,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|
@@ -50,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    
     
@@ -122,7 +192,7 @@ class DirToXML
     @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
     dtx = DirToXML.new(dx)
     block_given? ? dtx.dx.all.map(&:name).each(&blk) : dtx
@@ -162,31 +232,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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 1.0.4
 platform: ruby
 authors:
 - James Robertson
@@ -11,54 +11,54 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMjA5MTI1MDQ2WhcN
-  MjAwMjA5MTI1MDQ2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDZ4t3Z
-  RMbb5Rq5td/W9rc8g40wxGUMWbpbTgAakq6En2t4tDg06Cp6VkW7fJQXh4lz5cB3
-  2IsgRuQ3rI5dBWWbWzoBV4stsk2Cbr5LZfL0jriAE9Itxz0+9EUaEN/BSak6tjS7
-  HxW9nqwqgHigpr55BJV1VuiNUWcYvWxMv2FYSpb9x6Txi5InjLSBuG+4VLkjYq6W
-  5ZW1EdTLMD+INJmu9L0/6gRuspLna6hgr3yvbs6U99xSZXAKDz1ACvSauStIV9Tg
-  JFtZVMX9gP5YoV/LGKOa9UcaNowQn5BVtYkkx4u+zunWQMXNjJdhNKd1q9M5hKj3
-  xsiLdOPUgvPD6yxIdc4P/HhFRj8uUV1qvGTwVvWtM3AQgTUauIU6ywxxy9VJWFVm
-  Dx9IM8e8C1iRIe+eJHOjC3gNdJylQd4dkJRdk3eg98lKU3HJ4l+Hx71gbKbT6AkX
-  veaO0ROVEhqfyphqcxsQUsUiqwzU3TXucQ0ox/WgsxERn7husNv9TXgOOpMCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQURigjbkWd
-  CxSBvgS6ssMZVw4K69IwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  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
-  BgkqhkiG9w0BAQsFAAOCAYEAF4a75Pyo4NimD1hul2zroctjVUOO0mORuTDRNnqg
-  444YSSusJhGe3gbPdOligJagqv0LHkRdsGC3ZFnYuZIHQ3PoAF6bJYJBses6EJzQ
-  yY3p+lKZ71Z2gt+7gY3dlxIMfcTjP7/ekuaWwH/rP/PGWPP3Sm2YgETkGIgeLgU+
-  RpcwXtymgy72fK7ayEczkCZlbIrlovr3GM1Lg3dn288xZ4Q17V9hVMscG6zwWsm8
-  VA8Dq9kZU/O8CoU3i1JC6N8vGSZcFJyKsdLnZ4odN8bN44Pzgcj0Kl18k0hLhSIB
-  KUFajr4eEXGSM+dPKyIHRAdPJ90PDETUbJmfNZHQtcj6eFdZZZjRw6dM9LKrHK+S
-  WaLbf3RZkn+ts0C9JLtsQBfzKQ+fVBtQsdUgsTm9K5HfwwJ7DOvMrBNTlUT3TYIH
-  BTVk165yWnQB2Yq2v52HPRkRaeuOLH66MVgEX6wMvIP14S1JM1GrbyBSQDzKAuVb
-  +a4LimR9d0PX4VBzCShRiadP
+  BgkqhkiG9w0BAQsFAAOCAYEAUyL0Sh3Ld6sK0fldg057McECcaOIyB/nKJApz1er
+  ET9qYthBvhpcaNNo19NFuf9W9UyaE6RI9Eb07DvGYyVP/b0yTrIKyzXzSAwFmrek
+  3VUVAhdqOIrIrf16Zpm4NoOGTOst+6sXZ9KQ52DPPwxdLbRCL7HkUFBMIVf2x2LV
+  XflA8IOlSUPH2vmHJnE0yfs7Lzd5+xYpKeOzQSHo0p+SBDzIim3mOZ3ryf4IZQhv
+  wh0fYGJ2iC/w3rPA78Awm6FNPlGCPjgPIz4mliMicRI/sZmFQvn8+2HYWEzDDOO8
+  zYvUB7rkjDGXYqN1Ft3N6EOuNworOFjUlcPrDFCQHf4UgPjD6Z8WbYkI9c7LWtjc
+  HJCyl/PVyS0Srbl8IPn7JsgUCS7S02KOnVzukQ7PTc1wBlAZ4mNb7N9EOp90GP9a
+  YSREEphg3phQsU9LV4Dlc2Id4gB3W+//c1Ek6TFieKoVemKMkbtB1lgqsEpTCfwh
+  oNUg84DlSmZ2z9LKagBVAlDy
   -----END CERTIFICATE-----
-date: 2019-02-09 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.8'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.15
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.15
+        version: 0.3.2
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -76,14 +76,15 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Dir-to-xml saves a directory listing in the Dynarex XML format