sra2019 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d80258051ebf745f12d63277fa418945b747e4143cddfdb9ae14fd59d8a7cf
-  data.tar.gz: 62d9f9565ac94cff85a4c4177c3ffac2e166c7c945754aa1570382a45f221002
+  metadata.gz: 2ddc547d97ba77fd821c80247707774db29fa20b38d8a9f4183e793e04516ca8
+  data.tar.gz: 93fde335b26f1cda3befbab1c5db96e346e877a16d42907dd55c9f64e3671355
 SHA512:
-  metadata.gz: 8da13a1cf115f3c94899df1372100300f17434997abeaeeecf59abda9775b96a2bb06f065c73789f4d1998dfaa143ee29a53ae3abd67853600713ab713f05a93
-  data.tar.gz: 568778997ef54ccbb817f56700c388d8ab491cadf6d34c88aaef017d4c0624feb166a141a87cc2a7e77ffb56687ca71447e2a532c529c50bc7b96941abec2d78
+  metadata.gz: '017894f86f375912322529f8d9c66b61c4b35c9a9960684bd93abd3f2ca415862daf0cf3265353581679bea0623f695dfd08560ced77197fbc0e20d1e5fdc0fb'
+  data.tar.gz: af6db46c959d7b5beedff8b15be615a0d8c7733886d5abb78e830bf9e991d5b49bc0fec5d012f1b0d50c9d07d9e7fb9b8d43db814b11d07a3acd0b225ae54637

data/lib/sra2019.rb

@@ -8,7 +8,10 @@
 require 'hlt'
 require 'rexle'
 require 'base64'
+require 'ostruct'
+require 'subunit'
 require 'zip/zip'
+require 'dynarex'
 require 'rxfhelper'
 require 'wicked_pdf'
 require 'mini_magick'
@@ -16,11 +19,21 @@ require 'archive/zip'
 require 'rexle-builder'
 
 
+module TimeHelper
+
+  refine String do
+    def to_time()
+      Time.strptime(self, "%H:%M:%S")
+    end
+  end
+
+end
 
 class StepsRecorderAnalyser
   using ColouredText
+  using TimeHelper
 
-  attr_reader :steps
+  attr_reader :steps, :start_time, :stop_time
   
 
   def initialize(s, debug: false, savepath: '/tmp', title: 'Untitled')
@@ -37,12 +50,39 @@ class StepsRecorderAnalyser
 
     puts ('content: ' + content.inspect).debug if @debug
     
-    all_steps = parse_steps  content  
-    @doc = build all_steps
-    @steps = all_steps.select {|x| x[:user_comment]}
+    @actions = parse_report content
+    @all_steps = parse_steps  content  
+    @doc = build @all_steps
+    steps = @all_steps.select {|x| x[:user_comment]}
+    @steps = steps.any? ? steps : @all_steps
 
   end
 
+  def import(s)
+    
+    @dx = Dynarex.new
+    @dx.import s
+    
+  end
+  
+  # Returns a Dynarex object
+  #
+  def to_dx()
+    
+    @dx = Dynarex.new 'instructions/instruction(step, imgsrc, description)'
+    @dx.summary[:rawdoc_type] = 'rowx'
+    
+    @steps.each.with_index do |h, i|
+      
+      @dx.create step: i+1, imgsrc: "screenshot#{i+1}.jpg", 
+          description: h[:user_comment] || h[:desc]
+      
+    end
+    
+    @dx
+    
+  end
+
   def to_kbml(options={})
 
 
@@ -50,6 +90,9 @@ class StepsRecorderAnalyser
 
   end
   
+
+  # Writes the steps to an HTML file
+  #
   def to_html(filepath=File.join(@savepath, 'sra' + Time.now.to_i.to_s))
     
     # save the image files to a file directory.
@@ -95,7 +138,9 @@ html
 EOF
 
     html = Rexle.new(Hlt.new(@sliml).to_html)\
-        .root.element('html').xml pretty: true
+        .root.element('html').xml pretrequire 'requestor'
+eval Requestor.read('http://a0.jamesrobertson.eu/rorb/r/ruby'){|x| x.require 'sra2019' }
+ty: true
     File.write File.join(filepath, 'index.html'), html
 
     %w(layout style print).each \
@@ -109,6 +154,43 @@ EOF
     @sliml
   end
   
