getting ready for combined downloads

JEMcats · JEMcats · commit 69eaeacc3117 · 2025-04-10T19:07:26.000-04:00
diff --git a/README.md b/README.md
@@ -1,11 +1,19 @@
 ![VideoSnatcher Logo](./assets/icon.png)
 # VideoSnatcher
 VideoSnatcher by JEMcats-Software allows for you to download videos from Youtube and similer platforms.
+
 ## To-Do List
 - [ ] Add Dark Mode
 - [ ] Add Windows Support
+- [ ] Add Download Progress Bar
 - [ ] Launch v1.0.0
 
+## Requirements
+You MUST have Rosetta installed if you are on a Mac with Apple Silicon. To do so please run this command in terminal.
+```
+/usr/sbin/softwareupdate --install-rosetta
+```
+
 ## Support
 For questions open a discussion.
 
diff --git a/index.js b/index.js
@@ -5,6 +5,8 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const https = require('https'); // Add this import
+const { v4: uuidv4 } = require('uuid');
+
 
 const expressApp = express();
 let serverPort, ytWin;
@@ -80,11 +82,23 @@ function ensureFile(filePath, url) {
 }
 
 function parseVideoFormats(output) {
-    const filtered = output.split('\n').filter(line =>
-        line.trim() && !/(?:\[|\]|Downloading|Available formats|ID|-------------------)/.test(line)
-    );
+    const filtered = output.split('\n').filter(line => {
+        line = line.trim();
+        if (!line) return false;
+        if (/(Downloading|Available formats|ID|-------------------)/.test(line)) return false;
+        const matches = line.match(/\[[^\]]*\]/g);
+        if (matches) {
+            for (const m of matches) {
+                const content = m.slice(1, -1);
+                // Allow only if content has exactly two letters.
+                if (!/^[A-Za-z]{2}$/.test(content)) return false;
+            }
+        }
+        return true;
+    });
 
     const result = filtered.map(line => {
+        if (line.toLowerCase().includes('quic')) return null; // Skip lines containing 'quic'
         let parts = line.split(/\s{2,}/).map(x => x.trim()).flatMap(part =>
             part.split('|').map(x => x.trim()).filter(Boolean)
         );
@@ -101,7 +115,7 @@ function parseVideoFormats(output) {
             }
         }
         return parts;
-    }).filter(parts => parts.length > 1 && !parts.includes('images'));
+    }).filter(parts => parts && parts.length > 1 && !parts.includes('images'));
 
     // Remove duplicate entries
     const unique = Array.from(new Set(result.map(a => JSON.stringify(a)))).map(e => JSON.parse(e));
