Merge pull request #655 from Tzahi12345/improved-downloads-management

Improved downloads management
pull/659/head
Tzahi12345 3 years ago committed by GitHub
commit c91e51de15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -129,6 +129,27 @@ paths:
description: User is not authorized to view the file.
security:
- Auth query parameter: []
/api/updateFile:
post:
tags:
- files
summary: Updates file database object
description: Updates a file db object using its uid and a change object.
operationId: post-updateFile
requestBody:
content:
application/json:
schema:
$ref: '#/components/schemas/UpdateFileRequest'
responses:
'200':
description: OK
content:
application/json:
schema:
$ref: '#/components/schemas/SuccessObject'
security:
- Auth query parameter: []
/api/enableSharing:
post:
tags:
@ -841,17 +862,10 @@ paths:
- Auth query parameter: []
tags:
- downloader
/api/clearFinishedDownloads:
/api/clearDownloads:
post:
tags:
- downloader
summary: Clear finished downloads
operationId: post-api-clear-finished-downloads
requestBody:
content:
application/json:
schema:
type: object
summary: Clear multiple downloads
operationId: post-api-clear-downloads
responses:
'200':
description: OK
@ -859,8 +873,17 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/SuccessObject'
requestBody:
content:
application/json:
schema:
$ref: '#/components/schemas/ClearDownloadsRequest'
description: ''
description: "Clears multiple downloads based on a given filter."
security:
- Auth query parameter: []
tags:
- downloader
/api/getTask:
post:
summary: Get info for one task
@ -1507,6 +1530,8 @@ components:
properties:
success:
type: boolean
error:
type: string
FileType:
type: string
enum:
@ -1607,6 +1632,15 @@ components:
type: array
items:
$ref: '#/components/schemas/Download'
ClearDownloadsRequest:
type: object
properties:
clear_finished:
type: boolean
clear_paused:
type: boolean
clear_errors:
type: boolean
GetTaskRequest:
type: object
properties:
@ -1727,6 +1761,18 @@ components:
type: boolean
file:
$ref: '#/components/schemas/DatabaseFile'
UpdateFileRequest:
required:
- uid
- change_obj
type: object
properties:
uid:
type: string
description: Video UID
change_obj:
type: object
description: Object with fields to update as keys and their new values
SharingToggle:
required:
- uid
@ -2153,7 +2199,6 @@ components:
type: boolean
result:
allOf:
- $ref: '#/components/schemas/file'
- type: object
properties:
formats:
@ -2311,6 +2356,9 @@ components:
type: string
thumbnailURL:
type: string
description: Backup if thumbnailPath is not defined
thumbnailPath:
type: string
isAudio:
type: boolean
duration:
@ -2322,6 +2370,7 @@ components:
type: string
size:
type: number
description: In bytes
path:
type: string
upload_date:
@ -2330,6 +2379,12 @@ components:
type: string
sharingEnabled:
type: boolean
category:
$ref: '#/components/schemas/Category'
view_count:
type: number
local_view_count:
type: number
Playlist:
required:
- uids
@ -2359,6 +2414,8 @@ components:
type: number
user_uid:
type: string
auto:
type: boolean
Download:
required:
- url
@ -2545,28 +2602,6 @@ components:
type: string
passhash:
type: string
files:
type: object
properties:
audio:
type: array
items:
$ref: '#/components/schemas/file'
video:
type: array
items:
$ref: '#/components/schemas/file'
playlists:
type: object
properties:
audio:
type: array
items:
$ref: '#/components/schemas/file'
video:
type: array
items:
$ref: '#/components/schemas/file'
subscriptions:
type: array
items:

@ -30,7 +30,8 @@
"src/backend"
],
"styles": [
"src/styles.scss"
"src/styles.scss",
"src/bootstrap.min.css"
],
"scripts": [],
"vendorChunk": true,
@ -118,7 +119,8 @@
"src/backend"
],
"styles": [
"src/styles.scss"
"src/styles.scss",
"src/bootstrap.min.css"
],
"scripts": []
},
@ -151,7 +153,8 @@
"tsConfig": "src/tsconfig.spec.json",
"scripts": [],
"styles": [
"src/styles.scss"
"src/styles.scss",
"src/bootstrap.min.css"
],
"assets": [
"src/assets",

@ -933,23 +933,34 @@ app.post('/api/getAllFiles', optionalJwt, async function (req, res) {
else if (file_type_filter === 'video_only') filter_obj['isAudio'] = false;
files = await db_api.getRecords('files', filter_obj, false, sort, range, text_search);
let file_count = await db_api.getRecords('files', filter_obj, true);
playlists = await db_api.getRecords('playlists', {user_uid: uuid});
const categories = await categories_api.getCategoriesAsPlaylists(files);
if (categories) {
playlists = playlists.concat(categories);
}
const file_count = await db_api.getRecords('files', filter_obj, true);
files = JSON.parse(JSON.stringify(files));
res.send({
files: files,
file_count: file_count,
playlists: playlists
});
});
app.post('/api/updateFile', optionalJwt, async function (req, res) {
const uid = req.body.uid;
const change_obj = req.body.change_obj;
const file = await db_api.updateRecord('files', {uid: uid}, change_obj);
if (!file) {
res.send({
success: false,
error: 'File could not be found'
});
} else {
res.send({
success: true
});
}
});
app.post('/api/checkConcurrentStream', async (req, res) => {
const uid = req.body.uid;
@ -1365,7 +1376,7 @@ app.post('/api/getPlaylists', optionalJwt, async (req, res) => {
let playlists = await db_api.getRecords('playlists', {user_uid: uuid});
if (include_categories) {
const categories = await categories_api.getCategoriesAsPlaylists(files);
const categories = await categories_api.getCategoriesAsPlaylists();
if (categories) {
playlists = playlists.concat(categories);
}
@ -1669,9 +1680,15 @@ app.post('/api/download', optionalJwt, async (req, res) => {
}
});
app.post('/api/clearFinishedDownloads', optionalJwt, async (req, res) => {
app.post('/api/clearDownloads', optionalJwt, async (req, res) => {
const user_uid = req.isAuthenticated() ? req.user.uid : null;
const success = db_api.removeAllRecords('download_queue', {finished: true, user_uid: user_uid});
const clear_finished = req.body.clear_finished;
const clear_paused = req.body.clear_paused;
const clear_errors = req.body.clear_errors;
let success = true;
if (clear_finished) success &= await db_api.removeAllRecords('download_queue', {finished: true, user_uid: user_uid});
if (clear_paused) success &= await db_api.removeAllRecords('download_queue', {paused: true, user_uid: user_uid});
if (clear_errors) success &= await db_api.removeAllRecords('download_queue', {error: {$ne: null}, user_uid: user_uid});
res.send({success: success});
});

@ -171,8 +171,12 @@ exports.registerUser = async function(req, res) {
exports.login = async (username, password) => {
// even if we're using LDAP, we still want users to be able to login using internal credentials
const user = await db_api.getRecord('users', {name: username});
if (!user) { logger.error(`User ${username} not found`); return false }
if (!user) {
if (config_api.getConfigItem('ytdl_auth_method') === 'internal') logger.error(`User ${username} not found`);
return false;
}
if (user.auth_method && user.auth_method !== 'internal') { return false }
return await bcrypt.compare(password, user.passhash) ? user : false;
}

@ -55,17 +55,18 @@ async function getCategories() {
return categories ? categories : null;
}
async function getCategoriesAsPlaylists(files = null) {
async function getCategoriesAsPlaylists() {
const categories_as_playlists = [];
const available_categories = await getCategories();
if (available_categories && files) {
if (available_categories) {
for (let category of available_categories) {
const files_that_match = utils.addUIDsToCategory(category, files);
const files_that_match = await db_api.getRecords('files', {'category.uid': category['uid']});
if (files_that_match && files_that_match.length > 0) {
category['thumbnailURL'] = files_that_match[0].thumbnailURL;
category['thumbnailPath'] = files_that_match[0].thumbnailPath;
category['duration'] = files_that_match.reduce((a, b) => a + utils.durationStringToNumber(b.duration), 0);
category['id'] = category['uid'];
category['auto'] = true;
categories_as_playlists.push(category);
}
}

@ -127,7 +127,7 @@ function setConfigItem(key, value) {
success = setConfigFile(config_json);
return success;
};
}
function setConfigItems(items) {
let success = false;

@ -387,9 +387,9 @@ exports.getPlaylist = async (playlist_id, user_uid = null, require_sharing = fal
if (!playlist) {
playlist = await exports.getRecord('categories', {uid: playlist_id});
if (playlist) {
// category found
const files = await exports.getFiles(user_uid);
utils.addUIDsToCategory(playlist, files);
const uids = (await exports.getRecords('files', {'category.uid': playlist_id})).map(file => file.uid);
playlist['uids'] = uids;
playlist['auto'] = true;
}
}
@ -629,7 +629,7 @@ exports.bulkInsertRecordsIntoTable = async (table, docs) => {
exports.getRecord = async (table, filter_obj) => {
// local db override
if (using_local_db) {
return applyFilterLocalDB(local_db.get(table), filter_obj, 'find').value();
return exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'find').value();
}
return await database.collection(table).findOne(filter_obj);
@ -638,7 +638,7 @@ exports.getRecord = async (table, filter_obj) => {
exports.getRecords = async (table, filter_obj = null, return_count = false, sort = null, range = null) => {
// local db override
if (using_local_db) {
let cursor = filter_obj ? applyFilterLocalDB(local_db.get(table), filter_obj, 'filter').value() : local_db.get(table).value();
let cursor = filter_obj ? exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'filter').value() : local_db.get(table).value();
if (sort) {
cursor = cursor.sort((a, b) => (a[sort['by']] > b[sort['by']] ? sort['order'] : sort['order']*-1));
}
@ -664,7 +664,7 @@ exports.getRecords = async (table, filter_obj = null, return_count = false, sort
exports.updateRecord = async (table, filter_obj, update_obj) => {
// local db override
if (using_local_db) {
applyFilterLocalDB(local_db.get(table), filter_obj, 'find').assign(update_obj).write();
exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'find').assign(update_obj).write();
return true;
}
@ -677,7 +677,7 @@ exports.updateRecord = async (table, filter_obj, update_obj) => {
exports.updateRecords = async (table, filter_obj, update_obj) => {
// local db override
if (using_local_db) {
applyFilterLocalDB(local_db.get(table), filter_obj, 'filter').assign(update_obj).write();
exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'filter').assign(update_obj).write();
return true;
}
@ -722,7 +722,7 @@ exports.bulkUpdateRecords = async (table, key_label, update_obj) => {
exports.pushToRecordsArray = async (table, filter_obj, key, value) => {
// local db override
if (using_local_db) {
applyFilterLocalDB(local_db.get(table), filter_obj, 'find').get(key).push(value).write();
exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'find').get(key).push(value).write();
return true;
}
@ -733,7 +733,7 @@ exports.pushToRecordsArray = async (table, filter_obj, key, value) => {
exports.pullFromRecordsArray = async (table, filter_obj, key, value) => {
// local db override
if (using_local_db) {
applyFilterLocalDB(local_db.get(table), filter_obj, 'find').get(key).pull(value).write();
exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'find').get(key).pull(value).write();
return true;
}
@ -746,7 +746,7 @@ exports.pullFromRecordsArray = async (table, filter_obj, key, value) => {
exports.removeRecord = async (table, filter_obj) => {
// local db override
if (using_local_db) {
applyFilterLocalDB(local_db.get(table), filter_obj, 'remove').write();
exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'remove').write();
return true;
}
@ -757,7 +757,7 @@ exports.removeRecord = async (table, filter_obj) => {
// exports.removeRecordsByUIDBulk = async (table, uids) => {
// // local db override
// if (using_local_db) {
// applyFilterLocalDB(local_db.get(table), filter_obj, 'remove').write();
// exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'remove').write();
// return true;
// }
@ -821,7 +821,7 @@ exports.removeAllRecords = async (table = null, filter_obj = null) => {
if (using_local_db) {
for (let i = 0; i < tables_to_remove.length; i++) {
const table_to_remove = tables_to_remove[i];
if (filter_obj) applyFilterLocalDB(local_db.get(table), filter_obj, 'remove').write();
if (filter_obj) exports.applyFilterLocalDB(local_db.get(table), filter_obj, 'remove').write();
else local_db.assign({[table_to_remove]: []}).write();
logger.debug(`Successfully removed records from ${table_to_remove}`);
}
@ -1075,8 +1075,13 @@ exports.transferDB = async (local_to_remote) => {
This function is necessary to emulate mongodb's ability to search for null or missing values.
A filter of null or undefined for a property will find docs that have that property missing, or have it
null or undefined. We want that same functionality for the local DB as well
error: {$ne: null}
^ ^
| |
filter_prop filter_prop_value
*/
const applyFilterLocalDB = (db_path, filter_obj, operation) => {
exports.applyFilterLocalDB = (db_path, filter_obj, operation) => {
const filter_props = Object.keys(filter_obj);
const return_val = db_path[operation](record => {
if (!filter_props) return true;
@ -1085,14 +1090,20 @@ const applyFilterLocalDB = (db_path, filter_obj, operation) => {
const filter_prop = filter_props[i];
const filter_prop_value = filter_obj[filter_prop];
if (filter_prop_value === undefined || filter_prop_value === null) {
filtered &= record[filter_prop] === undefined || record[filter_prop] === null
filtered &= record[filter_prop] === undefined || record[filter_prop] === null;
} else {
if (typeof filter_prop_value === 'object') {
if (filter_prop_value['$regex']) {
if ('$regex' in filter_prop_value) {
filtered &= (record[filter_prop].search(new RegExp(filter_prop_value['$regex'], filter_prop_value['$options'])) !== -1);
} else if ('$ne' in filter_prop_value) {
filtered &= filter_prop in record && record[filter_prop] !== filter_prop_value['$ne'];
}
} else {
filtered &= record[filter_prop] === filter_prop_value;
// handle case of nested property check
if (filter_prop.includes('.'))
filtered &= utils.searchObjectByString(record, filter_prop) === filter_prop_value;
else
filtered &= record[filter_prop] === filter_prop_value;
}
}
}

@ -108,6 +108,7 @@ exports.clearDownload = async (download_uid) => {
}
async function handleDownloadError(download_uid, error_message) {
if (!download_uid) return;
await db_api.updateRecord('download_queue', {uid: download_uid}, {error: error_message, finished: true, running: false});
}
@ -186,7 +187,7 @@ async function collectInfo(download_uid) {
let args = await exports.generateArgs(url, type, options, download['user_uid']);
// get video info prior to download
let info = await getVideoInfoByURL(url, args, download_uid);
let info = await exports.getVideoInfoByURL(url, args, download_uid);
if (!info) {
// info failed, error presumably already recorded
@ -203,9 +204,11 @@ async function collectInfo(download_uid) {
options.customOutput = category['custom_output'];
options.noRelativePath = true;
args = await exports.generateArgs(url, type, options, download['user_uid']);
info = await getVideoInfoByURL(url, args, download_uid);
info = await exports.getVideoInfoByURL(url, args, download_uid);
}
download['category'] = category;
// setup info required to calculate download progress
const expected_file_size = utils.getExpectedFileSize(info);
@ -507,7 +510,7 @@ exports.generateArgs = async (url, type, options, user_uid = null, simulated = f
return downloadConfig;
}
async function getVideoInfoByURL(url, args = [], download_uid = null) {
exports.getVideoInfoByURL = async (url, args = [], download_uid = null) => {
return new Promise(resolve => {
// remove bad args
const new_args = [...args];

@ -148,6 +148,7 @@ exports.updateTaskSchedule = async (task_key, schedule) => {
await db_api.updateRecord('tasks', {key: task_key}, {schedule: schedule});
if (TASKS[task_key]['job']) {
TASKS[task_key]['job'].cancel();
TASKS[task_key]['job'] = null;
}
if (schedule) {
TASKS[task_key]['job'] = scheduleJob(task_key, schedule);

@ -42,6 +42,25 @@ const { uuid } = require('uuidv4');
db_api.initialize(db, users_db);
const sample_video_json = {
id: "Sample Video",
title: "Sample Video",
thumbnailURL: "https://sampleurl.jpg",
isAudio: false,
duration: 177.413,
url: "sampleurl.com",
uploader: "Sample Uploader",
size: 2838445,
path: "users\\admin\\video\\Sample Video.mp4",
upload_date: "2017-07-28",
description: null,
view_count: 230,
abr: 128,
thumbnailPath: null,
user_uid: "admin",
uid: "1ada04ab-2773-4dd4-bbdd-3e2d40761c50",
registered: 1628469039377
}
describe('Database', async function() {
describe('Import', async function() {
@ -214,7 +233,7 @@ describe('Database', async function() {
for (let i = 0; i < NUM_RECORDS_TO_ADD; i++) {
const uid = uuid();
if (i === NUM_RECORDS_TO_ADD/2) random_uid = uid;
test_records.push({"id":"A$AP Mob - Yamborghini High (Official Music Video) ft. Juicy J","title":"A$AP Mob - Yamborghini High (Official Music Video) ft. Juicy J","thumbnailURL":"https://i.ytimg.com/vi/tt7gP_IW-1w/maxresdefault.jpg","isAudio":true,"duration":312,"url":"https://www.youtube.com/watch?v=tt7gP_IW-1w","uploader":"asapmobVEVO","size":5060157,"path":"audio\\A$AP Mob - Yamborghini High (Official Music Video) ft. Juicy J.mp3","upload_date":"2016-05-11","description":"A$AP Mob ft. Juicy J - \"Yamborghini High\" Get it now on:\niTunes: http://smarturl.it/iYAMH?IQid=yt\nListen on Spotify: http://smarturl.it/sYAMH?IQid=yt\nGoogle Play: http://smarturl.it/gYAMH?IQid=yt\nAmazon: http://smarturl.it/aYAMH?IQid=yt\n\nFollow A$AP Mob:\nhttps://www.facebook.com/asapmobofficial\nhttps://twitter.com/ASAPMOB\nhttp://instagram.com/asapmob \nhttp://www.asapmob.com/\n\n#AsapMob #YamborghiniHigh #Vevo #HipHop #OfficialMusicVideo #JuicyJ","view_count":118689353,"height":null,"abr":160,"uid": uid,"registered":1626672120632});
test_records.push({"id":"RandomTextRandomText","title":"RandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomText","thumbnailURL":"https://i.ytimg.com/vi/randomurl/maxresdefault.jpg","isAudio":true,"duration":312,"url":"https://www.youtube.com/watch?v=randomvideo","uploader":"randomUploader","size":5060157,"path":"audio\\RandomTextRandomText.mp3","upload_date":"2016-05-11","description":"RandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomTextRandomText","view_count":118689353,"height":null,"abr":160,"uid": uid,"registered":1626672120632});
}
const insert_start = Date.now();
let success = await db_api.bulkInsertRecordsIntoTable('test', test_records);
@ -235,6 +254,30 @@ describe('Database', async function() {
assert(success);
});
});
describe('Local DB Filters', async function() {
it('Basic', async function() {
const result = db_api.applyFilterLocalDB([{test: 'test'}, {test: 'test1'}], {test: 'test'}, 'find');
assert(result && result['test'] === 'test');
});
it('Regex', async function() {
const filter = {$regex: `\\w+\\d`, $options: 'i'};
const result = db_api.applyFilterLocalDB([{test: 'test'}, {test: 'test1'}], {test: filter}, 'find');
assert(result && result['test'] === 'test1');
});
it('Not equals', async function() {
const filter = {$ne: 'test'};
const result = db_api.applyFilterLocalDB([{test: 'test'}, {test: 'test1'}], {test: filter}, 'find');
assert(result && result['test'] === 'test1');
});
it('Nested', async function() {
const result = db_api.applyFilterLocalDB([{test1: {test2: 'test3'}}, {test4: 'test5'}], {'test1.test2': 'test3'}, 'find');
assert(result && result['test1']['test2'] === 'test3');
});
})
});
describe('Multi User', async function() {
@ -253,10 +296,12 @@ describe('Multi User', async function() {
assert(user);
});
});
describe('Video player - normal', function() {
const video_to_test = 'ebbcfffb-d6f1-4510-ad25-d1ec82e0477e';
describe('Video player - normal', async function() {
await db_api.removeRecord('files', {uid: sample_video_json['uid']});
await db_api.insertRecordIntoTable('files', sample_video_json);
const video_to_test = sample_video_json['uid'];
it('Get video', async function() {
const video_obj = db_api.getVideo(video_to_test, 'admin');
const video_obj = await db_api.getVideo(video_to_test);
assert(video_obj);
});
@ -341,7 +386,9 @@ describe('Downloader', function() {
});
it('Get file info', async function() {
this.timeout(300000);
const info = await downloader_api.getVideoInfoByURL(url);
assert(!!info);
});
it('Download file', async function() {
@ -360,20 +407,23 @@ describe('Downloader', function() {
});
it('Pause file', async function() {
const returned_download = await downloader_api.createDownload(url, 'video', options);
await downloader_api.pauseDownload(returned_download['uid']);
const updated_download = await db_api.getRecord('download_queue', {uid: returned_download['uid']});
assert(updated_download['paused'] && !updated_download['running']);
});
it('Generate args', async function() {
const args = await downloader_api.generateArgs(url, 'video', options);
console.log(args);
assert(args.length > 0);
});
it('Generate args - subscription', async function() {
subscriptions_api.initialize(db_api, logger);
const sub = await subscriptions_api.getSubscription(sub_id);
const sub_options = subscriptions_api.generateOptionsForSubscriptionDownload(sub, 'admin');
const args = await downloader_api.generateArgs(url, 'video', sub_options, 'admin');
console.log(args);
const args_normal = await downloader_api.generateArgs(url, 'video', options);
const args_sub = await downloader_api.generateArgs(url, 'video', sub_options, 'admin');
console.log(JSON.stringify(args_normal) !== JSON.stringify(args_sub));
});
it('Generate kodi NFO file', async function() {
@ -417,7 +467,7 @@ describe('Tasks', function() {
};
tasks_api.TASKS['dummy_task'] = dummy_task;
await tasks_api.initialize();
await tasks_api.setupTasks();
});
it('Backup db', async function() {
const backups_original = await utils.recFindByExt('appdata', 'bak');
@ -429,12 +479,13 @@ describe('Tasks', function() {
});
it('Check for missing files', async function() {
this.timeout(300000);
await db_api.removeAllRecords('files', {uid: 'test'});
const test_missing_file = {uid: 'test', path: 'test/missing_file.mp4'};
await db_api.insertRecordIntoTable('files', test_missing_file);
await tasks_api.executeTask('missing_files_check');
const task_obj = await db_api.getRecord('tasks', {key: 'missing_files_check'});
assert(task_obj['data'] && task_obj['data']['uids'] && task_obj['data']['uids'].length >= 1, true);
const missing_file_db_record = await db_api.getRecord('files', {uid: 'test'});
assert(!missing_file_db_record, true);
});
it('Check for duplicate files', async function() {
@ -447,10 +498,13 @@ describe('Tasks', function() {
await db_api.insertRecordIntoTable('files', test_duplicate_file1);
await db_api.insertRecordIntoTable('files', test_duplicate_file2);
await db_api.insertRecordIntoTable('files', test_duplicate_file3);
await tasks_api.executeTask('duplicate_files_check');
await tasks_api.executeRun('duplicate_files_check');
const task_obj = await db_api.getRecord('tasks', {key: 'duplicate_files_check'});
const duplicated_record_count = await db_api.getRecords('files', {path: 'test/missing_file.mp4'}, true);
assert(task_obj['data'] && task_obj['data']['uids'] && task_obj['data']['uids'].length >= 1, true);
await tasks_api.executeTask('duplicate_files_check');
const duplicated_record_count = await db_api.getRecords('files', {path: 'test/missing_file.mp4'}, true);
assert(duplicated_record_count == 1, true);
});
@ -475,22 +529,36 @@ describe('Tasks', function() {
});
it('Schedule and cancel task', async function() {
const today_4_hours = new Date();
today_4_hours.setHours(today_4_hours.getHours() + 4);
await tasks_api.updateTaskSchedule('dummy_task', today_4_hours);
assert(!!tasks_api.TASKS['dummy_task']['job'], true);
this.timeout(5000);
const today_one_year = new Date();
today_one_year.setFullYear(today_one_year.getFullYear() + 1);
const schedule_obj = {
type: 'timestamp',
data: { timestamp: today_one_year.getTime() }
}
await tasks_api.updateTaskSchedule('dummy_task', schedule_obj);
const dummy_task = await db_api.getRecord('tasks', {key: 'dummy_task'});
assert(!!tasks_api.TASKS['dummy_task']['job']);
assert(!!dummy_task['schedule']);
await tasks_api.updateTaskSchedule('dummy_task', null);
assert(!!tasks_api.TASKS['dummy_task']['job'], false);
const dummy_task_updated = await db_api.getRecord('tasks', {key: 'dummy_task'});
assert(!tasks_api.TASKS['dummy_task']['job']);
assert(!dummy_task_updated['schedule']);
});
it('Schedule and run task', async function() {
this.timeout(5000);
const today_1_second = new Date();
today_1_second.setSeconds(today_1_second.getSeconds() + 1);
await tasks_api.updateTaskSchedule('dummy_task', today_1_second);
assert(!!tasks_api.TASKS['dummy_task']['job'], true);
const schedule_obj = {
type: 'timestamp',
data: { timestamp: today_1_second.getTime() }
}
await tasks_api.updateTaskSchedule('dummy_task', schedule_obj);
assert(!!tasks_api.TASKS['dummy_task']['job']);
await utils.wait(2000);
const dummy_task_obj = await db_api.getRecord('tasks', {key: 'dummy_task'});
assert(dummy_task_obj['data'], true);
assert(dummy_task_obj['data']);
});
});

@ -456,6 +456,21 @@ function injectArgs(original_args, new_args) {
return updated_args;
}
const searchObjectByString = function(o, s) {
s = s.replace(/\[(\w+)\]/g, '.$1'); // convert indexes to properties
s = s.replace(/^\./, ''); // strip a leading dot
var a = s.split('.');
for (var i = 0, n = a.length; i < n; ++i) {
var k = a[i];
if (k in o) {
o = o[k];
} else {
return;
}
}
return o;
}
// objects
function File(id, title, thumbnailURL, isAudio, duration, url, uploader, size, path, upload_date, description, view_count, height, abr) {
@ -489,7 +504,6 @@ module.exports = {
createContainerZipFile: createContainerZipFile,
durationStringToNumber: durationStringToNumber,
getMatchingCategoryFiles: getMatchingCategoryFiles,
addUIDsToCategory: addUIDsToCategory,
getCurrentDownloader: getCurrentDownloader,
recFindByExt: recFindByExt,
removeFileExtension: removeFileExtension,
@ -501,5 +515,6 @@ module.exports = {
fetchFile: fetchFile,
restartServer: restartServer,
injectArgs: injectArgs,
searchObjectByString: searchObjectByString,
File: File
}

@ -90,7 +90,7 @@ exports.updateYoutubeDL = async (latest_update_version) => {
exports.verifyBinaryExistsLinux = () => {
const details_json = fs.readJSONSync(CONSTS.DETAILS_BIN_PATH);
if (!is_windows && details_json && details_json['path'] && details_json['path'].includes('.exe')) {
if (!is_windows && details_json && (details_json['path'].includes('.exe') || !details_json['path'])) {
details_json['path'] = 'node_modules/youtube-dl/bin/youtube-dl';
details_json['exec'] = 'youtube-dl';
details_json['version'] = OUTDATED_VERSION;

59
package-lock.json generated

@ -3295,65 +3295,12 @@
"safer-buffer": "~2.1.0"
}
},
"asn1.js": {
"version": "5.4.1",
"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
"dev": true,
"requires": {
"bn.js": "^4.0.0",
"inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0",
"safer-buffer": "^2.1.0"
},
"dependencies": {
"bn.js": {
"version": "4.11.9",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
"dev": true
}
}
},
"assert": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
"integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
"dev": true,
"requires": {
"object-assign": "^4.1.1",
"util": "0.10.3"
},
"dependencies": {
"inherits": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
"dev": true
},
"util": {
"version": "0.10.3",
"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
"dev": true,
"requires": {
"inherits": "2.0.1"
}
}
}
},
"assert-plus": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"dev": true
},
"assign-symbols": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
"dev": true
},
"ast-types-flow": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
@ -3367,9 +3314,9 @@
"dev": true
},
"async": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
"dev": true,
"requires": {
"lodash": "^4.17.14"

@ -4,6 +4,7 @@
export type { AddFileToPlaylistRequest } from './models/AddFileToPlaylistRequest';
export type { BaseChangePermissionsRequest } from './models/BaseChangePermissionsRequest';
export type { binary } from './models/binary';
export type { body_19 } from './models/body_19';
export type { body_20 } from './models/body_20';
export type { Category } from './models/Category';
@ -12,6 +13,7 @@ export type { ChangeRolePermissionsRequest } from './models/ChangeRolePermission
export type { ChangeUserPermissionsRequest } from './models/ChangeUserPermissionsRequest';
export type { CheckConcurrentStreamRequest } from './models/CheckConcurrentStreamRequest';
export type { CheckConcurrentStreamResponse } from './models/CheckConcurrentStreamResponse';
export type { ClearDownloadsRequest } from './models/ClearDownloadsRequest';
export type { ConcurrentStream } from './models/ConcurrentStream';
export type { Config } from './models/Config';
export type { ConfigResponse } from './models/ConfigResponse';
@ -23,6 +25,7 @@ export type { CropFileSettings } from './models/CropFileSettings';
export type { DatabaseFile } from './models/DatabaseFile';
export { DBBackup } from './models/DBBackup';
export type { DBInfoResponse } from './models/DBInfoResponse';
export type { DeleteAllFilesResponse } from './models/DeleteAllFilesResponse';
export type { DeleteCategoryRequest } from './models/DeleteCategoryRequest';
export type { DeleteMp3Mp4Request } from './models/DeleteMp3Mp4Request';
export type { DeletePlaylistRequest } from './models/DeletePlaylistRequest';
@ -36,7 +39,6 @@ export type { DownloadResponse } from './models/DownloadResponse';
export type { DownloadTwitchChatByVODIDRequest } from './models/DownloadTwitchChatByVODIDRequest';
export type { DownloadTwitchChatByVODIDResponse } from './models/DownloadTwitchChatByVODIDResponse';
export type { DownloadVideosForSubscriptionRequest } from './models/DownloadVideosForSubscriptionRequest';
export type { File } from './models/File';
export { FileType } from './models/FileType';
export type { GenerateArgsResponse } from './models/GenerateArgsResponse';
export type { GenerateNewApiKeyResponse } from './models/GenerateNewApiKeyResponse';
@ -98,6 +100,7 @@ export type { UpdateCategoriesRequest } from './models/UpdateCategoriesRequest';
export type { UpdateCategoryRequest } from './models/UpdateCategoryRequest';
export type { UpdateConcurrentStreamRequest } from './models/UpdateConcurrentStreamRequest';
export type { UpdateConcurrentStreamResponse } from './models/UpdateConcurrentStreamResponse';
export type { UpdateFileRequest } from './models/UpdateFileRequest';
export type { UpdatePlaylistRequest } from './models/UpdatePlaylistRequest';
export type { UpdaterStatus } from './models/UpdaterStatus';
export type { UpdateServerRequest } from './models/UpdateServerRequest';

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface AddFileToPlaylistRequest {
export type AddFileToPlaylistRequest = {
file_uid: string;
playlist_id: string;
}
};

@ -2,10 +2,10 @@
/* tslint:disable */
/* eslint-disable */
import { UserPermission } from './UserPermission';
import { YesNo } from './YesNo';
import type { UserPermission } from './UserPermission';
import type { YesNo } from './YesNo';
export interface BaseChangePermissionsRequest {
export type BaseChangePermissionsRequest = {
permission: UserPermission;
new_value: YesNo;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { CategoryRule } from './CategoryRule';
import type { CategoryRule } from './CategoryRule';
export interface Category {
export type Category = {
name?: string;
uid?: string;
rules?: Array<CategoryRule>;
@ -12,4 +12,4 @@ export interface Category {
* Overrides file output for downloaded files in category
*/
custom_output?: string;
}
};

@ -2,11 +2,10 @@
/* tslint:disable */
/* eslint-disable */
export interface CategoryRule {
export type CategoryRule = {
preceding_operator?: CategoryRule.preceding_operator;
comparator?: CategoryRule.comparator;
}
};
export namespace CategoryRule {

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { BaseChangePermissionsRequest } from './BaseChangePermissionsRequest';
import type { BaseChangePermissionsRequest } from './BaseChangePermissionsRequest';
export interface ChangeRolePermissionsRequest extends BaseChangePermissionsRequest {
role: string;
}
export type ChangeRolePermissionsRequest = (BaseChangePermissionsRequest & {
role: string;
});

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { BaseChangePermissionsRequest } from './BaseChangePermissionsRequest';
import type { BaseChangePermissionsRequest } from './BaseChangePermissionsRequest';
export interface ChangeUserPermissionsRequest extends BaseChangePermissionsRequest {
user_uid: string;
}
export type ChangeUserPermissionsRequest = (BaseChangePermissionsRequest & {
user_uid: string;
});

@ -2,10 +2,9 @@
/* tslint:disable */
/* eslint-disable */
export interface CheckConcurrentStreamRequest {
export type CheckConcurrentStreamRequest = {
/**
* UID of the concurrent stream
*/
uid: string;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { ConcurrentStream } from './ConcurrentStream';
import type { ConcurrentStream } from './ConcurrentStream';
export interface CheckConcurrentStreamResponse {
export type CheckConcurrentStreamResponse = {
stream: ConcurrentStream;
}
};

@ -0,0 +1,9 @@
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */
export type ClearDownloadsRequest = {
clear_finished?: boolean;
clear_paused?: boolean;
clear_errors?: boolean;
};

@ -2,9 +2,8 @@
/* tslint:disable */
/* eslint-disable */
export interface ConcurrentStream {
export type ConcurrentStream = {
playback_timestamp?: number;
unix_timestamp?: number;
playing?: boolean;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface Config {
export type Config = {
YoutubeDLMaterial: any;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { Config } from './Config';
import type { Config } from './Config';
export interface ConfigResponse {
export type ConfigResponse = {
config_file: Config;
success: boolean;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface CreateCategoryRequest {
export type CreateCategoryRequest = {
name: string;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { Category } from './Category';
import type { Category } from './Category';
export interface CreateCategoryResponse {
export type CreateCategoryResponse = {
new_category?: Category;
success?: boolean;
}
};

@ -2,11 +2,11 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import type { FileType } from './FileType';
export interface CreatePlaylistRequest {
export type CreatePlaylistRequest = {
playlistName: string;
uids: Array<string>;
type: FileType;
thumbnailURL: string;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { Playlist } from './Playlist';
import type { Playlist } from './Playlist';
export interface CreatePlaylistResponse {
export type CreatePlaylistResponse = {
new_playlist: Playlist;
success: boolean;
}
};

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface CropFileSettings {
export type CropFileSettings = {
cropFileStart: number;
cropFileEnd: number;
}
};

@ -2,13 +2,12 @@
/* tslint:disable */
/* eslint-disable */
export interface DBBackup {
export type DBBackup = {
name: string;
timestamp: number;
size: number;
source: DBBackup.source;
}
};
export namespace DBBackup {

@ -2,17 +2,17 @@
/* tslint:disable */
/* eslint-disable */
import { TableInfo } from './TableInfo';
import type { TableInfo } from './TableInfo';
export interface DBInfoResponse {
export type DBInfoResponse = {
using_local_db?: boolean;
stats_by_table?: {
files?: TableInfo,
playlists?: TableInfo,
categories?: TableInfo,
subscriptions?: TableInfo,
users?: TableInfo,
roles?: TableInfo,
download_queue?: TableInfo,
files?: TableInfo;
playlists?: TableInfo;
categories?: TableInfo;
subscriptions?: TableInfo;
users?: TableInfo;
roles?: TableInfo;
download_queue?: TableInfo;
};
}
};

@ -2,11 +2,16 @@
/* tslint:disable */
/* eslint-disable */
import type { Category } from './Category';
export interface DatabaseFile {
export type DatabaseFile = {
id: string;
title: string;
/**
* Backup if thumbnailPath is not defined
*/
thumbnailURL: string;
thumbnailPath?: string;
isAudio: boolean;
/**
* In seconds
@ -14,9 +19,15 @@ export interface DatabaseFile {
duration: number;
url: string;
uploader: string;
/**
* In bytes
*/
size: number;
path: string;
upload_date: string;
uid: string;
sharingEnabled?: boolean;
}
category?: Category;
view_count?: number;
local_view_count?: number;
};

@ -0,0 +1,14 @@
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */
export type DeleteAllFilesResponse = {
/**
* Number of files found matching search parameters
*/
file_count?: number;
/**
* Number of files removed
*/
delete_count?: number;
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface DeleteCategoryRequest {
export type DeleteCategoryRequest = {
category_uid: string;
}
};

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface DeleteMp3Mp4Request {
export type DeleteMp3Mp4Request = {
uid: string;
blacklistMode?: boolean;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import type { FileType } from './FileType';
export interface DeletePlaylistRequest {
export type DeletePlaylistRequest = {
playlist_id: string;
type: FileType;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { SubscriptionRequestData } from './SubscriptionRequestData';
import type { SubscriptionRequestData } from './SubscriptionRequestData';
export interface DeleteSubscriptionFileRequest {
export type DeleteSubscriptionFileRequest = {
file: string;
file_uid?: string;
sub: SubscriptionRequestData;
@ -12,4 +12,4 @@ export interface DeleteSubscriptionFileRequest {
* If true, does not remove id from archive. Only valid if youtube-dl archive is enabled in settings.
*/
deleteForever?: boolean;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface DeleteUserRequest {
export type DeleteUserRequest = {
uid: string;
}
};

@ -1,7 +0,0 @@
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */
export type Dictionary<T> = {
[key: string]: T;
}

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface Download {
export type Download = {
uid: string;
ui_uid?: string;
running: boolean;
@ -23,4 +22,4 @@ export interface Download {
user_uid?: string;
sub_id?: string;
sub_name?: string;
}
};

@ -2,9 +2,8 @@
/* tslint:disable */
/* eslint-disable */
export interface DownloadArchiveRequest {
export type DownloadArchiveRequest = {
sub: {
archive_dir: string,
archive_dir: string;
};
}
};

@ -2,13 +2,13 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import type { FileType } from './FileType';
export interface DownloadFileRequest {
export type DownloadFileRequest = {
uid?: string;
uuid?: string;
sub_id?: string;
playlist_id?: string;
url?: string;
type?: FileType;
}
};

@ -2,10 +2,10 @@
/* tslint:disable */
/* eslint-disable */
import { CropFileSettings } from './CropFileSettings';
import { FileType } from './FileType';
import type { CropFileSettings } from './CropFileSettings';
import type { FileType } from './FileType';
export interface DownloadRequest {
export type DownloadRequest = {
url: string;
/**
* Video format code. Overrides other quality options.
@ -41,4 +41,4 @@ export interface DownloadRequest {
maxBitrate?: string;
type?: FileType;
cropFileSettings?: CropFileSettings;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { Download } from './Download';
import type { Download } from './Download';
export interface DownloadResponse {
export type DownloadResponse = {
download?: Download;
}
};

@ -2,10 +2,10 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import { Subscription } from './Subscription';
import type { FileType } from './FileType';
import type { Subscription } from './Subscription';
export interface DownloadTwitchChatByVODIDRequest {
export type DownloadTwitchChatByVODIDRequest = {
/**
* File ID
*/
@ -20,4 +20,4 @@ export interface DownloadTwitchChatByVODIDRequest {
*/
uuid?: string;
sub?: Subscription;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { TwitchChatMessage } from './TwitchChatMessage';
import type { TwitchChatMessage } from './TwitchChatMessage';
export interface DownloadTwitchChatByVODIDResponse {
export type DownloadTwitchChatByVODIDResponse = {
chat: Array<TwitchChatMessage>;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface DownloadVideosForSubscriptionRequest {
export type DownloadVideosForSubscriptionRequest = {
subID: string;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export enum FileType {
AUDIO = 'audio',
VIDEO = 'video',

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface GenerateArgsResponse {
export type GenerateArgsResponse = {
args?: Array<string>;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface GenerateNewApiKeyResponse {
export type GenerateNewApiKeyResponse = {
new_api_key: string;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { Category } from './Category';
import type { Category } from './Category';
export interface GetAllCategoriesResponse {
export type GetAllCategoriesResponse = {
categories: Array<Category>;
}
};

@ -2,10 +2,9 @@
/* tslint:disable */
/* eslint-disable */
export interface GetAllDownloadsRequest {
export type GetAllDownloadsRequest = {
/**
* Filters downloads with the array
*/
uids?: Array<string> | null;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { Download } from './Download';
import type { Download } from './Download';
export interface GetAllDownloadsResponse {
export type GetAllDownloadsResponse = {
downloads?: Array<Download>;
}
};

@ -2,13 +2,13 @@
/* tslint:disable */
/* eslint-disable */
import { DatabaseFile } from './DatabaseFile';
import { Playlist } from './Playlist';
import type { DatabaseFile } from './DatabaseFile';
import type { Playlist } from './Playlist';
export interface GetAllFilesResponse {
export type GetAllFilesResponse = {
files: Array<DatabaseFile>;
/**
* All video playlists
*/
playlists: Array<Playlist>;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { Subscription } from './Subscription';
import type { Subscription } from './Subscription';
export interface GetAllSubscriptionsResponse {
export type GetAllSubscriptionsResponse = {
subscriptions: Array<Subscription>;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { Task } from './Task';
import type { Task } from './Task';
export interface GetAllTasksResponse {
export type GetAllTasksResponse = {
tasks?: Array<Task>;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { DBBackup } from './DBBackup';
import type { DBBackup } from './DBBackup';
export interface GetDBBackupsResponse {
export type GetDBBackupsResponse = {
tasks?: Array<DBBackup>;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface GetDownloadRequest {
export type GetDownloadRequest = {
download_uid: string;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { Download } from './Download';
import type { Download } from './Download';
export interface GetDownloadResponse {
export type GetDownloadResponse = {
download?: Download;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface GetFileFormatsRequest {
export type GetFileFormatsRequest = {
url?: string;
}
};

@ -2,11 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { File } from './File';
export interface GetFileFormatsResponse {
export type GetFileFormatsResponse = {
success: boolean;
result: {
formats?: Array<any>,
formats?: Array<any>;
};
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import type { FileType } from './FileType';
export interface GetFileRequest {
export type GetFileRequest = {
/**
* Video UID
*/
@ -14,4 +14,4 @@ export interface GetFileRequest {
* User UID
*/
uuid?: string;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { DatabaseFile } from './DatabaseFile';
import type { DatabaseFile } from './DatabaseFile';
export interface GetFileResponse {
export type GetFileResponse = {
success: boolean;
file?: DatabaseFile;
}
};

@ -2,10 +2,10 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import { Subscription } from './Subscription';
import type { FileType } from './FileType';
import type { Subscription } from './Subscription';
export interface GetFullTwitchChatRequest {
export type GetFullTwitchChatRequest = {
/**
* File ID
*/
@ -16,4 +16,4 @@ export interface GetFullTwitchChatRequest {
*/
uuid?: string;
sub?: Subscription;
}
};

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface GetFullTwitchChatResponse {
export type GetFullTwitchChatResponse = {
success: boolean;
error?: string;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface GetLogsRequest {
export type GetLogsRequest = {
lines?: number;
}
};

@ -2,11 +2,10 @@
/* tslint:disable */
/* eslint-disable */
export interface GetLogsResponse {
export type GetLogsResponse = {
/**
* Number of lines to retrieve from the bottom
*/
logs?: string;
success?: boolean;
}
};

@ -2,13 +2,13 @@
/* tslint:disable */
/* eslint-disable */
import { DatabaseFile } from './DatabaseFile';
import { Playlist } from './Playlist';
import type { DatabaseFile } from './DatabaseFile';
import type { Playlist } from './Playlist';
export interface GetMp3sResponse {
export type GetMp3sResponse = {
mp3s: Array<DatabaseFile>;
/**
* All audio playlists
*/
playlists: Array<Playlist>;
}
};

@ -2,13 +2,13 @@
/* tslint:disable */
/* eslint-disable */
import { DatabaseFile } from './DatabaseFile';
import { Playlist } from './Playlist';
import type { DatabaseFile } from './DatabaseFile';
import type { Playlist } from './Playlist';
export interface GetMp4sResponse {
export type GetMp4sResponse = {
mp4s: Array<DatabaseFile>;
/**
* All video playlists
*/
playlists: Array<Playlist>;
}
};

@ -2,11 +2,11 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import type { FileType } from './FileType';
export interface GetPlaylistRequest {
export type GetPlaylistRequest = {
playlist_id: string;
type?: FileType;
uuid?: string;
include_file_metadata?: boolean;
}
};

@ -2,11 +2,11 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import { Playlist } from './Playlist';
import type { FileType } from './FileType';
import type { Playlist } from './Playlist';
export interface GetPlaylistResponse {
export type GetPlaylistResponse = {
playlist: Playlist;
type: FileType;
success: boolean;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface GetPlaylistsRequest {
export type GetPlaylistsRequest = {
include_categories?: boolean;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { Playlist } from './Playlist';
import type { Playlist } from './Playlist';
export interface GetPlaylistsResponse {
export type GetPlaylistsResponse = {
playlists: Array<Playlist>;
}
};

@ -2,15 +2,15 @@
/* tslint:disable */
/* eslint-disable */
import { UserPermission } from './UserPermission';
import type { UserPermission } from './UserPermission';
export interface GetRolesResponse {
export type GetRolesResponse = {
roles: {
admin?: {
permissions?: Array<UserPermission>,
},
permissions?: Array<UserPermission>;
};
user?: {
permissions?: Array<UserPermission>,
},
permissions?: Array<UserPermission>;
};
};
}
};

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface GetSubscriptionRequest {
export type GetSubscriptionRequest = {
/**
* Subscription ID
*/
@ -12,4 +11,4 @@ export interface GetSubscriptionRequest {
* Subscription name
*/
name?: string;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { Subscription } from './Subscription';
import type { Subscription } from './Subscription';
export interface GetSubscriptionResponse {
export type GetSubscriptionResponse = {
subscription: Subscription;
files: Array<any>;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface GetTaskRequest {
export type GetTaskRequest = {
task_key: string;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { Task } from './Task';
import type { Task } from './Task';
export interface GetTaskResponse {
export type GetTaskResponse = {
task?: Task;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { User } from './User';
import type { User } from './User';
export interface GetUsersResponse {
export type GetUsersResponse = {
users: Array<User>;
}
};

@ -2,12 +2,11 @@
/* tslint:disable */
/* eslint-disable */
export interface IncrementViewCountRequest {
export type IncrementViewCountRequest = {
file_uid: string;
sub_id?: string;
/**
* User UID
*/
uuid?: string;
}
};

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface LoginRequest {
export type LoginRequest = {
username: string;
password: string;
}
};

@ -2,12 +2,12 @@
/* tslint:disable */
/* eslint-disable */
import { User } from './User';
import { UserPermission } from './UserPermission';
import type { User } from './User';
import type { UserPermission } from './UserPermission';
export interface LoginResponse {
export type LoginResponse = {
user?: User;
token?: string;
permissions?: Array<UserPermission>;
available_permissions?: Array<UserPermission>;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import type { FileType } from './FileType';
export interface Playlist {
export type Playlist = {
name: string;
uids: Array<string>;
id: string;
@ -13,4 +13,5 @@ export interface Playlist {
registered: number;
duration: number;
user_uid?: string;
}
auto?: boolean;
};

@ -2,9 +2,8 @@
/* tslint:disable */
/* eslint-disable */
export interface RegisterRequest {
export type RegisterRequest = {
userid: string;
username: string;
password: string;
}
};

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { User } from './User';
import type { User } from './User';
export interface RegisterResponse {
export type RegisterResponse = {
user?: User;
}
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface RestoreDBBackupRequest {
export type RestoreDBBackupRequest = {
file_name: string;
}
};

@ -2,16 +2,15 @@
/* tslint:disable */
/* eslint-disable */
export interface Schedule {
export type Schedule = {
type: Schedule.type;
data: {
dayOfWeek?: Array<number>,
hour?: number,
minute?: number,
timestamp?: number,
dayOfWeek?: Array<number>;
hour?: number;
minute?: number;
timestamp?: number;
};
};
}
export namespace Schedule {

@ -2,8 +2,8 @@
/* tslint:disable */
/* eslint-disable */
import { Config } from './Config';
import type { Config } from './Config';
export interface SetConfigRequest {
export type SetConfigRequest = {
new_config_file: Config;
}
};

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface SharingToggle {
export type SharingToggle = {
uid: string;
is_playlist?: boolean;
}
};

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface SubscribeRequest {
export type SubscribeRequest = {
name: string;
url: string;
timerange?: string;
@ -11,4 +10,4 @@ export interface SubscribeRequest {
customArgs?: string;
customFileOutput?: string;
maxQuality?: string;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { Subscription } from './Subscription';
import type { Subscription } from './Subscription';
export interface SubscribeResponse {
export type SubscribeResponse = {
new_sub: Subscription;
error?: string;
}
};

@ -2,9 +2,9 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import type { FileType } from './FileType';
export interface Subscription {
export type Subscription = {
name: string;
url: string;
id: string;
@ -17,4 +17,4 @@ export interface Subscription {
custom_args?: string;
custom_output?: string;
videos: Array<any>;
}
};

@ -2,12 +2,12 @@
/* tslint:disable */
/* eslint-disable */
import { FileType } from './FileType';
import type { FileType } from './FileType';
export interface SubscriptionRequestData {
export type SubscriptionRequestData = {
name: string;
id: string;
type?: FileType;
isPlaylist?: boolean;
archive?: string;
}
};

@ -2,7 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface SuccessObject {
export type SuccessObject = {
success: boolean;
}
error?: string;
};

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export interface TableInfo {
export type TableInfo = {
records_count?: number;
}
};

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface Task {
export type Task = {
key: string;
last_ran: number;
last_confirmed: number;
@ -12,4 +11,4 @@ export interface Task {
data: any;
error: string;
schedule: any;
}
};

@ -2,10 +2,9 @@
/* tslint:disable */
/* eslint-disable */
export interface TestConnectionStringRequest {
export type TestConnectionStringRequest = {
/**
* MongoDB connection string
*/
connection_string: string;
}
};

@ -2,8 +2,7 @@
/* tslint:disable */
/* eslint-disable */
export interface TestConnectionStringResponse {
export type TestConnectionStringResponse = {
success: boolean;
error?: string;
}
};

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save