This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5b04a12350f513195078119d | |
5b075bdd538bea001a4fdd58 | |
5cbdf2e13d1ef5001b9bbaf4 | |
5cc23e25473e6b001c3b9c05 | |
5cc24829473e6b001c3b9d46 | |
5cc248f9473e6b001c3b9d51 | |
5cc24b0d473e6b001c3b9d6b | |
5cc24ce3473e6b001c3b9d81 | |
5cc2567e473e6b001c3b9e06 | |
5cc3b1f5473e6b001c3ba081 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5b04a12350f513195078119d | |
5b075bdd538bea001a4fdd58 | |
5cbdf2e13d1ef5001b9bbaf4 | |
5cc23e25473e6b001c3b9c05 | |
5cc24829473e6b001c3b9d46 | |
5cc248f9473e6b001c3b9d51 | |
5cc24b0d473e6b001c3b9d6b | |
5cc24ce3473e6b001c3b9d81 | |
5cc2567e473e6b001c3b9e06 | |
5cc3b1f5473e6b001c3ba081 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
env: flex | |
runtime: custom | |
service: worker | |
skip_files: | |
- package-lock.json | |
resources: | |
cpu: 2 | |
memory_gb: 16 | |
disk_size_gb: 50 | |
env_variables: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
const config = require('../../config') | |
const cloudTasks = require('@google-cloud/tasks') | |
const queue = {} | |
queue.transcodeVideo = async (data) => { | |
const qClient = new cloudTasks.CloudTasksClient() | |
const task = { | |
appEngineHttpRequest: { | |
httpMethod : 'POST', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Dockerfile for appengine | |
FROM arturostories/api:cherrypick | |
COPY . /app/ | |
RUN yarn install --production=false | |
CMD yarn test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/server/controllers/manifest.js b/server/controllers/manifest.js | |
index 94b3ab7..b28956f 100644 | |
--- a/server/controllers/manifest.js | |
+++ b/server/controllers/manifest.js | |
@@ -2,7 +2,7 @@ const HLS = require('hls-parser') | |
const config = require('../../config') | |
const Story = require('../models/story') | |
const Video = require('../models/video') | |
-const transcoderProfiles = require('../../config/transcoder.js') | |
+const transcoderProfiles = require('../../config/transcoder.js')[config.transcoderProfile] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/server/controllers/hls.js b/server/controllers/hls.js | |
index 12c16cd..5b7589e 100644 | |
--- a/server/controllers/hls.js | |
+++ b/server/controllers/hls.js | |
@@ -110,16 +110,17 @@ controller.mediaPlaylist = async (req, res) => { | |
return | |
} | |
- // Skip Image Chapters | |
- const imageObj = currentVersion.renderedImage || currentVersion.baseImage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/server/routes/hls-player.js b/server/routes/hls-player.js | |
index f6b6b61..bd0e9c1 100644 | |
--- a/server/routes/hls-player.js | |
+++ b/server/routes/hls-player.js | |
@@ -50,13 +50,6 @@ function processStory(tStoryObj) { | |
// Set Chapter Id | |
chapter.id = chapter._id | |
const { currentVersion } = chapter | |
- const chapterImage = currentVersion.renderedImage || currentVersion.baseImage | |
- if (chapterImage && chapterImage.path) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Dockerfile b/Dockerfile | |
index f54fb28..bd22f9f 100644 | |
--- a/Dockerfile | |
+++ b/Dockerfile | |
@@ -14,6 +14,7 @@ RUN npm install --unsafe-perm --global yarn | |
# Install ffmpeg | |
#RUN apt-get -y update && apt-get install -y ffmpeg libav-tools x264 x265 | |
+RUN add-apt-repository ppa:jonathonf/ffmpeg-4 && apt-get update && apt-get install ffmpeg | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/components/utils.js b/src/components/utils.js | |
index 3904618..80069ed 100644 | |
--- a/src/components/utils.js | |
+++ b/src/components/utils.js | |
@@ -42,6 +42,10 @@ const Utils = { | |
isIE() { | |
return window.MSInputMethodContext && document.documentMode | |
}, | |
+ isSnap() { | |
+ const ua = navigator.userAgent.toLowerCase() |
NewerOlder