sra2019 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ef6fff18b33ade289433566faab793bf5a2f1e76
-  data.tar.gz: 30314b992672aa85ef961c2966cfbe889a0465e2
+SHA256:
+  metadata.gz: f3e1d3453484d6966a4f7b87accbeb853d27ded6f01de06efab200ac453aa096
+  data.tar.gz: bd1cbf03646d9e70e0e01a780bfb402b2daebaf342066f2dd54a9d5bfc4cc9df
 SHA512:
-  metadata.gz: 505db3abd23cc84977dd7f0b06a88bd5bd16e7eacb32dc662fb8e08d0c829e7b22833b9d99659b76d72985babeb6b081b666024a1bd3a36fe73e33c85a1fe579
-  data.tar.gz: 3e61bd59af19d5a4f2575942cee9e9f8580efc4efd94d2e28f3b0498b57bee052611f376711af067e1b73ff56605c702495c6fbfdb144131c439282a34f75cc0
+  metadata.gz: 0a86de275c24a13393b6897a12228eb728a9d917605546c545b383c3dd3e9d92d3b519a0663d7256c16b4af757092ae8e36983a26e3523de357bbdca2c93a81f
+  data.tar.gz: 3273e2ab3854b2b1357627099588b11a6ab0991d398e89643388684de17fa9be57b173face08173cb817a4a572c4c15ff6dd2f55884e5b35bf2d7b217f12e2b3

data/lib/sra2019.rb

@@ -12,57 +12,13 @@ require 'ostruct'
 require 'subunit'
 require 'zip/zip'
 require 'dynarex'
-require 'ogginfo'
-require 'wavefile'
 require 'rxfhelper'
 require 'wicked_pdf'
 require 'mini_magick'
 require 'archive/zip'
-require 'pollyspeech'
 require 'rexle-builder'
 
 
-module WavTool
-  include WaveFile
-    
-  def wav_silence(filename, duration: 1)
-
-    square_cycle = [0] * 100 * duration
-    buffer = Buffer.new(square_cycle, Format.new(:mono, :float, 44100))
-
-    Writer.new(filename, Format.new(:mono, :pcm_16, 22050)) do |writer|
-      220.times { writer.write(buffer) }
-    end
-
-  end
-  
-  def wav_concat(files, save_file='audio.wav')
-    
-    Writer.new(save_file, Format.new(:stereo, :pcm_16, 22050)) do |writer|
-
-      files.each do |file_name|
-
-        Reader.new(file_name).each_buffer(samples_per_buffer=4096) do |buffer|
-          writer.write(buffer)
-        end
-
-      end
-    end
-    
-  end
-  
-  def ogg_to_wav(oggfile, wavfile=oggfile.sub(/\.ogg$/,'.wav'))
-    
-    if block_given? then
-      yield(oggfile)
-    else
-    `oggdec #{oggfile}`
-    end
-    
-  end
-
-end
-
 module TimeHelper
 
   refine String do
@@ -79,19 +35,18 @@ module TimeHelper
 
 end
 
+
+
 class StepsRecorderAnalyser
   using ColouredText
   using TimeHelper
-  include WavTool
-
+  
   attr_reader :start_time, :duration
   attr_accessor :steps
   
 
   def initialize(s, debug: false, savepath: '/tmp', title: 'Untitled', 
-                 working_dir: '/tmp', pollyspeech: {access_key: nil, 
-                 secret_key: nil, voice_id: 'Amy', 
-                 cache_filepath: '/tmp/pollyspeech/cache'})
+                 working_dir: '/tmp')
 
     @savepath, @title, @working_dir, @debug = savepath, title, 
         working_dir, debug
@@ -122,120 +77,9 @@ class StepsRecorderAnalyser
       end
       
     end
-
-    @pollyspeech = PollySpeech.new(pollyspeech) if pollyspeech[:access_key]
-    
-  end
-  
-  # adds the audio track to the video file
-  # mp4 in avi out
-  #
-  def add_audio_track(audio_file, video_file, target_video)
-    
-    if block_given? then
-      yield(audio_file, video_file, target_video)
-    else
-      `ffmpeg -i #{video_file} -i #{audio_file} -codec copy -shortest #{target_video} -y`
-    end
-    
-  end
-  
-  # mp4 in mp4 out
-  #
-  def add_subtitles(source, destination)
-    
-    
-    subtitles = File.join(@working_dir, 's.srt')
-    File.write subtitles, to_srt()
-    
-    if block_given? then
-      yield(source, subtitles, destination)
-    else
-      `ffmpeg -i #{source} -i #{subtitles} -c copy -c:s mov_text #{destination} -y`
-    end
     
   end
   
