7 files changed, 109 insertions, 13 deletions

diff --git a/scripts/create-generate-storyboard-job.ts b/scripts/create-generate-storyboard-job.ts
new file mode 100644
index 000000000..47c08edac
--- /dev/null
+++ b/scripts/create-generate-storyboard-job.ts
@@ -0,0 +1,85 @@
+import { program } from 'commander'
+import { toCompleteUUID } from '@server/helpers/custom-validators/misc'
+import { initDatabaseModels } from '@server/initializers/database'
+import { JobQueue } from '@server/lib/job-queue'
+import { VideoModel } from '@server/models/video/video'
+import { StoryboardModel } from '@server/models/video/storyboard'
+
+program
+  .description('Generate videos storyboard')
+  .option('-v, --video [videoUUID]', 'Generate the storyboard of a specific video')
+  .option('-a, --all-videos', 'Generate missing storyboards of local videos')
+  .parse(process.argv)
+
+const options = program.opts()
+
+if (!options['video'] && !options['allVideos']) {
+  console.error('You need to choose videos for storyboard generation.')
+  process.exit(-1)
+}
+
+run()
+  .then(() => process.exit(0))
+  .catch(err => {
+    console.error(err)
+    process.exit(-1)
+  })
+
+async function run () {
+  await initDatabaseModels(true)
+
+  JobQueue.Instance.init()
+
+  let ids: number[] = []
+
+  if (options['video']) {
+    const video = await VideoModel.load(toCompleteUUID(options['video']))
+
+    if (!video) {
+      console.error('Unknown video ' + options['video'])
+      process.exit(-1)
+    }
+
+    if (video.remote === true) {
+      console.error('Cannot process a remote video')
+      process.exit(-1)
+    }
+
+    if (video.isLive) {
+      console.error('Cannot process live video')
+      process.exit(-1)
+    }
+
+    ids.push(video.id)
+  } else {
+    ids = await listLocalMissingStoryboards()
+  }
+
+  for (const id of ids) {
+    const videoFull = await VideoModel.load(id)
+
+    if (videoFull.isLive) continue
+
+    await JobQueue.Instance.createJob({
+      type: 'generate-video-storyboard',
+      payload: {
+        videoUUID: videoFull.uuid,
+        federate: true
+      }
+    })
+
+    console.log(`Created generate-storyboard job for ${videoFull.name}.`)
+  }
+}
+
+async function listLocalMissingStoryboards () {
+  const ids = await VideoModel.listLocalIds()
+  const results: number[] = []
+
+  for (const id of ids) {
+    const storyboard = await StoryboardModel.loadByVideo(id)
+    if (!storyboard) results.push(id)
+  }
+
+  return results
+}
diff --git a/scripts/create-move-video-storage-job.ts b/scripts/create-move-video-storage-job.ts
index c402115f0..8537114eb 100644
--- a/scripts/create-move-video-storage-job.ts
+++ b/scripts/create-move-video-storage-job.ts
@@ -1,4 +1,5 @@
 import { program } from 'commander'
+import { toCompleteUUID } from '@server/helpers/custom-validators/misc'
 import { CONFIG } from '@server/initializers/config'
 import { initDatabaseModels } from '@server/initializers/database'
 import { JobQueue } from '@server/lib/job-queue'
