Mirrors/CrunchyDL
2
0
Fork 0
mirror of https://github.com/OpenSTDL/CrunchyDL.git synced 2024-10-18 14:05:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

moved from exec to execFile

Browse Source
This commit is contained in:
stratuma 2024-07-08 15:36:54 +02:00
parent ca41ed0727
commit cec66853c4
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/routes/service/service.service.ts
View File

@ -23,7 +23,7 @@ import settings from 'electron-settings'
import { server } from '../../api' import { server } from '../../api'
import { createChapterFile } from '../../services/chapter' import { createChapterFile } from '../../services/chapter'
import { app } from 'electron' import { app } from 'electron'
const exec = util.promisify(require('child_process').exec) const execFile = util.promisify(require('child_process').execFile)
settings.configure({ settings.configure({
dir: app.getPath('documents') + '/Crunchyroll Downloader/settings/' dir: app.getPath('documents') + '/Crunchyroll Downloader/settings/'
@ -1354,9 +1354,13 @@ async function mergeParts(parts: { filename: string; url: string }[], downloadID
await updatePlaylistByID(downloadID, 'decrypting video') await updatePlaylistByID(downloadID, 'decrypting video')
console.log('Video Decryption started') console.log('Video Decryption started')
const command = `${shaka} input="${tmp}/temp-main.m4s",stream=video,output="${tmp}/main.m4s" --enable_raw_key_decryption --keys key_id=${drmkeys[1].kid}:key=${drmkeys[1].key}` await execFile(shaka, [
`input=${tmp}/temp-main.m4s,stream=video,output=${tmp}/main.m4s`,
'--enable_raw_key_decryption',
'--keys',
`key_id=${drmkeys[1].kid}:key=${drmkeys[1].key}`
])
await exec(command)
console.log('Video Decryption finished') console.log('Video Decryption finished')
concatenatedFile = `${tmp}/main.m4s` concatenatedFile = `${tmp}/main.m4s`
} }

10
src/api/services/audio.ts
View File

@ -9,7 +9,7 @@ const ffmpegP = getFFMPEGPath()
const shaka = getShakaPath() const shaka = getShakaPath()
import util from 'util' import util from 'util'
import { server } from '../api' import { server } from '../api'
const exec = util.promisify(require('child_process').exec) const execFile = util.promisify(require('child_process').execFile)
import { finished } from 'stream/promises' import { finished } from 'stream/promises'
import { messageBox } from '../../electron/background' import { messageBox } from '../../electron/background'
@ -163,9 +163,13 @@ async function mergePartsAudio(
console.log(`Audio Decryption started`) console.log(`Audio Decryption started`)
const command = `${shaka} input="${tmp}/temp-main.m4s",stream=audio,output="${tmp}/main.m4s" --enable_raw_key_decryption --keys key_id=${drmkeys[1].kid}:key=${drmkeys[1].key}` await execFile(shaka, [
`input=${tmp}/temp-main.m4s,stream=audio,output=${tmp}/main.m4s`,
'--enable_raw_key_decryption',
'--keys',
`key_id=${drmkeys[1].kid}:key=${drmkeys[1].key}`
])
await exec(command)
concatenatedFile = `${tmp}/main.m4s` concatenatedFile = `${tmp}/main.m4s`
console.log(`Audio Decryption finished`) console.log(`Audio Decryption finished`)
} }

2
src/api/services/shaka.ts
View File

@ -14,7 +14,7 @@ export function getShakaPath() {
return shaka return shaka
} else { } else {
const shaka = `"${path.join(shakaFolderPath, 'shaka.exe')}"` const shaka = path.join(shakaFolderPath, 'shaka.exe')
return shaka return shaka
} }