all_todo 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e614f169caa9cf9299694cbae2877a94a5bea86
-  data.tar.gz: 18c546ba19151dc0728c091583c907bce8ccecc7
+  metadata.gz: 14a238fd842c1ed5bc0895777821fd9c55475f8f
+  data.tar.gz: 94883c7db7611aaf8d9b81437f4aa7792425e68c
 SHA512:
-  metadata.gz: 6b0ffae932f9e7521ce2bc53540628ee6b776c1ecbd92789f27545a97321400eb8b179ceeb6dafdabf6482222d00c4a53e3313045d95a7b4226e07a7644207b1
-  data.tar.gz: b92a0306c04b622aa19bdd664b22b07a82c3698dbbbbd5d1f5f02892612395b237c5f14916ab22752c7c411d2a51a064ce4e84167127277b0c1225ecff1680e1
+  metadata.gz: 5d644983654f354f63ab409e03264b12dc15c7164cebfab9f1ee2aa9a78399f0776f44cb8103ca1d372ad4284ab8b0c9fe23338e13e9084b25cc5fc04fc25669
+  data.tar.gz: eea0a4e9fc9e82949dfa4b2b7b805ed0dcb790636978ef8c1e8bad97e7992652efc77a7131c6676e3656f54c68372b198e4bb0c74208fc6af35b5cba8925b7df

data/lib/all_todo.rb

@@ -9,29 +9,35 @@ require 'rexle-diff'
 
 class AllTodo < PxTodo
 
-  def initialize(raw_s, filepath: '.')
+  def initialize(raw_s=nil, filepath: '.')
     
-    super(raw_s, filepath: filepath) do |x|
+    if raw_s then
       
-      todo = x.title
-
-      # is the to-do item selected for action today?
-      today_item = todo.slice!(/^\*\s+/)      
-      x.when = 'today' if today_item
-      
-      x.title = todo
-      
-    end        
+      super(raw_s, filepath: filepath) do |x|
+        
+        todo = x.title
 
+        # is the to-do item selected for action today?
+        today_item = todo.slice!(/^\*\s+/)      
+        x.when = 'today' if today_item
+        
+        x.title = todo
+        
+      end        
+    end
+    
   end
   
+  # generates the all_todo_detail.txt file contents
+  #
   def detail()
     
     lines = []
     
     @px.each_recursive do |item, parent, level, i|
 
-      lines << item.to_h.map {|k,v| "%s%s: %s" % ['  ' * level, k, v]}.join("\n")
+      lines << item.to_h.map \
+          {|k,v| "%s%s: %s" % ['  ' * level, k, v]}.join("\n")
       lines << ['']
       
     end    
@@ -69,12 +75,83 @@ class AllTodo < PxTodo
     pr = PxRowX.new(lines.join)
     pr.to_xml pretty: true    
 
+  end  
+
+  # parses the all_todo_detail.txt file and updates the all_todo_detail.xml file
+  
+  def update_detail()
+    
+    s = File.read File.join(@filepath, 'all_todo_detail.txt')
+    
+    px = Polyrex.new parse_detail(s)
+    results = []
+    
+    px.each_recursive do |x, parent|
+      
+      if x.when.length > 0 then
+
+        basic_xpath = x.node.backtrack.to_xpath
+
+        a = basic_xpath.split('/')
+        a.shift # removes the root node reference
+        
+        s = if parent.heading.length > 0 then
+          "heading='%s'" % parent.heading
+        else
+          "title='%s'" % parent.title
+        end
+        
+        a[-3] << "[summary/#{s}]"
+        a.last << "[summary/title='#{x.title}']"
+        xpath = a.join('/')
+
+        results << [xpath, x.when]
+      end
+    end
+
+    # open the all_todo_detail.xml file
+    
+    xmlfilepath = File.join(@filepath, 'all_todo_detail.xml')
+    
+    # if the file doesn't exist save it and return from the method
+    
+    unless File.exists? xmlfilepath then
+      File.write xmlfilepath, px.to_xml(pretty: true)
+    end
+
+    px2 = Polyrex.new xmlfilepath
+
+    results.each do |xpath, val|
+
+      r = px2.element(xpath + '/summary/when')
+      r2 = px.element(xpath + '/summary/when')
+      next unless r
+
+      a1, a2 = [r.text, val].map {|x| x.split(';').map(&:strip) }
+      
+      # return values which in both a1 and a2
+      r2.text = (a1 | a2).join('; ')
+
+    end
+    
+    # update the all_todo_detail.xml file
+
+    File.write xmlfilepath, px.to_xml(pretty: true)
+
   end
 
   def save(filepath=File.join(@filepath, 'all_todo.xml'))
 
     File.write filepath, @px.to_xml(pretty: true)
-
+    
+    # also update the all_todo.txt  and all_todo_detail.txt
+    
+    File.write File.join(@filepath, 'all_todo.txt'), self.to_s    
+    
+    #update_detail()
+    #File.write File.join(@filepath, 'all_todo_detail.txt'), self.detail
+    'saved'
+    
   end
   
   def to_s()
@@ -103,7 +180,7 @@ class AllTodo < PxTodo
         status = x.status == 'done' ? 'x' : ' '
         
         todo = []
-        todo << '* ' if x.when == 'today'
+        todo << '* ' if x.when =~ /today/
         todo << "%s[%s] %s" % [indent, status, x.title]
         
         lines << '' if i == 0 and parent.heading.length > 0
@@ -166,35 +243,39 @@ class AllTodo < PxTodo
   def update_today(file='todo_daily.txt')
 
     # parse the newest todo_daily.txt file
-    pxtodo = PxTodo.new(file, filepath: @filepath)
+
+    pxtodo = PxTodo.new(file, filepath: @filepath, ignore_headings: true)
 
     # remove the id attributes
     px2 = pxtodo.to_px
     px2.xpath('//todo').each {|x| x.attributes.delete :id}
-    
+
     # read the todo_daily_noid file
     px1noid = Polyrex.new(File.join(@filepath, 'todo_daily_noid.xml'))
-    
+    xml = px1noid.to_xml
+    xml2 = px2.to_xml pretty: true
+
     # compare the 2 documents   
-    doc = RexleDiff.new(px1noid.to_xml, px2.to_xml).to_doc
-    
+    doc = RexleDiff.new(xml, xml2).to_doc
+
     a = doc.xpath('//todo/summary/status[@created]../.')
     
+
     # update the all_todo document    
     # first we need to find the ids
     
     px1 = Polyrex.new(File.join(@filepath, 'todo_daily.xml'))
-    
+
     statuses = a.map do |node|
 
        e = px1.element("//summary[contains(title,'#{node.text('title')}')]")
        [e.parent.attributes[:id], node.text('status') ]
       
     end
-    
+
     statuses.each do |id, status|
       
-      todo = @px.find_by_id id
+      todo = @px.find_by_id id      
       todo.status = status
       
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: all_todo
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   4IWTpx4UfuUB+a/n3zRd7tPzfsCnbjv0WeNaOLxPEdrqrbPxdMp0ULnHMi6/cuMX
   +/4csIEIHj2yLg==
   -----END CERTIFICATE-----
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: px_todo