wco_models 3.1.0.223 → 3.1.0.225

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f69322c6f97753488603d03b7438b7855f404df3b30dfc195c9b67ab4d2bc9c
-  data.tar.gz: e075c71ede3d49b95c7163f2224c58aee5879db95c226a215ad730c27331e68e
+  metadata.gz: 7ca7ade6153f9d370599a082e97ef9b625afc6d972467acb889f89eb464c79e6
+  data.tar.gz: 7292522eb303b9f5bcd906346d0e179652e454447051358de69d7156e265d40b
 SHA512:
-  metadata.gz: 6a82bb730896e49d3ba7402d9fee427a08c89060784c4b2506517303aae8f7ecbbb2e2cee94dbd11c1caf4cb3df5c721c20bf40b628527ce309904d6c1cece5d
-  data.tar.gz: 10849ffee5a49bfcbfae302eb76cbaace4913ae472a41f817a9ef570968999636102225a5c2728354dfd1e697b79696c9f6a7b964abe29818e18c0a13d246beb
+  metadata.gz: ac170c556fc3895669b8f583f1a0e2d27e2fb525875731d562743e7533abe410a5fc32de4fa36641607d32aa89594651e3c1b3b3edf513d36dd21c7e81c3dbc4
+  data.tar.gz: 3225baa3b6c77cab386e29b68ec49ba08f98217ff2c578399f4564fc09fe55960a46e00c562ebee5670d6cf5723c02612ed72e489a3be0fc87c5cc9b3d592e67

data/app/assets/stylesheets/wco/newsvideos.scss

@@ -0,0 +1,58 @@
+
+.NewsoverlayTimeline {
+  border: 5px solid green;
+  position: absolute;
+  left: 230px;
+}
+
+.NewspartialTimeline {
+  border: 1px solid blue;
+  position: relative;
+
+  margin-left: 50px;
+  width: 400px;
+
+  .full-text {
+    position: absolute;
+    left: 300px;
+
+    .header {
+      background: #efefef;
+    }
+
+    .flex-row > div {
+      margin-right: 1em;
+    }
+
+    .descr {
+      min-width: 300px;
+    }
+
+  }
+
+  .main {
+    width: 200px;
+  }
+
+
+  .timestamp {
+    position: absolute;
+    .word {
+      border: 1px solid cyan;
+      left: 100px;
+      position: absolute;
+    }
+    .wtime {
+      border: 1px solid yellow;
+      left: 20px;
+      position: absolute;
+    }
+  }
+
+}
+
+
+.NewsvideoTimeline {
+  border: 5px solid yellow;
+  position: absolute;
+}

data/app/controllers/wco/api/newsvideos_controller.rb

@@ -0,0 +1,23 @@
+
+
+class Wco::Api::NewsvideosController < Wco::ApiController
+
+  skip_before_action :decode_jwt
+  skip_before_action :verify_authenticity_token
+  before_action :decode_simple_api_key
+
+  ##
+  ## the other one is used, not this one. Because I don't want to deal with api keys.
+  ##
+  def generate_illustration
+    @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
+
+    Rails.env.production? ?
+      Wco::NewsvideoIllustrationJob.perform_async(@newsvideo.id.to_s, params[:image_url]) :
+      Wco::NewsvideoIllustrationJob.perform_sync( @newsvideo.id.to_s, params[:image_url])
+
+    render json: { status: :ok, message: 'scheduled the run on pc-ai' }
+    # redirect_to action: 'show', newsvideo_id: params[:id]
+  end
+
+end

data/app/controllers/wco/newsoverlay_configs_controller.rb

@@ -0,0 +1,11 @@
+
+
+class Wco::NewsoverlayConfigsController < Wco::ApplicationController
+
+  def new
+    authorize! :create, Wco::NewsoverlayConfig
+    @newsoverlay_config = Wco::NewsoverlayConfig.new video_id: params[:video_id]
+    @newsvideos_list = Wco::Newsvideo.list
+  end
+
+end

data/app/controllers/wco/newsoverlays_controller.rb

@@ -0,0 +1,62 @@
+
+
+class Wco::NewsoverlaysController < Wco::ApplicationController
+
+  before_action :set_lists, only: [ :edit, :new ]
+
+  def create
+    @newsoverlay = Wco::Newsoverlay.new params[:newsoverlay].permit!
+    authorize! :create, @newsoverlay
+    if @newsoverlay.save
+      flash_notice 'Success'
+    else
+      flash_alert "No luck: #{@newsoverlay.errors.full_messages.join(',')}."
+    end
+    redirect_to controller: 'newsvideos', action: 'show', id: params[:newsoverlay][:newsvideo_id]
+  end
+
+  def destroy
+    @newsoverlay = Wco::Newsoverlay.find params[:id]
+    authorize! :destroy, @newsoverlay
+    flag = @newsoverlay.delete
+    if flag
+      flash[:notice] = "deleted newsoverlay"
+    else
+      flash[:alert] = "Cannot delete newsoverlay: #{@newsoverlay.errors.messages}"
+    end
+    redirect_to request.referrer
+  end
+
+  def edit
+    @newsoverlay = Wco::Newsoverlay.find params[:id]
+    authorize! :edit, @newsoverlay
+  end
+
+  def update
+    @newsoverlay = Wco::Newsoverlay.find params[:id]
+    authorize! :update, @newsoverlay
+
+    if @newsoverlay.update_attributes params[:newsoverlay].permit!
+      flash_notice 'Success'
+    else
+      flash_alert "No luck: #{@newsoverlay.errors.full_messages.join(',')}."
+    end
+    redirect_to controller: 'newsvideos', action: 'show', id: params[:newsoverlay][:newsvideo_id]
+  end
+
+  def new
+    authorize! :create, Wco::Newsoverlay
+    video = Wco::Video.find params[:video_id]
+    @newsoverlay = Wco::Newsoverlay.new video: video
+  end
+
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+    @newsvideos_list = Wco::Newsvideo.list
+  end
+
+end

