diff options
author | Chocobozzz <me@florianbigard.com> | 2020-03-10 14:49:02 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-03-10 16:18:29 +0100 |
commit | 7b81edc854902a536083298472bf92bb6726edcf (patch) | |
tree | 822dae6b6d4755ac9afffe2569b74dcb45da5535 /server/lib/activitypub/videos.ts | |
parent | 8319d6ae72d4da6de51bd3d4b5c68040fc8dc3b4 (diff) | |
download | PeerTube-7b81edc854902a536083298472bf92bb6726edcf.tar.gz PeerTube-7b81edc854902a536083298472bf92bb6726edcf.tar.zst PeerTube-7b81edc854902a536083298472bf92bb6726edcf.zip |
Video file metadata PR cleanup
Diffstat (limited to 'server/lib/activitypub/videos.ts')
-rw-r--r-- | server/lib/activitypub/videos.ts | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 30de4714c..452e43c8c 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts | |||
@@ -9,13 +9,13 @@ import { | |||
9 | ActivityPlaylistUrlObject, | 9 | ActivityPlaylistUrlObject, |
10 | ActivityTagObject, | 10 | ActivityTagObject, |
11 | ActivityUrlObject, | 11 | ActivityUrlObject, |
12 | ActivityVideoFileMetadataObject, | ||
12 | ActivityVideoUrlObject, | 13 | ActivityVideoUrlObject, |
13 | VideoState, | 14 | VideoState |
14 | ActivityVideoFileMetadataObject | ||
15 | } from '../../../shared/index' | 15 | } from '../../../shared/index' |
16 | import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' | 16 | import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' |
17 | import { VideoPrivacy } from '../../../shared/models/videos' | 17 | import { VideoPrivacy } from '../../../shared/models/videos' |
18 | import { sanitizeAndCheckVideoTorrentObject } from '../../helpers/custom-validators/activitypub/videos' | 18 | import { sanitizeAndCheckVideoTorrentObject, isAPVideoFileMetadataObject } from '../../helpers/custom-validators/activitypub/videos' |
19 | import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' | 19 | import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' |
20 | import { deleteNonExistingModels, resetSequelizeInstance, retryTransactionWrapper } from '../../helpers/database-utils' | 20 | import { deleteNonExistingModels, resetSequelizeInstance, retryTransactionWrapper } from '../../helpers/database-utils' |
21 | import { logger } from '../../helpers/logger' | 21 | import { logger } from '../../helpers/logger' |
@@ -26,7 +26,8 @@ import { | |||
26 | P2P_MEDIA_LOADER_PEER_VERSION, | 26 | P2P_MEDIA_LOADER_PEER_VERSION, |
27 | PREVIEWS_SIZE, | 27 | PREVIEWS_SIZE, |
28 | REMOTE_SCHEME, | 28 | REMOTE_SCHEME, |
29 | STATIC_PATHS, THUMBNAILS_SIZE | 29 | STATIC_PATHS, |
30 | THUMBNAILS_SIZE | ||
30 | } from '../../initializers/constants' | 31 | } from '../../initializers/constants' |
31 | import { TagModel } from '../../models/video/tag' | 32 | import { TagModel } from '../../models/video/tag' |
32 | import { VideoModel } from '../../models/video/video' | 33 | import { VideoModel } from '../../models/video/video' |
@@ -69,7 +70,8 @@ import { | |||
69 | MVideoAPWithoutCaption, | 70 | MVideoAPWithoutCaption, |
70 | MVideoFile, | 71 | MVideoFile, |
71 | MVideoFullLight, | 72 | MVideoFullLight, |
72 | MVideoId, MVideoImmutable, | 73 | MVideoId, |
74 | MVideoImmutable, | ||
73 | MVideoThumbnail | 75 | MVideoThumbnail |
74 | } from '../../typings/models' | 76 | } from '../../typings/models' |
75 | import { MThumbnail } from '../../typings/models/video/thumbnail' | 77 | import { MThumbnail } from '../../typings/models/video/thumbnail' |
@@ -527,10 +529,6 @@ function isAPHashTagObject (url: any): url is ActivityHashTagObject { | |||
527 | return url && url.type === 'Hashtag' | 529 | return url && url.type === 'Hashtag' |
528 | } | 530 | } |
529 | 531 | ||
530 | function isAPVideoFileMetadataObject (url: any): url is ActivityVideoFileMetadataObject { | ||
531 | return url && url.type === 'Link' && url.mediaType === 'application/json' && url.hasAttribute('rel') && url.rel.includes('metadata') | ||
532 | } | ||
533 | |||
534 | async function createVideo (videoObject: VideoTorrentObject, channel: MChannelAccountLight, waitThumbnail = false) { | 532 | async function createVideo (videoObject: VideoTorrentObject, channel: MChannelAccountLight, waitThumbnail = false) { |
535 | logger.debug('Adding remote video %s.', videoObject.id) | 533 | logger.debug('Adding remote video %s.', videoObject.id) |
536 | 534 | ||
@@ -701,11 +699,11 @@ function videoFileActivityUrlToDBAttributes ( | |||
701 | 699 | ||
702 | // Fetch associated metadata url, if any | 700 | // Fetch associated metadata url, if any |
703 | const metadata = urls.filter(isAPVideoFileMetadataObject) | 701 | const metadata = urls.filter(isAPVideoFileMetadataObject) |
704 | .find(u => | 702 | .find(u => { |
705 | u.height === fileUrl.height && | 703 | return u.height === fileUrl.height && |
706 | u.fps === fileUrl.fps && | 704 | u.fps === fileUrl.fps && |
707 | u.rel.includes(fileUrl.mediaType) | 705 | u.rel.includes(fileUrl.mediaType) |
708 | ) | 706 | }) |
709 | 707 | ||
710 | const mediaType = fileUrl.mediaType | 708 | const mediaType = fileUrl.mediaType |
711 | const attribute = { | 709 | const attribute = { |