mirror of
https://github.com/Tzahi12345/YoutubeDL-Material.git
synced 2026-04-21 12:13:21 +03:00
Adds preliminary support for tiktok and periscope
Added alternate json path for mp4s in case it's not found in the main location
This commit is contained in:
@@ -713,30 +713,37 @@ function getJSONMp3(name)
|
|||||||
{
|
{
|
||||||
var jsonPath = audioFolderPath+name+".info.json";
|
var jsonPath = audioFolderPath+name+".info.json";
|
||||||
var alternateJsonPath = audioFolderPath+name+".mp3.info.json";
|
var alternateJsonPath = audioFolderPath+name+".mp3.info.json";
|
||||||
|
var obj = null;
|
||||||
if (fs.existsSync(jsonPath))
|
if (fs.existsSync(jsonPath))
|
||||||
var obj = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
|
obj = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
|
||||||
else if (fs.existsSync(alternateJsonPath))
|
else if (fs.existsSync(alternateJsonPath))
|
||||||
var obj = JSON.parse(fs.readFileSync(alternateJsonPath, 'utf8'));
|
obj = JSON.parse(fs.readFileSync(alternateJsonPath, 'utf8'));
|
||||||
else
|
else
|
||||||
var obj = 0;
|
obj = 0;
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getJSONMp4(name, customPath = null)
|
function getJSONMp4(name, customPath = null)
|
||||||
{
|
{
|
||||||
|
var obj = null; // output
|
||||||
let jsonPath = null;
|
let jsonPath = null;
|
||||||
|
var alternateJsonPath = videoFolderPath + name + ".mp4.info.json";
|
||||||
if (!customPath) {
|
if (!customPath) {
|
||||||
jsonPath = videoFolderPath+name+".info.json";
|
jsonPath = videoFolderPath + name + ".info.json";
|
||||||
} else {
|
} else {
|
||||||
jsonPath = customPath + name + ".info.json";
|
jsonPath = customPath + name + ".info.json";
|
||||||
|
alternateJsonPath = customPath + name + ".mp4.info.json";
|
||||||
}
|
}
|
||||||
if (fs.existsSync(jsonPath))
|
if (fs.existsSync(jsonPath))
|
||||||
{
|
{
|
||||||
var obj = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
|
obj = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
|
||||||
return obj;
|
return obj;
|
||||||
|
} else if (fs.existsSync(alternateJsonPath)) {
|
||||||
|
obj = JSON.parse(fs.readFileSync(alternateJsonPath, 'utf8'));
|
||||||
}
|
}
|
||||||
else return 0;
|
else obj = 0;
|
||||||
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getAmountDownloadedMp3(name)
|
function getAmountDownloadedMp3(name)
|
||||||
@@ -1005,7 +1012,7 @@ function generateFileObject(id, type) {
|
|||||||
var url = jsonobj.webpage_url;
|
var url = jsonobj.webpage_url;
|
||||||
var uploader = jsonobj.uploader;
|
var uploader = jsonobj.uploader;
|
||||||
var upload_date = jsonobj.upload_date;
|
var upload_date = jsonobj.upload_date;
|
||||||
upload_date = `${upload_date.substring(0, 4)}-${upload_date.substring(4, 6)}-${upload_date.substring(6, 8)}`;
|
upload_date = upload_date ? `${upload_date.substring(0, 4)}-${upload_date.substring(4, 6)}-${upload_date.substring(6, 8)}` : 'N/A';
|
||||||
|
|
||||||
var size = stats.size;
|
var size = stats.size;
|
||||||
|
|
||||||
@@ -1437,6 +1444,11 @@ app.post('/api/tomp4', async function(req, res) {
|
|||||||
let downloadConfig = null;
|
let downloadConfig = null;
|
||||||
let qualityPath = 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4';
|
let qualityPath = 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4';
|
||||||
|
|
||||||
|
if (url.includes('tiktok') || url.includes('pscp.tv')) {
|
||||||
|
// tiktok videos fail when using the default format
|
||||||
|
qualityPath = 'best';
|
||||||
|
}
|
||||||
|
|
||||||
if (customArgs) {
|
if (customArgs) {
|
||||||
downloadConfig = customArgs.split(' ');
|
downloadConfig = customArgs.split(' ');
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user