v2av 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7da8afea58a1871295561eee8f90e398bec6eb98ff1a8d2ba2a30bc997d35b5
-  data.tar.gz: 921dafddb47f35ac522ecb56f3143c8a8945a1b363d4f3a883e4ff8777e51726
+  metadata.gz: 3b2be660527bd3b117a12cdaef65b842a23e467b795facacade9d792f3016a73
+  data.tar.gz: a552c7c44d277998db08af36a12e0499b0dae0b672d44860f94afc6ba92b2b33
 SHA512:
-  metadata.gz: 3918d1b9de5d199346e3453936ddb4a19647963aebadddb0c033407cecfe9894035e0a42da43ae4d47f848f44d62f4f7858fbc6d809ffac3e5ff42ba98c58895
-  data.tar.gz: 9a70a295daf690f261f81a801154d5604458e61c72bbc7c76103277966b2d9f9615f33c6b5b35216cdc1209663abe0070b9b7460dde616559f4f19652147f0ab
+  metadata.gz: 2102a4681362a5e5715b1f513b1eb463366e7e62ff1702e16038d74c8ed5c87f32c80406e11e27b508039ff1491a53e8bc0999f051dbfd8eb05d9c44cc538d02
+  data.tar.gz: 47ab02903e7e8b83bbbf95ca244a644d88a87a5a7406bc429f4fbba2398fff01eb1a63c3e2ced7a799f11f9c77dbbca27029ab09bd1187cba023eb4faaa0e2a3

data/lib/v2av.rb

@@ -73,22 +73,38 @@ class V2av
   using ColouredText
   using TimeHelper
   include WavTool
+  
+  attr_accessor :steps, :duration
 
   def initialize(src, srt, working_dir: '/tmp/v2av', debug: false, 
       pollyspeech: {access_key: nil, secret_key: nil, voice_id: 'Amy', 
                  cache_filepath: '/tmp/v2av/pollyspeech/cache'})
 
-    @working_dir, @debug = working_dir, debug
+    @source, @working_dir, @debug = src, working_dir, debug
 
     @steps = srt.lines.map do |x| 
-      raw_time, desc = rx.split(/ +/,)
+      raw_time, desc = x.chomp.split(/ +/,2)
       OpenStruct.new({time: raw_time.to_i, desc: desc})
     end
+    
+    s = `exiftool #{src}`
+    puts 's: ' + s.inspect if @debug
+    #a = s[/Duration.*(\d{1,2}:\d{2}:\d{2})/,1].split(':').map(&:to_i)
+    #@duration = Subunit.new(units={minutes:60, hours:60, seconds: 0}, a).to_i
+    @duration = s[/Duration.*: (\d+)/,1].to_i        
+    puts ('@duration: ' + @duration.inspect).debug if @debug
+    
+    @steps[0..-2].each.with_index do |x, i|
+      x.duration = @steps[i+1].time - x.time
+    end
+    
+    @steps.last.duration = @duration - @steps.last.time    
 
     @pollyspeech = PollySpeech.new(pollyspeech) if pollyspeech[:access_key]
+    
   end
 
-  def build()
+  def build(destination)
 
     if block_given? then
 
@@ -96,19 +112,16 @@ class V2av
 
     else
 
-      dir = File.dirname(source)
-      file = File.basename(source)
-      
-      tidy!
-      
-      vid2 = File.join(dir, file.sub(/\.mp4$/,'b\0'))
-      trim_video source, vid2
+      dir = File.dirname(@source)
+      file = File.basename(@source)      
       