data/app/controllers/wco/newspartials_controller.rb

@@ -25,7 +25,7 @@ class Wco::NewspartialsController < Wco::ApplicationController
     else
       flash_alert 'No luck.'
     end
-    redirect_to action: 'index'
+    redirect_to request.referrer
   end
 
   def edit
@@ -42,8 +42,13 @@ class Wco::NewspartialsController < Wco::ApplicationController
 
   def generate_video
     @newspartial = Wco::Newspartial.unscoped.find params[:id]
-    authorize! :show, @newspartial
-    @newspartial.generate_video
+    authorize! :edit, @newspartial
+
+    Rails.env.production? ?
+      Wco::NewspartialVideoJob.perform_async(params[:id]) :
+      Wco::NewspartialVideoJob.perform_sync( params[:id])
+
+    flash_notice 'Scheduled.'
     redirect_to controller: 'newsvideos', id: @newspartial.newsvideo_id, action: 'show'
   end
 

data/app/controllers/wco/newsvideos_controller.rb

@@ -1,8 +1,10 @@
 require 'net/ssh'
+require 'pragmatic_segmenter'
 
 class Wco::NewsvideosController < Wco::ApplicationController
 
   before_action :set_lists
+  skip_before_action :verify_authenticity_token, only: [ :generate_illustration ]
 
   def create
     params[:newsvideo][:tag_ids]&.delete ''
@@ -26,36 +28,131 @@ class Wco::NewsvideosController < Wco::ApplicationController
     authorize! :edit, @newsvideo
   end
 
-  def generate_illustration
+  def generate
     @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
     authorize! :edit, @newsvideo
 
-    cmd = " cd /opt/projects/simple_ai_1/src/Stability ; \
-      wget --user-agent='Mozilla/5.0' -O input.png #{params[:image_url]} ";
-
-    cmd_1 = " . zenv_stability/bin/activate ; \
-      rm -rf out ; \
-      python scripts/minimal_run.py ";
 
-    cmd_2 = " ffmpeg -framerate 7 -i out/frames/frame_%04d.png -c:v libx264 -pix_fmt yuv420p out/output.mp4 ; \
+    ## put together config
+    # cmd = "cd #{Rails.root.join('tmp')} ; mkdir -p #{@newsvideo.id} ; cd #{@newsvideo.id} ; rm -f videolist.txt audiolist.txt ; "
+    # @newsvideo.newspartials.each_with_index do |part, idx|
+    #   cmd = "#{cmd} echo \"file 'newspartial_#{idx}.mp4' \" >> videolist.txt ; "
+    #   cmd = "#{cmd} echo \"file 'newspartial_#{idx}.wav' \" >> audiolist.txt ; "
+    #   cmd = "#{cmd} ffmpeg -i newspartial_#{idx}.webm newspartial_#{idx}.mp4 ; "
+    # end
+    # puts! cmd, 'cmd'
+    # out = `#{cmd}`
+    # puts! out, 'out'
+
+    ## get base files locally
+    # cmd = "cd #{Rails.root.join('tmp', @newsvideo.id)} ; "
+    # @newsvideo.newspartials.each_with_index do |part, idx|
+    #   cmd = "#{cmd} wget -O newspartial_#{idx}.webm #{part.video.video.url} ; "
+    #   cmd = "#{cmd} wget -O newspartial_#{idx}.wav #{part.audio.url} ; "
+    # end
+    # puts! cmd, 'cmd'
+    # out = `#{cmd}`
+    # puts! out, 'out'
+
+    ## get overlays
+    # cmd = "cd #{Rails.root.join('tmp', @newsvideo.id)} ; "
+    # @newsvideo.newsoverlays.each_with_index do |overlay, idx|
+    #   cmd = "#{cmd} wget -O overlay_#{idx}.mp4 #{overlay.video.video.url} ; "
+    # end
+    # puts! cmd, 'cmd'
+    # out = `#{cmd}`
+    # puts! out, 'out'
+
+    ## video concat
+#     cmd = <<AOL
+#       cd #{Rails.root.join('tmp', @newsvideo.id)} ;
+#       rm -f video_concat.mp4 ;
+#       ffmpeg -f concat -safe 0 -i videolist.txt -c copy video_concat.mp4 ;
+# AOL
+#     puts! cmd, 'cmd'
+#     out = `#{cmd}`
+#     puts! out, 'out'
+
+    ## audio concat
+#     audio_filenames = (0...@newsvideo.newspartials.length).map { |i| "newspartial_#{i}.wav" }.join("|")
+#     cmd = <<AOL
+#       cd #{Rails.root.join('tmp', @newsvideo.id)} ;
+#       rm -f audio_concat.wav ;
+#       ffmpeg -f concat -safe 0 -i audiolist.txt -c copy audio_concat.wav ;
+# AOL
+#     puts! cmd, 'cmd'
+#     out = `#{cmd}`
+#     puts! out, 'out'
+
+    ## combine base
+#     cmd = <<AOL
+#       cd #{Rails.root.join('tmp', @newsvideo.id)} ;
+#       rm -f output.mp4 ;
+#       ffmpeg -i video_concat.mp4 -i audio_concat.wav -c:v copy -c:a aac combined_base.mp4 ;
+# AOL
+#     puts! cmd, 'cmd'
+#     out = `#{cmd}`
+#     puts! out, 'out'
+
+    ##  combine overlays
+    # nn = @newsvideo.newsoverlays.map { |ol| ol.start_at_ms }
+    # puts! nn, 'nn'
+    # ffmpeg_cmd = [ "ffmpeg -i combined_base.mp4 \\ " ]
+    # nn.each_with_index do |ms, idx|
+    #   ffmpeg_cmd.push " -i overlay_#{idx}.mp4 \\ "
+    # end
+    # ffmpeg_cmd.push "-filter_complex \" \\ "
+    # #
+    # nn.each_with_index do |ms, idx|
+    #   ffmpeg_cmd.push " [#{idx+1}:v]setpts=PTS-STARTPTS+#{ms.to_f/1000}/TB[v#{idx+1}]; \\ "
+    # end
+    # #
+    # curr_s = "0:v"
+    # n = nil
+    # nn.each_with_index do |ms, idx|
+    #   n = idx+1
+    #   ffmpeg_cmd.push " [#{curr_s}][v#{n}]overlay=0:0:eof_action=pass[tmp#{n}]; \\ "
+    #   curr_s = "tmp#{n}"
+    # end
+    # ffmpeg_cmd.push " \" -map \"[#{curr_s}]\" -map 0:a? -c:v libx264 -c:a copy combined_fin.mp4 "
+    # ffmpeg_cmd = ffmpeg_cmd.join("\n")
+    # puts "+++ ffmpeg_cmd:"
+    # puts ffmpeg_cmd
+
+    # combine overlays 2
+#     cmd = <<AOL
+#       cd #{Rails.root.join('tmp', @newsvideo.id)} ;
+#       rm -f combined_fin.mp4 ;
+#       #{ffmpeg_cmd} ;
+# AOL
+#     puts! cmd, 'cmd'
+#     out = `#{cmd}`
+#     puts! out, 'out'
+
+    ## upload the video.
+    @video = Wco::Video.new name: @newsvideo.title
+    video_path = Rails.root.join("tmp", @newsvideo.id, "combined_fin.mp4")
+    @video.video = File.open(video_path)
+    @video.save!
+
+    render json: { status: :ok }
+  end
 