@@ -32,7 +33,10 @@ if (options['toObjectStorage'] && !CONFIG.OBJECT_STORAGE.ENABLED) {
 
 run()
   .then(() => process.exit(0))
-  .catch(err => console.error(err))
+  .catch(err => {
+    console.error(err)
+    process.exit(-1)
+  })
 
 async function run () {
   await initDatabaseModels(true)
@@ -42,7 +46,7 @@ async function run () {
   let ids: number[] = []
 
   if (options['video']) {
-    const video = await VideoModel.load(options['video'])
+    const video = await VideoModel.load(toCompleteUUID(options['video']))
 
     if (!video) {
       console.error('Unknown video ' + options['video'])
diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts
index 72136614c..696a097b1 100755
--- a/scripts/i18n/create-custom-files.ts
+++ b/scripts/i18n/create-custom-files.ts
@@ -69,7 +69,13 @@ const playerKeys = {
   '{1} from servers · {2} from peers': '{1} from servers · {2} from peers',
   'Previous video': 'Previous video',
   'Video page (new window)': 'Video page (new window)',
-  'Next video': 'Next video'
+  'Next video': 'Next video',
+  'This video is password protected': 'This video is password protected',
+  'You need a password to watch this video.': 'You need a password to watch this video.',
+  'Incorrect password, please enter a correct password': 'Incorrect password, please enter a correct password',
+  'Cancel': 'Cancel',
+  'Up Next': 'Up Next',
+  'Autoplay is suspended': 'Autoplay is suspended'
 }
 Object.assign(playerKeys, videojs)
 
diff --git a/scripts/migrations/peertube-4.2.ts b/scripts/migrations/peertube-4.2.ts
index 513c629ef..d8929692b 100644
--- a/scripts/migrations/peertube-4.2.ts
+++ b/scripts/migrations/peertube-4.2.ts
@@ -78,7 +78,7 @@ async function fillAvatarSizeIfNeeded (accountOrChannel: MAccountDefault | MChan
 
     console.log('Filling size of avatars of %s.', accountOrChannel.name)
 
-    const { width, height } = await getImageSize(join(CONFIG.STORAGE.ACTOR_IMAGES, avatar.filename))
+    const { width, height } = await getImageSize(join(CONFIG.STORAGE.ACTOR_IMAGES_DIR, avatar.filename))
     avatar.width = width
     avatar.height = height
 
@@ -107,8 +107,8 @@ async function generateSmallerAvatar (actor: MActorDefault) {
   const sourceFilename = bigAvatar.filename
 
   const newImageName = buildUUID() + getLowercaseExtension(sourceFilename)
-  const source = join(CONFIG.STORAGE.ACTOR_IMAGES, sourceFilename)
-  const destination = join(CONFIG.STORAGE.ACTOR_IMAGES, newImageName)
+  const source = join(CONFIG.STORAGE.ACTOR_IMAGES_DIR, sourceFilename)
+  const destination = join(CONFIG.STORAGE.ACTOR_IMAGES_DIR, newImageName)
 
   await processImage({ path: source, destination, newSize: imageSize, keepOriginal: true })
 
diff --git a/scripts/prune-storage.ts b/scripts/prune-storage.ts
index d19594a60..9a73a8600 100755
--- a/scripts/prune-storage.ts
+++ b/scripts/prune-storage.ts
@@ -37,8 +37,8 @@ async function run () {
   console.log('Detecting files to remove, it could take a while...')
 
   toDelete = toDelete.concat(
-    await pruneDirectory(DIRECTORIES.VIDEOS.PUBLIC, doesWebTorrentFileExist()),
-    await pruneDirectory(DIRECTORIES.VIDEOS.PRIVATE, doesWebTorrentFileExist()),
+    await pruneDirectory(DIRECTORIES.VIDEOS.PUBLIC, doesWebVideoFileExist()),
+    await pruneDirectory(DIRECTORIES.VIDEOS.PRIVATE, doesWebVideoFileExist()),
 
     await pruneDirectory(DIRECTORIES.HLS_STREAMING_PLAYLIST.PRIVATE, doesHLSPlaylistExist()),
     await pruneDirectory(DIRECTORIES.HLS_STREAMING_PLAYLIST.PUBLIC, doesHLSPlaylistExist()),
@@ -50,7 +50,7 @@ async function run () {
     await pruneDirectory(CONFIG.STORAGE.PREVIEWS_DIR, doesThumbnailExist(true, ThumbnailType.PREVIEW)),
     await pruneDirectory(CONFIG.STORAGE.THUMBNAILS_DIR, doesThumbnailExist(false, ThumbnailType.MINIATURE)),
 
-    await pruneDirectory(CONFIG.STORAGE.ACTOR_IMAGES, doesActorImageExist)
+    await pruneDirectory(CONFIG.STORAGE.ACTOR_IMAGES_DIR, doesActorImageExist)
   )
 
   const tmpFiles = await readdir(CONFIG.STORAGE.TMP_DIR)
@@ -93,12 +93,12 @@ async function pruneDirectory (directory: string, existFun: ExistFun) {
   return toDelete
 }
 
-function doesWebTorrentFileExist () {
+function doesWebVideoFileExist () {
   return (filePath: string) => {
     // Don't delete private directory
     if (filePath === DIRECTORIES.VIDEOS.PRIVATE) return true
 
-    return VideoFileModel.doesOwnedWebTorrentVideoFileExist(basename(filePath))
+    return VideoFileModel.doesOwnedWebVideoFileExist(basename(filePath))
   }
 }
 
diff --git a/scripts/release-embed-api.sh b/scripts/release-embed-api.sh
index ae76a65f5..41c84ed38 100755
--- a/scripts/release-embed-api.sh
+++ b/scripts/release-embed-api.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-cd client/src/standalone/player
+cd client/src/standalone/embed-player-api
 
 rm -rf dist build && tsc -p . && ../../../node_modules/.bin/webpack --config ./webpack.config.js
 
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 86135fcc9..64c7e1581 100755
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -43,10 +43,11 @@ if [ -x "$(command -v pg_dump)" ]; then
   DB_USER=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['username'])")
   DB_PASS=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['password'])")
   DB_HOST=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['hostname'])")
+  DB_PORT=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['port'])")
   DB_SUFFIX=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['suffix'])")
   DB_NAME=$(node -e "console.log(require('js-yaml').load(fs.readFileSync('$PEERTUBE_PATH/config/production.yaml', 'utf8'))['database']['name'] || '')")
 
-  PGPASSWORD=$DB_PASS pg_dump -U $DB_USER -h $DB_HOST -F c "${DB_NAME:-peertube${DB_SUFFIX}}" -f "$SQL_BACKUP_PATH"
+  PGPASSWORD=$DB_PASS pg_dump -U $DB_USER -p $DB_PORT -h $DB_HOST -F c "${DB_NAME:-peertube${DB_SUFFIX}}" -f "$SQL_BACKUP_PATH"
 else
   echo "pg_dump not found. Cannot make a SQL backup!"
 fi