TheLanc3/YoutubeDL-Material
1
0
Fork 0
mirror of https://github.com/Tzahi12345/YoutubeDL-Material.git synced 2026-04-11 17:21:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug preventing app being used outside root url

Browse Source
This commit is contained in:
Isaac Grynsztein
2019-10-21 02:24:47 -04:00
parent bc1e0ea542
commit f98ba00551
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backend/app.js
View File

@@ -8,6 +8,8 @@ var express = require("express");
var bodyParser = require("body-parser"); var bodyParser = require("body-parser");
var app = express(); var app = express();
var URL = require('url').URL;
var frontendUrl = config.get("YoutubeDLMaterial.Host.frontendurl"); var frontendUrl = config.get("YoutubeDLMaterial.Host.frontendurl");
var backendUrl = config.get("YoutubeDLMaterial.Host.backendurl") var backendUrl = config.get("YoutubeDLMaterial.Host.backendurl")
var backendPort = 17442; var backendPort = 17442;
@@ -36,8 +38,10 @@ if (usingEncryption)
app.use(bodyParser.urlencoded({ extended: false })); app.use(bodyParser.urlencoded({ extended: false }));
app.use(bodyParser.json()); app.use(bodyParser.json());
var url_domain = new URL(frontendUrl);
app.use(function(req, res, next) { app.use(function(req, res, next) {
res.header("Access-Control-Allow-Origin", frontendUrl); res.header("Access-Control-Allow-Origin", url_domain.origin);
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
next(); next();
}); });
@@ -181,6 +185,7 @@ app.post('/tomp3', function(req, res) {
// write file info // write file info
/*
youtubedl.getInfo(url, function(err, info) { youtubedl.getInfo(url, function(err, info) {
if (err) throw err; if (err) throw err;
@@ -193,6 +198,7 @@ app.post('/tomp3', function(req, res) {
console.log("The file was saved!"); console.log("The file was saved!");
}); });
}); });
*/
var completeString = "done"; var completeString = "done";
var audiopathEncoded = encodeURIComponent(audiopath); var audiopathEncoded = encodeURIComponent(audiopath);
res.send({ res.send({
@@ -206,7 +212,7 @@ app.post('/tomp4', function(req, res) {
var date = Date.now(); var date = Date.now();
var path = videoPath; var path = videoPath;
var videopath = Date.now(); var videopath = Date.now();
youtubedl.exec(url, ['-o', path + videopath + ".mp4", '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4', '--write-info-json'], {}, function(err, output) { youtubedl.exec(url, ['--external-downloader', 'aria2c', '-o', path + videopath + ".mp4", '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4', '--write-info-json'], {}, function(err, output) {
if (err) { if (err) {
videopath = "-1"; videopath = "-1";
throw err; throw err;
@@ -343,7 +349,9 @@ app.post('/deleteMp3', function(req, res) {
var wasDeleted = false; var wasDeleted = false;
if (fs.existsSync(fullpath)) if (fs.existsSync(fullpath))
{ {
fs.unlink(fullpath); fs.unlink(fullpath, call => {
});
wasDeleted = true; wasDeleted = true;
res.send(wasDeleted); res.send(wasDeleted);
res.end("yes"); res.end("yes");