-      curl -v -X POST '#{WCO_ORIGIN_2}/wco/api/videos/?api_key=#{SIMPLE_API_KEY}&api_secret=#{SIMPLE_API_SECRET}' \
-        -H 'Accept: application/json' \
-        -F 'video=@out/output.mp4' \
-        -F 'thumb=@out/frames/frame_0000.png' \
-        -F 'name=#{@newsvideo.title}' \
-        -D 'newsvideo_id=#{params[:id]}' ";
+  def generate_illustration
+    @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
+    authorize! :edit, @newsvideo
 
-    out = `ssh pc-ai " whoami ; pwd ; #{cmd} ; #{cmd_1} ; #{cmd_2} ; "`
-    puts! out, 'out'
+    Rails.env.production? ?
+      Wco::NewsvideoIllustrationJob.perform_async(@newsvideo.id.to_s, params[:image_url]) :
+      Wco::NewsvideoIllustrationJob.perform_sync( @newsvideo.id.to_s, params[:image_url])
 
-    render json: { status: :ok } ## _TODO: remove
+    render json: { status: :ok, message: 'scheduled the run on pc-ai' }
     # redirect_to action: 'show', newsvideo_id: params[:id]
   end
 
   def index
     authorize! :index, Wco::Newsvideo
-    @newsvideos = Wco::Newsvideo.all
+    @newsvideos = Wco::Newsvideo.all.order_by( created_at: :desc )
     if params[:deleted]
       @newsvideos = Wco::Newsvideo.unscoped.where( :deleted_at.ne => nil )
     end
@@ -71,9 +168,31 @@ class Wco::NewsvideosController < Wco::ApplicationController
     @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
     authorize! :show, @newsvideo
     @newspartials = Wco::Newspartial.where( newsvideo_id: @newsvideo.id.to_s).includes(:video)
+    @newsoverlays = @newsvideo.newsoverlays
+    @skip_footer = true
+  end
+
+  def split
+    @newsvideo = Wco::Newsvideo.unscoped.find params[:id]
+    authorize! :edit, @newsvideo
+
+    if Wco::Newspartial.where( newsvideo: @newsvideo).length > 0
+      # Wco::Newspartial.where( newsvideo: @newsvideo).each { |n| n.delete }
+      flash_alert 'newspartials already exist for this newsvideo - cannot split.'
+      redirect_to request.referrer
+      return
+    end
+
+    sentences = PragmaticSegmenter::Segmenter.new(text: @newsvideo.body).segment
+    phrases = sentences_to_phrases(sentences)
+    # puts! phrases, 'phrases'
+    phrases.each do |phrase|
+      newspartial = Wco::Newspartial.new body: phrase, newsvideo: @newsvideo
+      newspartial.save!
+    end
 
-    # @config = JSON.parse( @newsvideo.config_json )
-    # @duration_ms = @config['vtimes'].last.to_i + @config['vdurations'].last.to_i
+    flash_notice 'All done.'
+    redirect_to request.referrer
   end
 
 
@@ -95,6 +214,31 @@ class Wco::NewsvideosController < Wco::ApplicationController
   ##
   private
 
