tiktok & soundcloud: proper best audio picking

also improved tiktok audio file naming scheme. full audio now has the "_audio_original" tag. audio extracted from video is simply "_audio".

src/modules/processing/services/soundcloud.js

@@ -63,13 +63,13 @@ export default async function(obj) {
 
     if (!json["media"]["transcodings"]) return { error: 'ErrorEmptyDownload' };
 
-    let isMp3,
+    let bestAudio = 'opus',
         selectedStream = json.media.transcodings.filter(v => v.preset === "opus_0_0")
 
     // fall back to mp3 if no opus is available
     if (selectedStream.length === 0) {
         selectedStream = json.media.transcodings.filter(v => v.preset === "mp3_0_0")
-        isMp3 = true
+        bestAudio = 'mp3'
     }
     let fileUrlBase = selectedStream[0]["url"];
     let fileUrl = `${fileUrlBase}${fileUrlBase.includes("?") ? "&" : "?"}client_id=${clientId}&track_authorization=${json.track_authorization}`;
@@ -94,7 +94,7 @@ export default async function(obj) {
             title: fileMetadata.title,
             author: fileMetadata.artist
         },
-        isMp3,
+        bestAudio,
         fileMetadata
     }
 }

src/modules/processing/services/tiktok.js

@@ -41,8 +41,9 @@ export default async function(obj) {
     detail = detail?.aweme_list?.find(v => v.aweme_id === postId);
     if (!detail) return { error: 'ErrorCouldntFetch' };
 
-    let video, videoFilename, audioFilename, isMp3, audio, images,
-        filenameBase = `tiktok_${detail.author.unique_id}_${postId}`;
+    let video, videoFilename, audioFilename, audio, images,
+        filenameBase = `tiktok_${detail.author.unique_id}_${postId}`,
+        bestAudio = 'm4a';
 
     images = detail.image_post_info?.images;
 
@@ -56,12 +57,12 @@ export default async function(obj) {
     } else {
         let fallback = playAddr.url_list[0];
         audio = fallback;
-        audioFilename = `${filenameBase}_audio_fv`;  // fv - from video
+        audioFilename = `${filenameBase}_audio`;
         if (obj.fullAudio || fallback.includes("music")) {
             audio = detail.music.play_url.url_list[0]
-            audioFilename = `${filenameBase}_audio`
+            audioFilename = `${filenameBase}_audio_original`
         }
-        if (audio.slice(-4) === ".mp3") isMp3 = true;
+        if (audio.slice(-4) === ".mp3") bestAudio = 'mp3';
     }
 
     if (video) return {
@@ -72,7 +73,7 @@ export default async function(obj) {
         urls: audio,
         audioFilename: audioFilename,
         isAudioOnly: true,
-        isMp3: isMp3
+        bestAudio
     }
     if (images) {
         let imageLinks = [];
@@ -86,13 +87,13 @@ export default async function(obj) {
             urls: audio,
             audioFilename: audioFilename,
             isAudioOnly: true,
-            isMp3: isMp3
+            bestAudio
         }
     }
     if (audio) return {
         urls: audio,
         audioFilename: audioFilename,
         isAudioOnly: true,
-        isMp3: isMp3
+        bestAudio
     }
 }