wco_models 3.1.0.313 → 3.1.0.314

data/app/models/wco_email/context.rb

@@ -150,6 +150,17 @@ class WcoEmail::Context
     })
   end
 
+  def self.new_for message
+    self.new({
+      from_email: message.to&.downcase,
+      lead_id: message.lead_id,
+      subject: message.subject,
+      reply_to_message: message,
+      email_template_id: ET.find_by( slug: 'blank').id,
+    })
+  end
+
+
 end
 Ctx = WcoEmail::Context
 

data/app/models/wco_email/email_filter_condition.rb

@@ -47,6 +47,12 @@ class WcoEmail::EmailFilterCondition
 
   field :value
   validates :value, presence: true
+  before_validation :strip_value
+  def strip_value
+    self.value = value.strip
+  end
+
+  field :comment
 
 
   def apply lead:, message:
@@ -62,6 +68,16 @@ class WcoEmail::EmailFilterCondition
         end
       end
 
+    when WcoEmail::EmailFilterCondition::FIELD_LEADSET
+      if cond.operator == WcoEmail::EmailFilterCondition::OPERATOR__ID
+        test_leadset = Wco::Leadset.find( value ) rescue nil
+        if test_leadset
+          if lead.leadset == test_leadset
+            reason = "#{email_skip_filter ? 'skip_' : ''}condition leadset _id `#{value}`"
+          end
+        end
+      end
+
     when WcoEmail::EmailFilterCondition::FIELD_TAGGED
       ## cond.operator should eql OPERATOR__ID but I don't check b/c if its slug, it should work also.
       tag   = Wco::Tag.find( cond.value ) rescue nil
@@ -98,7 +114,7 @@ class WcoEmail::EmailFilterCondition
     "<EF#{email_skip_filter ? 'Skip' : ''}Condition #{field} #{operator} `#{value}` />"
   end
   def to_s_full indent: 0
-    "#{" " * indent }<EF#{email_skip_filter ? 'Skip' : ''}Condition #{field} #{operator} `#{value}` />\n"
+    "#{" " * indent }<EF#{email_skip_filter ? 'Skip' : ''}Condition #{field} #{operator} `#{value}` #{comment} />\n"
   end
 
 

data/app/views/wco/api/newsproducer/README.txt

@@ -0,0 +1,2 @@
+
+studio_1 is that chick on gray background

data/app/views/wco/{newsproducer → api/newsproducer}/_studio_1.js

@@ -3,23 +3,23 @@
 **/
 const logg = (a, b="", c=null) => {
   if ('undefined' === typeof window) { return }
-  c = "string" === typeof c ? c : b.replace(/\W/g, "");
+  c = "string" === typeof c ? c : b.replace(/\W/g, '')
   if (c.length > 0) {
-    window[c] = a;
+    window[c] = a
   }
-  console.log(`+++ ${b}:`, a); // eslint-disable-line no-console
-};
+  console.log(`+++ ${b}:`, a) // eslint-disable-line no-console
+}
 
 let avatar_url = 'https://cdn.jsdelivr.net/gh/wasya-co/ishlib3js@0.0.3/public/vendor/models/avatars/brunette.glb'
 
-import * as THREE from 'three';
+import * as THREE from 'three'
 
-import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
-import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
+import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js'
+import { OrbitControls } from 'three/addons/controls/OrbitControls.js'
 
-import { TalkingHead } from "talkinghead";
+import { TalkingHead } from "talkinghead"
 
-const params = new URLSearchParams(window.location.search);
+const params = new URLSearchParams(window.location.search)
 
 let config = {
     sampleRate: 8000,
@@ -29,22 +29,23 @@ let config = {
     lipsyncLang: "en",
     waitForAudioChunks: false,
     enableMetrics: false,
-  };
-let width = 640;
-let height = 480;
-const FPS = 24;
+  }
+let width = 50
+let height = 50
+let slug = '<ccapture>'
+const FPS = 24
 
-let frame = 0;
+let frame = 0
 const api_key    = params.get('api_key')
 const api_secret = params.get('api_secret')
 const wco_origin = params.get('wco_origin')
 const newspartial_id = params.get('newspartial_id')
 let totalFrames
 