+  def sentences_to_phrases sentences
+    max_words = 50
+    phrases = []
+    current_phrase = []
+
+    current_word_count = 0
+
+    sentences.each do |sentence|
+      words_in_sentence = sentence.split.size
+
+      # If adding this sentence exceeds the limit, start a new phrase
+      if current_word_count + words_in_sentence > max_words
+        phrases << current_phrase.join(" ")
+        current_phrase = []
+        current_word_count = 0
+      end
+
+      current_phrase << sentence
+      current_word_count += words_in_sentence
+    end
+
+    # Add the last phrase if any
+    phrases << current_phrase.join(" ") unless current_phrase.empty?
+  end
+
   def set_lists
     @tags_list = Wco::Tag.list
   end

data/app/jobs/wco/newspartial_video_job.rb

@@ -0,0 +1,15 @@
+
+require 'sidekiq'
+require 'net/ssh'
+
+class Wco::NewspartialVideoJob
+  include Sidekiq::Job
+  sidekiq_options queue: 'default'
+
+  def perform id
+    puts! id, 'Newspartial video job...'
+    @newspartial = Wco::Newspartial.find id
+    @newspartial.generate_video
+  end
+
+end

data/app/jobs/wco/newsvideo_illustration_job.rb

@@ -0,0 +1,33 @@
+
+require 'sidekiq'
+require 'net/ssh'
+
+class Wco::NewsvideoIllustrationJob
+  include Sidekiq::Job
+  sidekiq_options queue: 'default'
+
+  def perform id, image_url
+    puts! [ id, image_url ], 'NewsvideoIllustrationJob#perform...'
+    @newsvideo = Wco::Newsvideo.unscoped.find id
+
+    cmd = " cd /opt/projects/simple_ai_1/src/Stability ; \
+      wget --user-agent='Mozilla/5.0' -O input.png #{image_url} ";
+
+    cmd_1 = " . zenv_stability/bin/activate ; \
+      rm -rf out ; \
+      python scripts/minimal_run_cont.py ";
+
+    cmd_2 = " ffmpeg -framerate 7 -i out/frames/frame_%04d.png -c:v libx264 -pix_fmt yuv420p out/output.mp4 ; \
+
+      curl -v -X POST '#{WCO_ORIGIN_2}/wco/api/videos/?api_key=#{SIMPLE_API_KEY}&api_secret=#{SIMPLE_API_SECRET}' \
+        -H 'Accept: application/json' \
+        -F 'video=@out/output.mp4' \
+        -F 'thumb=@out/frames/frame_0000.png' \
+        -F 'name=#{@newsvideo.title}' \
+        -F 'newsvideo_id=#{id}' ";
+
+    out = `ssh pc-ai " whoami ; pwd ; #{cmd} ; #{cmd_1} ; #{cmd_2} ; "`
+    puts! out, 'out'
+  end
+
+end

data/app/models/wco/newsoverlay.rb

@@ -0,0 +1,44 @@
+
+##
+## it has start and duration.
+##
+
+=begin
+
+ffmpeg \
+  -i combined.mp4 \
+  -i overlay_1.mp4 \
+  -i overlay_2.mp4 \
+  -filter_complex \
+  "[1:v]setpts=PTS-STARTPTS+1.55/TB[v1];
+   [2:v]setpts=PTS-STARTPTS+5.55/TB[v2];
+   [0:v][v1]overlay=0:0:eof_action=pass[tmp];
+   [tmp][v2]overlay=0:0:eof_action=pass[vout]" \
+  -map "[vout]" \
+  -map 0:a? \
+  -c:v libx264 \
+  -c:a copy \
+  combined_2.mp4
+
+=end
+
+class Wco::Newsoverlay
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  include Wco::Utils
+  store_in collection: 'wco_newsoverlays'
+
+  PAGE_PARAM_NAME = 'newsoverlays_page'
+
+  belongs_to :video
+  belongs_to :newsoverlay_config, optional: true
+  belongs_to :newsvideo
+
+  field :start_at_ms, type: :integer, default: 0
+  field :duration_ms, type: :integer, default: 0
+
+  delegate :duration_ms, to: :video
+  delegate :name,        to: :video
+
+end

data/app/models/wco/newsoverlay_config.rb

@@ -0,0 +1,13 @@
+
+class Wco::NewsoverlayConfig
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Wco::Utils
+  store_in collection: 'wco_newsoverlay_configs'
+
+  PAGE_PARAM_NAME = 'newsoverlayconfigs_page'
+
+  belongs_to :video
+  belongs_to :newsvideo
+
+end

data/app/models/wco/newspartial.rb

@@ -1,8 +1,11 @@
 
+require 'mongoid_paperclip'
+
 class Wco::Newspartial
   include Mongoid::Document
-  include Mongoid::Timestamps
+  include Mongoid::Paperclip
   include Mongoid::Paranoia
+  include Mongoid::Timestamps
   include Wco::Utils
   store_in collection: 'wco_newspartials'
 
@@ -19,6 +22,35 @@ class Wco::Newspartial
   belongs_to :newsvideo
   has_one :video
 
+  has_mongoid_attached_file :audio,
+    :storage => :s3,
+    :s3_credentials => ::S3_CREDENTIALS,
+    :path => "newspartials/:id/audio/:filename",
+    :s3_protocol => 'https',
+    # :s3_permissions => 'public-read',
+    :validate_media_type => false,
+    s3_region: ::S3_CREDENTIALS[:region]
+  validates_attachment_content_type :audio, content_type: [ /\Aaudio\/.*\z/, ]
+
+  # has_mongoid_attached_file :video,
+  #   :storage => :s3,
+  #   :s3_credentials => ::S3_CREDENTIALS,
+  #   :path => "newspartials/:id/video/:filename",
+  #   :s3_protocol => 'https',
+  #   :validate_media_type => false,
+  #   s3_region: ::S3_CREDENTIALS[:region]
+  # validates_attachment_content_type :video, content_type: [ /\Avideo\/.*\Z/, ]
+
+  # has_mongoid_attached_file :thumb,
+  #   :storage => :s3,
+  #   :s3_credentials => ::S3_CREDENTIALS,
+  #   :path => "newspartials/:id/thumb/:filename",
+  #   :s3_protocol => 'https',
+  #   :validate_media_type => false,
+  #   s3_region: ::S3_CREDENTIALS[:region]
+  # validates_attachment_content_type :thumb, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
+
+
   def config
     @config ||= JSON.parse self[:config_json]
   end
