Merge branch 'release/v1.3.0' into develop

[github/Chocobozzz/PeerTube.git] / server / models / video / thumbnail.ts

diff --git a/server/models/video/thumbnail.ts b/server/models/video/thumbnail.ts
index baa5533ac424fd00a2ca793515802608be6164dc..8faf0adbaca2c3c8a6ff32335b8149e6156192a5 100644 (file)
--- a/server/models/video/thumbnail.ts
+++ b/server/models/video/thumbnail.ts
@@ -42,7 +42,7 @@ export class ThumbnailModel extends Model<ThumbnailModel> {
 
   @AllowNull(true)
   @Column
-  url: string
+  fileUrl: string
 
   @ForeignKey(() => VideoModel)
   @Column
@@ -75,8 +75,8 @@ export class ThumbnailModel extends Model<ThumbnailModel> {
   updatedAt: Date
 
   private static types: { [ id in ThumbnailType ]: { label: string, directory: string, staticPath: string } } = {
-    [ThumbnailType.THUMBNAIL]: {
-      label: 'thumbnail',
+    [ThumbnailType.MINIATURE]: {
+      label: 'miniature',
       directory: CONFIG.STORAGE.THUMBNAILS_DIR,
       staticPath: STATIC_PATHS.THUMBNAILS
     },
@@ -100,17 +100,19 @@ export class ThumbnailModel extends Model<ThumbnailModel> {
     return videoUUID + '.jpg'
   }
 
-  getUrl () {
-    if (this.url) return this.url
+  getFileUrl () {
+    if (this.fileUrl) return this.fileUrl
 
     const staticPath = ThumbnailModel.types[this.type].staticPath
     return WEBSERVER.URL + staticPath + this.filename
   }
 
-  removeThumbnail () {
+  getPath () {
     const directory = ThumbnailModel.types[this.type].directory
-    const thumbnailPath = join(directory, this.filename)
+    return join(directory, this.filename)
+  }
 
-    return remove(thumbnailPath)
+  removeThumbnail () {
+    return remove(this.getPath())
   }
 }