mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-03 10:15:45 +00:00
Code Issues Releases Wiki Activity

Fix #3444, support single file hybrid torrents. (#3446)

Browse source
This commit is contained in:
Colin B 2022-07-14 11:53:00 -07:00 committed by GitHub
parent 39d442b3ee
commit c3db52e310
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libtransmission/torrent-metainfo.cc
View file

@ -244,6 +244,7 @@ struct MetainfoHandler final : public transmission::benc::BasicHandler<MaxBencDe
{ {
// v2, ignore for today // v2, ignore for today
tr_logAddInfo("'file tree' is ignored"); tr_logAddInfo("'file tree' is ignored");
state_ = State::UsePath;
} }
else if (state_ == State::Files) // bittorrent v1 format else if (state_ == State::Files) // bittorrent v1 format
{ {
@ -254,6 +255,10 @@ struct MetainfoHandler final : public transmission::benc::BasicHandler<MaxBencDe
file_subpath_.clear(); file_subpath_.clear();
} }
else if (state_ == State::PieceLayers)
{
state_ = State::UsePath;
}
return depth() > 0; return depth() > 0;
} }

1
tests/utils/CMakeLists.txt
View file

@ -15,3 +15,4 @@ AddShowTest(transmission-show-bittorrent-v2-hybrid-test bittorrent-v2-hybrid-tes
AddShowTest(transmission-show-inner-sanctum Inner_Sanctum_movie_archive) AddShowTest(transmission-show-inner-sanctum Inner_Sanctum_movie_archive)
AddShowTest(transmission-show-thor Thor_and_the_Amazon_Women.avi) AddShowTest(transmission-show-thor Thor_and_the_Amazon_Women.avi)
AddShowTest(transmission-show-ubuntu ubuntu-20.04.3-desktop-amd64.iso) AddShowTest(transmission-show-ubuntu ubuntu-20.04.3-desktop-amd64.iso)
AddShowTest(transmission-show-ubuntu-hybrid hybrid-single-ubuntu-20.04.3-desktop-amd64.iso)

25
tests/utils/assets/hybrid-single-ubuntu-20.04.3-desktop-amd64.iso.show Normal file
View file

@ -0,0 +1,25 @@
Name: ubuntu-20.04.3-desktop-amd64.iso
File: assets/hybrid-single-ubuntu-20.04.3-desktop-amd64.iso.torrent
GENERAL
Name: ubuntu-20.04.3-desktop-amd64.iso
Hash v1: c4b7a178451f4f1a5154ffe1e780b168d6482e98
Hash v2: e07f234e9d32eda230d13b7d28bfc07ddd324aa2653c51ed966e9dbadaaa8fa9
Created by: Unknown
Created on: Unknown
Piece Count: 11719
Piece Size: 256.0 KiB
Total Size: 3.07 GB
Privacy: Public torrent
TRACKERS
Tier #1
http://example.com/announce
FILES
ubuntu-20.04.3-desktop-amd64.iso (3.07 GB)

BIN
tests/utils/assets/hybrid-single-ubuntu-20.04.3-desktop-amd64.iso.torrent Normal file
View file

Binary file not shown.