-  def build_video(source, destination)
-    
-    dir = File.dirname(source)
-    file = File.basename(source)
-    
-    tidy!
-    
-    vid2 = File.join(dir, file.sub(/\.mp4$/,'b\0'))
-    trim_video source, vid2
-    
-    vid3 = File.join(dir, file.sub(/\.mp4$/,'c.avi'))
-
-    generate_audio
-    add_audio_track File.join(@working_dir, 'audio.wav'), vid2, vid3
-
-    
-    vid4 = File.join(dir, file.sub(/\.avi$/,'d\0'))
-    resize_video vid3, vid4
-    
-    vid5 = File.join(dir, file.sub(/\.mp4$/,'e\0'))
-    transcode_video(vid4, vid5)
-    add_subtitles(vid5, destination)    
-    
-  end  
-    
-  
-  def generate_audio(wav: true)
-    
-    return nil unless @pollyspeech
-    
-    @steps.each.with_index do |x, i|
-      
-      puts 'x.desc: ' + x.desc.inspect if @debug
-      filename = "voice#{i+1}.ogg"
-      
-      x.audio = filename
-      file = File.join(@working_dir, filename)
-      @pollyspeech.tts(x.desc.force_encoding('UTF-8'), file)
-      
-      x.audio_duration = OggInfo.open(file) {|ogg| ogg.length.to_i }
-      
-      if @debug then
-        puts ('x.duration: ' + x.duration.inspect).debug
-        puts ('x.audio_duration: ' + x.audio_duration.inspect).debug
-      end
-      
-      duration = x.duration - x.audio_duration
-      x.silence_duration = duration >= 0 ? duration : 0
-      
-      if wav then
-        
-        silent_file = File.join(@working_dir, "silence#{(i+1).to_s}.wav")
-        puts 'x.silence_duration: ' + x.silence_duration.inspect if @debug
-        wav_silence silent_file, duration: x.silence_duration        
-        ogg_to_wav File.join(@working_dir, "voice#{i+1}.ogg")            
-        
-      end
-      
-      sleep 0.02
-      
-    end
-    
-    if wav then
-      
-      intro = File.join(@working_dir, 'intro.wav')
-      wav_silence intro
-      
-      files = @steps.length.times.flat_map do |n|
-        [
-          File.join(@working_dir, "voice#{n+1}.wav"), 
-          File.join(@working_dir, "silence#{n+1}.wav")
-        ]
-      end
-      
-      files.prepend intro
-      
-      wav_concat files, File.join(@working_dir, 'audio.wav')
-    end
-    
-  end
 
   def import(s)
     
@@ -248,11 +92,7 @@ class StepsRecorderAnalyser
     a.each {|n| @steps[n] = nil }
     @steps.compact!    
   end
-  
-  # avi in avi out
-  def resize_video(source, destination)
-    `ffmpeg -i #{source} -vf scale="720:-1" #{destination} -y`
-  end
+
   
   def tidy!()
 
@@ -291,27 +131,7 @@ class StepsRecorderAnalyser
     
   end
   
-  def transcode_video(avi, mp4)
-    
-    if block_given? then
-      yield(avi, mp4)
-    else
-      `ffmpeg -i #{avi} #{mp4} -y`
-    end
-    
-  end
-  
-  def trim_video(video, newvideo)
-    
-    start = @steps.first.time - 4
-    t1, t2 = [start, @steps.last.time - 2 ].map do |step|
-      "%02d:%02d:%02d" % (step.to_hms.reverse + [0,0]).take(3).reverse
-    end
-    
-    `ffmpeg -i #{video} -ss #{t1} -t #{t2} -async 1 #{newvideo} -y`
-    
-  end
-  
+
   # Returns a Dynarex object
   #
   def to_dx()
@@ -398,43 +218,23 @@ EOF
     @sliml
   end
   
-  def to_srt(offset=-(@steps.first.time - 2))
-
-    lines = to_subtitles(offset).strip.lines.map.with_index do |x, i|
-
-      raw_times, subtitle = x.split(/ /,2)
-      puts ('raw_times: ' + raw_times.inspect).debug if @debug
-      start_time, end_time = raw_times.split('-',2)
-      times = [("%02d:%02d:%02d,000" % ([0, 0 ] + start_time.split(/\D/)\
-                                    .map(&:to_i)).reverse.take(3).reverse), \
-               '-->', \
-              ("%02d:%02d:%02d,000" % ([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(offset=-(@steps.first.time - 2))
-    
-    raw_times = @steps.map {|x| [x.time, x.time + x.audio_duration + 1]} 
-    
-
-    times = raw_times.map do |x|
-
-      x.map do |sec|
-        a = Subunit.new(units={minutes:60}, seconds: sec+offset).to_h.to_a
-        a.map {|x|"%d%s" % [x[1], x[0][0]] }.join('')
-      end.join('-')
+  def to_subtitles(offset=-(@steps.first.time - 1))
+              
+    @steps.map do |x|
+      
+      secs = x.time.to_i+offset
+      
+      if secs < 1 then
+        raise "to_subtitles: time can't be negative. Reduce the offset value"   
+      end
+      
+      a = Subunit.new(units={minutes:60}, seconds: secs).to_h.to_a
+      time = a.map {|x|"%d%s" % [x[1], x[0][0]] }.join('')
+      "%s %s " % [time, x.desc]
       
     end
-    
-    times.zip(@steps.map(&:desc)).map {|x| x.join(' ')}.join("\n")
-                          
   end
   
   # Writes the steps to a PDF file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sra2019
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   YgXo0DU1HUhuKAAuA0aZdb6DV5BqgZx9e27CLIKqRk5P7TikW49mFaelQfSRi675
   ugi0V/wkIOHFlKLS87IPnc09
   -----END CERTIFICATE-----
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hlt
@@ -61,82 +61,42 @@ dependencies:
   name: subunit
   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: ruby-ogginfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
-- !ruby/object:Gem::Dependency
-  name: wavefile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: archive-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -157,26 +117,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
-- !ruby/object:Gem::Dependency
-  name: pollyspeech
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -223,8 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Steps Recorder (MS Windows) Analyser 2019