Fixed issue where testing the connecting string would fail if local DB was being used

Fixed issue where blacklisting video in with archiving would not work

Cleaned up unused functions in app.js
pull/413/head
Isaac Abadi 4 years ago
parent c8f219d5b0
commit b03b4d173b

@ -18,13 +18,10 @@ var mergeFiles = require('merge-files');
const low = require('lowdb') const low = require('lowdb')
var ProgressBar = require('progress'); var ProgressBar = require('progress');
const NodeID3 = require('node-id3') const NodeID3 = require('node-id3')
const downloader = require('youtube-dl/lib/downloader')
const fetch = require('node-fetch'); const fetch = require('node-fetch');
var URL = require('url').URL; var URL = require('url').URL;
const shortid = require('shortid')
const url_api = require('url'); const url_api = require('url');
const CONSTS = require('./consts') const CONSTS = require('./consts')
const { spawn } = require('child_process')
const read_last_lines = require('read-last-lines'); const read_last_lines = require('read-last-lines');
var ps = require('ps-node'); var ps = require('ps-node');
@ -753,67 +750,6 @@ function generateEnvVarConfigItem(key) {
return {key: key, value: process['env'][key]}; return {key: key, value: process['env'][key]};
} }
function getFileSizeMp3(name)
{
var jsonPath = audioFolderPath+name+".mp3.info.json";
if (fs.existsSync(jsonPath))
var obj = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
else
var obj = 0;
return obj.filesize;
}
function getFileSizeMp4(name)
{
var jsonPath = videoFolderPath+name+".info.json";
var filesize = 0;
if (fs.existsSync(jsonPath))
{
var obj = JSON.parse(fs.readFileSync(jsonPath, 'utf8'));
var format = obj.format.substring(0,3);
for (i = 0; i < obj.formats.length; i++)
{
if (obj.formats[i].format_id == format)
{
filesize = obj.formats[i].filesize;
}
}
}
return filesize;
}
function getAmountDownloadedMp3(name)
{
var partPath = audioFolderPath+name+".mp3.part";
if (fs.existsSync(partPath))
{
const stats = fs.statSync(partPath);
const fileSizeInBytes = stats.size;
return fileSizeInBytes;
}
else
return 0;
}
function getAmountDownloadedMp4(name)
{
var format = getVideoFormatID(name);
var partPath = videoFolderPath+name+".f"+format+".mp4.part";
if (fs.existsSync(partPath))
{
const stats = fs.statSync(partPath);
const fileSizeInBytes = stats.size;
return fileSizeInBytes;
}
else
return 0;
}
function getVideoFormatID(name) function getVideoFormatID(name)
{ {
var jsonPath = videoFolderPath+name+".info.json"; var jsonPath = videoFolderPath+name+".info.json";
@ -1283,17 +1219,6 @@ async function cropFile(file_path, start, end, ext) {
}); });
} }
// archive helper functions
async function writeToBlacklist(type, line) {
let blacklistPath = path.join(archivePath, (type === 'audio') ? 'blacklist_audio.txt' : 'blacklist_video.txt');
// adds newline to the beginning of the line
line.replace('\n', '');
line.replace('\r', '');
line = '\n' + line;
await fs.appendFile(blacklistPath, line);
}
// download management functions // download management functions
async function updateDownloads() { async function updateDownloads() {

@ -75,7 +75,7 @@ exports.initialize = (input_db, input_users_db, input_logger) => {
} }
exports.connectToDB = async (retries = 5, no_fallback = false, custom_connection_string = null) => { exports.connectToDB = async (retries = 5, no_fallback = false, custom_connection_string = null) => {
if (using_local_db) return; if (using_local_db && !custom_connection_string) return;
const success = await exports._connectToDB(custom_connection_string); const success = await exports._connectToDB(custom_connection_string);
if (success) return true; if (success) return true;
@ -1019,3 +1019,15 @@ const applyFilterLocalDB = (db_path, filter_obj, operation) => {
}); });
return return_val; return return_val;
} }
// archive helper functions
async function writeToBlacklist(type, line) {
const archivePath = path.join(__dirname, 'appdata', 'archives');
let blacklistPath = path.join(archivePath, (type === 'audio') ? 'blacklist_audio.txt' : 'blacklist_video.txt');
// adds newline to the beginning of the line
line.replace('\n', '');
line.replace('\r', '');
line = '\n' + line;
await fs.appendFile(blacklistPath, line);
}

Loading…
Cancel
Save