Merge pull request #4 from JEMcats-Software/dev

release 1.0.1-beta

Author: JEMcats

README.md

@@ -3,17 +3,18 @@
 VideoSnatcher by JEMcats-Software allows for you to download videos from Youtube and similer platforms.
 
 ## To-Do List
+- [ ] Batch Downloads
+- [ ] Audio Extraction For Video Only Instances
 - [ ] Fix The Problems Of Youtube Outputs (m4a's work best)
 - [ ] Add Dark Mode
 - [ ] Add Windows Support
 - [ ] Add Download Progress Bar
-- [ ] Launch v1.0.0-beta
-
-## 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
-```
+- [ ] Write Documentation
+- [ ] Add Customizable Output Path
+- [x] Fix Saving Videos
+- [x] Auto Install Rosetta
+- [x] Add Website
+- [x] Launch v1.0.0-beta
 
 ## Support
 For questions open a discussion.
@@ -41,4 +42,5 @@ No closed-source forks or redistributions allowed.
 
 ## Credits
 
-- [YT-DLP](https://github.com/yt-dlp/yt-dlp) (The runtime that make this possible)
+- [YT-DLP](https://github.com/yt-dlp/yt-dlp) (The runtime that make this possible)
+- [FFMPEG](https://github.com/FFmpeg/FFmpeg) (Combines video and audio + extracts audio)

index.js

@@ -7,12 +7,13 @@ const os = require('os');
 const https = require('https'); // Add this import
 const { v4: uuidv4 } = require('uuid');
 const { Decoder } = require('ts-ebml');
+const { shell } = require('electron');
 
+let savePath = path.join(os.homedir(), 'Downloads');
 
 const expressApp = express();
 let serverPort, ytWin;
 let youtubeCookies = "";
-
 const baseDir = path.join(os.homedir(), 'Library/Application Support/videosnatcher');
 const logsDir = path.join(baseDir, 'logs');
 const liveLogPath = path.join(logsDir, 'live.log');
@@ -347,6 +348,13 @@ app.whenReady().then(() => {
         path.join(executablesDir, 'yt-dlp-mac'),
         'https://jemcats.software/github_pages/VideoSnatcher/files/yt-dlp-mac'
     );
+    exec('/usr/sbin/softwareupdate --install-rosetta --agree-to-license', (error, stdout, stderr) => {
+        if (error) {
+            console.error(`Error installing Rosetta: ${error.message}`);
+        } else {
+            console.log('Rosetta installed successfully.');
+        }
+    });
     ensureFile(
         path.join(executablesDir, 'ffmpeg-mac'),
         'https://jemcats.software/github_pages/VideoSnatcher/files/ffmpeg-mac'
@@ -359,42 +367,17 @@ expressApp.get('/get_vid', (req, res) => {
 
     if (!videoPath) return res.status(400).send('Missing "path" parameter');
 
-    const stream = fs.createReadStream(videoPath);
-    stream.on('error', (err) => {
-        console.error(err);
-        res.status(500).send('Error reading video file');
-    });
-    const ext = path.extname(videoPath).toLowerCase();
-    if (ext === '.mp4') {
-        const stat = fs.statSync(videoPath);
-        const ebmlDecoder = new Decoder();
-        const fileBuffer = fs.readFileSync(videoPath);
-        const elements = ebmlDecoder.decode(fileBuffer);
-        const isAudioOnly = elements.some(element => element.name === 'TrackType' && element.value === 2); // Check if the file contains audio-only tracks
-        if (isAudioOnly) {
-            res.setHeader('Content-Type', 'audio/mp4');
-        } else {
-            res.setHeader('Content-Type', 'video/mp4');
-        }
-    } else if (ext === '.webm') {
-        const stat = fs.statSync(videoPath);
-        const ebmlDecoder = new Decoder();
-        const fileBuffer = fs.readFileSync(videoPath);
-        const elements = ebmlDecoder.decode(fileBuffer);
-        const isAudioOnly = elements.some(element => element.name === 'TrackType' && element.value === 2); // Check if the file contains audio-only tracks
-        if (isAudioOnly) {
-            res.setHeader('Content-Type', 'audio/webm');
-        } else {
-            res.setHeader('Content-Type', 'video/webm');
+    const destinationPath = path.join(savePath, path.basename(videoPath));
+
+    fs.rename(videoPath, destinationPath, (err) => {
+        if (err) {
+            console.error('Error moving file:', err);
+            return res.status(500).send('Error moving file');
         }
-    } else if (ext === '.mp3') {
-        res.setHeader('Content-Type', 'audio/mp3');
-        } else if (ext === '.m4a') {
-        res.setHeader('Content-Type', 'audio/m4a');
-    } else {
-        res.setHeader('Content-Type', 'application/octet-stream');
-    }
-    stream.pipe(res);
+        shell.showItemInFolder(destinationPath);
+        res.send(JSON.stringify({ path: destinationPath }));
+    });
+
 });
 
 app.on('window-all-closed', () => {