@@ -42,9 +74,18 @@ class Wco::Newspartial
     puts! out, 'out'
 
     self[:config_json] = out
-
     tmp = JSON.parse( out )
+
+    decoded_audio = Base64.decode64( tmp['audio'] )
+    temp_file = Tempfile.new(['speech', '.wav'])
+    temp_file.binmode
+    temp_file.write(decoded_audio)
+    temp_file.rewind
+    self.audio = temp_file
+    temp_file.close
+    temp_file.unlink
     tmp.delete('audio')
+
     self[:speech_json] = tmp.to_json
 
     self.save

data/app/models/wco/newsvideo.rb

@@ -24,6 +24,7 @@ class Wco::Newsvideo
 
   field :body
   field :config_json, type: :string
+  field :duration_ms, type: :integer
 
   field :x, :type => Float
   field :y, :type => Float
@@ -34,8 +35,19 @@ class Wco::Newsvideo
 
   belongs_to :author, class_name: 'Wco::Profile'
 
-  has_and_belongs_to_many :tags
   has_many :newspartials
+  def newspartials
+    Wco::Newspartial.where( newsvideo_id: self.id )
+  end
+
+  has_many :newsoverlay_configs
+  has_and_belongs_to_many :tags
   has_many :videos
 
+
+  has_many :newsoverlays
+  def newsoverlays
+    Wco::Newsoverlay.where( newsvideo_id: self.id )
+  end
+
 end

data/app/models/wco/video.rb

@@ -3,9 +3,9 @@ require 'mongoid_paperclip'
 
 class Wco::Video
   include Mongoid::Document
-  include Mongoid::Timestamps
   include Mongoid::Paperclip
   include Mongoid::Paranoia
+  include Mongoid::Timestamps
   include Wco::Utils
   store_in collection: 'videos'
 
@@ -31,6 +31,8 @@ class Wco::Video
   validates_uniqueness_of :youtube_id, allow_blank: true, case_sensitive: false
   before_save { youtube_id.present? || youtube_id = nil }
 
+  field :duration_ms, type: :integer
+
   # belongs_to :user_profile,                  :class_name => 'Ish::UserProfile', :inverse_of => :videos
   # has_and_belongs_to_many :shared_profiles,  :class_name => 'Ish::UserProfile', :inverse_of => :shared_videos
 

data/app/views/layouts/wco/application.haml

@@ -36,7 +36,6 @@
     %hr
 
     = yield
-    %hr
     = render '/wco/main_footer'
     = render '/wco/analytics' if Rails.env.production?
 

data/app/views/wco/_main_footer.haml

@@ -1,35 +1,38 @@
 
-#Config{ data: { jwt_token: @jwt_token } }
-:javascript
-  localStorage.setItem('jwt_token', $("#Config").data('jwt-token') )
-
-.application--main-footer.main-footer
-  .maxwidth
-
-    %i.fa.fa-compress.collapse-expand#mainFooter
-      Account & Session
-    .a
-      .row
-        .col-sm-4
-          %ul
-            %li
-              <b>Email:</b> #{@current_profile.email}
-              = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete, data: { confirm: 'Are you sure?' }
-            %li= link_to 'sidekiq', '/sidekiq', target: :_blank
-            %li= link_to 'Iron Warbler', '/iron_warbler'
-
-
-        .col-sm-4
-          %ul
-            %li ~__^ &nbsp; &nbsp; v#{@version}
-            %li
-              = pp_date Time.now
-              = pp_time Time.now
-
-        .col-sm-4
-          = render '/wco/profiles/form_extra', profile: @current_profile
-          = link_to 'RTEditor', wco.application_tinymce_path, target: :_blank
-      = render 'wco/application/debug' if !Rails.env.production?
-
-    .c
+- if !@skip_footer
+  %hr
+
+  #Config{ data: { jwt_token: @jwt_token } }
+  :javascript
+    localStorage.setItem('jwt_token', $("#Config").data('jwt-token') )
+
+  .application--main-footer.main-footer
+    .maxwidth
+
+      %i.fa.fa-compress.collapse-expand#mainFooter
+        Account & Session
+      .a
+        .row
+          .col-sm-4
+            %ul
+              %li
+                <b>Email:</b> #{@current_profile.email}
+                = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete, data: { confirm: 'Are you sure?' }
+              %li= link_to 'sidekiq', '/sidekiq', target: :_blank
+              %li= link_to 'Iron Warbler', '/iron_warbler'
+
+
+          .col-sm-4
+            %ul
+              %li ~__^ &nbsp; &nbsp; v#{@version}
+              %li
+                = pp_date Time.now
+                = pp_time Time.now
+
+          .col-sm-4
+            = render '/wco/profiles/form_extra', profile: @current_profile
+            = link_to 'RTEditor', wco.application_tinymce_path, target: :_blank
+        = render 'wco/application/debug' if !Rails.env.production?
+
+      .c
 

data/app/views/wco/_main_header.haml

@@ -29,18 +29,21 @@
         %ul
           %li= render '/wco/leadsets/header'
           %li= render '/wco/leads/header'
