From 047b50711919b6aa2d4a7fe8e25a963e60d4ee3a Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 30 Dec 2021 18:20:37 -0700 Subject: [PATCH] Downloader can be specified by the user. --- app/src/api.js | 9 +++- app/src/components/Admin.js | 3 +- app/src/components/Upload.js | 50 ++++++++++++++----- modules/archive/__init__.py | 1 + modules/videos/channel/lib.py | 1 + modules/videos/downloader.py | 12 +++++ modules/videos/models.py | 3 -- modules/videos/test/test_downloader.py | 55 +++++++++++++++++++++ wrolpi/downloader.py | 68 +++++++++++++------------- wrolpi/root_api.py | 13 ++++- wrolpi/schema.py | 3 +- wrolpi/test/test_downloader.py | 6 +++ 12 files changed, 171 insertions(+), 53 deletions(-) diff --git a/app/src/api.js b/app/src/api.js index f261a88d..a4f07dc3 100644 --- a/app/src/api.js +++ b/app/src/api.js @@ -339,8 +339,8 @@ export async function fetchDomains() { } } -export async function postDownload(urls) { - let body = {'urls': urls}; +export async function postDownload(urls, downloader) { + let body = {urls: urls, downloader: downloader}; let response = await apiPost(`${API_URI}/download`, body); return response; } @@ -350,3 +350,8 @@ export async function killDownload(download_id) { let response = await apiPost(`${API_URI}/download/${download_id}/kill`); return response; } + +export async function getDownloaders() { + let response = await apiGet(`${API_URI}/downloaders`); + return await response.json(); +} diff --git a/app/src/components/Admin.js b/app/src/components/Admin.js index b7035cc7..d8a6f782 100644 --- a/app/src/components/Admin.js +++ b/app/src/components/Admin.js @@ -219,7 +219,8 @@ class StoppableRow extends React.Component { handleStart = async (e) => { e.preventDefault(); - await postDownload(`${this.props.url}`); + let downloader = this.props.downloader || null; + await postDownload(`${this.props.url}`, downloader); this.closeStart(); await this.props.fetchDownloads(); }; diff --git a/app/src/components/Upload.js b/app/src/components/Upload.js index 1338ba61..451bd189 100644 --- a/app/src/components/Upload.js +++ b/app/src/components/Upload.js @@ -1,6 +1,6 @@ import React from "react"; -import {Button, Form, Header, Segment, TextArea} from "semantic-ui-react"; -import {postDownload} from "../api"; +import {Button, Dropdown, Form, Header, Segment, TextArea} from "semantic-ui-react"; +import {getDownloaders, postDownload} from "../api"; const validUrl = /^(http|https):\/\/[^ "]+$/; @@ -11,14 +11,29 @@ class Downloader extends React.Component { urls: '', valid: true, pending: false, + downloaders: [], + downloader: null, }; } + async componentDidMount() { + await this.fetchDownloaders(); + } + + fetchDownloaders = async () => { + let {downloaders} = await getDownloaders(); + downloaders = downloaders.map((i) => { + return {key: i.name, text: i.pretty_name || i.name, value: i.name} + }) + this.setState({downloaders}); + } + submitDownload = async () => { - if (this.state.urls) { + let {urls, downloader} = this.state; + if (urls) { this.setState({pending: true}); try { - let response = await postDownload(this.state.urls); + let response = await postDownload(urls, downloader); if (response.status === 204) { this.setState({urls: '', pending: false}); } @@ -52,14 +67,25 @@ class Downloader extends React.Component { return (
-
Enter the URLs you wish to bring offline.
-