dir-to-xml 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95f3f9304511ed382a219b2a65296302d9bea293d775fd051ba6d3f6eb426d2d
-  data.tar.gz: 2736fc013064b22e0f51977b1ad1471390d9fd0b786585e58ecef31a3ff8d97d
+  metadata.gz: 5a981066889af6ae5fe3c1b95af1fe1b11847441f0e7be318f394311293bd583
+  data.tar.gz: 3e930b643d528dced500e2352bd778524d481feca645a51a0b79f2057161eea3
 SHA512:
-  metadata.gz: 3932719c3963587b52bb82edd0475badab68675c46c0f0d8e01a73b1f24d2890630486982dd13918efafb1ddb9af12a70724f83c85b618c8b619370975874665
-  data.tar.gz: 286e1826d10993011a9d565a89c214257504d6a1629362417a9d94936bb9ceeb81ac68a4fd3e534021b52e195c0e6342df3236a3738714e7fbbb05f9aee08624
+  metadata.gz: a215864766564c3e9c3fbf21665933fa2ab6c22a390472b9998a80e069188486292b94dbf596884301d7abc530190bb4ee27a7ffebbab4284999e31aa9abe623
+  data.tar.gz: a452a6224daab6a70a97852e6741d5ea1db20ba5f08b58a55bcff64bb0a5b55abbc974ccc20e026a65577f5ebadd8aaf52c7ccb961908df1f9acd31ed0d70a4a

data/lib/dir-to-xml.rb

@@ -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,32 +127,39 @@ 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
 
@@ -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,9 @@ class DirToXML
     @latest_file[:path] = @path
     puts ':@latest_file: ' + @latest_file.inspect if @debug
 
+    puts 'before directories()' if @debug
     dir_list = directories()
+    puts 'dir_list: ' + dir_list.inspect if @debug
 
     if dir_list.any? then
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,8 @@ cert_chain:
   m7hEq9GAsvYejQNMhcxlvi+e70d3QiEg+2SVsBHaUGURzv0LjycCOjOaUxQA5swC
   JKGINad8xoEL7XIDoO6EnBcY
   -----END CERTIFICATE-----
-date: 2022-02-20 00:00:00.000000000 Z
+date: 2022-02-21 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'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: dxlite
   requirement: !ruby/object:Gem::Requirement