From 3f10dcb8a9c3b0fd91c568ccde53d4ab97b0e34f Mon Sep 17 00:00:00 2001 From: stratuma Date: Fri, 28 Jun 2024 02:31:31 +0200 Subject: [PATCH] moved getFilename function to services/folder.ts --- src/api/routes/service/service.service.ts | 12 +----------- src/api/services/folder.ts | 10 ++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/api/routes/service/service.service.ts b/src/api/routes/service/service.service.ts index d632c6e..8ca8e82 100644 --- a/src/api/routes/service/service.service.ts +++ b/src/api/routes/service/service.service.ts @@ -1,7 +1,7 @@ import { Account, Playlist } from '../../db/database' import { downloadMPDAudio } from '../../services/audio' import { concatenateTSFiles } from '../../services/concatenate' -import { checkFileExistence, createFolder, createFolderName, deleteFolder, deleteTemporaryFolders } from '../../services/folder' +import { checkFileExistence, createFolder, createFolderName, deleteFolder, deleteTemporaryFolders, getFilename } from '../../services/folder' import { downloadADNSub, downloadCRSub } from '../../services/subs' import { CrunchyEpisode } from '../../types/crunchyroll' import { checkAccountMaxStreams, crunchyGetMetadata, crunchyGetPlaylist, crunchyGetPlaylistMPD } from '../crunchyroll/crunchyroll.service' @@ -1397,16 +1397,6 @@ async function mergeVideoFile( if (format === 'mp4') { options.push('-c:s mov_text') } - - const getFilename = function(path: string, ext: string, delimiter: string): string { - const segments = path.split(delimiter) - - if (segments.length == 0) { - return "unkown" - } - - return segments[segments.length - 1].split(ext)[0] - } for (const [index, a] of audios.entries()) { output.addInput(a) diff --git a/src/api/services/folder.ts b/src/api/services/folder.ts index 97c9767..95faab9 100644 --- a/src/api/services/folder.ts +++ b/src/api/services/folder.ts @@ -100,3 +100,13 @@ export async function deleteTemporaryFolders() { throw error } } + +export function getFilename(path: string, ext: string, delimiter: string) { + const segments = path.split(delimiter) + + if (segments.length == 0) { + return "unkown" + } + + return segments[segments.length - 1].split(ext)[0] +} \ No newline at end of file