dir-to-xml 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4998b6d46270e28da59d130d05325abac6f47dcd
-  data.tar.gz: 572ff620f7843bb58fed25581a7b13c5e20b1f3a
+  metadata.gz: 7fa7c3734845467a3d98751753c039b7fe4aadcf
+  data.tar.gz: 291e33ee74d2bac3a424d9872fb00adea0c3de1f
 SHA512:
-  metadata.gz: cb3856faa4719d8327937a5740d78d61ed3c1e70d2ccc14d514b63a1a03a5c2c34b307262a0074121899d5581eeea07061479dd00844495088075b7953e75a31
-  data.tar.gz: 439244faafb626edd247aaf4c7a706fa28fee7547e1e29d87411d7f7b3075b1a620718c78ecb4bc30dbe02aebe855c03fb2892761deb3219b3cd41adfc587817
+  metadata.gz: a75b46bf2769935e624aa30b7c32aff05c491fb7ef80a11813b037b8d70c23b4e7d323666bd469ee935d8dbd0d003540c018f54e1de0f67a1492321ba1e9d298
+  data.tar.gz: 9d4e8ee319557c9a880768721b7b53f9a2c31f9411cda7757829bc0931f8dc4f22deacb1a043ecf708945d73fb407504180dbbdad573767ffad59167acaa44af

data.tar.gz.sig

@@ -1,4 +1 @@
-��ݼ���ҙ�go�5!�i�]0��S]�R� #lW.
-�l�x����d9'^?�wڗ戩�MVv6�'y�-��qK7�	K(�6Ȼ_�����4���f.�%���ݻӛyơ�ݟ8㡒��"T,��MW��lq��_�v��,m�ˡBᲾ�p ~��}��&�t����':6�i�umJ��
-��L�-���i'�A�M��ח�
-/�t�6F�Z,���+���^�%����N8.A���Ƴ��k��]k�Dx����
+�G��.3:CN:�Ƃ� a�w&#v2��	#��	���1�_��dK�t�z�y@HC�u�H�%&�m��7�jI�A���n�

data/lib/dir-to-xml.rb

@@ -4,9 +4,9 @@
 
 require 'dynarex'
 
+
 class DirToXML
 
-  attr_reader :status
 
   def initialize(path= '.', recursive: false)
     super()
@@ -16,17 +16,33 @@ class DirToXML
     Dir.chdir  path
 
     a = Dir.glob("*").sort
+    a.delete 'dir.xml'
+    
+    a2 = a.inject([]) do |r, x|
 
-    command = a.include?('dir.xml') ? 'run' : 'new_run'      
-    @doc, @status = self.send command, a
+      r << {
+        name: x,
+        type: File::ftype(x),
+        ext: File.extname(x),
+        created: File::ctime(x),
+        last_modified: File::mtime(x),
+        last_accessed: File::atime(x)
+      }
 
-    Dir.chdir old_path #File.expand_path('~')
-    @h = self.to_dynarex.to_h
+    end    
+
+    command = File.exists?('dir.xml') ? :refresh : :dxify
+    
+    @dx  = self.method(command).call a2
+
+    Dir.chdir old_path 
+
+    @h = @dx.to_h
     @object = @h
     
     @path = path
     @recursive = recursive
-    
+
   end
   
   def filter(pattern=/.*/)
@@ -75,102 +91,45 @@ class DirToXML
     @object || @h
   end
   
-  def to_xml
-    @doc.to_s
+  def to_xml(options=nil)
+    @dx.to_xml options
   end
   
   def to_dynarex
-    Dynarex.new @doc.to_s
+    @dx.clone
   end
   
   private
       
-  def new_element(name, text=nil)
-    new_node = Rexle::Element.new(name)
-    new_node.text = text if text
-    new_node
-  end
+  def dxify(a)
+    
+    dx = Dynarex.new 'directory[title,file_path]/file(name, ' + \
+            'type, ext, created, last_modified, last_accessed,' + \
+                            ' description, owner, group, permissions)'
 
-  def new_file(name, type, ext, ctime, mtime, atime)
-    node = Rexle::Element.new('file')
-    node.add_element new_element('name', name)
-    node.add_element new_element('type', type)
-    node.add_element new_element('ext', ext)
-    node.add_element new_element('created', ctime)
-    node.add_element new_element('last_modified', mtime)
-    node.add_element new_element('last_accessed', atime)
-    node.add_element new_element('description')
-    node.add_element new_element('owner')
-    node.add_element new_element('group')
-    node.add_element new_element('permissions')
-    node
-  end
+    dx.title = 'Index of ' + File.basename(Dir.pwd)
+    dx.file_path = Dir.pwd
 
-  def add_files(doc, a)
+    dx.import a
+    dx.save 'dir.xml'
     
-    dir_files = a.map do |x| 
-      [x, File.extname(x), File::ftype(x), File::ctime(x), \
-                                            File::mtime(x), File::atime(x)]
-    end
-
-    records = doc.root.element('records')
-    i = '0'
+    return dx
 
-    dir_files.each do |name, ext, type, ctime, mtime, atime|       
-      records.add_element new_file(name, type, ext, ctime, mtime, atime)
-      i.succ!
-    end
   end
 
-  def new_run(a)
+  def refresh(cur_files)
 
-summary = "
-<summary>
-  <title>Index of #{File.basename(Dir.pwd)}</title>
-  <file_path>#{File.dirname(Dir.pwd)}</file_path>
-  <recordx_type>dynarex</recordx_type>
-  <schema>directory[title,file_path]/file(name, type, ext, created, " \
-   + "last_modified, last_accessed, description, owner, group, permissions)" \
-   + "</schema>\n</summary>"
+    dx = Dynarex.new 'dir.xml'
 
-    buffer = "<directory>%s<records/></directory>" % summary
-    doc = Rexle.new(buffer)
-    add_files(doc, a)
-
-    doc.root.element('records').add_element new_file(name='dir.xml', type=nil, ext='.xml', *[Time.now] * 3)
-
-    File.open('dir.xml','w'){|f| f.write doc.xml pretty: false}
-    [doc, "created"]
-  end
-
-  def run(a)
-
-    doc = Rexle.new(File.open('dir.xml','r').read)   
-    
-    doc.root.xpath('records/file').each do |x|    
-      x.element('last_modified').text = File.mtime x.text('name') if File.exists?(x.text('name'))
-    end
-    
-    a_dir = doc.root.xpath('records/file/name/text()').sort
-    
-    if a == a_dir then
-      File.open('dir.xml','w'){|f| doc.write f}
-      return [doc, "nothing new"]
+    prev_files = dx.to_a
+            
+    cur_files.each do |x|
+      file = prev_files.find {|item| item[:name] == x[:name] }
+      x[:description] = file[:description] if file and file[:description]
     end
 
-    # files to add
-    files_to_insert = a - a_dir
-    add_files(doc, files_to_insert)
+    dxify(cur_files)
     
-    # files to delete
-    files_to_delete = a_dir - a
-
-    files_to_delete.each do |filename|
-      node = doc.root.element("records/file[name='#{filename}']")
-      node.delete
-    end
-
-    File.write 'dir.xml', doc.xml(pretty: true)
-    [doc, "updated"]
   end
-end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dir-to-xml
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   iqgRYucyTfq3VLTy6wrGN2HJj8unXh4JIFjyEvR3yvcCYl6IaHxuDfgoDfBI6MeQ
   Em7HctRLQorltw==
   -----END CERTIFICATE-----
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.33
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.33
+        version: 1.6.2
 description: 
 email: james@r0bertson.co.uk
 executables: []