-
-
Notifications
You must be signed in to change notification settings - Fork 4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add WebAPI for fetching torrent metadata #21015
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only preliminary comments after brief review.
@Piccirello In any case, this part of the API should be thought out, implying the subsequent addition of torrents. Otherwise, we may end up with something little useful in practice. |
I'm not convinced that's the approach we'll eventually take. I can imagine sending the .torrent file once, returning the metadata to the client, and then allowing the torrent to be added without needing to re-send the file (likely by transmitting the info hash).
To me the session seems like an appropriate place to store this. I don't think the client should be responsible for parsing this data. It would also mean each client (official and unofficial) would need to implement it.
I agree with this. I'll try to sketch out what the next steps would look like and how this API would be used. |
cec83e2
to
f857170
Compare
I think there is no need to embed the Bencode decoder directly into the client API. This is quite easy to do directly in the “graphical” part. More interesting is the need to provide the ability to assign priority to files in the |
1490741
to
f736e62
Compare
FYI, there certainly exists bencode encoder/decoder library in JS however I'm not aware that they are compatible with bittorrent v2. In the past, I had to mod one to suit my need. |
"bencode" format is independent from BitTorrent so generic "bencode" decoder should not depend on it too. Or do you refer to torrent file specific parsers? |
They had deficiencies in their implementations. Not fully conform with the spec. |
It seems to be the same problem as with bencode editors. I couldn't find BitTorrent independent editor for Linux. |
I ended up exploring how retrieved metadata would tie into the |
I suppose you're talking about percent-encoding, right? |
It would look much simpler and more convenient if "metadata" endpoint accepted only single source. |
This was my initial approach but I changed it because of how it will integrate with the Add Torrent dialogs in the WebUI. With proper documentation and status codes, I think this API will be easy for consumers/clients to understand. |
Then why do you suggest using it non-encoded?
Do "Add Torrent dialogs in the WebUI" really require API endpoint to allow accepting multiple sources at once?
If "metadata" accepts only single source then 202 status would definitely mean that the response does not contain metadata, and 200 - on the contrary, that the metadata is available in the response. |
778a776
to
dee0d8c
Compare
@qbittorrent/bug-handlers this PR has been in a ready state for several weeks. Can I get a thorough review and/or an approval? |
It's still on my to-do list. Unfortunately it's hard to review such changes using the mobile web version of GitHub, which I usually use to review the PRs. And there is still not enough time at the computer for it, since there are many other tasks. |
Understood. You've already given several rounds of reviews, so I invite other folks to take a look too. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only commented on coding style.
src/webui/api/torrentscontroller.h
Outdated
#include "base/bittorrent/torrentdescriptor.h" | ||
#include "base/bittorrent/torrentinfo.h" | ||
#include "base/net/downloadmanager.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since you already forward declared them:
#include "base/bittorrent/torrentdescriptor.h" | |
#include "base/bittorrent/torrentinfo.h" | |
#include "base/net/downloadmanager.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So how about this?
dee0d8c
to
6e68324
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Last two comments for coding style.
6e68324
to
64d1af9
Compare
Any more feedback on this or is it ready for approvals? |
I still haven't gotten to the detailed code review, but at the same time I had the opportunity to rethink its design.
I will not insist (for subjective reasons). If someone explicitly approves of the current design, then so be it. Your responsibility. |
64d1af9
to
59eb3bd
Compare
@@ -67,6 +69,8 @@ class APIController : public ApplicationComponent<QObject> | |||
void setResult(const QJsonObject &result); | |||
void setResult(const QByteArray &result, const QString &mimeType = {}, const QString &filename = {}); | |||
|
|||
void setStatus(APIStatus status); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe just add another parameter to setResult
?
void setResult(const QJsonObject &result, APIStatus status = APIStatus::Ok);
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How would this work for cases where we don't want to send any data? For example, setting an explicit 204
.
src/webui/api/torrentscontroller.cpp
Outdated
if (m_torrentMetadata.contains(infoHash)) | ||
{ | ||
const BitTorrent::TorrentDescriptor &torrentDescr = m_torrentMetadata[infoHash]; | ||
return torrentDescr.info().has_value() && torrentDescr.info().value().isValid(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe the following check is enough:
return torrentDescr.info().has_value() && torrentDescr.info().value().isValid(); | |
return torrentDescr.info().has_value(); |
src/webui/api/torrentscontroller.cpp
Outdated
if (iter != m_torrentSource.end() && isMetadataDownloaded(iter.value())) | ||
{ | ||
const BitTorrent::InfoHash &hash = iter.value(); | ||
const BitTorrent::TorrentDescriptor &torrentDescr = m_torrentMetadata[hash]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After using
m_torrentSource.constFind
, this should change to:
I don't understand what the relationship is... Why to copy it?
b58e754
to
2e36fd9
Compare
Signed-off-by: Thomas Piccirello <thomas@piccirello.com>
Signed-off-by: Thomas Piccirello <thomas@piccirello.com>
Signed-off-by: Thomas Piccirello <thomas@piccirello.com>
Signed-off-by: Thomas Piccirello <thomas@piccirello.com>
2e36fd9
to
8127516
Compare
This PR implements two new APIs for fetching a torrent's metadata. The APIs accept a magnet URI, torrent hash, .torrent URL, or uploaded .torrent file, and return the torrent's associated metadata. This PR also modifies the
/torrents/add
API to support downloading a torrent whose metadata has been previously fetched. The ultimate goal is for the WebUI to provide an Add Torrent experience equivalent to that of the GUI, where content can be reprioritized/unchecked before the torrent is added./fetchMetadata
APIHTTP request
To request metadata for a torrent, specify the torrent in the
source
query parameter of a GET request to/api/v2/torrents/fetchMetadata
. Torrents are supported in the following formats:magnet:?xt=urn:btih:a8eeefc8a0dc402b24686ddfd775a409fe4b00e0&dn=example
)a8eeefc8a0dc402b24686ddfd775a409fe4b00e0
)https://example.com/example.torrent
)HTTP response
Given the asynchronous nature of retrieving metadata, there are two successful HTTP status codes used.
When metadata is requested for a torrent that requires asynchronous background work (i.e. connecting to DHT/peers), the client will receive a 202. A 202 indicates that the request was successful, but additional background work must be completed before a meaningful response can be provided. The response will contain the info hashes, if available, or an empty object.
When metadata is available for the torrent, either because the torrent exists in the transfer list or because the metadata has been retrieved from a prior request, the client will receive a 200.
Retrieved metadata will be cached in the current web session. Subsequent requests performed within the same web session will return the metadata immediately, while other web sessions will be required to reretrieve the torrent's metadata from peers. Once a torrent is added using the cached metadata, the metadata is removed from the cache.
/parseMetadata
APIHTTP request
To request metadata for one to several .torrent file(s), you may upload the files to the
/parseMetadata
API. To do so, submit the file(s) as multipart MIME data. You may use any key for the uploaded value.To test file upload using curl, specify the
-F
flag (e.g.curl https://127.0.0.1:8080/api/v2/torrents/parseMetadata --get -F file=@"/root/example.torrent"
).HTTP response
This API always responds to successful requests (i.e. valid torrent file(s)) with a 200. The response will contain the full metadata for the uploaded torrent(s). The response object is keyed off of the uploaded file's name.
/add
APIThe existing
/add
API now supports using the metadata cache that's populated by the new metadata APIs. When specifying a url and/or torrent file to download, the metadata cache is first checked for the torrent. If found, the metadata is used directly from the cache, rather than needing to re-retrieve it. Note that when specifying the name of a .torrent file uploaded via theparseMetadata
API, you must prependfile:
to the file name. For example, if you uploadedexample.torrent
to theparseMetadata
API, you can add this torrent via the/add
API by specifying a url offile:example.torrent
.When metadata is retrieved directly from the cache, you may also specify a new
filePriorities
parameter. This parameter allows for specifying the file priority of each file in the torrent. This parameter may only be specified when adding a single torrent.Alternatives:
I explored having the metadata API leave the request open until the metadata was available. Once the metadata was fetched, it would be returned directly in the response of the original request. One downside of this approach is that metadata retrieval can take an arbitrary long amount of time. This could result in torrents whose metadata could never be retrieved via this API (e.g. due to the retrieval taking longer than the client's/reverse proxy's request timeout). This approach would also require some further modification of qBittorrent's web application layer to suppress the default behavior of returning a blank response.
Future work:
/fetchMetadata
API. This will likely mean splitting the current Add/Upload Torrent dialog into two dialogs. The first dialog will support specifying the URL(s)/.torrent file(s) to submit, while the second dialog will display the torrent's metadata and allow for modification of file priorities.Closes #20966.