blitzwing/cobalt-7
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

newgrounds: return proper error codes

Browse source
This commit is contained in:
hyperdefined 2024-09-11 12:21:59 -04:00
parent 985bedf5fb
commit 38d5d02938
No known key found for this signature in database
GPG key ID: EB0B55B31E88AB03
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api/src/processing/services/newgrounds.js
View file

@ -71,19 +71,19 @@ async function getVideo(obj) {
.then(request => request.text()) .then(request => request.text())
.catch(() => {}); .catch(() => {});
if (!req) return { error: 'ErrorCouldntFetch' }; if (!req) return { error: 'fetch.fail' };
let json; let json;
try { try {
json = JSON.parse(req); json = JSON.parse(req);
} catch { return { error: 'ErrorEmptyDownload' }; } } catch { return { error: 'fetch.empty' }; }
const videoData = getQuality(json.sources, obj.quality); const videoData = getQuality(json.sources, obj.quality);
if (videoData == null) { if (videoData == null) {
return { error: 'ErrorCouldntFetch' }; return { error: 'fetch.empty' };
} }
if (!videoData.type.includes('mp4')) { if (!videoData.type.includes('mp4')) {
return { error: 'ErrorCouldntFetch' }; return { error: 'fetch.empty' };
} }
let fileMetadata = { let fileMetadata = {
@ -115,14 +115,14 @@ async function getMusic(obj) {
.then(request => request.text()) .then(request => request.text())
.catch(() => {}); .catch(() => {});
if (!req) return { error: 'ErrorCouldntFetch' }; if (!req) return { error: 'fetch.fail' };
const titleMatch = req.match(/"name"\s*:\s*"([^"]+)"/); const titleMatch = req.match(/"name"\s*:\s*"([^"]+)"/);
const artistMatch = req.match(/"artist"\s*:\s*"([^"]+)"/); const artistMatch = req.match(/"artist"\s*:\s*"([^"]+)"/);
const urlMatch = req.match(/"filename"\s*:\s*"([^"]+)"/); const urlMatch = req.match(/"filename"\s*:\s*"([^"]+)"/);
if (!titleMatch || !artistMatch || !urlMatch) { if (!titleMatch || !artistMatch || !urlMatch) {
return { error: 'ErrorCouldntFetch' }; return { error: 'fetch.empty' };
} }
const title = titleMatch[1]; const title = titleMatch[1];
@ -153,5 +153,5 @@ export default function(obj) {
if (obj.type == 'audio') { if (obj.type == 'audio') {
return getMusic(obj); return getMusic(obj);
} }
return { error: 'ErrorUnsupported' }; return { error: 'link.unsupported' };
} }