From 1b952dd4266b0da4887701e0ce0860faded96768 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 28 Jun 2018 16:58:15 +0200 Subject: Reset published date on publish --- client/src/assets/player/webtorrent-info-button.ts | 2 +- server/lib/job-queue/handlers/video-file.ts | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/client/src/assets/player/webtorrent-info-button.ts b/client/src/assets/player/webtorrent-info-button.ts index 5f3e80c79..deef253ce 100644 --- a/client/src/assets/player/webtorrent-info-button.ts +++ b/client/src/assets/player/webtorrent-info-button.ts @@ -80,7 +80,7 @@ class WebtorrentInfoButton extends Button { const totalUploaded = bytes(data.uploaded) const numPeers = data.numPeers - subDivWebtorrent.title = this.player_.localize('Total Downloaded: ') + totalDownloaded.join(' ') + '\n' + + subDivWebtorrent.title = this.player_.localize('Total downloaded: ') + totalDownloaded.join(' ') + '\n' + this.player_.localize('Total uploaded: ' + totalUploaded.join(' ')) downloadSpeedNumber.textContent = downloadSpeed[ 0 ] diff --git a/server/lib/job-queue/handlers/video-file.ts b/server/lib/job-queue/handlers/video-file.ts index a5c6bf300..fc40527c7 100644 --- a/server/lib/job-queue/handlers/video-file.ts +++ b/server/lib/job-queue/handlers/video-file.ts @@ -71,13 +71,18 @@ async function onVideoFileTranscoderOrImportSuccess (video: VideoModel) { // Video does not exist anymore if (!videoDatabase) return undefined + let isNewVideo = false + // We transcoded the video file in another format, now we can publish it - const oldState = videoDatabase.state - videoDatabase.state = VideoState.PUBLISHED - videoDatabase = await videoDatabase.save({ transaction: t }) + if (videoDatabase.state !== VideoState.PUBLISHED) { + isNewVideo = true + + videoDatabase.state = VideoState.PUBLISHED + videoDatabase.publishedAt = new Date() + videoDatabase = await videoDatabase.save({ transaction: t }) + } // If the video was not published, we consider it is a new one for other instances - const isNewVideo = oldState !== VideoState.PUBLISHED await federateVideoIfNeeded(videoDatabase, isNewVideo, t) return undefined -- cgit v1.2.3