dir-to-xml 0.9.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59219ab2db1951fd62a36a833fbc4253961bbb4c
-  data.tar.gz: 8ac53b24217951922458f98b8e903b91140058c6
+SHA256:
+  metadata.gz: 6d3847feaade1ff658c8dda0403e10b0a98c6350333b01fc4048e97d86cdcd0d
+  data.tar.gz: 99a0cad18703df51c90405b585a2aeab5820dca22b52d27acba5dc96dc5e1bb8
 SHA512:
-  metadata.gz: ad02c21b2b1173e6511271987465625c3127961a183a07b623ef55570b907dbbb101c817cca5cb1a48d1647c6cdcc747aa360e8314ff2740fb25b449224457a0
-  data.tar.gz: 20646cc68aa7aefe2b6e102e4ac391712d69f492eb9e20c567689b2e3143eb350e2871e8bc9884c3fe405dac036b27686515596e05095a0f6b4460337ca25ffc
+  metadata.gz: 37bee8d677c8a5801715d92d2d0617be2d8b559244d4f58b0d0b6fb0cef37f0e803d1a76214dcc92b09012a6fe5d15b51bfe0949feb0bdaa3af6d9e53721d515
+  data.tar.gz: 60d691388d4e8f46f15307b50e01f4358fad88ced3f6656d29b8be9e1fa408a256f20f641146b8d375041800952818ed752d78043b79d03e4bae93868781d979

data/lib/dir-to-xml.rb

@@ -2,18 +2,20 @@
 
 # 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
+    
+    if x.is_a? DxLite then
       
       @dx = x      
       @a = @dx.to_a    
@@ -27,9 +29,20 @@ class DirToXML
     @path, @index, @recursive = path, index, recursive
     
     raise "Directory not found." unless File.exists? path
+    
+    @dx = DxLite.new(File.join(@path, @index), debug: @debug)
 
+    # 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 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 +63,23 @@ class DirToXML
       end
 
     end    
+    
+    if @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
 
@@ -74,15 +104,19 @@ class DirToXML
     @dx.filter &blk
   end
   
-  def filter_by(pattern=/.*/, type: nil)
+  def filter_by(pattern=/.*/, type: nil, ext: nil)
     
     @object = @a.select do |x| 
             
       pattern_match = x[:name] =~ pattern
+      
       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
     
@@ -113,12 +147,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
+    return if @object.empty?
     
-    @object = ext != '*' ? @a.select{|x| x[:ext][/#{ext}/]} : @a
-    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)
@@ -149,17 +186,20 @@ class DirToXML
     @dx.clone
   end
   
+  alias to_dx to_dynarex
+  
   private
       
   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)
@@ -170,14 +210,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.2
+  version: 1.0.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,51 +10,55 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDczMTE1MDg0MFoXDTE3MDczMTE1MDg0MFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAKe0Tx9cyuP49OURT7IiCnuCaeFllrizfGPz71cWJwRwG3tTKgyahn929V6N
-  8ALUq10u1g3s1ZtOxhpv0UXj8DkqrV6Y7B37ASrKgfeN8+oKOOYldFlcP0Bixyfp
-  K7Y1O3xrd66O2qNjtTdD7uTEzOPhLw3SUkO0IkuF+Kqam81fsmAcAIWdROGiD9ax
-  DL4j7ykZ/AYmi6R8NKrYN637w2sOnkYXufIQ8wx9qibY3HMW5+X21L6gEaFUDeSW
-  2m//fkHlxmFN+IICo6DFc5VZKtwQmJVK1HnpKOVtWfsVN4bll7ANy54AxvyPsz0r
-  AO6/53uNtf6aJXGNkgAoSnRskXMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUaNTA8KT0NF8E1x4S7UJf8EzbHJYwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAC6wZQVPx
-  H8PVmazVDwrxyllTrkeVFSgr3qVyigcBGpm+/sGyTDYnYWhV2GH9vYHM/OI1pJup
-  0q2bFjmKFR1xSHtlMzCTulPY+OpKY403Wg0VZepzTjh9ZDS19/0tQQoaFRd6Y0CT
-  y8cHVYq+Ij6Ug16AA5KRuViQ1vaanElSlRKEmoWom3gkt5fkZ3SMVu/I/Bpx2j6u
-  wqDD24RYravGp0su86eLBFeVjwF8kMUx1VA64kCz8FDTws+tozgFi2HMWPO/B603
-  KsWUx1RJXP2nrd/DuPwuyaNM0fcsnnqFnbAO7RjbYXWS96dGA0WVmxdO7PcMnJ9K
-  PneSyA3VrnMuNQ==
+  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: 2017-06-15 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: []
@@ -72,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:
   - - ">="
@@ -80,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Dir-to-xml saves a directory listing in the Dynarex XML format