Commit 08064a0
authored
Fix/addtorrent duplicates (#3338)
* Report duplicate torrents in the add dialog
rtorrent answers a load for an info hash it already has with 0 and no
fault, and drops the new copy. addtorrent.php only checked that the
load did not fail, so a torrent or magnet that was already loaded was
reported as added.
rTorrent::loadedHashes() reads the loaded hashes with download_list,
once, before anything is loaded. A returned hash that was already
loaded, or that an earlier item of the same request added, is reported
as Duplicate, and the uploaded copy of a duplicate is not kept. The
result pages show it with a new addTorrentDuplicate string, in English
in every language file for now, in the alert style; filedrop and the
mobile plugin style it the same.
* bulk_magnet: report duplicates, not successes
sendMagnet() and sendTorrent() return the hash whether rtorrent added
the torrent or dropped it as one it already has, so bulk loading
reported every duplicate as added.
Read the loaded hashes with rTorrent::loadedHashes() before the batch,
and count a returned hash that is already loaded, or that an earlier
line of the same batch added, as a duplicate. The dialog shows that
count with a new bulkAddDuplicate string, in English in every language
file for now.1 parent 19a200f commit 08064a0
62 files changed
Lines changed: 457 additions & 13 deletions
File tree
- lang
- php
- plugins
- bulk_magnet
- lang
- filedrop
- mobile
- tests
- php
- plugins
- bulk_magnet
- filedrop
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
| 290 | + | |
290 | 291 | | |
291 | 292 | | |
292 | 293 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
| 290 | + | |
290 | 291 | | |
291 | 292 | | |
292 | 293 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
| 290 | + | |
290 | 291 | | |
291 | 292 | | |
292 | 293 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
| 290 | + | |
290 | 291 | | |
291 | 292 | | |
292 | 293 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
285 | 285 | | |
286 | 286 | | |
287 | 287 | | |
| 288 | + | |
288 | 289 | | |
289 | 290 | | |
290 | 291 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
| 290 | + | |
290 | 291 | | |
291 | 292 | | |
292 | 293 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
| 290 | + | |
290 | 291 | | |
291 | 292 | | |
292 | 293 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
| 290 | + | |
290 | 291 | | |
291 | 292 | | |
292 | 293 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
| 290 | + | |
290 | 291 | | |
291 | 292 | | |
292 | 293 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
287 | 287 | | |
288 | 288 | | |
289 | 289 | | |
| 290 | + | |
290 | 291 | | |
291 | 292 | | |
292 | 293 | | |
| |||
0 commit comments