jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged changes from RC_1_0

Browse Source
This commit is contained in:
Arvid Norberg
2014-11-17 03:41:01 +00:00
parent 0b711f1280
commit edfa38cd30
13 changed files with 316 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
examples/client_test.cpp
View File

@@ -242,6 +242,41 @@ int load_file(std::string const& filename, std::vector<char>& v
return 0;
}
bool is_absolute_path(std::string const& f)
{
if (f.empty()) return false;
#if defined(TORRENT_WINDOWS) || defined(TORRENT_OS2)
int i = 0;
// match the xx:\ or xx:/ form
while (f[i] && strchr("abcdefghijklmnopqrstuvxyz", f[i])) ++i;
if (i < int(f.size()-1) && f[i] == ':' && (f[i+1] == '\\' || f[i+1] == '/'))
return true;
// match the \\ form
if (int(f.size()) >= 2 && f[0] == '\\' && f[1] == '\\')
return true;
return false;
#else
if (f[0] == '/') return true;
return false;
#endif
}
std::string path_append(std::string const& lhs, std::string const& rhs)
{
if (lhs.empty() || lhs == ".") return rhs;
if (rhs.empty() || rhs == ".") return lhs;
#if defined(TORRENT_WINDOWS) || defined(TORRENT_OS2)
#define TORRENT_SEPARATOR "\\"
bool need_sep = lhs[lhs.size()-1] != '\\' && lhs[lhs.size()-1] != '/';
#else
#define TORRENT_SEPARATOR "/"
bool need_sep = lhs[lhs.size()-1] != '/';
#endif
return lhs + (need_sep?TORRENT_SEPARATOR:"") + rhs;
}
bool is_hex(char const *in, int len)
{
for (char const* end = in + len; in < end; ++in)
@@ -572,8 +607,7 @@ void add_torrent(libtorrent::session& ses
if (share_mode) p.flags |= add_torrent_params::flag_share_mode;
lazy_entry resume_data;
// TODO: implement combine_path in here, since it's internal to libtorrent
std::string filename = combine_path(save_path, combine_path(".resume"
std::string filename = path_append(save_path, path_append(".resume"
, libtorrent::filename(torrent) + ".resume"));
error_code ec;
@@ -595,6 +629,67 @@ void add_torrent(libtorrent::session& ses
files.insert(std::pair<const std::string, torrent_handle>(torrent, torrent_handle()));
}
std::vector<std::string> list_dir(std::string path
, bool (*filter_fun)(std::string const&))
{
std::vector<std::string> ret;
#ifdef TORRENT_WINDOWS
if (!f.empty() && f[f.size()-1] != '\\') f += "\\*";
else f += "*";
std::wstring wpath;
libtorrent::utf8_wchar(path, wpath);
WIN32_FIND_DATAW fd;
HANDLE handle = FindFirstFileW(wpath.c_str(), &fd);
if (handle == INVALID_HANDLE_VALUE)
return ret;
do
{
std::string p;
libtorrent::wchar_utf8(fd.cFileName, p);
if (filter_fun(p))
ret.push_back(p);
} while (FindNextFileW(handle, &fd));
FindClose(handle);
#else
if (!path.empty() && path[path.size()-1] == '/')
path.resize(path.size()-1);
DIR* handle = opendir(path.c_str());
if (handle == 0) return ret;
struct dirent de;
dirent* dummy;
while (readdir_r(handle, &de, &dummy) == 0)
{
if (dummy == 0) break;
std::string p = de.d_name;
if (filter_fun(p))
ret.push_back(p);
}
#endif
return ret;
}
bool filter_fun(std::string const& p)
{
for (int i = p.size() - 1; i >= 0; --i)
{
if (p[i] == '/') break;
#ifdef TORRENT_WINDOWS
if (p[i] == '\\') break;
#endif
if (p[i] != '.') continue;
return p.compare(i, 8, ".torrent") == 0;
}
return false;
}
void scan_dir(std::string const& dir_path
, libtorrent::session& ses
, handles_t& files
@@ -609,20 +704,12 @@ void scan_dir(std::string const& dir_path
using namespace libtorrent;
error_code ec;
std::vector<std::pair<boost::uint64_t, std::string> > ents;
// TODO: don't use internal directory type
for (directory i(dir_path, ec); !i.done(); i.next(ec))
{
if (extension(i.file()) != ".torrent") continue;
ents.push_back(std::make_pair(i.inode(), i.file()));
}
std::vector<std::string> ents = list_dir(dir_path, filter_fun);
std::sort(ents.begin(), ents.end());
for (std::vector<std::pair<boost::uint64_t, std::string> >::iterator i = ents.begin()
for (std::vector<std::string>::iterator i = ents.begin()
, end(ents.end()); i != end; ++i)
{
std::string file = combine_path(dir_path, i->second);
std::string file = path_append(dir_path, *i);
handles_t::iterator k = files.find(file);
if (k != files.end())
@@ -737,7 +824,7 @@ bool handle_alert(libtorrent::session& ses, libtorrent::alert* a
torrent_handle h = p->handle;
error_code ec;
file_status st;
std::string base_name = combine_path("certificates", to_hex(h.info_hash().to_string()));
std::string base_name = path_append("certificates", to_hex(h.info_hash().to_string()));
std::string cert = base_name + ".pem";
std::string priv = base_name + "_key.pem";
stat_file(cert, &st, ec);
@@ -781,7 +868,7 @@ bool handle_alert(libtorrent::session& ses, libtorrent::alert* a
bencode(std::back_inserter(buffer), te);
sha1_hash hash = ti->info_hash();
std::string filename = ti->name() + "." + to_hex(hash.to_string()) + ".torrent";
filename = combine_path(monitor_dir, filename);
filename = path_append(monitor_dir, filename);
save_file(filename, buffer);
files.insert(std::pair<std::string, libtorrent::torrent_handle>(filename, h));
@@ -871,7 +958,7 @@ bool handle_alert(libtorrent::session& ses, libtorrent::alert* a
std::vector<char> out;
bencode(std::back_inserter(out), *p->resume_data);
torrent_status st = h.status(torrent_handle::query_save_path);
save_file(combine_path(st.save_path, combine_path(".resume", libtorrent::filename(
save_file(path_append(st.save_path, path_append(".resume", libtorrent::filename(
hash_to_filename[st.info_hash]) + ".resume")), out);
if (h.is_valid()
&& non_files.find(h) == non_files.end()
@@ -1321,10 +1408,10 @@ int main(int argc, char* argv[])
}
// create directory for resume files
// TODO: don't use internal create_directory function
create_directory(combine_path(save_path, ".resume"), ec);
if (ec)
fprintf(stderr, "failed to create resume file directory: %s\n", ec.message().c_str());
int ret = mkdir(path_append(save_path, ".resume").c_str(), 0777);
if (ret < 0)
fprintf(stderr, "failed to create resume file directory: (%d) %s\n"
, errno, strerror(errno));
if (bind_to_interface.empty()) bind_to_interface = "0.0.0.0";
settings.set_str(settings_pack::listen_interfaces, bind_to_interface + ":" + to_string(listen_port).elems);
@@ -1382,7 +1469,7 @@ int main(int argc, char* argv[])
if (ec) continue;
std::string filename = combine_path(save_path, combine_path(".resume"
std::string filename = path_append(save_path, path_append(".resume"
, to_hex(tmp.info_hash.to_string()) + ".resume"));
load_file(filename.c_str(), p.resume_data, ec);
@@ -1522,7 +1609,7 @@ int main(int argc, char* argv[])
if (ec) continue;
std::string filename = combine_path(save_path, combine_path(".resume"
std::string filename = path_append(save_path, path_append(".resume"
, to_hex(tmp.info_hash.to_string()) + ".resume"));
load_file(filename.c_str(), p.resume_data, ec);
@@ -1550,10 +1637,10 @@ int main(int argc, char* argv[])
{
error_code ec;
std::string path;
if (is_complete(i->first)) path = i->first;
else path = combine_path(monitor_dir, i->first);
remove(path, ec);
if (ec) printf("failed to delete .torrent file: %s\n", ec.message().c_str());
if (is_absolute_path(i->first)) path = i->first;
else path = path_append(monitor_dir, i->first);
if (::remove(path.c_str()) < 0)
printf("failed to delete .torrent file: %s\n", ec.message().c_str());
files.erase(i);
}
if (st.handle.is_valid())
@@ -2054,8 +2141,8 @@ int main(int argc, char* argv[])
torrent_status st = h.status(torrent_handle::query_save_path);
std::vector<char> out;
bencode(std::back_inserter(out), *rd->resume_data);
save_file(combine_path(st.save_path, combine_path(".resume", libtorrent::filename(
hash_to_filename[st.info_hash]) + ".resume")), out);
save_file(path_append(st.save_path, path_append(".resume"
, libtorrent::filename(hash_to_filename[st.info_hash]) + ".resume")), out);
}
}