-      vid3 = File.join(dir, file.sub(/\.mp4$/,'c.avi'))
+      vid2 = File.join(@working_dir, file.sub(/\.mp4$/,'b\0'))
+      trim_video @source, vid2
+
+      vid3 = File.join(@working_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
@@ -132,6 +145,7 @@ class V2av
       yield(audio_file, video_file, target_video)
     else
       `ffmpeg -i #{video_file} -i #{audio_file} -codec copy -shortest #{target_video} -y`
+      #"ffmpeg -i #{video_file} -i #{audio_file} -codec copy -shortest #{target_video} -y"
     end
     
   end
@@ -212,47 +226,12 @@ class V2av
     `ffmpeg -i #{source} -vf scale="720:-1" #{destination} -y`
   end
   
-  def tidy!()
-
-    verbose_level = 0
-
-    @steps.each do |x|
-
-      x.desc.gsub!(/\s*\([^\)]+\)\s*/,'')
-      x.desc.sub!(/ in "\w+"$/,'')
-      x.desc.sub!(/"User account for [^"]+"/,'the User account icon.')
-      
-      if x.desc =~ /User left click/ and verbose_level == 0 then
-
-        x.desc.sub!(/User left click/, 'Using the mouse, left click')
-        verbose_level = 1
-
-      elsif x.desc =~ /User left click/ and verbose_level == 1
-
-        x.desc.sub!(/User left click/, 'Left click')
-        verbose_level = 2
-
-      elsif x.desc =~ /User left click/ and verbose_level == 2
-
-        x.desc.sub!(/User left click/, 'Click')
-        verbose_level = 3
-
-      elsif x.desc =~ /User left click/ and verbose_level == 3
-
-        x.desc.sub!(/User left click on/, 'Select')
-
-      else
-        verbose_level = 0
-      end
-
-    end
-    
-  end
-
+  
   def to_srt(offset=-(@steps.first.time - 1))
 
     lines = to_subtitles(offset).strip.lines.map.with_index do |x, i|
 
+      puts ('x: ' + x.inspect).debug if @debug
       raw_times, subtitle = x.split(/ /,2)
       puts ('raw_times: ' + raw_times.inspect).debug if @debug
       start_time, end_time = raw_times.split('-',2)
@@ -300,7 +279,8 @@ class V2av
   
   def trim_video(video, newvideo)
     
-    start = @steps.first.time - 4
+    start = @steps.first.time > 4 ? @steps.first.time - 4 : @steps.first.time
+    
     t1, t2 = [start, @steps.last.time - 2 ].map do |step|
       "%02d:%02d:%02d" % (step.to_hms.reverse + [0,0]).take(3).reverse
     end
@@ -311,5 +291,3 @@ class V2av
 
 end
 
-v2 = V2av.new('video.mp4', 's.srt', working_dir: '/tmp/v2av')
-v2.build('video2.mp4')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: v2av
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   iJVbOvYHXer/n2nZUT7Y3p/QDtueJZnnK3YK+ATp5fv8qdUhyMKlbzNLK4n6cZAm
   DdWGleqfN3lBh5+Kul0GL3kB
   -----END CERTIFICATE-----
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subunit
@@ -43,20 +43,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: ruby-ogginfo
   requirement: !ruby/object:Gem::Requirement

metadata.gz.sig

@@ -1,2 +1 @@
-z����D�M��#�=���B4��JH��2��y�������wE;��u�xٷ6����Z��k�]��fq��:2T��x�,w2o�o�I���'Z���)K	�wx~7���i��׺�m���(��܊~��G�����T�`�t�۽R��~,w[��Q��~��H��sԥ�WAee*��euϊ�@�\��l��굲�av����s|���dp�|��l�25��f� ��m����rVx���V\�-�����g\9\}f���C�Q}�q��
��ã�X����^�.$�C2B��K������
-=V��(3zX��I;W�����$KB��(*\Mf&&�:R�x�KA(���Ղ=��kt�@�j�����u
+��Lؑ8��b/y�����v0��fn�����>���/�ۺ�U��3ՈQ*P%g��x�F]��G):1y;�Ɨ�pሦ��lL��#�������Z!}&`G�3|�	��z���Rnp�'����/�P�T���;k)?F֪�@i�r\OE6f��}���ę]�&o�q��[j@��F!�[�6H.���H���$����KM%�|Տb�v��aoJ�AJa�{Gud�ΠU&Do�SV��2G�=�R���<�+����jY�+Q�a�+�:��5�TD��Q.d��'��1:v��v�N��L�l��p��$/GV�M�E�I�����7�JMM��,Ķ�I��9��