@@ -178,13 +192,13 @@ expressApp.get('/get_vid_options', (req, res) => {
 
     if (!videoUrl) return res.status(400).send('Missing "url" parameter');
 
-    let cookiePart = videoUrl.includes("youtube.com")
+    let parameters = videoUrl.includes("youtube.com")
         ? ` --cookies "${path.join(userDataDir, 'yt-cookie.txt')}"`
         : '';
-    cookiePart = vimeoPass
+    parameters = vimeoPass
         ? ` --video-password "${vimeoPass}"`
         : '';
-    const command = `"${path.join(executablesDir, 'yt-dlp-mac')}"${cookiePart} -F "${videoUrl}"`;
+    const command = `"${path.join(executablesDir, 'yt-dlp-mac')}"${parameters} -F "${videoUrl}"`;
 
     exec(command, { encoding: 'utf8', maxBuffer: 1024 * 1024 }, (error, stdout) => {
         if (error) {
@@ -193,7 +207,6 @@ expressApp.get('/get_vid_options', (req, res) => {
         }
         try {
             const parsed = parseVideoFormats(stdout);
-            console.log(parsed);
             res.send(parsed);
         } catch (e) {
             console.error(e);
@@ -202,6 +215,49 @@ expressApp.get('/get_vid_options', (req, res) => {
     });
 });
 
+expressApp.get('/download_vid', (req, res) => {
+    const videoUrl = req.query.url;
+    const vimeoPass = req.query.vimeoPass;
+    const videoFormat = req.query.id;
+    const videoType = req.query.type;
+
+    if (!videoUrl) return res.status(400).send('Missing "url" parameter');
+    if (!videoFormat) return res.status(400).send('Missing "format" parameter');
+
+    let parameters = videoUrl.includes("youtube.com")
+        ? ` --cookies "${path.join(userDataDir, 'yt-cookie.txt')}"`
+        : '';
+    parameters = vimeoPass && vimeoPass !== undefined
+        ? ` --video-password "${vimeoPass}"`
+        : '';
+
+    if (videoFormat.includes('vid') && videoFormat.includes('aud')) {
+        const video_download_id = uuidv4();
+        const audio_download_id = uuidv4();
+        const [videoId, audioId] = videoFormat
+            .split(',')
+            .map(part => part.split(':')[1].trim());
+        
+    } else {
+        const video_download_id = uuidv4();
+        
+        const command = `"${path.join(executablesDir, 'yt-dlp-mac')}"${parameters} -f "${videoFormat}" "${videoUrl}" -o "${path.join(baseDir, 'OutputFiles')}/${video_download_id}.${videoType}"`;
+        exec(command, { encoding: 'utf8', maxBuffer: 1024 * 1024 }, (error, stdout) => {
+            if (error) {
+                console.error(error);
+                return res.status(500).send('Error downloading video');
+            }
+            try {
+                const download_path = `${path.join(baseDir, 'OutputFiles')}/${video_download_id}.${videoType}`
+                res.send(JSON.stringify({ download_path }));
+            } catch (e) {
+                console.error(e);
+                res.status(500).send('Error downloading video');
+            }
+        });
+    }
+});
+
 expressApp.get('/show_supported_list', (req, res) => {
     createListWindow();
     res.send('Success');
@@ -235,6 +291,10 @@ app.whenReady().then(() => {
         path.join(executablesDir, 'yt-dlp-mac'),
         'https://jemcats.software/github_pages/VideoSnatcher/files/yt-dlp-mac'
     );
+    ensureFile(
+        path.join(executablesDir, 'ffmpeg-mac'),
+        'https://jemcats.software/github_pages/VideoSnatcher/files/ffmpeg-mac'
+    );
     createMainWindow();
 });
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
   "dependencies": {
     "dialogs": "^2.0.1",
     "express": "^4.21.2",
+    "uuid": "^11.1.0",
     "yt-dlp-wrap": "^2.3.12"
   }
 }
diff --git a/web/index.html b/web/index.html
@@ -67,6 +67,7 @@
             min-height: 100vh;
             font-family: sans-serif;
             position: relative;
+            flex-direction: column;
         }
 
         .icon-container {
@@ -87,6 +88,7 @@
             /* max-w-lg */
             width: 100%;
             text-align: center;
+            margin-bottom: 2rem;
         }
 
         .link-blue {
@@ -168,6 +170,75 @@
         <p onclick="view_supported()" class="link-blue">Over 900 sites supported!</p>
         <div id="loader" style="margin-bottom: 10px; display: none;" class="loader mx-auto"></div>
     </div>
+    <div id="video_options" style="display: none;" class="card">
+        <table style="width: 100%; border-collapse: collapse; margin-top: 1rem;">
+            <thead>
+                <tr style="background-color: #f1f5f9; /* Tailwind's bg-gray-200 */">
+                    <th style="padding: 0.5rem; border: 1px solid #e5e7eb; /* Tailwind's border-gray-300 */">Resolution</th>
+                    <th style="padding: 0.5rem; border: 1px solid #e5e7eb;">Contains</th>
+                    <th style="padding: 0.5rem; border: 1px solid #e5e7eb;">Format</th>
+                    <th style="padding: 0.5rem; border: 1px solid #e5e7eb;">Size</th>
+                    <th style="padding: 0.5rem; border: 1px solid #e5e7eb;">Download</th>
+                </tr>
+            </thead>
+            <tbody id="video_options_table">
+                <!-- Rows will be dynamically added here -->
+            </tbody>
+        </table>
+        <div id="downloader_loader" style="margin-bottom: 10px; margin-top: 10px; display: none;" class="loader mx-auto"></div>
+        <script>
+            function populateTable(options) {
+                const tableBody = document.getElementById("video_options_table");
+                tableBody.innerHTML = ""; // Clear existing rows
+                options.forEach(option => {
+                    const row = document.createElement("tr");
+                    row.style.border = "1px solid #e5e7eb";
+                    row.innerHTML = `
+                        <td style="padding: 0.5rem; text-align: center;">${option.res || "N/A"}</td>
+                        <td style="padding: 0.5rem; text-align: center;">${option.contains || "N/A"}</td>
+                        <td style="padding: 0.5rem; text-align: center;">${option.format || "N/A"}</td>
+                        <td style="padding: 0.5rem; text-align: center;">${option.size || "N/A"}</td>
+                        <td style="padding: 0.5rem; text-align: center;">
+                            <button onclick="downloadVideo('${option.id}', '${option.url}', '${option.pass}', '${option.format}')" style="background-color: #2563eb; color: white; padding: 0.25rem 0.5rem; border: none; border-radius: 0.25rem; cursor: pointer;">
+                                Download
+                            </button>
+                        </td>
+                    `;
+                    tableBody.appendChild(row);
+                });
+            }
+        </script>
+    </div>
+        <script>
+            function downloadVideo(id, url, pass, format) {
+                document.getElementById("downloader_loader").style.display = "";
+                let fetch_url;
+                if (pass && pass !== "undefined") {
+                    fetch_url = `http://localhost:${getParam("port")}/download_vid?url=${url}&id=${id}&vimeoPass=${pass}&type=${format}`;
+                } else {
+                    fetch_url = `http://localhost:${getParam("port")}/download_vid?url=${url}&id=${id}&format=${format}`;
+                }
+                fetch(fetch_url)
+                    .then(response => {
+                        if (response.status === 200) {
+                            response.json().then(data => {
+                                alert("Download finished!");
+                                document.getElementById("downloader_loader").style.display = "none";
+                            });
+                        } else {
+                            response.text().then(text => {
+                                alert("Failed to start download. Please try again.");
+                                document.getElementById("downloader_loader").style.display = "none";
+                            });
+                        }
+                    })
+                    .catch(error => {
+                        alert("Failed to start download. Please try again.");
+                        document.getElementById("downloader_loader").style.display = "none";
+                    });
+            }
+        </script>
+    </div>
     <script>
         document.getElementById('url_input').addEventListener('input', function (event) {
             const inputField = event.target;
@@ -184,16 +255,22 @@
         let current_vid_options = [];
         const urlParams = new URLSearchParams(window.location.search);
         
-        function parseArrayToDictionary(arr) {
+        function parseArrayToDictionary(arr, url, pass) {
             const result = {};
             result.id = arr[0];
+            result.url = url;
+            console.log(pass)
+            if (pass) {
+                result.pass = pass;
+            }
             arr.forEach(value => {
                 if (value.includes('x')) {
                     result.res = value;
                 } else if (value.includes('only') && value !== 'only') {
                     result.contains = value;
-                } else if (value.endsWith('MiB')) {
+                } else if (value.endsWith('iB')) {
                     result.size = value;
+                    result.size = result.size.replace("~", "")
                 } else if (['mp4', 'mp3', 'webm'].includes(value)) {
                     result.format = value;
                 }
@@ -256,8 +333,34 @@
                                 document.getElementById("loader").style.display = "none";
                                 current_vid_options = [];
                                 data.forEach(option => {
-                                    current_vid_options.push(parseArrayToDictionary(option));
+                                    if (vimeo_pass.value !== "") {
+                                        current_vid_options.push(parseArrayToDictionary(option, urlInput.value, vimeo_pass.value));
+                                    } else {
+                                        current_vid_options.push(parseArrayToDictionary(option, urlInput.value));
+                                    }
+                                });
+
+                                // Add combined options
+                                const videoOnlyOptions = current_vid_options.filter(opt => opt.contains === "video only");
+                                const audioOnlyOptions = current_vid_options.filter(opt => opt.contains === "audio only");
+
+                                videoOnlyOptions.forEach(videoOption => {
+                                    const lastAudioOption = audioOnlyOptions[audioOnlyOptions.length - 1];
+                                    if (lastAudioOption) {
+                                        current_vid_options.push({
+                                            res: videoOption.res,
+                                            contains: "combined",
+                                            format: videoOption.format,
+                                            size: videoOption.size,
+                                            id: `vid: ${videoOption.id}, aud: ${lastAudioOption.id}`,
+                                            url: videoOption.url,
+                                            pass: videoOption.pass
+                                        });
+                                    }
                                 });
+
+                                populateTable(current_vid_options);
+                                document.getElementById("video_options").style.display = "";
                                 console.log(current_vid_options);
                             });
                             return;

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@`
`57`	`57`	`"dependencies": {`
`58`	`58`	`"dialogs": "^2.0.1",`
`59`	`59`	`"express": "^4.21.2",`
	`60`	`+ "uuid": "^11.1.0",`
`60`	`61`	`"yt-dlp-wrap": "^2.3.12"`
`61`	`62`	`}`
`62`	`63`	`}`