dir-to-xml 1.1.3 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0d019bf13b52e143181d63f55ecb59d4afd6d0528316f8eabc98dad63d7701e
-  data.tar.gz: 706dfd39b2ec9a414394374736bc390a9fc786243181ccdc65ca4c7b42f16f90
+  metadata.gz: 68fb3b092b29f78ba022f7ed82bcb492de8371abcbfbeffb96b68d5dce547838
+  data.tar.gz: e30e9f017e10760e9b6df95f56fd3984edf86c6d0f94794b465d5c0de7492dc1
 SHA512:
-  metadata.gz: 761c9d38635ad4b9391a8b532713c2c8aa0c3b7e08172d811bf60772135392e4e8fbfc477239083cae926255c005aa689963d03b13aa5965b6a32804f7270067
-  data.tar.gz: d067ed9b1577125f7bc3b6cf8527531f9ced333a687486e65576307b4462d8ce27f2216042121147d64561e107e5f97d18d82b42a3e6cb4e732ddcbd4f1e9b61
+  metadata.gz: eaac7e5cd9fabbd8e36c447fcf1476da286e5d38aa529cf49ef49bb4c92e70f3ec7f826754e4c90efb758d722eb130a13c23274aa8f3f6d021206284e6f1cea1
+  data.tar.gz: 6b40bb4b36f1a3873cea22cfd0246952d4d83a1000140f1472f0b75316611d5f8a101b30a04dc96bf663bb13f8eefc7ab5783697ee47f1074a97409fd1093ba4

data/lib/dir-to-xml.rb

@@ -31,7 +31,7 @@ require 'dxlite'
 
 class DirToXML
   using ColouredText
-  include RXFHelperModule
+  include RXFReadWriteModule
 
   attr_reader :new_files, :deleted_files, :dx, :latest_files, :latest_file
 
@@ -75,7 +75,11 @@ class DirToXML
   alias changes activity
 
   def directories()
-    @dx.all.select {|x| x.type == 'directory'}.map(&:name)
+
+    a = @dx.all
+    puts 'inside directories() a: ' + a.inspect if @debug
+    a.select {|x| x.type == 'directory'}.map(&:name)
+
   end
 
   def find_all_by_ext(s)
@@ -97,8 +101,9 @@ class DirToXML
   def new_scan()
 
     t = Time.now
+    puts '_new_scan() @path: ' + @path.inspect if @debug
     records = scan_dir @path
-    puts 'new_scan() records: ' + records.inspect if @debug
+    puts '_new_scan() records: ' + records.inspect if @debug
 
     a = records.map {|x| x[:name]}
 
@@ -122,37 +127,44 @@ class DirToXML
 
       end
 
-      # check for newly modified files
-      # compare the file date with index file last modified date
+      # Add any new files
       #
-      dtx_last_modified = Time.parse(@dx.last_modified)
+      @new_files = a - a2
 
-      select_records = records.select do |file|
+      if @new_files.any? then
+        @dx.import @new_files.map {|filename| getfile_info(filename) }
+      end
 
-        file[:mtime] > dtx_last_modified or file[:type] == 'directory'
+      if (@deleted_files +  @new_files).any? then
 
-      end
+        @dx.last_modified = Time.now.to_s
+        @dx.save
 
-      puts 'select_records: ' + select_records.inspect if @debug
-      find_latest(select_records) if select_records.any?
+        new_scan()
 
-      # Add any new files
-      #
-      @new_files = a - a2
+      else
 
-      if @new_files.any? then
+        # check for newly modified files
+        # compare the file date with index file last modified date
+        #
+        dtx_last_modified = Time.parse(@dx.last_modified)
 
-        @dx.last_modified = Time.now.to_s
-        @dx.import @new_files.map {|filename| getfile_info(filename) }
+        select_records = records.select do |file|
 
+          file[:mtime] > dtx_last_modified or file[:type] == 'directory'
+
+        end
+
+        puts 'select_records: ' + select_records.inspect if @debug
+
+        find_latest(select_records) if select_records.any?
       end
 
-      @dx.last_modified = Time.now.to_s if @deleted_files.any?
 
     else
 
       @dx = new_index(records)
-      find_latest(records)
+      find_latest(records) if records.any?
 
     end
 
@@ -166,7 +178,7 @@ class DirToXML
     t = Time.now
     puts 'read path: ' + File.join(@path, index).inspect if @Debug
 
-    dx = DxLite.new(File.join(@path, index), autosave: true)
+    dx = DxLite.new(File.join(@path, index), autosave: false)
 
     t2 = Time.now - t
     puts ("%s read in %.2f seconds" % [@index, t2]).info if @verbose
@@ -186,7 +198,11 @@ class DirToXML
     @latest_file[:path] = @path
     puts ':@latest_file: ' + @latest_file.inspect if @debug
 
+    return unless @recursive
+
+    puts 'before directories()' if @debug
     dir_list = directories()
+    puts 'dir_list: ' + dir_list.inspect if @debug
 
     if dir_list.any? then
 
@@ -194,7 +210,7 @@ class DirToXML
 
         puts 'dir: ' + dir.inspect if @debug
         dtx2 = DirToXML.new(File.join(@path, dir), index: @index,
-                            recursive: true, verbose: false, debug: @debug)
+                            recursive: @recursive, verbose: false, debug: @debug)
         [dir, dtx2.latest_file]
 
       end.reject {|_,latest|  latest.nil? }.sort_by {|_, x| x[:mtime]}.last
@@ -248,7 +264,7 @@ class DirToXML
     dx.title = 'Index of ' + @path
     dx.file_path = @path
     dx.last_modified = Time.now
-    dx.import records.reverse
+    dx.import records.reverse if records.any?
     dx.save File.join(@path, @index)
 
     return dx

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,48 +35,28 @@ cert_chain:
   m7hEq9GAsvYejQNMhcxlvi+e70d3QiEg+2SVsBHaUGURzv0LjycCOjOaUxQA5swC
   JKGINad8xoEL7XIDoO6EnBcY
   -----END CERTIFICATE-----
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: c32
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        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: 0.3.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: dxlite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -103,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Dir-to-xml saves a directory listing in the Dynarex XML format

metadata.gz.sig

@@ -1,5 +1 @@
-38�����������π����8����|�A�4,���觶��b�E�-w��24T&���+N�J>_�	
-v�l~ot|5a�O��lp���Wk���qA[��1�~�x׿?���L�yܿ'Lx/*.�n��
-H��@4�_F�uV�����u��'�U��;k�K��hPw�5�i3��?6��9{�B���\�)��w����
��ԌCo*W���!�_]ty�؉cڻk����]cŽ
Iz�<�શGPZM��.f}��A֜���ܜr�_)Џ��j�2ʬ�r��8��-RL�E�]��&`�����q$�(���� ��i�W�	^GP.�@�<�5�\xy��-�9�/i|T��f
-���b率z1'��
-~�4r.
+��mQT>Ђ��H��