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

added better drm key checks

Browse Source
This commit is contained in:
stratuma 2024-06-01 22:53:27 +02:00
parent cbe97b6e87
commit 0dec051afb
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
import { Account, Playlist } from '../../db/database'
import { downloadMPDAudio } from '../../services/audio'
import { concatenateTSFiles } from '../../services/concatenate'
import { createFolder, createFolderName, deleteFolder, deleteTemporaryFolders } from '../../services/folder'
import { checkFileExistence, createFolder, createFolderName, deleteFolder, deleteTemporaryFolders } from '../../services/folder'
import { downloadADNSub, downloadCRSub } from '../../services/subs'
import { CrunchyEpisode } from '../../types/crunchyroll'
import { checkAccountMaxStreams, crunchyGetPlaylist, crunchyGetPlaylistMPD } from '../crunchyroll/crunchyroll.service'
@ -541,8 +541,40 @@ export async function downloadCrunchyrollPlaylist(
await updatePlaylistByID(downloadID, undefined, undefined, seasonFolder)
const drmL3blob = await settings.get('l3blob')
const drmL3key = await settings.get('l3key')
const drmL3blob = (await settings.get('l3blob')) as string
const drmL3key = (await settings.get('l3key')) as string
if (drmL3blob) {
const found = await checkFileExistence(drmL3blob)
if (!found) {
messageBox('error', ['Cancel'], 2, 'Widevine Key path is invalid', 'Widevine Key path is invalid', 'Widevine Key path is invalid, downloading without drm decryption')
server.logger.log({
level: 'error',
message: 'Widevine Key path is invalid, downloading without drm decryption',
timestamp: new Date().toISOString(),
section: 'crunchyrollCheckDRMPath'
})
await settings.set('CREndpoint', 1)
await settings.set('l3blob', null)
}
}
if (drmL3key) {
const found = await checkFileExistence(drmL3key)
if (!found) {
messageBox('error', ['Cancel'], 2, 'Widevine Key path is invalid', 'Widevine Key path is invalid', 'Widevine Key path is invalid, downloading without drm decryption')
server.logger.log({
level: 'error',
message: 'Widevine Key path is invalid, downloading without drm decryption',
timestamp: new Date().toISOString(),
section: 'crunchyrollCheckDRMPath'
})
await settings.set('CREndpoint', 1)
await settings.set('l3key', null)
}
}
const dubDownloadList: Array<{
audio_locale: string

11
src/api/services/folder.ts
View File

@ -31,6 +31,17 @@ export async function checkDirectoryExistence(dir: string) {
}
}
export async function checkFileExistence(file: string) {
try {
await fs.promises.access(file)
console.log(`File ${file} exists.`)
return true
} catch (error) {
console.log(`File ${file} does not exist.`)
return false
}
}
export async function createFolderName(name: string, dir: string) {
var tempPath = (await settings.get('tempPath')) as string