From ac940348cdb6ea6d86a80e37b464b754826cb9ad Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 10 Mar 2020 16:37:25 +0100 Subject: [PATCH 1/1] Fix lint --- client/src/app/core/menu/menu.service.ts | 2 +- server/lib/activitypub/videos.ts | 3 +-- server/lib/video-transcoding.ts | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.ts index 46ef72e17..ecb2bceb7 100644 --- a/client/src/app/core/menu/menu.service.ts +++ b/client/src/app/core/menu/menu.service.ts @@ -8,7 +8,7 @@ export class MenuService { isMenuDisplayed = true isMenuChangedByUser = false - constructor( + constructor ( private screenService: ScreenService ) { // Do not display menu on small screens diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 452e43c8c..62f589272 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -9,13 +9,12 @@ import { ActivityPlaylistUrlObject, ActivityTagObject, ActivityUrlObject, - ActivityVideoFileMetadataObject, ActivityVideoUrlObject, VideoState } from '../../../shared/index' import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' import { VideoPrivacy } from '../../../shared/models/videos' -import { sanitizeAndCheckVideoTorrentObject, isAPVideoFileMetadataObject } from '../../helpers/custom-validators/activitypub/videos' +import { isAPVideoFileMetadataObject, sanitizeAndCheckVideoTorrentObject } from '../../helpers/custom-validators/activitypub/videos' import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' import { deleteNonExistingModels, resetSequelizeInstance, retryTransactionWrapper } from '../../helpers/database-utils' import { logger } from '../../helpers/logger' diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts index bde4c2633..ab1e917f3 100644 --- a/server/lib/video-transcoding.ts +++ b/server/lib/video-transcoding.ts @@ -2,8 +2,8 @@ import { HLS_STREAMING_PLAYLIST_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION, WEBSER import { basename, extname as extnameUtil, join } from 'path' import { canDoQuickTranscode, - getMetadataFromFile, getDurationFromVideoFile, + getMetadataFromFile, getVideoFileFPS, transcode, TranscodeOptions, @@ -20,7 +20,6 @@ import { CONFIG } from '../initializers/config' import { MStreamingPlaylistFilesVideo, MVideoFile, MVideoWithAllFiles, MVideoWithFile } from '@server/typings/models' import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' import { generateVideoStreamingPlaylistName, getVideoFilename, getVideoFilePath } from './video-paths' -import { extractVideo } from './videos' /** * Optimize the original video file and replace it. The resolution is not changed. -- 2.41.0