mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: C++ify clients.cc (#1907) 

* refactor: use C++17 for clients.cc
This commit is contained in:
Charles Kerr 2021-10-08 21:46:10 -05:00 committed by GitHub
parent e9a264f29d
commit 1ba64684f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 606 additions and 2476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code_style.sh
View File

@ -30,6 +30,7 @@ cfile_excludes=(
'macosx/VDKQueue/*'
'third-party/*'
'web/*'
'.git/*'
)
get_find_path_args() {

1423
libtransmission/clients.cc
View File

File diff suppressed because it is too large Load Diff

1569
qt/DetailsDialog.cc.orig
View File

File diff suppressed because it is too large Load Diff

89
tests/libtransmission/clients-test.cc
View File

@ -21,58 +21,47 @@ TEST(Client, clientForId)
char const* expected_client;
};
auto const tests = std::array<LocalTest, 32>{
LocalTest{ "-BT791B-", "BitTorrent 7.9.1 (Beta)" },
{ "-BT791\0-", "BitTorrent 7.9.1" },
{ "-FC1013-", "FileCroc 1.0.1.3" },
{ "-FC1013-", "FileCroc 1.0.1.3" },
{ "-MR1100-", "Miro 1.1.0.0" },
{ "-TR0006-", "Transmission 0.6" },
{ "-TR0072-", "Transmission 0.72" },
{ "-TR111Z-", "Transmission 1.11+" },
{ "-UT341\0-", "\xc2\xb5Torrent 3.4.1" },
{ "O1008132", "Osprey 1.0.0" },
{ "TIX0193-", "Tixati 1.93" },
/* Xfplay 9.9.92 to 9.9.94 uses "-XF9992-" */
{ "-XF9992-", "Xfplay 9.9.92" },
/* Older Xfplay versions have three digit version number */
{ "-XF9990-", "Xfplay 9.9.9" },
/* PicoTorrent */
{ "-PI0091-", "PicoTorrent 0.09.1" },
{ "-PI0120-", "PicoTorrent 0.12.0" },
/* Free Download Manager */
{ "-FD51R\xFF-", "Free Download Manager 5.1.27" },
{ "-FD51W\xFF-", "Free Download Manager 5.1.32" },
{ "-FD51@\xFF-", "Free Download Manager 5.1.x" }, /* Negative test case */
/* Folx */
{ "-FL51FF-", "Folx 5.x" }, /* Folx v5.2.1.13690 */
/* Baidu Netdisk */
{ "-BN0001-", "Baidu Netdisk" }, /* Baidu Netdisk Client v5.5.4 */
/* gobbledygook */
{ "-IIO\x10\x2D\x04-", "-IIO%10-%04-" },
{ "-I\05O\x08\x03\x01-", "-I%05O%08%03%01-" },
{ "\x65\x78\x62\x63\x00\x38\x7A\x44\x63\x10\x2D\x6E\x9A\xD6\x72\x3B\x33\x9F\x35\xA9", "BitComet 0.56" },
{ "\x65\x78\x62\x63\x00\x38\x4C\x4F\x52\x44\x32\x00\x04\x8E\xCE\xD5\x7B\xD7\x10\x28", "BitLord 0.56" },
{ "-UW110Q-", "\xc2\xb5Torrent Web 1.1.0" },
{ "-FW6830-", "FrostWire 6.8.3" },
{ "-BI2300-", "BiglyBT 2.3.0.0" },
{ "A2-1-18-8-", "aria2 1.18.8" },
{ "A2-1-2-0-", "aria2 1.2.0" },
{ "-BL246326", "BitLord 2.4.6-326" }, // Style used after BitLord 0.59
{ "-WW0007-", "WebTorrent 0.0.0.7" },
{ "-WS1000-", "HTTP Seed" }
auto constexpr Tests = std::array<LocalTest, 37>{
{ { "-AZ8421-", "Azureus / Vuze 8.4.2.1" },
{ "-BC0241-", "BitComet 2.41" }, // two major, two minor
{ "-BI2300-", "BiglyBT 2.3.0.0" },
{ "-BL246326", "BitLord 2.4.6-326" }, // Style used after BitLord 0.59
{ "-BN0001-", "Baidu Netdisk" }, // Baidu Netdisk Client v5.5.4
{ "-BT791B-", "BitTorrent 7.9.1 (Beta)" },
{ "-BT791\0-", "BitTorrent 7.9.1" },
{ "-FC1013-", "FileCroc 1.0.1.3" },
{ "-FC1013-", "FileCroc 1.0.1.3" },
{ "-FD51@\xFF-", "Free Download Manager 5.1.x" }, // Negative test case
{ "-FD51R\xFF-", "Free Download Manager 5.1.27" },
{ "-FD51W\xFF-", "Free Download Manager 5.1.32" },
{ "-FL51FF-", "Folx 5.x" }, // Folx v5.2.1.13690
{ "-FW6830-", "FrostWire 6.8.3" },
{ "-IIO\x10\x2D\x04-", "-IIO%10-%04-" },
{ "-I\05O\x08\x03\x01-", "-I%05O%08%03%01-" },
{ "-KT33D1-", "KTorrent 3.3 Dev 1" },
{ "-MR1100-", "Miro 1.1.0.0" },
{ "-PI0091-", "PicoTorrent 0.09.1" },
{ "-PI0120-", "PicoTorrent 0.12.0" },
{ "-TR0006-", "Transmission 0.6" },
{ "-TR0072-", "Transmission 0.72" },
{ "-TR111Z-", "Transmission 1.11+" },
{ "-UT341\0-", "\xc2\xb5Torrent 3.4.1" },
{ "-UW110Q-", "\xc2\xb5Torrent Web 1.1.0" },
{ "-UW1110Q", "\xc2\xb5Torrent Web 1.1.10" }, // wider version
{ "-WS1000-", "HTTP Seed" },
{ "-WW0007-", "WebTorrent 0.0.0.7" },
{ "-XF9990-", "Xfplay 9.9.9" }, // Older Xfplay versions have three digit version number
{ "-XF9992-", "Xfplay 9.9.92" }, // Xfplay 9.9.92 to 9.9.94 uses "-XF9992-"
{ "A2-1-18-8-", "aria2 1.18.8" },
{ "A2-1-2-0-", "aria2 1.2.0" },
{ "S58B-----", "Shad0w 5.8.11" },
{ "Q1-23-4-", "Queen Bee 1.23.4" },
{ "TIX0193-", "Tixati 1.93" },
{ "\x65\x78\x62\x63\x00\x38\x4C\x4F\x52\x44\x32\x00\x04\x8E\xCE\xD5\x7B\xD7\x10\x28", "BitLord 0.56" },
{ "\x65\x78\x62\x63\x00\x38\x7A\x44\x63\x10\x2D\x6E\x9A\xD6\x72\x3B\x33\x9F\x35\xA9", "BitComet 0.56" } }
};
for (auto const& test : tests)
for (auto const& test : Tests)
{
auto buf = std::array<char, 128>{};
tr_clientForId(buf.data(), buf.size(), test.peer_id);