From 2de4cd6a301fd328c09f0ccd5826c783002eae27 Mon Sep 17 00:00:00 2001
From: hyperdefined <contact@hyper.lol>
Date: Fri, 26 Jul 2024 18:06:33 -0400
Subject: [PATCH] cleanup: move processing into different functions

---
 src/modules/processing/services/newgrounds.js | 157 +++++++++---------
 1 file changed, 83 insertions(+), 74 deletions(-)

diff --git a/src/modules/processing/services/newgrounds.js b/src/modules/processing/services/newgrounds.js
index bd39aec6..d94449c6 100644
--- a/src/modules/processing/services/newgrounds.js
+++ b/src/modules/processing/services/newgrounds.js
@@ -1,86 +1,95 @@
 import { genericUserAgent } from "../../config.js";
 import { cleanString } from "../../sub/utils.js";
 
+async function video(obj) {
+    let req = await fetch(`https://www.newgrounds.com/portal/video/${obj.id}`, {
+        headers: {
+            'User-Agent': genericUserAgent,
+            'X-Requested-With': 'XMLHttpRequest',
+        }
+    })
+    .then(request => request.text())
+    .catch(() => {});
+
+    if (!req) return { error: 'ErrorCouldntFetch' };
+
+    let json;
+    try {
+        json = JSON.parse(req);
+    } catch { return { error: 'ErrorEmptyDownload' }; }
+    const highestQuality = Object.keys(json.sources)[0];
+    const video = json.sources[highestQuality][0].src;
+    if (!json.sources[highestQuality][0].type.includes('mp4')) {
+        return { error: 'ErrorCouldntFetch' };
+    }
+
+    let fileMetadata = {
+        title: cleanString(decodeURIComponent(json.title)),
+        artist: cleanString(decodeURIComponent(json.author)),
+    }
+
+    return {
+        urls: video,
+        filenameAttributes: {
+            service: "newgrounds",
+            id: obj.id,
+            title: fileMetadata.title,
+            author: fileMetadata.artist,
+            extension: 'mp4'
+        },
+        fileMetadata,
+    }
+}
+
+async function music(obj) {
+    let req = await fetch(`https://www.newgrounds.com/audio/listen/${obj.id}`, {
+        headers: {
+            'User-Agent': genericUserAgent,
+        }
+    })
+    .then(request => request.text())
+    .catch(() => {});
+
+    if (!req) return { error: 'ErrorCouldntFetch' };
+
+    const titleMatch = req.match(/"name"\s*:\s*"([^"]+)"/);
+    const artistMatch = req.match(/"artist"\s*:\s*"([^"]+)"/);
+    const urlMatch = req.match(/"filename"\s*:\s*"([^"]+)"/);
+
+    if (!titleMatch || !artistMatch || !urlMatch) {
+        return { error: 'ErrorCouldntFetch' };
+    }
+
+    const title = titleMatch[1];
+    const artist = artistMatch[1];
+    const url = urlMatch[1].replace(/\\\//g, '/');
+    let fileMetadata = {
+        title: cleanString(decodeURIComponent(title.trim())),
+        artist: cleanString(decodeURIComponent(artist.trim())),
+    }
+
+    return {
+        urls: url,
+        filenameAttributes: {
+            service: "newgrounds",
+            id: obj.id,
+            title: fileMetadata.title,
+            author: fileMetadata.artist,
+        },
+        fileMetadata,
+        isAudioOnly: true
+    }
+}
+
 export default async function(obj) {
     // handle video downloads
     if (obj.type == 'portal') {
-        let req = await fetch(`https://www.newgrounds.com/portal/video/${obj.id}`, {
-            headers: {
-                'User-Agent': genericUserAgent,
-                'X-Requested-With': 'XMLHttpRequest',
-            }
-        })
-        .then(request => request.text())
-        .catch(() => {});
-
-        if (!req) return { error: 'ErrorCouldntFetch' };
-
-        let json;
-        try {
-            json = JSON.parse(req);
-        } catch { return { error: 'ErrorEmptyDownload' }; }
-        const highestQuality = Object.keys(json.sources)[0];
-        const video = json.sources[highestQuality][0].src;
-        if (!json.sources[highestQuality][0].type.includes('mp4')) {
-            return { error: 'ErrorCouldntFetch' };
-        }
-
-        let fileMetadata = {
-            title: cleanString(decodeURIComponent(json.title)),
-            artist: cleanString(decodeURIComponent(json.author)),
-        }
-
-        return {
-            urls: video,
-            filenameAttributes: {
-                service: "newgrounds",
-                id: obj.id,
-                title: fileMetadata.title,
-                author: fileMetadata.artist,
-                extension: 'mp4'
-            },
-            fileMetadata,
-        }
+        return video(obj);
     }
 
     // handle audio downloads
     if (obj.type == 'audio') {
-        let req = await fetch(`https://www.newgrounds.com/audio/listen/${obj.id}`, {
-            headers: {
-                'User-Agent': genericUserAgent,
-            }
-        })
-        .then(request => request.text())
-        .catch(() => {});
-
-        if (!req) return { error: 'ErrorCouldntFetch' };
-
-        const titleMatch = req.match(/"name"\s*:\s*"([^"]+)"/);
-        const artistMatch = req.match(/"artist"\s*:\s*"([^"]+)"/);
-        const urlMatch = req.match(/"filename"\s*:\s*"([^"]+)"/);
-
-        if (!titleMatch || !artistMatch || !urlMatch) {
-            return { error: 'ErrorCouldntFetch' };
-        }
-
-        const title = titleMatch[1];
-        const artist = artistMatch[1];
-        const url = urlMatch[1].replace(/\\\//g, '/');
-        let fileMetadata = {
-            title: cleanString(decodeURIComponent(title.trim())),
-            artist: cleanString(decodeURIComponent(artist.trim())),
-        }
-    
-        return {
-            urls: url,
-            filenameAttributes: {
-                service: "newgrounds",
-                id: obj.id,
-                title: fileMetadata.title,
-                author: fileMetadata.artist,
-            },
-            fileMetadata,
-            isAudioOnly: true
-        }
+        return music(obj);
     }
+    return { error: 'ErrorUnsupported' };
 }
\ No newline at end of file