mirror of
https://github.com/Tzahi12345/YoutubeDL-Material.git
synced 2026-04-09 12:21:28 +03:00
Changed location of archive path to appdata/archives. If the folder doesn't exist, it gets auto-generated. In the future this path will be configurable
This commit is contained in:
@@ -51,6 +51,7 @@ var useDefaultDownloadingAgent = null;
|
|||||||
var customDownloadingAgent = null;
|
var customDownloadingAgent = null;
|
||||||
var allowSubscriptions = null;
|
var allowSubscriptions = null;
|
||||||
var subscriptionsCheckInterval = null;
|
var subscriptionsCheckInterval = null;
|
||||||
|
var archivePath = path.join(__dirname, 'appdata', 'archives');
|
||||||
|
|
||||||
// other needed values
|
// other needed values
|
||||||
var options = null; // encryption options
|
var options = null; // encryption options
|
||||||
@@ -197,6 +198,11 @@ async function loadConfig() {
|
|||||||
|
|
||||||
url_domain = new URL(url);
|
url_domain = new URL(url);
|
||||||
|
|
||||||
|
// creates archive path if missing
|
||||||
|
if (!fs.existsSync(archivePath)){
|
||||||
|
fs.mkdirSync(archivePath);
|
||||||
|
}
|
||||||
|
|
||||||
// get subscriptions
|
// get subscriptions
|
||||||
if (allowSubscriptions) {
|
if (allowSubscriptions) {
|
||||||
// runs initially, then runs every ${subscriptionCheckInterval} seconds
|
// runs initially, then runs every ${subscriptionCheckInterval} seconds
|
||||||
@@ -452,7 +458,7 @@ async function deleteAudioFile(name, blacklistMode = false) {
|
|||||||
|
|
||||||
let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
|
let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
|
||||||
if (useYoutubeDLArchive) {
|
if (useYoutubeDLArchive) {
|
||||||
const archive_path = audioFolderPath + 'archive.txt';
|
const archive_path = path.join(archivePath, 'archive_audio.txt');
|
||||||
|
|
||||||
// get ID from JSON
|
// get ID from JSON
|
||||||
|
|
||||||
@@ -510,7 +516,7 @@ async function deleteVideoFile(name, customPath = null, blacklistMode = false) {
|
|||||||
|
|
||||||
let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
|
let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
|
||||||
if (useYoutubeDLArchive) {
|
if (useYoutubeDLArchive) {
|
||||||
const archive_path = videoFolderPath + 'archive.txt';
|
const archive_path = path.join(archivePath, 'archive_video.txt');
|
||||||
|
|
||||||
// get ID from JSON
|
// get ID from JSON
|
||||||
|
|
||||||
@@ -633,10 +639,10 @@ async function getUrlInfos(urls) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function writeToBlacklist(type, line) {
|
function writeToBlacklist(type, line) {
|
||||||
let blacklistBasePath = (type === 'audio') ? audioFolderPath : videoFolderPath;
|
let blacklistPath = path.join(archivePath, (type === 'audio') ? 'blacklist_audio.txt' : 'blacklist_video.txt');
|
||||||
// adds newline to the beginning of the line
|
// adds newline to the beginning of the line
|
||||||
line = '\n' + line;
|
line = '\n' + line;
|
||||||
fs.appendFileSync(blacklistBasePath + 'blacklist.txt', line);
|
fs.appendFileSync(blacklistPath, line);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function startYoutubeDL() {
|
async function startYoutubeDL() {
|
||||||
@@ -806,13 +812,13 @@ app.post('/api/tomp3', async function(req, res) {
|
|||||||
|
|
||||||
let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
|
let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
|
||||||
if (useYoutubeDLArchive) {
|
if (useYoutubeDLArchive) {
|
||||||
let archive_path = audioFolderPath + 'archive.txt';
|
const archive_path = path.join(archivePath, 'archive_audio.txt');
|
||||||
// create archive file if it doesn't exist
|
// create archive file if it doesn't exist
|
||||||
if (!fs.existsSync(archive_path)) {
|
if (!fs.existsSync(archive_path)) {
|
||||||
fs.closeSync(fs.openSync(archive_path, 'w'));
|
fs.closeSync(fs.openSync(archive_path, 'w'));
|
||||||
}
|
}
|
||||||
|
|
||||||
let blacklist_path = audioFolderPath + 'blacklist.txt';
|
let blacklist_path = path.join(archivePath, 'blacklist_audio.txt');
|
||||||
// create blacklist file if it doesn't exist
|
// create blacklist file if it doesn't exist
|
||||||
if (!fs.existsSync(blacklist_path)) {
|
if (!fs.existsSync(blacklist_path)) {
|
||||||
fs.closeSync(fs.openSync(blacklist_path, 'w'));
|
fs.closeSync(fs.openSync(blacklist_path, 'w'));
|
||||||
@@ -886,7 +892,8 @@ app.post('/api/tomp3', async function(req, res) {
|
|||||||
if (merged_string !== null) {
|
if (merged_string !== null) {
|
||||||
let current_merged_archive = fs.readFileSync(merged_path, 'utf8');
|
let current_merged_archive = fs.readFileSync(merged_path, 'utf8');
|
||||||
let diff = current_merged_archive.replace(merged_string, '');
|
let diff = current_merged_archive.replace(merged_string, '');
|
||||||
fs.appendFileSync(audioFolderPath + 'archive.txt', diff);
|
const archive_path = path.join(archivePath, 'archive_audio.txt');
|
||||||
|
fs.appendFileSync(archive_path, diff);
|
||||||
fs.unlinkSync(merged_path)
|
fs.unlinkSync(merged_path)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -902,7 +909,6 @@ app.post('/api/tomp3', async function(req, res) {
|
|||||||
app.post('/api/tomp4', async function(req, res) {
|
app.post('/api/tomp4', async function(req, res) {
|
||||||
var url = req.body.url;
|
var url = req.body.url;
|
||||||
var date = Date.now();
|
var date = Date.now();
|
||||||
var path = videoFolderPath;
|
|
||||||
var videopath = '%(title)s';
|
var videopath = '%(title)s';
|
||||||
var globalArgs = config_api.getConfigItem('ytdl_custom_args');
|
var globalArgs = config_api.getConfigItem('ytdl_custom_args');
|
||||||
var customArgs = req.body.customArgs;
|
var customArgs = req.body.customArgs;
|
||||||
@@ -928,9 +934,9 @@ app.post('/api/tomp4', async function(req, res) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (customOutput) {
|
if (customOutput) {
|
||||||
downloadConfig = ['-o', path + customOutput + ".mp4", '-f', qualityPath, '--write-info-json', '--print-json'];
|
downloadConfig = ['-o', videoFolderPath + customOutput + ".mp4", '-f', qualityPath, '--write-info-json', '--print-json'];
|
||||||
} else {
|
} else {
|
||||||
downloadConfig = ['-o', path + videopath + ".mp4", '-f', qualityPath, '--write-info-json', '--print-json'];
|
downloadConfig = ['-o', videoFolderPath + videopath + ".mp4", '-f', qualityPath, '--write-info-json', '--print-json'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (youtubeUsername && youtubePassword) {
|
if (youtubeUsername && youtubePassword) {
|
||||||
@@ -943,13 +949,13 @@ app.post('/api/tomp4', async function(req, res) {
|
|||||||
|
|
||||||
let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
|
let useYoutubeDLArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
|
||||||
if (useYoutubeDLArchive) {
|
if (useYoutubeDLArchive) {
|
||||||
let archive_path = videoFolderPath + 'archive.txt';
|
const archive_path = path.join(archivePath, 'archive_video.txt');
|
||||||
// create archive file if it doesn't exist
|
// create archive file if it doesn't exist
|
||||||
if (!fs.existsSync(archive_path)) {
|
if (!fs.existsSync(archive_path)) {
|
||||||
fs.closeSync(fs.openSync(archive_path, 'w'));
|
fs.closeSync(fs.openSync(archive_path, 'w'));
|
||||||
}
|
}
|
||||||
|
|
||||||
let blacklist_path = videoFolderPath + 'blacklist.txt';
|
let blacklist_path = path.join(archivePath, 'blacklist_video.txt');
|
||||||
// create blacklist file if it doesn't exist
|
// create blacklist file if it doesn't exist
|
||||||
if (!fs.existsSync(blacklist_path)) {
|
if (!fs.existsSync(blacklist_path)) {
|
||||||
fs.closeSync(fs.openSync(blacklist_path, 'w'));
|
fs.closeSync(fs.openSync(blacklist_path, 'w'));
|
||||||
@@ -1023,7 +1029,8 @@ app.post('/api/tomp4', async function(req, res) {
|
|||||||
if (merged_string !== null) {
|
if (merged_string !== null) {
|
||||||
let current_merged_archive = fs.readFileSync(videoFolderPath + 'merged.txt', 'utf8');
|
let current_merged_archive = fs.readFileSync(videoFolderPath + 'merged.txt', 'utf8');
|
||||||
let diff = current_merged_archive.replace(merged_string, '');
|
let diff = current_merged_archive.replace(merged_string, '');
|
||||||
fs.appendFileSync(videoFolderPath + 'archive.txt', diff);
|
const archive_path = path.join(archivePath, 'archive_video.txt');
|
||||||
|
fs.appendFileSync(archive_path, diff);
|
||||||
}
|
}
|
||||||
|
|
||||||
var videopathEncoded = encodeURIComponent(file_names[0]);
|
var videopathEncoded = encodeURIComponent(file_names[0]);
|
||||||
|
|||||||
Reference in New Issue
Block a user