17 files changed, 93 insertions, 62 deletions

diff --git a/scripts/build/client.sh b/scripts/build/client.sh
index be3eef802..d409d0594 100755
--- a/scripts/build/client.sh
+++ b/scripts/build/client.sh
@@ -41,7 +41,7 @@ if [ -z ${1+x} ] || [ "$1" != "--light" ]; then
         languages=("fr_FR")
     else
         # Supported languages
-        languages=("pl_PL" "it_IT" "ru_RU" "fr_FR" "pt_BR" "sv_SE" "eu_ES" "ca_ES" "cs_CZ" "eo" "zh_Hant_TW" "de_DE" "es_ES" "oc" "zh_Hans_CN")
+        languages=("nl_NL" "es_ES" "oc" "pt_BR" "pt_PT" "sv_SE" "pl_PL" "ru_RU" "zh_Hans_CN" "zh_Hant_TW" "fr_FR" "ja_JP" "eu_ES" "ca_ES" "cs_CZ" "eo" "de_DE" "it_IT")
     fi
 
     for lang in "${languages[@]}"; do
@@ -51,7 +51,7 @@ if [ -z ${1+x} ] || [ "$1" != "--light" ]; then
         npm run ng build -- --prod --i18n-file "./src/locale/target/angular_$lang.xml" --i18n-format xlf --i18n-locale "$lang" \
             --output-path "dist/$lang/" --deploy-url "/client/$lang/"
 
-        # Do no duplicate assets
+        # Do not duplicate assets
         rm -r "./dist/$lang/assets"
 
         # TODO: remove when the project will use runtime translations
diff --git a/scripts/clean/server/test.sh b/scripts/clean/server/test.sh
index b897c30ba..5694ac922 100755
--- a/scripts/clean/server/test.sh
+++ b/scripts/clean/server/test.sh
@@ -21,7 +21,14 @@ dropRedis () {
   redis-cli KEYS "redis-localhost:900$1*" | grep -v empty | xargs --no-run-if-empty redis-cli DEL
 }
 
-for i in $(seq 1 6); do
+seq=$(seq 1 6)
+
+if [ ! -z ${1+x} ]; then
+  seq=$1
+fi
+
+
+for i in $seq; do
   recreateDB "$i" &
   dropRedis "$i" &
   removeFiles "$i" &
diff --git a/scripts/create-transcoding-job.ts b/scripts/create-transcoding-job.ts
index 7e5b687bb..4a677eacb 100755
--- a/scripts/create-transcoding-job.ts
+++ b/scripts/create-transcoding-job.ts
@@ -42,6 +42,6 @@ async function run () {
   }
 
   await JobQueue.Instance.init()
-  await JobQueue.Instance.createJob({ type: 'video-file', payload: dataInput })
+  await JobQueue.Instance.createJob({ type: 'video-transcoding', payload: dataInput })
   console.log('Transcoding job for video %s created.', video.uuid)
 }
diff --git a/scripts/danger/clean/cleaner.ts b/scripts/danger/clean/cleaner.ts
index 009f8f7a0..d575af283 100644
--- a/scripts/danger/clean/cleaner.ts
+++ b/scripts/danger/clean/cleaner.ts
@@ -1,6 +1,7 @@
 import * as Promise from 'bluebird'
 import * as rimraf from 'rimraf'
