From 337ba64efc5a54e83884f33a91de4012ed9b7d11 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 16 Jul 2018 14:38:11 +0200 Subject: [PATCH] Parse log script parse the last updated log --- .../video-caption-add-modal.component.ts | 7 +------ scripts/parse-log.ts | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts index 5498dac22..d084a4908 100644 --- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts +++ b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts @@ -76,13 +76,8 @@ export class VideoCaptionAddModalComponent extends FormReactive implements OnIni this.captionAdded.emit({ language: languageObject, - captionfile: this.form.value['captionfile'] + captionfile: this.form.value[ 'captionfile' ] }) - // - // this.form.patchValue({ - // language: null, - // captionfile: null - // }) this.form.reset() } diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts index 4e4f3df63..dccab0884 100755 --- a/scripts/parse-log.ts +++ b/scripts/parse-log.ts @@ -1,5 +1,5 @@ import * as program from 'commander' -import { createReadStream, readdirSync } from 'fs' +import { createReadStream, readdirSync, statSync } from 'fs' import { join } from 'path' import { createInterface } from 'readline' import * as winston from 'winston' @@ -53,7 +53,7 @@ const logLevels = { } const logFiles = readdirSync(CONFIG.STORAGE.LOG_DIR) -const lastLogFile = logFiles[logFiles.length - 1] +const lastLogFile = getNewestFile(logFiles, CONFIG.STORAGE.LOG_DIR) const path = join(CONFIG.STORAGE.LOG_DIR, lastLogFile) console.log('Opening %s.', path) @@ -77,3 +77,17 @@ function toTimeFormat (time: string) { return new Date(timestamp).toISOString() } + +// Thanks: https://stackoverflow.com/a/37014317 +function getNewestFile (files: string[], basePath: string) { + const out = [] + + files.forEach(file => { + const stats = statSync(basePath + '/' + file) + if (stats.isFile()) out.push({ file, mtime: stats.mtime.getTime() }) + }) + + out.sort((a, b) => b.mtime - a.mtime) + + return (out.length > 0) ? out[ 0 ].file : '' +} \ No newline at end of file -- 2.25.1