-          %li= render '/wco/office_action_templates/header'
-          %li= render '/wco/office_actions/header'
           %li= render '/wco/profiles/header'
 
         %ul
+          %li= render '/wco/office_action_templates/header'
+          %li= render '/wco/office_actions/header'
           %li= render '/wco/sites/header'
-          %li= render '/wco/headlines/header'
           %li= render '/wco/publishers/header'
+
+        %ul
+          -# %li= render '/wco/headlines/header'
           %li= render '/wco/galleries/header_mini'
           %li= render '/wco/newsvideos/header_mini'
           %li= render '/wco/reports/header'
           %li= render '/wco/videos/header'
 
 
+
     .c

data/app/views/wco/newsoverlay_configs/_form.haml

@@ -0,0 +1,15 @@
+
+= form_for newsoverlay_config do |f|
+  .actions
+    = f.submit 'Submit'
+
+  .field
+    %label Newsvideo
+    = f.select :newsvideo_id, options_for_select(@newsvideos_list, selected: newsoverlay_config.newsvideo_id), {}, class: :select2
+
+  .field
+    %label Video
+    = f.text_field :video_id, value: newsoverlay_config[:video_id] || params[:video_id]
+
+  .actions
+    = f.submit 'Submit'

data/app/views/wco/newsoverlay_configs/new.haml

@@ -0,0 +1,4 @@
+
+.maxwidth
+  %h5.text-center New newsoverlay_config
+  = render 'form', newsoverlay_config: @newsoverlay_config

data/app/views/wco/newsoverlays/_form.haml

@@ -0,0 +1,22 @@
+
+= form_for newsoverlay do |f|
+  .actions
+    = f.submit 'Submit'
+
+  .field
+    %label Newsvideo
+    = f.select :newsvideo_id, options_for_select(@newsvideos_list, selected: newsoverlay.newsvideo_id), {}, class: :select2
+
+  .field.d-flex.flex-column
+    %label Video
+    = f.text_field :video_id, value: newsoverlay[:video_id] || params[:video_id], disabled: true
+    .flex-row
+      .thumb= image_tag( newsoverlay.video.thumb.url( :thumb ), :alt => '' )
+      .a Duration: #{newsoverlay.video.duration_ms}ms
+
+  .field
+    %label Start at ms
+    = f.text_field :start_at_ms, value: newsoverlay.start_at_ms
+
+  .actions
+    = f.submit 'Submit'

data/app/views/wco/newsoverlays/_show_in_newsvideo.haml

@@ -0,0 +1,10 @@
+
+.NewsoverlayTimeline{ style: "top: #{newsoverlay.start_at_ms*HEIGHT_MS}px; height: #{newsoverlay.duration_ms*HEIGHT_MS}px;"}
+  .d-flex
+    = newsoverlay.name
+    = link_to '[~]', edit_newsoverlay_path(newsoverlay)
+    = button_to 'x', newsoverlay_path(newsoverlay), method: :delete, data: { confirm: 'Are you sure?' }
+
+  %img{ src: newsoverlay.video.thumb.url(:thumb) }
+  .a start_at: #{newsoverlay.start_at_ms}ms
+  .a Duration: #{newsoverlay.duration_ms}ms

data/app/views/wco/newsoverlays/edit.haml

@@ -0,0 +1,4 @@
+
+.maxwidth
+  %h5.text-center Edit newsoverlay
+  = render 'form', newsoverlay: @newsoverlay

data/app/views/wco/newsoverlays/new.haml

@@ -0,0 +1,4 @@
+
+.maxwidth
+  %h5.text-center New newsoverlay
+  = render 'form', newsoverlay: @newsoverlay

data/app/views/wco/newspartials/_show_in_newsvideo.haml

@@ -1,31 +1,32 @@
 
-- height_ms = 100.0/1000
-
-.newspartials--show-in-newsvideo
-
-  .a
-    = link_to '[~]', edit_newspartial_path(newspartial)
-    Newspartial `#{link_to newspartial.title, newspartial_path(newspartial)}`
-    %span{ class: 'gray' } #{newspartial.id}
-    = link_to '[api]', api_newspartial_config_path(newspartial, format: :json, api_key: SIMPLE_API_KEY, api_secret: SIMPLE_API_SECRET ), target: :_blank
-
-
-.Timeline{ style: "height: #{newspartial.duration_ms*height_ms}px; min-height: 100px;" }
+.NewspartialTimeline{ style: "height: #{newspartial.duration_ms*HEIGHT_MS}px; min-height: 100px;" }
   .main
     - newspartial.config['wtimes']&.each_with_index do |wtime, idx|
 
-      %div.ts{ style: "top: #{wtime.to_f*height_ms}px"}
+      %div.timestamp{ style: "top: #{wtime.to_f*HEIGHT_MS}px"}
         .wtime= wtime
         .word= newspartial.config['words'][idx]
 
   .full-text