-let camera, controls, head, renderer, scene;
-let faceTarget = new THREE.Vector3();
-let chunkedInput = null;
-var capturer = new CCapture( { format: 'webm', framerate: FPS } );
+let camera, controls, head, renderer, scene
+let faceTarget = new THREE.Vector3()
+let chunkedInput = null
+var capturer = new CCapture( { format: 'webm', framerate: FPS } )
 
 async function init() {
   if (newspartial_id) {
@@ -55,20 +56,23 @@ async function init() {
       if (typeof chunkedInput === 'string') {
         chunkedInput = JSON.parse(chunkedInput)
       }
-      logg(chunkedInput, 'chunkedInput')
+      // logg(chunkedInput, 'chunkedInput')
       const last = chunkedInput.wtimes.length-1
       const duration_ms = chunkedInput.wtimes[last] + chunkedInput.wdurations[last]
       logg(duration_ms, 'duration_ms')
-      totalFrames = duration_ms/1000*FPS;
+      totalFrames = duration_ms/1000*FPS
+      width = chunkedInput.w_px
+      height = chunkedInput.h_px
+      slug = chunkedInput.slug
     } catch (error) {
-      console.log(error);
-      chunkedInput = null;
-      totalFrames = undefined;
+      console.log(error)
+      chunkedInput = null
+      totalFrames = undefined
     }
   }
 
-  scene = new THREE.Scene();
-  scene.background = new THREE.Color(0xd3d3d3);
+  scene = new THREE.Scene()
+  scene.background = new THREE.Color(0xd3d3d3)
 
   /* fov — Camera frustum vertical field of view.
    * aspect — Camera frustum aspect ratio.
@@ -79,28 +83,28 @@ async function init() {
   camera.position.set( 0, 2, 8 )
   camera.lookAt( 0, 0, 0 )
 
-  const ambientLight = new THREE.AmbientLight( 0xffffff );
-  scene.add( ambientLight );
+  const ambientLight = new THREE.AmbientLight( 0xffffff )
+  scene.add( ambientLight )
 
-  const grid = new THREE.GridHelper(10, 10, 0x888888, 0xbbbbbb);
-  grid.position.y = 0;
-  scene.add(grid);
+  const grid = new THREE.GridHelper(10, 10, 0x888888, 0xbbbbbb)
+  grid.position.y = 0
+  scene.add(grid)
 
-  const nodeAvatar = document.getElementById('avatar');
+  const nodeAvatar = document.getElementById('avatar')
   head = new TalkingHead( nodeAvatar, {
     avatarOnly: true,
     avatarOnlyScene: scene,
     avatarOnlyCamera: camera,
 
     lipsyncModules: ["en"],
-  });
-  logg(head, 'head')
+  })
+  // logg(head, 'head')
 
 
 
-  const nodeLoading = document.getElementById('loading');
+  const nodeLoading = document.getElementById('loading')
   try {
-    nodeLoading.textContent = "Loading...";
+    nodeLoading.textContent = "Loading..."
     await head.showAvatar( {
       url: avatar_url,
       body: 'F',
@@ -108,41 +112,41 @@ async function init() {
       lipsyncLang: 'en'
     }, (ev) => {
       if ( ev.lengthComputable ) {
-        let val = Math.min(100,Math.round(ev.loaded/ev.total * 100 ));
-        nodeLoading.textContent = "Loading " + val + "%";
+        let val = Math.min(100,Math.round(ev.loaded/ev.total * 100 ))
+        nodeLoading.textContent = "Loading " + val + "%"
       }
-    });
-    nodeLoading.style.display = 'none';
+    })
+    nodeLoading.style.display = 'none'
 
-    head.armature.position.set(0, 0, 0);
-    head.armature.rotation.set(0, 0, 0);
-    scene.add(head.armature);
+    head.armature.position.set(0, 0, 0)
+    head.armature.rotation.set(0, 0, 0)
+    scene.add(head.armature)
 
     // Put feet at the origin
-    head.armature.updateMatrixWorld(true);
-    const leftToe = new THREE.Vector3();
-    const rightToe = new THREE.Vector3();
-    head.objectLeftToeBase.getWorldPosition(leftToe);
-    head.objectRightToeBase.getWorldPosition(rightToe);
+    head.armature.updateMatrixWorld(true)
+    const leftToe = new THREE.Vector3()
+    const rightToe = new THREE.Vector3()
+    head.objectLeftToeBase.getWorldPosition(leftToe)
+    head.objectRightToeBase.getWorldPosition(rightToe)
     head.armature.position.set(
       -(leftToe.x + rightToe.x) / 2,
       -Math.min(leftToe.y, rightToe.y),
       -(leftToe.z + rightToe.z) / 2
-    );
-    head.armature.updateMatrixWorld(true);
+    )
+    head.armature.updateMatrixWorld(true)
 
     // Camera at head level, pointed at the face
-    const leftEye = new THREE.Vector3();
-    const rightEye = new THREE.Vector3();
-    head.objectLeftEye.getWorldPosition(leftEye);
-    head.objectRightEye.getWorldPosition(rightEye);
-    faceTarget.copy(leftEye).add(rightEye).multiplyScalar(0.5);
-
-    const camPos = new THREE.Vector3(0, 0, 2);
-    camPos.applyQuaternion(head.armature.quaternion);
-    camPos.add(faceTarget);
-    camera.position.copy(camPos);
-    camera.lookAt(faceTarget);
+    const leftEye = new THREE.Vector3()
+    const rightEye = new THREE.Vector3()
+    head.objectLeftEye.getWorldPosition(leftEye)
+    head.objectRightEye.getWorldPosition(rightEye)
+    faceTarget.copy(leftEye).add(rightEye).multiplyScalar(0.5)
+
+    const camPos = new THREE.Vector3(0, 0, 2)
+    camPos.applyQuaternion(head.armature.quaternion)
+    camPos.add(faceTarget)
+    camera.position.copy(camPos)
+    camera.lookAt(faceTarget)
 
     await head.streamStart({
       sampleRate: config.sampleRate,
@@ -155,8 +159,8 @@ async function init() {
     })
 
   } catch (error) {
-    console.log(error);
-    nodeLoading.textContent = error.toString();
+    console.log(error)
+    nodeLoading.textContent = error.toString()
   }
 
 
@@ -165,41 +169,41 @@ async function init() {
   renderer = new THREE.WebGLRenderer( {
     alpha: false,
     antialias: true,
-  } );
-  renderer.setClearColor(0xd3d3d3, 1);
-  renderer.setPixelRatio( 1 ); // window.devicePixelRatio );
-  renderer.setSize( width, height );
-  renderer.toneMapping = THREE.ACESFilmicToneMapping;
-  renderer.toneMappingExposure = 1;
-  renderer.outputColorSpace = THREE.SRGBColorSpace;
-  document.getElementById('rotatingC').appendChild( renderer.domElement );
+  } )
+  renderer.setClearColor(0xd3d3d3, 1)
+  renderer.setPixelRatio( 1 ); // window.devicePixelRatio )
+  renderer.setSize( width, height )
+  renderer.toneMapping = THREE.ACESFilmicToneMapping
+  renderer.toneMappingExposure = 1
+  renderer.outputColorSpace = THREE.SRGBColorSpace
+  document.getElementById('rotatingC').appendChild( renderer.domElement )
 
   //
 
-  controls = new OrbitControls( camera, renderer.domElement );
-  controls.enableDamping = true;
-  controls.enableRotate = true;
-  controls.enablePan = true;
-  controls.enableZoom = true;
-  controls.minDistance = 0.5;
-  controls.maxDistance = 100;
-  controls.target.copy(faceTarget);
-  controls.autoRotate = false;
-  controls.update();
+  controls = new OrbitControls( camera, renderer.domElement )
+  controls.enableDamping = true
+  controls.enableRotate = true
+  controls.enablePan = true
+  controls.enableZoom = true
+  controls.minDistance = 0.5
+  controls.maxDistance = 100
+  controls.target.copy(faceTarget)
+  controls.autoRotate = false
+  controls.update()
 
   //
 
-  window.addEventListener( 'resize', onWindowResize );
+  window.addEventListener( 'resize', onWindowResize )
 
 
   // Keep rendering so OrbitControls drag/damping stay live
-  renderer.setAnimationLoop(animate);
+  renderer.setAnimationLoop(animate)
 
   // Start capture/audio only after the renderer exists
   if (newspartial_id && chunkedInput) {
-    capturer.start();
+    capturer.start()
     logg('capturer.start')
-    head.streamAudio(chunkedInput);
+    head.streamAudio(chunkedInput)
   }
 }
 
@@ -212,29 +216,29 @@ document.addEventListener('DOMContentLoaded', async function(e) {
 })
 
 function onWindowResize() {
-  camera.aspect = width / height;
-  camera.updateProjectionMatrix();
-  renderer.setSize( width, height );
-  render();
+  camera.aspect = width / height
+  camera.updateProjectionMatrix()
+  renderer.setSize( width, height )
+  render()
 }
 
 function render() {
-  renderer.render( scene, camera );
+  renderer.render( scene, camera )
 }
 
 function animate() {
-  const t = frame / FPS;
-  if (head) head.animate(1000/FPS);
-  controls.update();
-  renderer.render( scene, camera );
+  const t = frame / FPS
+  if (head) head.animate(1000/FPS)
+  controls.update()
+  renderer.render( scene, camera )
 
   if (totalFrames) {
-    capturer.capture( renderer.domElement );
-    frame++;
+    capturer.capture( renderer.domElement )
+    frame++
     if (frame >= totalFrames) {
       totalFrames = false
-      renderer.setAnimationLoop(null);
-      capturer.stop();
+      renderer.setAnimationLoop(null)
+      capturer.stop()
       logg('capturer.stop')
 
       if (newspartial_id) {
@@ -242,9 +246,9 @@ function animate() {
           logg(blob, 'blob')
           renderer.domElement.toBlob((thumb) => {
             logg(thumb, 'thumb')
-            const form = new FormData();
+            const form = new FormData()
             form.append('video', blob, 'lips.webm')
-            form.append('name', '<ccapturejs>')
+            form.append('name', slug)
             form.append('thumb', thumb)
             form.append('newspartial_id', newspartial_id)
 
@@ -254,26 +258,29 @@ function animate() {
                 // 'Content-Type': 'video/webm',
               },
               body: form,
+            }).then(() => {
+              document.getElementById('status').textContent = 'finished'
+              document.body.style.backgroundColor = 'gray'
             })
           })
-        });
+        })
       }
       // Resume interactive orbit after capture
-      renderer.setAnimationLoop(animate);
+      renderer.setAnimationLoop(animate)
     }
   }
 }
 
 
 // Speak when clicked
-const nodeSpeak = document.getElementById('speak');
+const nodeSpeak = document.getElementById('speak')
   nodeSpeak.addEventListener('click', function () {
     try {
 
     } catch (error) {
-      console.log(error);
+      console.log(error)
     }
-  });
+  })
 
 
 console.log('+++ loaded wco_models :: newsproducer :: studio_1.js')

data/app/views/wco/{newsproducer → api/newsproducer}/studio_1.html.erb

@@ -13,12 +13,13 @@
 }
 </script>
 
-<h1 class='center text-center'>{{ label }}</h1>
+Status:<span id='status'>pending</span>
+
 <button id='speak'>Speak</button>
 <div id='avatar'></div>
 <div id='loading'>Loading...</div>
-<div id="rotatingC" class="r2" style="width: 640px;
-  height: 480px;
+<div id="rotatingC" class="r2" style="width: 50px;
+  height: 50px;
   border: 1px solid red;
   text-align: center; " >
 </div>

data/app/views/wco/api/newsvideos/show.jbuilder

@@ -0,0 +1,13 @@
+
+json.id @newsvideo.id.to_s
+json.generate_url api_newsvideo_generate_url(@newsvideo, { api_key:    Wco::Setting.get('WASYACO_SIMPLE_API_KEY'),
+                                                           api_secret: Wco::Setting.get('WASYACO_SIMPLE_API_SECRET') })
+json.newspartials @newsvideo.newspartials.each do |newspartial|
+  json.generate_speech_url api_newspartial_generate_speech_url({ id: newspartial.id.to_s,
+                                                                 api_key:    Wco::Setting.get('WASYACO_SIMPLE_API_KEY'),
+                                                                 api_secret: Wco::Setting.get('WASYACO_SIMPLE_API_SECRET'), })
+  json.generate_video_url  api_newsproducer_studio_1_url({ newspartial_id: newspartial.id.to_s,
+                                                           wco_origin: request.base_url,
+                                                           api_key:    Wco::Setting.get('WASYACO_SIMPLE_API_KEY'),
+                                                           api_secret: Wco::Setting.get('WASYACO_SIMPLE_API_SECRET'), })
+end

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

@@ -5,8 +5,10 @@
       = f.submit
 
     .field.flex-row
-      %label Title
-      = f.text_field :title, class: 'w-100'
+      -# %label Title
+      -# = f.text_field :title, class: 'w-100'
+      %label slug
+      = f.text_field :slug, class: 'w-100'
 
     .field
       %label Body

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

@@ -14,10 +14,10 @@
 
     .full-text
       .header.collapse-expand{ id: newspartial.id.to_s }
-        Newspartial
+        newspartial::#{newspartial.slug}
         = link_to '[~]', edit_newspartial_path(newspartial)
         %span{ class: 'gray' } #{newspartial.id}
-        = link_to '[api]', api_newspartial_config_path(newspartial, format: :json, api_key: Wco::Setting.get('WASYACO_SIMPLE_API_KEY'), api_secret:  Wco::Setting.get('WASYACO_SIMPLE_API_SECRET') ), target: :_blank
+        = link_to '[config.json]', api_newspartial_config_path(newspartial, format: :json, api_key: Wco::Setting.get('WASYACO_SIMPLE_API_KEY'), api_secret:  Wco::Setting.get('WASYACO_SIMPLE_API_SECRET') ), target: :_blank
 
       .full-textC
         .flex-row
@@ -29,7 +29,7 @@
             -# = button_to 'Generate video', newspartial_generate_video_path(newspartial), :data => { :confirm => 'Are you sure?' }
             -# .small.gray ISHLIB3JS_ROOT
 
-            = link_to 'Generate video 2', newsproducer_studio_1_path({ newspartial_id: newspartial.id.to_s, wco_origin: request.base_url, api_key: Wco::Setting.get('WASYACO_SIMPLE_API_KEY'), api_secret: Wco::Setting.get('WASYACO_SIMPLE_API_SECRET') }), class: 'btn btn-primary', data: { confirm: 'Are you sure?' }
+            = link_to 'Generate video 2', api_newsproducer_studio_1_path({ newspartial_id: newspartial.id.to_s, wco_origin: request.base_url, api_key: Wco::Setting.get('WASYACO_SIMPLE_API_KEY'), api_secret: Wco::Setting.get('WASYACO_SIMPLE_API_SECRET') }), target: :_blank, class: 'btn btn-primary', data: { confirm: 'Are you sure?' }
 
             Video:
             - if newspartial.video

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

@@ -12,12 +12,21 @@
       = f.text_field :slug, class: 'w-100'
 
     .row
-      .field
-        %label w_px
-        = f.text_field :w_px
-      .field
-        %label h_px
-        = f.text_field :h_px
+      .a
+        .field
+          %label w_px
+          = f.text_field :w_px
+      .a
+        .field
+          %label h_px
+          = f.text_field :h_px
+      .descr
+        %ul
+          %li 1280x720 16:9
+          %li 1024x768 4:3
+          %li 854x480 16:9
+          %li 640x360 16:9
+          %li 640x480 4:3
 
     .field
       %label Body
@@ -28,5 +37,9 @@
       -# = render '/wco/tags/index', tags: newsvideo.tags
       = f.select :tag_ids, options_for_select(@tags_list, selected: newsvideo.tag_ids), {}, { multiple: true, class: 'select2' }
 
+    .field
+      %label next_overlay_ms
+      = f.text_field :next_overlay_ms
+
     .actions
       = f.submit

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

@@ -1,2 +1,3 @@
 
-= render 'form', newsvideo: @newsvideo
+.newsvideos-new.maxwidth
+  = render 'form', newsvideo: @newsvideo

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

@@ -4,17 +4,24 @@
     Newsvideo `#{@newsvideo.title}`
     #{link_to '[~]', edit_newsvideo_path(@newsvideo)}
 
+    = link_to '_[config.json]', api_newsvideo_path(@newsvideo.id, { api_key: Wco::Setting.get('WASYACO_SIMPLE_API_KEY'), api_secret: Wco::Setting.get('WASYACO_SIMPLE_API_SECRET') }), target: :_blank
     = link_to '[+ newspartial]', new_newspartial_path(newsvideo_id: @newsvideo.id)
-    = link_to '[search illustration]', pexels_search_path(newsvideo_id: @newsvideo.id), target: :_blank
+    = link_to '_[search illustration]', pexels_search_path(newsvideo_id: @newsvideo.id), target: :_blank
 
 
   %ul.actions
+    %li #{@newsvideo.w_px} x #{@newsvideo.h_px}
     %li
       .d-inline-block= button_to 'split', split_newsvideo_path(@newsvideo), :data => { :confirm => 'Are you sure?' }
       .small.gray
         Uses sentences_to_phrases to reasonably create Wco::Newspartial's
     %li
-      .d-inline-block= button_to 'generate', generate_newsvideo_path(@newsvideo), :data => { :confirm => 'Are you sure?' }
+      .d-inline-block= button_to 'generate all audio', newsvideo_generate_all_audio_path(@newsvideo), :data => { :confirm => 'Are you sure?' }
+    %li
+      .d-inline-block= button_to 'generate (obsolete)', generate_newsvideo_path(@newsvideo), :data => { :confirm => 'Are you sure?' }
+    %li
+      .d-inline-block= button_to 'generate video & output', newsvideo_generate_all_video_path(@newsvideo), :data => { :confirm => 'Are you sure?' }
+
 
   %i.fa.fa-compress.collapse-expand{ id: @newsvideo.id.to_s } Descr
   .descr= raw @newsvideo.body.gsub(/(\r?\n){2}/, "<br /><br />")

data/config/initializers/08_integrations.rb

@@ -7,3 +7,5 @@ Stripe.api_version = '2020-08-27'
 
 PI_DRUP_PROD_USERNAME ||= 'test-1@piousbox.com'
 PI_DRUP_PROD_PASSWD   ||= 'KSUisl321,'
+
+PUPPETEER_ROOT = '/Users/piousbox/projects/node/puppeteer_example'

data/config/initializers/08_integrations.rb-example

@@ -4,3 +4,5 @@ STRIPE_SK = ''
 
 Stripe.api_key = ::STRIPE_SK
 Stripe.api_version = '2020-08-27'
+
+PUPPETEER_ROOT = '/Users/piousbox/projects/node/puppeteer_example'

data/config/routes.rb

@@ -15,9 +15,17 @@ Wco::Engine.routes.draw do
 
     post  'reports',                to: 'reports#create'
     patch 'reports/:id/add-config', to: 'reports#add_config'
-    get   'newspartials/:id/config',     to: 'newspartials#show_config', as: :newspartial_config
+    get   'newspartials/:id/config',          to: 'newspartials#show_config',     as: :newspartial_config
+    match 'newspartials/:id/generate-speech', to: 'newspartials#generate_speech', as: :newspartial_generate_speech, via: [ :get, :post ]
+
+    get 'newsproducer/canvas',         to: 'newsproducer#canvas'
+    get 'newsproducer/canvas_minimal', to: 'newsproducer#canvas_minimal'
+    get 'newsproducer/studio_1',       to: 'newsproducer#studio_1'
+
 
     match 'newsvideos/:id/generate-illustration', to: 'newsvideos#generate_illustration', as: :newsvideo_generate_illustration, via: [ :get, :post ]
+    match 'newsvideos/:id/generate-video', to: 'newsvideos#generate', as: :newsvideo_generate, via: [ :get, :post ]
+    get   'newsvideos/:id', to: 'newsvideos#show', as: :newsvideo, defaults: { format: :json }
 
     get 'tags', to: 'tags#index'
 
@@ -69,13 +77,13 @@ Wco::Engine.routes.draw do
   resources :newspartials
 
 
-  get 'newsproducer/canvas', to: 'newsproducer#canvas'
-  get 'newsproducer/canvas_minimal', to: 'newsproducer#canvas_minimal'
-  get 'newsproducer/studio_1', to: 'newsproducer#studio_1'
 
   match 'newsvideos/:id/generate-illustration', to: 'newsvideos#generate_illustration', as: :newsvideo_generate_illustration, via: [ :get, :post ]
+  match 'newsvideos/:id/generate-all-audio',    to: 'newsvideos#generate_all_audio',    as: :newsvideo_generate_all_audio, via: [ :get, :post ]
+  match 'newsvideos/:id/generate-all-video',    to: 'newsvideos#generate_all_video',    as: :newsvideo_generate_all_video, via: [ :get, :post ]
   post  'newsvideos/:id/generate', to: 'newsvideos#generate', as: :generate_newsvideo
   post  'newsvideos/:id/split',    to: 'newsvideos#split',    as: :split_newsvideo
+  post  'newsvideos/:id/add-image-as-overlay', to: 'newsvideos#add_image_as_overlay'
   resources :newsvideos
 
   resources :obfuscated_redirects