5 files changed, 138 insertions, 67 deletions

diff --git a/scripts/benchmark.ts b/scripts/benchmark.ts
index 45b2a7a79..0cadb36d9 100644
--- a/scripts/benchmark.ts
+++ b/scripts/benchmark.ts
@@ -50,126 +50,102 @@ async function run () {
       title: 'AP - account peertube',
       path: '/accounts/peertube',
       headers: buildAPHeader(),
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.startsWith('{"type":')
+      expecter: (body, status) => {
+        return status === 200 && body.startsWith('{"type":')
       }
     },
     {
       title: 'AP - video',
       path: '/videos/watch/' + video.uuid,
       headers: buildAPHeader(),
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.startsWith('{"type":"Video"')
+      expecter: (body, status) => {
+        return status === 200 && body.startsWith('{"type":"Video"')
       }
     },
     {
       title: 'Misc - webfinger peertube',
       path: '/.well-known/webfinger?resource=acct:peertube@' + server.host,
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.startsWith('{"subject":')
+      expecter: (body, status) => {
+        return status === 200 && body.startsWith('{"subject":')
       }
     },
     {
       title: 'API - unread notifications',
       path: '/api/v1/users/me/notifications?start=0&count=0&unread=true',
       headers: buildAuthorizationHeader(),
-      expecter: (_client, statusCode) => {
-        return statusCode === 200
+      expecter: (_body, status) => {
+        return status === 200
       }
     },
     {
       title: 'API - me',
       path: '/api/v1/users/me',
       headers: buildAuthorizationHeader(),
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.startsWith('{"id":')
+      expecter: (body, status) => {
+        return status === 200 && body.startsWith('{"id":')
       }
     },
     {
       title: 'API - videos list',
       path: '/api/v1/videos',
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.startsWith('{"total":10')
+      expecter: (body, status) => {
+        return status === 200 && body.startsWith('{"total":10')
       }
     },
     {
       title: 'API - video get',
       path: '/api/v1/videos/' + video.uuid,
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.startsWith('{"id":')
+      expecter: (body, status) => {
+        return status === 200 && body.startsWith('{"id":')
       }
     },
     {
       title: 'API - video captions',
       path: '/api/v1/videos/' + video.uuid + '/captions',
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.startsWith('{"total":4')
+      expecter: (body, status) => {
+        return status === 200 && body.startsWith('{"total":4')
       }
     },
     {
       title: 'API - video threads',
       path: '/api/v1/videos/' + video.uuid + '/comment-threads',
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.startsWith('{"total":10')
+      expecter: (body, status) => {
+        return status === 200 && body.startsWith('{"total":10')
       }
     },
     {
       title: 'API - video replies',
       path: '/api/v1/videos/' + video.uuid + '/comment-threads/' + threadId,
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.startsWith('{"comment":{')
+      expecter: (body, status) => {
+        return status === 200 && body.startsWith('{"comment":{')
       }
     },
     {
       title: 'HTML - video watch',
       path: '/videos/watch/' + video.uuid,
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.includes('<title>my super')
+      expecter: (body, status) => {
+        return status === 200 && body.includes('<title>my super')
       }
     },
     {
       title: 'HTML - video embed',
       path: '/videos/embed/' + video.uuid,
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.includes('embed')
+      expecter: (body, status) => {
+        return status === 200 && body.includes('embed')
       }
     },
     {
       title: 'HTML - homepage',
       path: '/',
-      expecter: (_client, statusCode) => {
-        return statusCode === 200
+      expecter: (_body, status) => {
+        return status === 200
       }
     },
     {
       title: 'API - config',
       path: '/api/v1/config',
-      expecter: (client, statusCode) => {
-        const body = client.resData[0].body
-
-        return statusCode === 200 && body.startsWith('{"instance":')
+      expecter: (body, status) => {
+        return status === 200 && body.startsWith('{"instance":')
       }
     }
   ]
@@ -197,24 +173,27 @@ function runBenchmark (options: {
   const { path, expecter, headers } = options
 
   return new Promise((res, rej) => {
-    const instance = autocannon({
+    autocannon({
       url: server.url + path,
       connections: 20,
       headers,
       pipelining: 1,
-      duration: 10
+      duration: 10,
+      requests: [
+        {
+          onResponse: (status, body) => {
+            if (expecter(body, status) !== true) {
+              console.error('Expected result failed.', { body, status })
+              throw new Error('Invalid expectation')
+            }
+          }
+        }
+      ]
     }, (err, result) => {
       if (err) return rej(err)
 
       return res(result)
     })
-
-    instance.on('response', (client, statusCode) => {
-      if (expecter(client, statusCode) !== true) {
-        console.error('Expected result failed.', { data: client.resData })
-        process.exit(-1)
-      }
-    })
   })
 }
 
diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 3679dab74..5f4480c88 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -15,6 +15,8 @@ import { format as sqlFormat } from 'sql-formatter'
 program
   .option('-l, --level [level]', 'Level log (debug/info/warn/error)')
   .option('-f, --files [file...]', 'Files to parse. If not provided, the script will parse the latest log file from config)')
+  .option('-t, --tags [tags...]', 'Display only lines with these tags')
+  .option('-nt, --not-tags [tags...]', 'Donrt display lines containing these tags')
   .parse(process.argv)
 
 const options = program.opts()
@@ -24,6 +26,7 @@ const excludedKeys = {
   message: true,
   splat: true,
   timestamp: true,
+  tags: true,
   label: true,
   sql: true
 }
@@ -93,6 +96,14 @@ function run () {
       rl.on('line', line => {
         try {
           const log = JSON.parse(line)
+          if (options.tags && !containsTags(log.tags, options.tags)) {
+            return
+          }
+
+          if (options.notTags && containsTags(log.tags, options.notTags)) {
+            return
+          }
+
           // Don't know why but loggerFormat does not remove splat key
           Object.assign(log, { splat: undefined })
 
@@ -131,3 +142,15 @@ function toTimeFormat (time: string) {
 
   return new Date(timestamp).toISOString()
 }
+
+function containsTags (loggerTags: string[], optionsTags: string[]) {
+  if (!loggerTags) return false
+
+  for (const lt of loggerTags) {
+    for (const ot of optionsTags) {
+      if (lt === ot) return true
+    }
+  }
+
+  return false
+}
diff --git a/scripts/prune-storage.ts b/scripts/prune-storage.ts
index dcb1fcf90..bdfb335c6 100755
--- a/scripts/prune-storage.ts
+++ b/scripts/prune-storage.ts
@@ -11,7 +11,7 @@ import { VideoRedundancyModel } from '../server/models/redundancy/video-redundan
 import * as Bluebird from 'bluebird'
 import { getUUIDFromFilename } from '../server/helpers/utils'
 import { ThumbnailModel } from '../server/models/video/thumbnail'
-import { AvatarModel } from '../server/models/avatar/avatar'
+import { ActorImageModel } from '../server/models/account/actor-image'
 import { uniq, values } from 'lodash'
 import { ThumbnailType } from '@shared/models'
 
@@ -43,7 +43,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.AVATARS_DIR, doesAvatarExist)
+    await pruneDirectory(CONFIG.STORAGE.ACTOR_IMAGES, doesActorImageExist)
   )
 
   const tmpFiles = await readdir(CONFIG.STORAGE.TMP_DIR)
@@ -107,10 +107,10 @@ function doesThumbnailExist (keepOnlyOwned: boolean, type: ThumbnailType) {
   }
 }
 
-async function doesAvatarExist (file: string) {
-  const avatar = await AvatarModel.loadByName(file)
+async function doesActorImageExist (file: string) {
+  const image = await ActorImageModel.loadByName(file)
 
-  return !!avatar
+  return !!image
 }
 
 async function doesRedundancyExist (file: string) {
diff --git a/scripts/regenerate-thumbnails.ts b/scripts/regenerate-thumbnails.ts
new file mode 100644
index 000000000..b95343c0b
--- /dev/null
+++ b/scripts/regenerate-thumbnails.ts
@@ -0,0 +1,68 @@
+import { registerTSPaths } from '../server/helpers/register-ts-paths'
+registerTSPaths()
+
+import * as Bluebird from 'bluebird'
+import * as program from 'commander'
+import { pathExists, remove } from 'fs-extra'
+import { generateImageFilename, processImage } from '@server/helpers/image-utils'
+import { THUMBNAILS_SIZE } from '@server/initializers/constants'
+import { VideoModel } from '@server/models/video/video'
+import { MVideo } from '@server/types/models'
+import { initDatabaseModels } from '@server/initializers/database'
+
+program
+  .description('Regenerate local thumbnails using preview files')
+  .parse(process.argv)
+
+run()
+  .then(() => process.exit(0))
+  .catch(err => console.error(err))
+
+async function run () {
+  await initDatabaseModels(true)
+
+  const videos = await VideoModel.listLocal()
+
+  await Bluebird.map(videos, v => {
+    return processVideo(v)
+      .catch(err => console.error('Cannot process video %s.', v.url, err))
+  }, { concurrency: 20 })
+}
+
+async function processVideo (videoArg: MVideo) {
+  const video = await VideoModel.loadWithFiles(videoArg.id)
+
+  console.log('Processing video %s.', video.name)
+
+  const thumbnail = video.getMiniature()
+  const preview = video.getPreview()
+
+  const previewPath = preview.getPath()
+
+  if (!await pathExists(previewPath)) {
+    throw new Error(`Preview ${previewPath} does not exist on disk`)
+  }
+
+  const size = {
+    width: THUMBNAILS_SIZE.width,
+    height: THUMBNAILS_SIZE.height
+  }
+
+  const oldPath = thumbnail.getPath()
+
+  // Update thumbnail
+  thumbnail.filename = generateImageFilename()
+  thumbnail.width = size.width
+  thumbnail.height = size.height
+
+  const thumbnailPath = thumbnail.getPath()
+  await processImage(previewPath, thumbnailPath, size, true)
+
+  // Save new attributes
+  await thumbnail.save()
+
+  // Remove old thumbnail
+  await remove(oldPath)
+
+  // Don't federate, remote instances will refresh the thumbnails after a while
+}
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index f5f3219af..64a7b18fd 100755
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -39,8 +39,9 @@ then
   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_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'] || '')")
   mkdir -p $PEERTUBE_PATH/backup
-  PGPASSWORD=$DB_PASS pg_dump -U $DB_USER -h $DB_HOST -F c "peertube${DB_SUFFIX}" -f "$SQL_BACKUP_PATH"
+  PGPASSWORD=$DB_PASS pg_dump -U $DB_USER -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