-    = newspartial.body
-    .d-inline-block= button_to 'Generate visemes', newspartial_generate_speech_path(newspartial)
-    .d-inline-block= button_to 'Generate video', newspartial_generate_video_path(newspartial)
-
-    .a= newspartial.config_json[0...100]
-    .a= newspartial.speech_json[0...100]
-    .a
-      Video:
-      - if newspartial.video
-        = image_tag newspartial.video.thumb.url(:thumb), class: 'thumb'
+    .header
+      Newspartial
+      = link_to '[~]', edit_newspartial_path(newspartial)
+      .d-inline-block= button_to 'x', newspartial_path(newspartial), method: :delete, :data => { :confirm => 'Are you sure?' }
+      %span{ class: 'gray' } #{newspartial.id}
+      = link_to '[api]', api_newspartial_config_path(newspartial, format: :json, api_key: SIMPLE_API_KEY, api_secret: SIMPLE_API_SECRET ), target: :_blank
+
+    .flex-row
+      .a Duration: `#{newspartial.duration_ms}`ms
+      .descr= newspartial.body
+      .d-flex.flex-column
+        = button_to 'Generate video', newspartial_generate_video_path(newspartial)
+        Video:
+        - if newspartial.video
+          = image_tag newspartial.video.thumb.url(:thumb), class: 'thumb'
+      .d-flex.flex-column
+        = button_to 'Generate speech', newspartial_generate_speech_path(newspartial)
+        Audio:
+        - if newspartial.audio.present?
+          %audio{ controls: true }
+            %source{ src: newspartial.audio, type: "audio/wav" }
+            Your browser does not support the audio element.

data/app/views/wco/newsvideos/index.haml

@@ -1,5 +1,5 @@
 
-.newsvideos-index
+.newsvideos-index.maxwidth
   %h5.text-center Newsvideos
   %ul
     - @newsvideos.each do |nv|

data/app/views/wco/newsvideos/show.haml

@@ -1,10 +1,22 @@
 
 .newsvideos-show.maxwidth
-  %h5.text-center Newsvideo `#{@newsvideo.title}` #{link_to '[~]', edit_newsvideo_path(@newsvideo)}
+  %h5.text-center
+    Newsvideo `#{@newsvideo.title}`
+    #{link_to '[~]', edit_newsvideo_path(@newsvideo)}
+    .d-inline-block= button_to 'split', split_newsvideo_path(@newsvideo), :data => { :confirm => 'Are you sure?' }
+    = link_to '[+ newspartial]', new_newspartial_path(newsvideo_id: @newsvideo.id)
+    = link_to '[search illustration]', pexels_search_path(newsvideo_id: @newsvideo.id), target: :_blank
+    .d-inline-block= button_to 'generate', generate_newsvideo_path(@newsvideo), :data => { :confirm => 'Are you sure?' }
+
   .descr= @newsvideo.body
-%hr
-.text-center
-  Newspartials #{link_to '[+]', new_newspartial_path(newsvideo_id: @newsvideo.id) }
-  = link_to '[+ illustration]', pexels_search_path(newsvideo_id: @newsvideo.id), target: :_blank
-- @newspartials.each do |newspartial|
-  = render 'wco/newspartials/show_in_newsvideo', newspartial: newspartial
+  %br
+  %br
+
+.NewsvideoTimeline
+  - @newspartials.each do |newspartial|
+    = render 'wco/newspartials/show_in_newsvideo', newspartial: newspartial
+
+  - @newsoverlays.each do |newsoverlay|
+    = render 'wco/newsoverlays/show_in_newsvideo', newsoverlay: newsoverlay
+
+.c

data/app/views/wco/reports/_index.haml

@@ -3,18 +3,17 @@
 
 .reports--index
   = paginate reports, :param_name => :reports_page, :views_prefix => 'wco'
-  %ul
-    - reports.each do |ttt|
-      %li.Card
+  - reports.each do |ttt|
+    .Card
+      .flex-row
+        = button_to '[x]', report_path(ttt), method: :delete, data: { confirm: 'Are you sure?' }
+        = link_to '[~]', edit_report_path(ttt)
+        .a
+          = link_to ttt.title, report_path(ttt)
+          %br
+          `#{ttt.slug}`
+          .gray.mini= ttt.id
+      - if !config[:skip_tags]
         .flex-row
-          = button_to '[x]', report_path(ttt), method: :delete, data: { confirm: 'Are you sure?' }
-          = link_to '[~]', edit_report_path(ttt)
-          .a
-            = link_to ttt.title, report_path(ttt)
-            %br
-            `#{ttt.slug}`
-            .gray.mini= ttt.id
-        - if !config[:skip_tags]
-          .flex-row
-            = render '/wco/tags/list_chips', tags: ttt.tags
+          = render '/wco/tags/list_chips', tags: ttt.tags
   = paginate reports, :param_name => :reports_page, :views_prefix => 'wco'

data/app/views/wco/videos/_form.haml

@@ -29,6 +29,9 @@
     .col-md-6
       %label descr
       = f.text_area :descr, class: :tinymce
+      .field
+        %label duration_ms
+        = f.text_field :duration_ms
 
 
   .action

data/app/views/wco/videos/_index.haml

@@ -12,6 +12,8 @@
               = link_to video.name, video_path( video )
             .d-flex
               = link_to '[~]', edit_video_path( video )
+              = link_to '[overlay]', new_newsoverlay_path( video_id: video.id.to_s )
+              = link_to '[overlay-multi]', new_newsoverlay_config_path( video_id: video.id.to_s )
               = button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }
             = render 'meta', item: video
 

data/app/views/wco/videos/index.haml

@@ -2,10 +2,9 @@
 .videos-index.container-fluid
   .d-flex
     = link_to "Videos (#{@videos.count})", videos_path
-
     .inline-search
       = form_tag videos_path, method: :get do
         = text_field_tag :q
-
     = link_to '[+]', new_video_path
+
   = render '/wco/videos/index', videos: @videos

data/app/views/wco/videos/show.haml

@@ -24,3 +24,4 @@
     Download File: #{link_to video.video_file_name, video.video.url}
   %ul
     %li newspartial_id: #{video.newspartial_id}
+    %li newsvideo_id: #{video.newsvideo_id}

data/config/routes.rb

