aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-12-17 09:55:33 +0100
committerChocobozzz <me@florianbigard.com>2019-12-17 09:55:33 +0100
commit2735a154dc77316e584bc784c65e904df791067f (patch)
treeb564534f8f0cf07ebd5b0b8d460b32dcd19be00e
parent1a5fd848b461aac6ea1ec1d2bee62032024ba49d (diff)
downloadPeerTube-2735a154dc77316e584bc784c65e904df791067f.tar.gz
PeerTube-2735a154dc77316e584bc784c65e904df791067f.tar.zst
PeerTube-2735a154dc77316e584bc784c65e904df791067f.zip
Fix video import with long thumbnail url
-rw-r--r--server/initializers/constants.ts5
-rw-r--r--server/initializers/migrations/0465-thumbnail-file-url-length.ts27
-rw-r--r--server/models/video/thumbnail.ts18
3 files changed, 46 insertions, 4 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 00238f7a1..7e2617653 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -14,7 +14,7 @@ import { CONFIG, registerConfigChangedHandler } from './config'
14 14
15// --------------------------------------------------------------------------- 15// ---------------------------------------------------------------------------
16 16
17const LAST_MIGRATION_VERSION = 460 17const LAST_MIGRATION_VERSION = 465
18 18
19// --------------------------------------------------------------------------- 19// ---------------------------------------------------------------------------
20 20
@@ -291,6 +291,9 @@ const CONSTRAINTS_FIELDS = {
291 PLUGINS: { 291 PLUGINS: {
292 NAME: { min: 1, max: 214 }, // Length 292 NAME: { min: 1, max: 214 }, // Length
293 DESCRIPTION: { min: 1, max: 20000 } // Length 293 DESCRIPTION: { min: 1, max: 20000 } // Length
294 },
295 COMMONS: {
296 URL: { min: 5, max: 2000 } // Length
294 } 297 }
295} 298}
296 299
diff --git a/server/initializers/migrations/0465-thumbnail-file-url-length.ts b/server/initializers/migrations/0465-thumbnail-file-url-length.ts
new file mode 100644
index 000000000..db8c85c29
--- /dev/null
+++ b/server/initializers/migrations/0465-thumbnail-file-url-length.ts
@@ -0,0 +1,27 @@
1import * as Sequelize from 'sequelize'
2
3async function up (utils: {
4 transaction: Sequelize.Transaction,
5 queryInterface: Sequelize.QueryInterface,
6 sequelize: Sequelize.Sequelize,
7 db: any
8}): Promise<void> {
9 {
10 const data = {
11 type: Sequelize.STRING(2000),
12 allowNull: true,
13 defaultValue: null
14 }
15
16 await utils.queryInterface.changeColumn('thumbnail', 'fileUrl', data)
17 }
18}
19
20function down (options) {
21 throw new Error('Not implemented.')
22}
23
24export {
25 up,
26 down
27}
diff --git a/server/models/video/thumbnail.ts b/server/models/video/thumbnail.ts
index f1952dcc1..e68a6711f 100644
--- a/server/models/video/thumbnail.ts
+++ b/server/models/video/thumbnail.ts
@@ -1,6 +1,18 @@
1import { join } from 'path' 1import { join } from 'path'
2import { AfterDestroy, AllowNull, BelongsTo, Column, CreatedAt, Default, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript' 2import {
3import { LAZY_STATIC_PATHS, STATIC_PATHS, WEBSERVER } from '../../initializers/constants' 3 AfterDestroy,
4 AllowNull,
5 BelongsTo,
6 Column,
7 CreatedAt,
8 DataType,
9 Default,
10 ForeignKey,
11 Model,
12 Table,
13 UpdatedAt
14} from 'sequelize-typescript'
15import { CONSTRAINTS_FIELDS, LAZY_STATIC_PATHS, STATIC_PATHS, WEBSERVER } from '../../initializers/constants'
4import { logger } from '../../helpers/logger' 16import { logger } from '../../helpers/logger'
5import { remove } from 'fs-extra' 17import { remove } from 'fs-extra'
6import { CONFIG } from '../../initializers/config' 18import { CONFIG } from '../../initializers/config'
@@ -41,7 +53,7 @@ export class ThumbnailModel extends Model<ThumbnailModel> {
41 type: ThumbnailType 53 type: ThumbnailType
42 54
43 @AllowNull(true) 55 @AllowNull(true)
44 @Column 56 @Column(DataType.STRING(CONSTRAINTS_FIELDS.COMMONS.URL.max))
45 fileUrl: string 57 fileUrl: string
46 58
47 @AllowNull(true) 59 @AllowNull(true)