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

fix windows directory separator issue on windows with UNC paths

This commit is contained in:
Arvid Norberg 2012-03-13 04:50:12 +00:00
parent fc4f4a9753
commit 250f1645b3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/client_test.cpp
View File

@ -712,7 +712,7 @@ void add_torrent(libtorrent::session& ses
if (share_mode) p.flags |= add_torrent_params::flag_share_mode; if (share_mode) p.flags |= add_torrent_params::flag_share_mode;
lazy_entry resume_data; lazy_entry resume_data;
std::string filename = combine_path(save_path, ".resume/" + to_hex(t->info_hash().to_string()) + ".resume"); std::string filename = combine_path(save_path, combine_path(".resume", to_hex(t->info_hash().to_string()) + ".resume"));
std::vector<char> buf; std::vector<char> buf;
if (load_file(filename.c_str(), buf, ec) == 0) if (load_file(filename.c_str(), buf, ec) == 0)
@ -979,7 +979,7 @@ bool handle_alert(libtorrent::session& ses, libtorrent::alert* a
{ {
std::vector<char> out; std::vector<char> out;
bencode(std::back_inserter(out), *p->resume_data); bencode(std::back_inserter(out), *p->resume_data);
save_file(combine_path(h.save_path(), ".resume/" + to_hex(h.info_hash().to_string()) + ".resume"), out); save_file(combine_path(h.save_path(), combine_path(".resume", to_hex(h.info_hash().to_string()) + ".resume")), out);
if (h.is_valid() if (h.is_valid()
&& non_files.find(h) == non_files.end() && non_files.find(h) == non_files.end()
&& std::find_if(files.begin(), files.end() && std::find_if(files.begin(), files.end()
@ -1418,7 +1418,7 @@ int main(int argc, char* argv[])
} }
// create directory for resume files // create directory for resume files
create_directory(combine_path(save_path, ".resume/"), ec); create_directory(combine_path(save_path, ".resume"), ec);
if (ec) if (ec)
fprintf(stderr, "failed to create resume file directory: %s\n", ec.message().c_str()); fprintf(stderr, "failed to create resume file directory: %s\n", ec.message().c_str());
@ -1498,8 +1498,8 @@ int main(int argc, char* argv[])
if (btih.size() == 40 + 9) from_hex(&btih[9], 40, (char*)&info_hash[0]); if (btih.size() == 40 + 9) from_hex(&btih[9], 40, (char*)&info_hash[0]);
else info_hash.assign(base32decode(btih.substr(9))); else info_hash.assign(base32decode(btih.substr(9)));
std::string filename = combine_path(save_path, ".resume/" std::string filename = combine_path(save_path, combine_path(".resume"
+ to_hex(info_hash.to_string()) + ".resume"); , to_hex(info_hash.to_string()) + ".resume"));
if (load_file(filename.c_str(), buf, ec) == 0) if (load_file(filename.c_str(), buf, ec) == 0)
p.resume_data = &buf; p.resume_data = &buf;
@ -2331,7 +2331,7 @@ int main(int argc, char* argv[])
torrent_handle h = rd->handle; torrent_handle h = rd->handle;
std::vector<char> out; std::vector<char> out;
bencode(std::back_inserter(out), *rd->resume_data); bencode(std::back_inserter(out), *rd->resume_data);
save_file(combine_path(h.save_path(), ".resume/" + to_hex(h.info_hash().to_string()) + ".resume"), out); save_file(combine_path(h.save_path(), combine_path(".resume", to_hex(h.info_hash().to_string()) + ".resume")), out);
} }
} }

4
src/file.cpp
View File

@ -486,8 +486,8 @@ namespace libtorrent
std::string combine_path(std::string const& lhs, std::string const& rhs) std::string combine_path(std::string const& lhs, std::string const& rhs)
{ {
TORRENT_ASSERT(!is_complete(rhs)); TORRENT_ASSERT(!is_complete(rhs));
if (lhs.empty()) return rhs; if (lhs.empty() || lhs == ".") return rhs;
if (rhs.empty()) return lhs; if (rhs.empty() || rhs == ".") return lhs;
#ifdef TORRENT_WINDOWS #ifdef TORRENT_WINDOWS
#define TORRENT_SEPARATOR "\\" #define TORRENT_SEPARATOR "\\"