dir-to-xml 0.9.3 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 54d8f71f49b8e50b7d728ecd4acdfd3c5ac81321
-  data.tar.gz: 2f37cf87cb310ed00d0fbb748147c391014ebf17
+SHA256:
+  metadata.gz: c4612af405a2a24d589028a583d28b3217c7c44db120ad68d015c412efe86b16
+  data.tar.gz: 8d66e4b320b585972be52e6085186858b2fd99dbd369b3d3c0919cc0cd36afa2
 SHA512:
-  metadata.gz: d0915415f3a3388773f6638f0527156ffbf0d8b2a89ed64875038561be6103ce8e26b7e6f643ef0823243d524610274188746c862211ee2ab11caeab98c11ab0
-  data.tar.gz: a4d43cb520ec183a9fb9efc6974f2783409a9a0e095e16de3ebc80defe40226cfe793894381e0581ba2bd8dd47c45aae71d9a3c7299120414e9df922fbe1f43a
+  metadata.gz: bd2821ac72de327ed54318f5d2ac63c14c184dae26181e6ff38ba455466a067de75dffd48b3749ce5b9ba03ca542d98db4ac94818e929f9e6ce86df43406a4ff
+  data.tar.gz: 48852e32ca730dc65bc3a4363bf87eb8d365742ea20add65ec22adf97e9e80fabf59716cf1cdcea171a234bda6f3dc7dac4ecf994314e26241863b66f3957380

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,28 @@ 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)
+    
+    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
+    
+    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,6 +73,24 @@ class DirToXML
       end
 
     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
 
@@ -82,11 +123,11 @@ class DirToXML
       
       type_match = type ? x[:type] == type.to_s : true
       ext_match = ext ? x[:ext] == ext.to_s : true
-      
+
       pattern_match and type_match and ext_match
 
     end
-    
+
     self
   end
     
@@ -117,12 +158,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
-    dx = Dynarex.new json_out: false
+    @object = ext != '*' ? @a.select{|x| x[:ext][/#{ext}$/]} : @a
+    return if @object.empty?
+    
+    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)
@@ -159,13 +203,14 @@ class DirToXML
       
   def dxify(a)
     
-    dx = Dynarex.new('directory[title, file_path, description]/file(name, ' + \
+    dx = DxLite.new('directory[title, file_path, last_modified, description]/file(name, ' + \
             'type, ext, ctime, mtime, atime, description, owner, ' + \
-                                        'group, permissions)', json_out: false)
+                                        '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)
@@ -176,14 +221,18 @@ class DirToXML
 
   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.3
+  version: 1.0.2
 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-17 00:00:00.000000000 Z
+date: 2021-01-24 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'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.22
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.22
+        version: 0.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 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

metadata.gz.sig

@@ -1,3 +1,6 @@
-i�S���B�נ�>��K�f(�R��
-��u�:��ơKJ�]�a�@�_x���Q
-�:=+�{{�PL�F�V���
+����ʽ{]k$S�d����	�|(I]€�;"�~cWu�~��c
+'�"�</8��Cq�-
+&iB�ɐ�F٠�?�w3�V�R`�!��פ
�@����$MUDp��Dk,�C��"��������z�3����:�-F6�(�'J��+P���a��b}5��
�"��:�昉aϛ,E�oSX�3����}
+yd�#��U�>K,��B,ף��]��%$�����s:[��ߙ�?��
+�3��E�_"�s��v8
+��>.��u���N���/+�o��.j|wO�9��o\�`�ƨpjs���xϿb���Y}_@��=���~E��	�u\