sra2019 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 355540486041c1a4b1209995c49bcdfd0cf543257723745435270aea77846418
-  data.tar.gz: 920193b42c80c12ffa5c568733a6ca31b2541a4f9199bf95030878697d1262ee
+SHA1:
+  metadata.gz: ef6fff18b33ade289433566faab793bf5a2f1e76
+  data.tar.gz: 30314b992672aa85ef961c2966cfbe889a0465e2
 SHA512:
-  metadata.gz: e9d57f8434ee8e69d24579734076971d6adb744c4751c38fc61055c854b0a21dd23697ead57cce984e476b8062a220457123587b0e55970d5069c6d683dd149b
-  data.tar.gz: da1d2244ee4119de257ea5b30e392d45098f7328418857d990e2f1e9fdf078710eaaa839505ce66a0e4038432a5b706c4f987cfa364b74aceedce24353921147
+  metadata.gz: 505db3abd23cc84977dd7f0b06a88bd5bd16e7eacb32dc662fb8e08d0c829e7b22833b9d99659b76d72985babeb6b081b666024a1bd3a36fe73e33c85a1fe579
+  data.tar.gz: 3e61bd59af19d5a4f2575942cee9e9f8580efc4efd94d2e28f3b0498b57bee052611f376711af067e1b73ff56605c702495c6fbfdb144131c439282a34f75cc0

data.tar.gz.sig

@@ -1 +1,3 @@
-H���j
8�ȸ=o[fH�|Ր!)������\��Ps�^��<����f����L� ^�/��"kH0Z:�Ct���,�������M0�N�J<3Eҁ����_�k���D���t�	�w
�z��UskU��˂.8��g]���M-g�*�\l�Lp�s^����4�9z��K�Y��w4C���|�/��-z�í �Mn]ǬY�j&��h��/��(�v�9HI��LLq�Dk�����JW1���V�s[{}y��L���_��33�Q�hw5�����3L}�u���>��zc�^�}·1�q�S�������In�@����Ȅ��~�urDÈ{����u����L�e
t�J�J�������i���hI }��pPN|�G
+q}���Iޢ7ݎ��&W�K�'b���ZO��E�8:=^%���{��ݬ�UŔ���dj/����Tz�*m��4���
+m�ٲ�:��$�]�[Ic�Y�����#{�64;2�ɏ#�z	�)�(����݄#S���o �8�'0�s�0Ev����u&���
+u��͓�-Cơ.2�����€�.��/_������Fw9?w����0�t�K1БO�8��)	Р�)�4��h�А�!��3ᩍcy�V(���WŇE$��w����l
D��+��A01.�)�5��(fσ+E��Q�S�[{W�w�Δ�p��G�~r�k7~�R�j���]�
���,�~�R_����D5r�e*q?�

data/lib/sra2019.rb

@@ -70,6 +70,12 @@ module TimeHelper
       Time.strptime(self, "%H:%M:%S")
     end
   end
+  
+  refine Integer do
+    def to_hms
+      Subunit.new(units={minutes:60}, seconds: self).to_a
+    end
+  end
 
 end
 
@@ -122,17 +128,58 @@ class StepsRecorderAnalyser
   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}`
+      `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)
@@ -149,22 +196,33 @@ class StepsRecorderAnalyser
       @pollyspeech.tts(x.desc.force_encoding('UTF-8'), file)
       
       x.audio_duration = OggInfo.open(file) {|ogg| ogg.length.to_i }
-      x.silence_duration = x.duration - x.audio_duration
+      
+      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.6
+      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"), 
@@ -172,6 +230,8 @@ class StepsRecorderAnalyser
         ]
       end
       
+      files.prepend intro
+      
       wav_concat files, File.join(@working_dir, 'audio.wav')
     end
     
@@ -184,6 +244,16 @@ class StepsRecorderAnalyser
     
   end
   
+  def remove_steps(a)
+    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!()
 
     verbose_level = 0
@@ -219,7 +289,28 @@ class StepsRecorderAnalyser
 
     end
     
-  end    
+  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
   #
@@ -307,17 +398,17 @@ EOF
     @sliml
   end
   
-  def to_srt(offset=0)
+  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" % ([0, 0 ] + start_time.split(/\D/)\
+      times = [("%02d:%02d:%02d,000" % ([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))\
+              ("%02d:%02d:%02d,000" % ([0, 0 ] + end_time.split(/\D/).map(&:to_i))\
                .reverse.take(3).reverse)].join(' ')
 
       [i+1, times, subtitle].join("\n")
@@ -328,12 +419,12 @@ EOF
     
   end
   
-  def to_subtitles(offset=0)
+  def to_subtitles(offset=-(@steps.first.time - 2))
+    
+    raw_times = @steps.map {|x| [x.time, x.time + x.audio_duration + 1]} 
     
-    raw_times = @all_steps.map(&:time)
-    raw_times << raw_times.last + 10
 
-    times = raw_times.each_cons(2).map do |x|
+    times = raw_times.map do |x|
 
       x.map do |sec|
         a = Subunit.new(units={minutes:60}, seconds: sec+offset).to_h.to_a
@@ -342,7 +433,7 @@ EOF
       
     end
     
-    times.zip(@all_steps.map(&:desc)).map {|x| x.join(' ')}.join("\n")
+    times.zip(@steps.map(&:desc)).map {|x| x.join(' ')}.join("\n")
                           
   end
   

metadata

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

metadata.gz.sig

@@ -1 +1,4 @@
-
+I����6�]D����@�oh3�T�Uq`��TB���a��c!Qa&�7U[��+-��LP8i{�"��("G/�\�k��K�a
s��6�aXh�N"%g暴
+i�1ع�*}IR'j�����z��	zһ�@Al'�̺���S-ow������j�Q�I�
+�����53�e1��uR	.��)0@�B$Q3���\;3�tk�{���>O�VI�.�¬6R��L4y����l�WtXd�`�(���KT���_���̛��v`�E;F�CI��}ҵ��I���K�
�u�g�^����u��ڦ2��P\���'<��d�����ȩ��Ѓ�@ot�~�"�5.���ҭ<�m������l���u
+T���4A&?[?�F�Uj�B��