premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

strip trailing dots and spaces in filenames

This commit is contained in:
Arvid Norberg 2013-12-05 07:40:57 +00:00
parent 9c761f6777
commit 88e4e0a97b
3 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/torrent_info.cpp
View File

@ -195,47 +195,61 @@ namespace libtorrent
// on windows, the max path is expressed in // on windows, the max path is expressed in
// unicode characters, not bytes // unicode characters, not bytes
#if defined TORRENT_WINDOWS #if defined TORRENT_WINDOWS && TORRENT_USE_WSTRING
std::wstring path_element; std::wstring path_element;
utf8_wchar(element, path_element); utf8_wchar(element, path_element);
if (path_element.size() <= max_path_len) return; if (path_element.size() > max_path_len)
// truncate filenames that are too long. But keep extensions!
std::wstring ext;
wchar_t const* ext1 = wcsrchr(path_element.c_str(), '.');
if (ext1 != NULL) ext = ext1;
if (ext.size() > 15)
{ {
path_element.resize(max_path_len); // truncate filenames that are too long. But keep extensions!
} std::wstring ext;
else wchar_t const* ext1 = wcsrchr(path_element.c_str(), '.');
{ if (ext1 != NULL) ext = ext1;
path_element.resize(max_path_len - ext.size());
path_element += ext; if (ext.size() > 15)
{
path_element.resize(max_path_len);
}
else
{
path_element.resize(max_path_len - ext.size());
path_element += ext;
}
} }
// remove trailing spaces and dots. These aren't allowed in filenames on windows // remove trailing spaces and dots. These aren't allowed in filenames on windows
for (int i = path_element.size() - 1; i >= 0; --i) for (int i = path_element.size() - 1; i >= 0; --i)
{ {
if (path_element[i] != L' ' && path_element[i] != L'.') break; if (path_element[i] != L' ' && path_element[i] != L'.') break;
path_element[i] = L'_'; path_element.resize(i);
} }
if (path_element.empty()) path_element = L"_";
wchar_utf8(path_element, element); wchar_utf8(path_element, element);
#else #else
std::string& path_element = element; std::string& path_element = element;
if (int(path_element.size()) <= max_path_len) return; if (int(path_element.size()) > max_path_len)
{
// truncate filenames that are too long. But keep extensions! // truncate filenames that are too long. But keep extensions!
std::string ext = extension(path_element); std::string ext = extension(path_element);
if (ext.size() > 15) if (ext.size() > 15)
{ {
path_element.resize(max_path_len); path_element.resize(max_path_len);
}
else
{
path_element.resize(max_path_len - ext.size());
path_element += ext;
}
} }
else
// remove trailing spaces and dots. These aren't allowed in filenames on windows
// apply rules consistently across platforms though
for (int i = path_element.size() - 1; i >= 0; --i)
{ {
path_element.resize(max_path_len - ext.size()); if (path_element[i] != ' ' && path_element[i] != '.') break;
path_element += ext; path_element.resize(i);
} }
if (path_element.empty()) path_element = "_";
#endif #endif
} }

5
test/test_torrent_parse.cpp
View File

@ -72,6 +72,7 @@ test_torrent_t test_torrents[] =
{ "url_seed_multi_space_nolist.torrent" }, { "url_seed_multi_space_nolist.torrent" },
{ "root_hash.torrent" }, { "root_hash.torrent" },
{ "empty_path_multi.torrent" }, { "empty_path_multi.torrent" },
{ "invalid_name3.torrent" },
}; };
struct test_failing_torrent_t struct test_failing_torrent_t
@ -423,6 +424,10 @@ int test_main()
TEST_EQUAL(ti->url_seeds()[0], "http://test.com/test%20file/foo%20bar/"); TEST_EQUAL(ti->url_seeds()[0], "http://test.com/test%20file/foo%20bar/");
#endif #endif
} }
else if (std::string(test_torrents[i].file) == "invalid_name3.torrent")
{
TEST_EQUAL(ti->name(), "foobar");
}
file_storage const& fs = ti->files(); file_storage const& fs = ti->files();
for (int i = 0; i < fs.num_files(); ++i) for (int i = 0; i < fs.num_files(); ++i)

1
test/test_torrents/invalid_name3.torrent Normal file
View File

@ -0,0 +1 @@
d10:created by10:libtorrent13:creation datei1359599503e4:infod5:filesld6:lengthi425e4:pathl3:foo7:bar.txteed6:lengthi425e4:pathl3:foo7:var.txteee4:name7:foobar 12:piece lengthi16384e6:pieces20:‚ž¼Œ&¾ÇJW›}ÜA4u,·¼‘‡ee