-import { CONFIG, initDatabaseModels, sequelizeTypescript } from '../../../server/initializers'
+import { initDatabaseModels, sequelizeTypescript } from '../../../server/initializers'
+import { CONFIG } from '../../../server/initializers/config'
 
 initDatabaseModels(true)
   .then(() => {
diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
index 9b8fddac6..b4675c57f 100755
--- a/scripts/dev/server.sh
+++ b/scripts/dev/server.sh
@@ -4,7 +4,7 @@ set -eu
 
 if [ ! -f "./client/dist/en_US/index.html" ]; then
   echo "client/dist/en_US/index.html does not exist, compile client files..."
-  npm run build:client
+  npm run build:client -- --light
 fi
 
 npm run watch:server
diff --git a/scripts/e2e/index.sh b/scripts/e2e/index.sh
index cf2e04356..3856af06e 100755
--- a/scripts/e2e/index.sh
+++ b/scripts/e2e/index.sh
@@ -6,7 +6,6 @@ npm run clean:server:test
 
 (
     cd client
-    npm run webdriver-manager update
     npm run webpack -- --config webpack/webpack.video-embed.js --mode development
 )
 
diff --git a/scripts/e2e/local.sh b/scripts/e2e/local.sh
index 65ec653dc..b883ccaa3 100755
--- a/scripts/e2e/local.sh
+++ b/scripts/e2e/local.sh
@@ -6,11 +6,9 @@ npm run clean:server:test
 
 (
     cd client
-    npm run webdriver-manager update
     npm run webpack -- --config webpack/webpack.video-embed.js --mode development
 )
 
 npm run concurrently -- -k -s first \
-    "cd client && npm run webdriver-manager start" \
     "cd client && npm run ng -- e2e --port 3333 -c local" \
     "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warning\" } }' npm start"
diff --git a/scripts/generate-code-contributors.ts b/scripts/generate-code-contributors.ts
index 9824bc2f5..0d6266056 100755
--- a/scripts/generate-code-contributors.ts
+++ b/scripts/generate-code-contributors.ts
@@ -35,13 +35,17 @@ async function run () {
 
   {
     console.log('\n\n# Design\n')
-    console.log('By [Olivier Massain](https://twitter.com/omassain)\n')
-    console.log('Icons from [Robbie Pearce](https://robbiepearce.com/softies/)')
+    console.log(' * [Olivier Massain](https://twitter.com/omassain)')
+
+    console.log('\n\n# Icons\n')
+    console.log(' * [Robbie Pearce](https://robbiepearce.com/softies/)')
+    console.log(' * [Fork-Awesome](https://github.com/ForkAwesome/Fork-Awesome)')
+    console.log(' * playlist add by Google')
   }
 }
 
 function get (url: string, headers: any = {}) {
-  return doRequest({
+  return doRequest<any>({
     uri: url,
     json: true,
     headers: Object.assign(headers, {
diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts
index ab28f94c8..95897afa3 100755
--- a/scripts/i18n/create-custom-files.ts
+++ b/scripts/i18n/create-custom-files.ts
@@ -5,7 +5,7 @@ import {
   buildLanguages,
   VIDEO_CATEGORIES,
   VIDEO_IMPORT_STATES,
-  VIDEO_LICENCES,
+  VIDEO_LICENCES, VIDEO_PLAYLIST_PRIVACIES, VIDEO_PLAYLIST_TYPES,
   VIDEO_PRIVACIES,
   VIDEO_STATES
 } from '../../server/initializers/constants'
@@ -23,12 +23,16 @@ const playerKeys = {
   'Speed': 'Speed',
   'Subtitles/CC': 'Subtitles/CC',
   'peers': 'peers',
+  'peer': 'peer',
   'Go to the video page': 'Go to the video page',
   'Settings': 'Settings',
   'Uses P2P, others may know you are watching this video.': 'Uses P2P, others may know you are watching this video.',
   'Copy the video URL': 'Copy the video URL',
   'Copy the video URL at the current time': 'Copy the video URL at the current time',
-  'Copy embed code': 'Copy embed code'
+  'Copy embed code': 'Copy embed code',
+  'Copy magnet URI': 'Copy magnet URI',
+  'Total downloaded: ': 'Total downloaded: ',
+  'Total uploaded: ': 'Total uploaded: '
 }
 const playerTranslations = {
   target: join(__dirname, '../../../client/src/locale/source/player_en_US.xml'),
@@ -42,6 +46,8 @@ values(VIDEO_CATEGORIES)
   .concat(values(VIDEO_PRIVACIES))
   .concat(values(VIDEO_STATES))
   .concat(values(VIDEO_IMPORT_STATES))
+  .concat(values(VIDEO_PLAYLIST_PRIVACIES))
+  .concat(values(VIDEO_PLAYLIST_TYPES))
   .concat([
     'This video does not exist.',
     'We cannot fetch the video. Please try again later.',
diff --git a/scripts/i18n/pull-hook.sh b/scripts/i18n/pull-hook.sh
index b0668436d..2d728fef5 100755
--- a/scripts/i18n/pull-hook.sh
+++ b/scripts/i18n/pull-hook.sh
@@ -2,12 +2,13 @@
 
 set -eu
 
-# Zanata does not support inner elements in <source>, so we hack these special elements
-# This regex translate the converted elements to initial Angular elements
-
 for i in 1 2 3; do
+    # Angular does not like when there is not target element, so we create it with the same content than the source element
+    perl -0pi -e 's#<source>([^<]+)</source>\s*<context-group #<source>\1</source><target>\1</target><context-group #g' client/src/locale/target/angular_*.xml
+
+    # Zanata does not support inner elements in <source>, so we hack these special elements
+    # This regex translate the converted elements to initial Angular elements
     perl -pi -e 's|&lt;x id=(.+?)/&gt;([^"])|<x id=\1/>\2|g' client/src/locale/target/*.xml
-    perl -0pi -e 's|<source>(.+?)</source>\s*<context-group |<source>\1</source><target>\1</target><context-group |g' client/src/locale/target/angular_*.xml
 done
 
 npm run i18n:xliff2json
diff --git a/scripts/optimize-old-videos.ts b/scripts/optimize-old-videos.ts
index 1bee1b0f3..a1d5345a1 100644
--- a/scripts/optimize-old-videos.ts
+++ b/scripts/optimize-old-videos.ts
@@ -1,11 +1,12 @@
-import { CONFIG, VIDEO_TRANSCODING_FPS } from '../server/initializers/constants'
-import { getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution, getDurationFromVideoFile } from '../server/helpers/ffmpeg-utils'
+import { VIDEO_TRANSCODING_FPS } from '../server/initializers/constants'
+import { getDurationFromVideoFile, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../server/helpers/ffmpeg-utils'
 import { getMaxBitrate } from '../shared/models/videos'
 import { VideoModel } from '../server/models/video/video'
 import { optimizeVideofile } from '../server/lib/video-transcoding'
 import { initDatabaseModels } from '../server/initializers'
-import { join, basename, dirname } from 'path'
-import { copy, remove, move } from 'fs-extra'
+import { basename, dirname, join } from 'path'
+import { copy, move, remove } from 'fs-extra'
+import { CONFIG } from '../server/initializers/config'
 
 run()
   .then(() => process.exit(0))
diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 86aaa7994..83ad45b72 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,10 +1,11 @@
 import * as program from 'commander'
-import { createReadStream, readdirSync, statSync } from 'fs-extra'
+import { createReadStream, readdir } from 'fs-extra'
 import { join } from 'path'
 import { createInterface } from 'readline'
 import * as winston from 'winston'
 import { labelFormatter } from '../server/helpers/logger'
-import { CONFIG } from '../server/initializers/constants'
+import { CONFIG } from '../server/initializers/config'
+import { mtimeSortFilesDesc } from '../shared/core-utils/logs/logs'
 
 program
   .option('-l, --level [level]', 'Level log (debug/info/warn/error)')
@@ -52,42 +53,47 @@ const logLevels = {
   debug: logger.debug.bind(logger)
 }
 
-const logFiles = readdirSync(CONFIG.STORAGE.LOG_DIR)
-const lastLogFile = getNewestFile(logFiles, CONFIG.STORAGE.LOG_DIR)
+run()
+  .then(() => process.exit(0))
+  .catch(err => console.error(err))
 
-const path = join(CONFIG.STORAGE.LOG_DIR, lastLogFile)
-console.log('Opening %s.', path)
+function run () {
+  return new Promise(async res => {
+    const logFiles = await readdir(CONFIG.STORAGE.LOG_DIR)
+    const lastLogFile = await getNewestFile(logFiles, CONFIG.STORAGE.LOG_DIR)
 
-const rl = createInterface({
-  input: createReadStream(path)
-})
+    const path = join(CONFIG.STORAGE.LOG_DIR, lastLogFile)
+    console.log('Opening %s.', path)
 
-rl.on('line', line => {
-  const log = JSON.parse(line)
-  // Don't know why but loggerFormat does not remove splat key
-  Object.assign(log, { splat: undefined })
+    const stream = createReadStream(path)
 
-  logLevels[log.level](log)
-})
+    const rl = createInterface({
+      input: stream
+    })
 
-function toTimeFormat (time: string) {
-  const timestamp = Date.parse(time)
+    rl.on('line', line => {
+      const log = JSON.parse(line)
+      // Don't know why but loggerFormat does not remove splat key
+      Object.assign(log, { splat: undefined })
 
-  if (isNaN(timestamp) === true) return 'Unknown date'
+      logLevels[ log.level ](log)
+    })
 
-  return new Date(timestamp).toISOString()
+    stream.once('close', () => res())
+  })
 }
 
 // Thanks: https://stackoverflow.com/a/37014317
-function getNewestFile (files: string[], basePath: string) {
-  const out = []
+async function getNewestFile (files: string[], basePath: string) {
+  const sorted = await mtimeSortFilesDesc(files, basePath)
 
-  files.forEach(file => {
-    const stats = statSync(basePath + '/' + file)
-    if (stats.isFile()) out.push({ file, mtime: stats.mtime.getTime() })
-  })
+  return (sorted.length > 0) ? sorted[ 0 ].file : ''
+}
+
+function toTimeFormat (time: string) {
+  const timestamp = Date.parse(time)
 
-  out.sort((a, b) => b.mtime - a.mtime)
+  if (isNaN(timestamp) === true) return 'Unknown date'
 
-  return (out.length > 0) ? out[ 0 ].file : ''
+  return new Date(timestamp).toISOString()
 }
diff --git a/scripts/prune-storage.ts b/scripts/prune-storage.ts
index c9e4dbd4b..4953a7439 100755
--- a/scripts/prune-storage.ts
+++ b/scripts/prune-storage.ts
@@ -1,6 +1,6 @@
 import * as prompt from 'prompt'
 import { join } from 'path'
-import { CONFIG } from '../server/initializers/constants'
+import { CONFIG } from '../server/initializers/config'
 import { VideoModel } from '../server/models/video/video'
 import { initDatabaseModels } from '../server/initializers'
 import { remove, readdir } from 'fs-extra'
diff --git a/scripts/travis.sh b/scripts/travis.sh
index 509b40d87..3557816c8 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -36,8 +36,4 @@ elif [ "$1" = "lint" ]; then
     ( cd client
       npm run lint
     )
-elif [ "$1" = "jest" ]; then
-    ( cd client
-      npm run test
-    )
 fi
diff --git a/scripts/update-host.ts b/scripts/update-host.ts
index 422a3c9a7..57919b998 100755
--- a/scripts/update-host.ts
+++ b/scripts/update-host.ts
@@ -1,11 +1,12 @@
-import { CONFIG, initDatabaseModels } from '../server/initializers'
+import { WEBSERVER } from '../server/initializers/constants'
 import { ActorFollowModel } from '../server/models/activitypub/actor-follow'
 import { VideoModel } from '../server/models/video/video'
 import { ActorModel } from '../server/models/activitypub/actor'
 import {
   getAccountActivityPubUrl,
+  getVideoActivityPubUrl,
   getVideoAnnounceActivityPubUrl,
-  getVideoActivityPubUrl, getVideoChannelActivityPubUrl,
+  getVideoChannelActivityPubUrl,
   getVideoCommentActivityPubUrl
 } from '../server/lib/activitypub'
 import { VideoShareModel } from '../server/models/video/video-share'
@@ -13,6 +14,8 @@ import { VideoCommentModel } from '../server/models/video/video-comment'
 import { getServerActor } from '../server/helpers/utils'
 import { AccountModel } from '../server/models/account/account'
 import { VideoChannelModel } from '../server/models/video/video-channel'
+import { VideoStreamingPlaylistModel } from '../server/models/video/video-streaming-playlist'
+import { initDatabaseModels } from '../server/initializers'
 
 run()
   .then(() => process.exit(0))
@@ -61,7 +64,7 @@ async function run () {
     actor.url = newUrl
     actor.inboxUrl = newUrl + '/inbox'
     actor.outboxUrl = newUrl + '/outbox'
-    actor.sharedInboxUrl = CONFIG.WEBSERVER.URL + '/inbox'
+    actor.sharedInboxUrl = WEBSERVER.URL + '/inbox'
     actor.followersUrl = newUrl + '/followers'
     actor.followingUrl = newUrl + '/following'
 
@@ -109,11 +112,9 @@ async function run () {
 
   console.log('Updating video and torrent files.')
 
-  const videos = await VideoModel.list()
+  const videos = await VideoModel.listLocal()
   for (const video of videos) {
-    if (video.isOwned() === false) continue
-
-    console.log('Updated video ' + video.uuid)
+    console.log('Updating video ' + video.uuid)
 
     video.url = getVideoActivityPubUrl(video)
     await video.save()
@@ -122,5 +123,12 @@ async function run () {
       console.log('Updating torrent file %s of video %s.', file.resolution, video.uuid)
       await video.createTorrentAndSetInfoHash(file)
     }
+
+    for (const playlist of video.VideoStreamingPlaylists) {
+      playlist.playlistUrl = WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsMasterPlaylistStaticPath(video.uuid)
+      playlist.segmentsSha256Url = WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid)
+
+      await playlist.save()
+    }
   }
 }
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 4f7c58edd..5d7c5b0ea 100755
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -73,3 +73,7 @@ cp $PEERTUBE_PATH/peertube-latest/config/default.yaml $PEERTUBE_PATH/config/defa
 echo "Differences in configuration files..."
 diff -u $PEERTUBE_PATH/config/production.yaml "$PEERTUBE_PATH/versions/peertube-${VERSION}/config/production.yaml.example"
 
+echo ""
+echo "==========================================="
+echo "==   Don’t forget to restart PeerTube!   =="
+echo "==========================================="
diff --git a/scripts/watch/client.sh b/scripts/watch/client.sh
index f3799d2e9..1d6b8c2aa 100755
--- a/scripts/watch/client.sh
+++ b/scripts/watch/client.sh
@@ -4,4 +4,4 @@ set -eu
 
 cd client
 
-npm run ng -- serve --hmr --configuration hmr --host 0.0.0.0 --disable-host-check --port 3000
+npm run ng -- serve --proxy-config proxy.config.json --hmr --configuration hmr --host 0.0.0.0 --disable-host-check --port 3000