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

Added download error type information to notifications and downloads (currently unused)

Browse Source
This commit is contained in:
Tzahi12345
2023-01-29 15:55:05 -05:00
parent 6010d991fb
commit 0f7c495595
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Public API v1.yaml
View File

@@ -2560,6 +2560,10 @@ components:
type: string type: string
description: Error text, set if download fails. description: Error text, set if download fails.
nullable: true nullable: true
error_type:
type: string
description: Error type, may or may not be set in case of an error
nullable: true
user_uid: user_uid:
type: string type: string
sub_id: sub_id:

16
backend/downloader.js
View File

@@ -108,10 +108,10 @@ exports.clearDownload = async (download_uid) => {
return await db_api.removeRecord('download_queue', {uid: download_uid}); return await db_api.removeRecord('download_queue', {uid: download_uid});
} }
async function handleDownloadError(download, error_message) { async function handleDownloadError(download, error_message, error_type = null) {
if (!download || !download['uid']) return; if (!download || !download['uid']) return;
notifications_api.sendDownloadErrorNotification(download, download['user_uid']); notifications_api.sendDownloadErrorNotification(download, download['user_uid'], error_type);
await db_api.updateRecord('download_queue', {uid: download['uid']}, {error: error_message, finished: true, running: false}); await db_api.updateRecord('download_queue', {uid: download['uid']}, {error: error_message, finished: true, running: false, error_type: error_type});
} }
async function setupDownloads() { async function setupDownloads() {
@@ -160,7 +160,7 @@ async function checkDownloads() {
if (waiting_download['sub_id']) { if (waiting_download['sub_id']) {
const sub_missing = !(await db_api.getRecord('subscriptions', {id: waiting_download['sub_id']})); const sub_missing = !(await db_api.getRecord('subscriptions', {id: waiting_download['sub_id']}));
if (sub_missing) { if (sub_missing) {
handleDownloadError(waiting_download, `Download failed as subscription with id '${waiting_download['sub_id']}' is missing!`); handleDownloadError(waiting_download, `Download failed as subscription with id '${waiting_download['sub_id']}' is missing!`, 'sub_id_missing');
continue; continue;
} }
} }
@@ -211,7 +211,7 @@ async function collectInfo(download_uid) {
logger.warn(error); logger.warn(error);
if (download_uid) { if (download_uid) {
const download = await db_api.getRecord('download_queue', {uid: download_uid}); const download = await db_api.getRecord('download_queue', {uid: download_uid});
await handleDownloadError(download, error); await handleDownloadError(download, error, 'exists_in_archive');
return; return;
} }
} }
@@ -303,7 +303,7 @@ async function downloadQueuedFile(download_uid) {
if (output.length === 0 || output[0].length === 0) { if (output.length === 0 || output[0].length === 0) {
// ERROR! // ERROR!
const error_message = `No output received for video download, check if it exists in your archive.`; const error_message = `No output received for video download, check if it exists in your archive.`;
await handleDownloadError(download, error_message); await handleDownloadError(download, error_message, 'no_output');
logger.warn(error_message); logger.warn(error_message);
resolve(false); resolve(false);
return; return;
@@ -387,7 +387,7 @@ async function downloadQueuedFile(download_uid) {
} else { } else {
const error_message = 'Downloaded file failed to result in metadata object.'; const error_message = 'Downloaded file failed to result in metadata object.';
logger.error(error_message); logger.error(error_message);
await handleDownloadError(download, error_message); await handleDownloadError(download, error_message, 'no_metadata');
} }
const file_uids = file_objs.map(file_obj => file_obj.uid); const file_uids = file_objs.map(file_obj => file_obj.uid);
@@ -563,7 +563,7 @@ exports.getVideoInfoByURL = async (url, args = [], download_uid = null) => {
logger.error(error); logger.error(error);
if (download_uid) { if (download_uid) {
const download = await db_api.getRecord('download_queue', {uid: download_uid}); const download = await db_api.getRecord('download_queue', {uid: download_uid});
await handleDownloadError(download, error); await handleDownloadError(download, error, 'parse_failed');
} }
resolve(null); resolve(null);
} }

4
backend/notifications.js
View File

@@ -64,9 +64,9 @@ exports.sendDownloadNotification = async (file, user_uid) => {
return await exports.sendNotification(notification); return await exports.sendNotification(notification);
} }
exports.sendDownloadErrorNotification = async (download, user_uid) => { exports.sendDownloadErrorNotification = async (download, user_uid, error_type = null) => {
if (!notificationEnabled('download_error')) return; if (!notificationEnabled('download_error')) return;
const data = {download_uid: download.uid, download_url: download.url}; const data = {download_uid: download.uid, download_url: download.url, download_error_type: error_type};
const notification = exports.createNotification('download_error', ['view_download_error', 'retry_download'], data, user_uid); const notification = exports.createNotification('download_error', ['view_download_error', 'retry_download'], data, user_uid);
return await exports.sendNotification(notification); return await exports.sendNotification(notification);
} }