+  def to_srt()
+
+    lines = to_subtitles.strip.lines.map.with_index do |x, i|
+
+      raw_times, subtitle = x.split(/ /,2)
+      
+      start_time, end_time = raw_times.split('-',2)
+      times = [("%02d:%02d:%02d" % ([0, 0 ] + start_time.split(/\D/)\
+                                    .map(&:to_i)).reverse.take(3).reverse), \
+               '-->', \
+              ("%02d:%02d:%02d" % ([0, 0 ] + end_time.split(/\D/).map(&:to_i))\
+               .reverse.take(3).reverse)].join(' ')
+
+      [i+1, times, subtitle].join("\n")
+
+    end
+
+    lines.join("\n")    
+    
+  end
+  
+  def to_subtitles()
+    
+    times = @all_steps.map(&:time).each_cons(2).map do |x|
+
+      x.map do |sec|
+        a = Subunit.new(units={minutes:60, hours:60}, seconds: sec).to_h.to_a
+        a.map {|x|"%d%s" % [x[1], x[0][0]] }.join('')
+      end.join('-')
+      
+    end
+    times.zip(@all_steps.map(&:desc)).map {|x| x.join(' ')}.join("\n")
+                          
+  end
+  
+  # Writes the steps to a PDF file
+  #
   def to_pdf(pdf_file=File.join(@savepath, 'sra' + Time.now.to_i.to_s, 
                               @title.gsub(/ /,'-') + '.pdf'))
     
@@ -121,18 +203,20 @@ EOF
     
   end
   
-
+  # Compresses the HTML file directory to a ZIP file
+  #
   def to_zip()
     
     project = 'sra' + Time.now.to_i.to_s
     newdir = File.join(@savepath, project)
     zipfile = newdir + '.zip'
     
-    to_pdf(File.join(newdir, @title.gsub(/ /,'-') + '.pdf'))    
+    to_html(File.join(newdir))    
+    #to_pdf(File.join(newdir, @title.gsub(/ /,'-') + '.pdf'))    
 
     Archive::Zip.archive(zipfile, newdir)
     
-    'saved to ' +  zipfile
+    zipfile
     
   end
 
@@ -184,15 +268,16 @@ EOF
   
   
   def extract_image(s, n)
-    
-    report = Rexle.new s[/<Report>.*<\/Report>/m]        
-    
-    e = report.root.element('UserActionData/RecordSession/EachAction' + 
-                            "[@ActionNumber='#{n}']/HighlightXYWH")
-            
+        
+    action = @actions[n-1]          
+    puts 'action: ' + action.inspect if @debug
+    e = action.element('HighlightXYWH')
+    return unless e
     y, x, w, h = e.text.split(',').map(&:to_i)
 
-    jpg_file = e.parent.element('ScreenshotFileName/text()')
+    jpg_file = action.element('ScreenshotFileName/text()')
+    return unless jpg_file
+    
     img_data = s[/(?<=Content-Location: #{jpg_file}\r\n\r\n)[^--]+/m]    
     puts ('img_data: ' + img_data.inspect).debug if @debug
     
@@ -203,6 +288,23 @@ EOF
     image.to_blob
     
   end
+  
+  def parse_report(s)
+    
+    report = Rexle.new s[/<Report>.*<\/Report>/m]            
+    session = report.root.element('UserActionData/RecordSession')
+    puts 'session: ' + session.inspect if @debug
+    puts 'attributes: ' + session.attributes.inspect if @debug
+    
+    @start_time, @stop_time = %w(Start Stop).map do |x|
+      v = session.attributes[(x + 'Time').to_sym]
+      puts 'v: ' + v.inspect if @debug
+      v.to_time
+    end
+    
+    session.xpath('EachAction')    
+    
+  end
 
   def parse_steps(s)
 
@@ -220,27 +322,31 @@ EOF
 
       raw_comment = a[0][/User Comment: (.*)/,1]
       
-      n = a[0][/(?<=Step )\d+/]      
+      n = a[0][/(?<=Step )\d+/].to_i
       puts ('n: ' + n.inspect).debug if @debug
+      
+      time = (@actions[n-1].attributes[:Time].to_time - @start_time).to_i
 
-      if raw_comment then        
+      
+      h = if raw_comment then        
         
         {
-          step: n,
-          user_comment: raw_comment.gsub("&quot;",''),
-          screenshot: extract_image(s, n)
+          user_comment: raw_comment.gsub("&quot;",'')          
         }
 
       else
       
         {
-          step: n,
-          desc: a[0][/(?:Step \d+: )(.*)/,1].gsub("&quot;",'"'),
+          desc: a[0][/(?:Step \d+: )(.*)/,1].gsub('&amp;','&')\
+            .gsub("&quot;",'"').sub(/\s+\[[^\[]+\]$/,''),
           keys: keys ,
           program: a[1][/(?<=Program: ).*/],
           ui_elements: a[2][/(?<=UI Elements: ).*/].split(/,\s+/)
         }
       end
+      
+      steps = {step: n, time: time, screenshot: extract_image(s, n)}.merge(h)
+      OpenStruct.new(steps)
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sra2019
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   YgXo0DU1HUhuKAAuA0aZdb6DV5BqgZx9e27CLIKqRk5P7TikW49mFaelQfSRi675
   ugi0V/wkIOHFlKLS87IPnc09
   -----END CERTIFICATE-----
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hlt
@@ -57,6 +57,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: subunit
+  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: archive-zip
   requirement: !ruby/object:Gem::Requirement