@@ -12,6 +12,8 @@ Wco::Engine.routes.draw do
     patch 'reports/:id/add-config', to: 'reports#add_config'
     get   'newspartials/:id/config',     to: 'newspartials#show_config', as: :newspartial_config
 
+    match 'newsvideos/:id/generate-illustration', to: 'newsvideos#generate_illustration', as: :newsvideo_generate_illustration, via: [ :get, :post ]
+
     get 'tags', to: 'tags#index'
 
     post 'videos', to: 'videos#create'
@@ -47,11 +49,16 @@ Wco::Engine.routes.draw do
   delete 'logs/bulkop', to: 'logs#bulkop', as: :logs_bulkop
   resources :logs
 
+  resources :newsoverlay_configs
+  resources :newsoverlays
+
   match 'newspartials/:id/generate-speech', to: 'newspartials#generate_speech', as: :newspartial_generate_speech, via: [ :get, :post ]
   match 'newspartials/:id/generate-video',  to: 'newspartials#generate_video',  as: :newspartial_generate_video,  via: [ :get, :post ]
   resources :newspartials
 
   match 'newsvideos/:id/generate-illustration', to: 'newsvideos#generate_illustration', as: :newsvideo_generate_illustration, via: [ :get, :post ]
+  post  'newsvideos/:id/generate', to: 'newsvideos#generate', as: :generate_newsvideo
+  post  'newsvideos/:id/split',    to: 'newsvideos#split',    as: :split_newsvideo
   resources :newsvideos
 
   resources :obfuscated_redirects

data/lib/wco_models.rb

@@ -65,3 +65,8 @@ class Wco::HTTParty
 end
 
 ActiveSupport.escape_html_entities_in_json = true
+
+
+HEIGHT_SEC = 100.0
+HEIGHT_MS = HEIGHT_SEC/1000
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.223
+  version: 3.1.0.225
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -422,7 +422,7 @@ files:
 - app/assets/stylesheets/wco/galleries.scss
 - app/assets/stylesheets/wco/leads_leadsets.scss
 - app/assets/stylesheets/wco/main.scss
-- app/assets/stylesheets/wco/newsvideos_newspartials.scss
+- app/assets/stylesheets/wco/newsvideos.scss
 - app/assets/stylesheets/wco/office_action_templates.scss
 - app/assets/stylesheets/wco/pagination.scss
 - app/assets/stylesheets/wco/photos.scss
@@ -430,6 +430,7 @@ files:
 - app/assets/stylesheets/wco/videos.scss
 - app/controllers/wco/api/leads_controller.rb
 - app/controllers/wco/api/newspartials_controller.rb
+- app/controllers/wco/api/newsvideos_controller.rb
 - app/controllers/wco/api/obfuscated_redirects_controller.rb
 - app/controllers/wco/api/tags_controller.rb
 - app/controllers/wco/api/videos_controller.rb
@@ -441,6 +442,8 @@ files:
 - app/controllers/wco/leads_controller.rb
 - app/controllers/wco/leadsets_controller.rb
 - app/controllers/wco/logs_controller.rb
+- app/controllers/wco/newsoverlay_configs_controller.rb
+- app/controllers/wco/newsoverlays_controller.rb
 - app/controllers/wco/newspartials_controller.rb
 - app/controllers/wco/newsvideos_controller.rb
 - app/controllers/wco/obfuscated_redirects_controller.rb
@@ -459,6 +462,8 @@ files:
 - app/controllers/wco/unsubscribes_controller.rb
 - app/controllers/wco/videos_controller.rb
 - app/helpers/wco/application_helper.rb
+- app/jobs/wco/newspartial_video_job.rb
+- app/jobs/wco/newsvideo_illustration_job.rb
 - app/jobs/wco_hosting/certbot_job.rb
 - app/mailers/wco_email/application_mailer.rb
 - app/models/ability.rb
@@ -486,6 +491,8 @@ files:
 - app/models/wco/leadset_appliance_tmpl.rb
 - app/models/wco/log.rb
 - app/models/wco/newsitem.rb
+- app/models/wco/newsoverlay.rb
+- app/models/wco/newsoverlay_config.rb
 - app/models/wco/newspartial.rb
 - app/models/wco/newsvideo.rb
 - app/models/wco/obfuscated_redirect.rb
@@ -600,6 +607,12 @@ files:
 - app/views/wco/logs/_index.haml
 - app/views/wco/logs/edit.haml
 - app/views/wco/logs/new.haml
+- app/views/wco/newsoverlay_configs/_form.haml
+- app/views/wco/newsoverlay_configs/new.haml
+- app/views/wco/newsoverlays/_form.haml
+- app/views/wco/newsoverlays/_show_in_newsvideo.haml
+- app/views/wco/newsoverlays/edit.haml
+- app/views/wco/newsoverlays/new.haml
 - app/views/wco/newspartials/_form.haml
 - app/views/wco/newspartials/_show_in_newsvideo.haml
 - app/views/wco/newspartials/index.haml-trash

data/app/assets/stylesheets/wco/newsvideos_newspartials.scss

@@ -1,31 +0,0 @@
-
-.Timeline {
-  border: 1px solid blue;
-  position: relative;
-
-  .full-text {
-    position: absolute;
-    left: 300px;
-  }
-
-  .main {
-    width: 200px;
-  }
-
-
-  .ts { /* timestamp */
-    position: absolute;
-    .word {
-      border: 1px solid cyan;
-      left: 100px;
-      position: absolute;
-    }
-    .wtime {
-      border: 1px solid yellow;
-      left: 20px;
-      position: absolute;
-    }
-  }
-
-}
-