leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass back peers from Web UI when adding a magnet in attempt to speed it up

Browse source
This commit is contained in:
Igor Katson 2023-12-01 09:30:23 +00:00
parent 21b1bd9e7d
commit f337ab1837
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
8 changed files with 77 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/librqbit/webui/src/api.ts
View file

@ -22,6 +22,7 @@ export interface TorrentDetails {
export interface AddTorrentResponse {
id: number | null;
details: TorrentDetails;
seen_peers?: Array<string>;
}
export interface ListTorrentsResponse {
@ -147,7 +148,10 @@ export const API = {
},
uploadTorrent: (data: string | File, opts?: {
listOnly?: boolean, selectedFiles?: Array<number>, unpopularTorrent?: boolean,
listOnly?: boolean,
selectedFiles?: Array<number>,
unpopularTorrent?: boolean,
initialPeers?: Array<string>,
}): Promise<AddTorrentResponse> => {
opts = opts || {};
let url = '/torrents?&overwrite=true';
@ -160,6 +164,9 @@ export const API = {
if (opts.unpopularTorrent) {
url += '&peer_connect_timeout=20&peer_read_write_timeout=60';
}
if (opts.initialPeers) {
url += `&initial_peers=${opts.initialPeers.join(',')}`;
}
return makeRequest('POST', url, data)
},

45
crates/librqbit/webui/src/index.tsx
View file

@ -378,11 +378,11 @@ const ErrorComponent = (props: { error: Error, remove?: () => void }) => {
const UploadButton = ({ buttonText, onClick, data, resetData, variant }) => {
const [loading, setLoading] = useState(false);
const [fileList, setFileList] = useState([]);
const [fileListError, setFileListError] = useState(null);
const [listTorrentResponse, setListTorrentResponse] = useState<AddTorrentResponse>(null);
const [listTorrentError, setListTorrentError] = useState<Error>(null);
const ctx = useContext(AppContext);
const showModal = data !== null || fileListError !== null;
const showModal = data !== null || listTorrentError !== null;
// Get the torrent file list if there's data.
useEffect(() => {
@ -394,9 +394,9 @@ const UploadButton = ({ buttonText, onClick, data, resetData, variant }) => {
setLoading(true);
try {
const response = await API.uploadTorrent(data, { listOnly: true });
setFileList(response.details.files);
setListTorrentResponse(response);
} catch (e) {
setFileListError({ text: 'Error uploading torrent', details: e });
setListTorrentError({ text: 'Error listing torrent files', details: e });
} finally {
setLoading(false);
}
@ -406,8 +406,8 @@ const UploadButton = ({ buttonText, onClick, data, resetData, variant }) => {
const clear = () => {
resetData();
setFileListError(null);
setFileList([]);
setListTorrentError(null);
setListTorrentResponse(null);
setLoading(false);
}
@ -420,10 +420,10 @@ const UploadButton = ({ buttonText, onClick, data, resetData, variant }) => {
<FileSelectionModal
show={showModal}
onHide={clear}
fileListError={fileListError}
fileList={fileList}
listTorrentError={listTorrentError}
listTorrentResponse={listTorrentResponse}
data={data}
fileListLoading={loading}
listTorrentLoading={loading}
/>
</>
);
@ -471,12 +471,12 @@ const FileInput = () => {
const FileSelectionModal = (props: {
show: boolean,
onHide: () => void,
fileList: Array<TorrentFile>,
fileListError: Error,
fileListLoading: boolean,
listTorrentResponse: AddTorrentResponse,
listTorrentError: Error,
listTorrentLoading: boolean,
data: string | File
}) => {
let { show, onHide, fileList, fileListError, fileListLoading, data } = props;
let { show, onHide, listTorrentResponse, listTorrentError, listTorrentLoading, data } = props;
const [selectedFiles, setSelectedFiles] = useState([]);
const [uploading, setUploading] = useState(false);
@ -485,8 +485,8 @@ const FileSelectionModal = (props: {
const ctx = useContext(AppContext);
useEffect(() => {
setSelectedFiles(fileList.map((_, id) => id));
}, [fileList]);
setSelectedFiles(listTorrentResponse ? listTorrentResponse.details.files.map((_, id) => id) : []);
}, [listTorrentResponse]);
const clear = () => {
onHide();
@ -505,7 +505,8 @@ const FileSelectionModal = (props: {
const handleUpload = async () => {
setUploading(true);
API.uploadTorrent(data, { selectedFiles, unpopularTorrent }).then(() => {
let initialPeers = listTorrentResponse.seen_peers ? listTorrentResponse.seen_peers.slice(0, 32) : null;
API.uploadTorrent(data, { selectedFiles, unpopularTorrent, initialPeers }).then(() => {
onHide();
ctx.refreshTorrents();
},
@ -518,16 +519,16 @@ const FileSelectionModal = (props: {
return (
<Modal show={show} onHide={clear} size='lg'>
<Modal.Header closeButton>
{!!fileListError || <Modal.Title>Add torrent</Modal.Title>}
<Modal.Title>Add torrent</Modal.Title>
</Modal.Header>
<Modal.Body>
<Form>
<fieldset className='mb-5'>
<legend>Pick the files to download</legend>
{fileListLoading ? <Spinner />
: fileListError ? <ErrorComponent error={fileListError}></ErrorComponent> :
{listTorrentLoading ? <Spinner />
: listTorrentError ? <ErrorComponent error={listTorrentError}></ErrorComponent> :
<>
{fileList.map((file, index) => (
{listTorrentResponse?.details.files.map((file, index) => (
<Form.Group key={index} controlId={`check-${index}`}>
<Form.Check
type="checkbox"
@ -559,7 +560,7 @@ const FileSelectionModal = (props: {
</Modal.Body>
<Modal.Footer>
{uploading && <Spinner />}
<Button variant="primary" onClick={handleUpload} disabled={fileListLoading || uploading || selectedFiles.length == 0}>
<Button variant="primary" onClick={handleUpload} disabled={listTorrentLoading || uploading || selectedFiles.length == 0}>
OK
</Button>
<Button variant="secondary" onClick={clear}>