codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This commit is contained in:
Alon Zakai 2006-12-03 06:31:16 +00:00
parent 842db51672
commit dc86045220
4 changed files with 158 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
library/pytorrent.cpp → library/pytorrent_core.cpp
View File

@ -96,8 +96,6 @@ typedef std::string torrent_name_t;
struct torrent_t { struct torrent_t {
torrent_handle handle; torrent_handle handle;
unique_ID_t unique_ID; unique_ID_t unique_ID;
filter_out_t filter_out;
torrent_name_t name;
}; };
typedef std::vector<torrent_t> torrents_t; typedef std::vector<torrent_t> torrents_t;
@ -120,15 +118,15 @@ torrents_t *M_torrents = NULL;
// Exception types & macro // Exception types & macro
//------------------------ //------------------------
static PyObject *PyTorrentError; static PyObject *PyTorrentCoreError;
static PyObject *InvalidEncodingError; static PyObject *InvalidEncodingError;
static PyObject *FilesystemError; static PyObject *FilesystemError;
static PyObject *DuplicateTorrentError; static PyObject *DuplicateTorrentError;
static PyObject *InvalidTorrentError; static PyObject *InvalidTorrentError;
#define PYTORRENT_RAISE_PTR(e,s) { printf("Raising error: %s\r\n", s); PyErr_SetString(e, s); return NULL; } #define PYTORRENTCORE_RAISE_PTR(e,s) { printf("Raising error: %s\r\n", s); PyErr_SetString(e, s); return NULL; }
#define PYTORRENT_RAISE_INT(e,s) { printf("Raising error: %s\r\n", s); PyErr_SetString(e, s); return -1; } #define PYTORRENTCORE_RAISE_INT(e,s) { printf("Raising error: %s\r\n", s); PyErr_SetString(e, s); return -1; }
//--------------------- //---------------------
@ -158,7 +156,7 @@ long get_torrent_index(torrent_handle &handle)
return i; return i;
} }
PYTORRENT_RAISE_INT(PyTorrentError, "Handle not found."); PYTORRENTCORE_RAISE_INT(PyTorrentCoreError, "Handle not found.");
} }
long get_index_from_unique_ID(long unique_ID) long get_index_from_unique_ID(long unique_ID)
@ -169,7 +167,7 @@ long get_index_from_unique_ID(long unique_ID)
if ((*M_torrents)[i].unique_ID == unique_ID) if ((*M_torrents)[i].unique_ID == unique_ID)
return i; return i;
PYTORRENT_RAISE_INT(PyTorrentError, "No such unique_ID."); PYTORRENTCORE_RAISE_INT(PyTorrentCoreError, "No such unique_ID.");
} }
long internal_add_torrent(std::string const& torrent_name, long internal_add_torrent(std::string const& torrent_name,
@ -210,21 +208,12 @@ long internal_add_torrent(std::string const& torrent_name,
new_torrent.unique_ID = M_unique_counter; new_torrent.unique_ID = M_unique_counter;
M_unique_counter++; M_unique_counter++;
long num_files = h.get_torrent_info().num_files();
new_torrent.filter_out.reserve(num_files);
for (long i = 0; i < num_files; i++)
new_torrent.filter_out[i] = 0;
new_torrent.name = torrent_name;
M_torrents->push_back(new_torrent); M_torrents->push_back(new_torrent);
return (new_torrent.unique_ID); return (new_torrent.unique_ID);
} }
void internal_remove_torrent(long index) void internal_remove_torrent(long index, std::string const& torrent_name)
{ {
assert(index < M_torrents->size()); assert(index < M_torrents->size());
@ -238,7 +227,7 @@ void internal_remove_torrent(long index)
entry data = h.write_resume_data(); entry data = h.write_resume_data();
std::stringstream s; std::stringstream s;
s << M_torrents->at(index).name << ".fastresume"; s << torrent_name << ".fastresume";
boost::filesystem::ofstream out(s.str(), std::ios_base::binary); boost::filesystem::ofstream out(s.str(), std::ios_base::binary);
@ -305,7 +294,7 @@ long count_DHT_peers(entry &state)
static PyObject *torrent_init(PyObject *self, PyObject *args) static PyObject *torrent_init(PyObject *self, PyObject *args)
{ {
printf("pytorrent, using libtorrent %s. Compiled with NDEBUG value: %d\r\n", printf("pytorrent_core, using libtorrent %s. Compiled with NDEBUG value: %d\r\n",
LIBTORRENT_VERSION, LIBTORRENT_VERSION,
NDEBUG); NDEBUG);
@ -360,12 +349,6 @@ static PyObject *torrent_init(PyObject *self, PyObject *args)
static PyObject *torrent_quit(PyObject *self, PyObject *args) static PyObject *torrent_quit(PyObject *self, PyObject *args)
{ {
long Num = M_torrents->size();
// Shut down torrents gracefully
for (long i = 0; i < Num; i++)
internal_remove_torrent(0);
delete M_ses; // SLOWPOKE because of waiting for the trackers before shutting down delete M_ses; // SLOWPOKE because of waiting for the trackers before shutting down
delete M_settings; delete M_settings;
delete M_torrents; delete M_torrents;
@ -474,26 +457,27 @@ static PyObject *torrent_add_torrent(PyObject *self, PyObject *args)
return Py_BuildValue("i", ret); return Py_BuildValue("i", ret);
} }
catch (invalid_encoding&) catch (invalid_encoding&)
{ PYTORRENT_RAISE_PTR(InvalidEncodingError, ""); } { PYTORRENTCORE_RAISE_PTR(InvalidEncodingError, ""); }
catch (invalid_torrent_file&) catch (invalid_torrent_file&)
{ PYTORRENT_RAISE_PTR(InvalidTorrentError, ""); } { PYTORRENTCORE_RAISE_PTR(InvalidTorrentError, ""); }
catch (boost::filesystem::filesystem_error&) catch (boost::filesystem::filesystem_error&)
{ PYTORRENT_RAISE_PTR(FilesystemError, ""); } { PYTORRENTCORE_RAISE_PTR(FilesystemError, ""); }
catch (duplicate_torrent&) catch (duplicate_torrent&)
{ PYTORRENT_RAISE_PTR(DuplicateTorrentError, ""); } { PYTORRENTCORE_RAISE_PTR(DuplicateTorrentError, ""); }
} }
static PyObject *torrent_remove_torrent(PyObject *self, PyObject *args) static PyObject *torrent_remove_torrent(PyObject *self, PyObject *args)
{ {
python_long unique_ID; python_long unique_ID;
if (!PyArg_ParseTuple(args, "i", &unique_ID)) const char *name;
if (!PyArg_ParseTuple(args, "is", &unique_ID, &name))
return NULL; return NULL;
long index = get_index_from_unique_ID(unique_ID); long index = get_index_from_unique_ID(unique_ID);
if (PyErr_Occurred()) if (PyErr_Occurred())
return NULL; return NULL;
internal_remove_torrent(index); internal_remove_torrent(index, name);
Py_INCREF(Py_None); return Py_None; Py_INCREF(Py_None); return Py_None;
} }
@ -859,85 +843,7 @@ static PyObject *torrent_get_peer_info(PyObject *self, PyObject *args)
return ret; return ret;
}; };
static PyObject *torrent_get_file_info(PyObject *self, PyObject *args)
{
python_long unique_ID;
if (!PyArg_ParseTuple(args, "i", &unique_ID))
return NULL;
long index = get_index_from_unique_ID(unique_ID);
if (PyErr_Occurred())
return NULL;
std::vector<PyObject *> temp_files;
PyObject *file_info;
std::vector<float> progresses;
torrent_t &t = M_torrents->at(index);
t.handle.file_progress(progresses);
torrent_info::file_iterator start =
t.handle.get_torrent_info().begin_files();
torrent_info::file_iterator end =
t.handle.get_torrent_info().end_files();
long fileIndex = 0;
filter_out_t &filter_out = t.filter_out;
for(torrent_info::file_iterator i = start; i != end; ++i)
{
file_entry const &currFile = (*i);
file_info = Py_BuildValue(
"{s:s,s:d,s:d,s:f,s:i}",
"path", currFile.path.string().c_str(),
"offset", double(currFile.offset),
"size", double(currFile.size),
"progress", progresses[i - start]*100.0,
"filtered_out", long(filter_out.at(fileIndex))
);
fileIndex++;
temp_files.push_back(file_info);
};
PyObject *ret = PyTuple_New(temp_files.size());
for (unsigned long i = 0; i < temp_files.size(); i++)
PyTuple_SetItem(ret, i, temp_files[i]);
return ret;
};
static PyObject *torrent_set_filter_out(PyObject *self, PyObject *args)
{
python_long unique_ID;
PyObject *filter_out_object;
if (!PyArg_ParseTuple(args, "iO", &unique_ID, &filter_out_object))
return NULL;
long index = get_index_from_unique_ID(unique_ID);
if (PyErr_Occurred())
return NULL;
torrent_t &t = M_torrents->at(index);
long num_files = t.handle.get_torrent_info().num_files();
assert(PyList_Size(filter_out_object) == num_files);
for (long i = 0; i < num_files; i++)
{
t.filter_out.at(i) =
PyInt_AsLong(PyList_GetItem(filter_out_object, i));
};
t.handle.filter_files(t.filter_out);
Py_INCREF(Py_None); return Py_None;
}
static PyObject *torrent_constants(PyObject *self, PyObject *args) static PyObject *torrent_constants(PyObject *self, PyObject *args)
{ {
@ -1095,7 +1001,7 @@ static PyObject *torrent_create_torrent(PyObject *self, PyObject *args)
{ {
// std::cerr << e.what() << "\n"; // std::cerr << e.what() << "\n";
// return Py_BuildValue("l", 0); // return Py_BuildValue("l", 0);
PYTORRENT_RAISE_PTR(PyTorrentError, e.what()); PYTORRENTCORE_RAISE_PTR(PyTorrentCoreError, e.what());
} }
} }
@ -1145,7 +1051,7 @@ static PyObject *torrent_apply_IP_filter(PyObject *self, PyObject *args)
// Python Module data // Python Module data
//==================== //====================
static PyMethodDef pytorrent_methods[] = { static PyMethodDef pytorrent_core_methods[] = {
{"init", torrent_init, METH_VARARGS, "."}, {"init", torrent_init, METH_VARARGS, "."},
{"quit", torrent_quit, METH_VARARGS, "."}, {"quit", torrent_quit, METH_VARARGS, "."},
{"set_max_half_open", torrent_set_max_half_open, METH_VARARGS, "."}, {"set_max_half_open", torrent_set_max_half_open, METH_VARARGS, "."},
@ -1167,8 +1073,8 @@ static PyMethodDef pytorrent_methods[] = {
{"pop_event", torrent_pop_event, METH_VARARGS, "."}, {"pop_event", torrent_pop_event, METH_VARARGS, "."},
{"get_session_info", torrent_get_session_info, METH_VARARGS, "."}, {"get_session_info", torrent_get_session_info, METH_VARARGS, "."},
{"get_peer_info", torrent_get_peer_info, METH_VARARGS, "."}, {"get_peer_info", torrent_get_peer_info, METH_VARARGS, "."},
{"get_file_info", torrent_get_file_info, METH_VARARGS, "."}, // {"get_file_info", torrent_get_file_info, METH_VARARGS, "."},
{"set_filter_out", torrent_set_filter_out, METH_VARARGS, "."}, // {"set_filter_out", torrent_set_filter_out, METH_VARARGS, "."},
{"constants", torrent_constants, METH_VARARGS, "."}, {"constants", torrent_constants, METH_VARARGS, "."},
{"start_DHT", torrent_start_DHT, METH_VARARGS, "."}, {"start_DHT", torrent_start_DHT, METH_VARARGS, "."},
{"stop_DHT", torrent_stop_DHT, METH_VARARGS, "."}, {"stop_DHT", torrent_stop_DHT, METH_VARARGS, "."},
@ -1180,22 +1086,22 @@ static PyMethodDef pytorrent_methods[] = {
PyMODINIT_FUNC PyMODINIT_FUNC
initpytorrent(void) initpytorrent_core(void)
{ {
PyObject *m, *d; PyObject *m, *d;
m = Py_InitModule("pytorrent", pytorrent_methods); m = Py_InitModule("pytorrent_core", pytorrent_core_methods);
PyTorrentError = PyErr_NewException("pytorrent.Error", NULL, NULL); PyTorrentCoreError = PyErr_NewException("pytorrent_core.Error", NULL, NULL);
InvalidEncodingError = PyErr_NewException("pytorrent.InvalidEncodingError", NULL, NULL); InvalidEncodingError = PyErr_NewException("pytorrent_core.InvalidEncodingError", NULL, NULL);
FilesystemError = PyErr_NewException("pytorrent.FilesystemError", NULL, NULL); FilesystemError = PyErr_NewException("pytorrent_core.FilesystemError", NULL, NULL);
DuplicateTorrentError = PyErr_NewException("pytorrent.DuplicateTorrentError", NULL, NULL); DuplicateTorrentError = PyErr_NewException("pytorrent_core.DuplicateTorrentError", NULL, NULL);
InvalidTorrentError = PyErr_NewException("pytorrent.InvalidTorrentError", NULL, NULL); InvalidTorrentError = PyErr_NewException("pytorrent_core.InvalidTorrentError", NULL, NULL);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
PyDict_SetItemString(d, "PyTorrentError", PyTorrentError); PyDict_SetItemString(d, "PyTorrentCoreError", PyTorrentCoreError);
PyDict_SetItemString(d, "InvalidEncodingError", InvalidEncodingError); PyDict_SetItemString(d, "InvalidEncodingError", InvalidEncodingError);
PyDict_SetItemString(d, "FilesystemError", FilesystemError); PyDict_SetItemString(d, "FilesystemError", FilesystemError);

134
library/pytorrent_manager.py
View File

@ -41,35 +41,147 @@
# 8. Remove torrent's data (in deluge.py) # 8. Remove torrent's data (in deluge.py)
# #
import pytorrent import pytorrent_core
import os import os
import pickle import pickle
class preferences: class torrent:
def __init__(self, filename, save_dir, compact):
self.filename = filename
self.save_dir = save_dir
self.compact = compact
static PyObject *torrent_get_file_info(PyObject *self, PyObject *args)
{
python_long unique_ID;
if (!PyArg_ParseTuple(args, "i", &unique_ID))
return NULL;
long index = get_index_from_unique_ID(unique_ID);
if (PyErr_Occurred())
return NULL;
std::vector<PyObject *> temp_files;
PyObject *file_info;
std::vector<float> progresses;
torrent_t &t = M_torrents->at(index);
t.handle.file_progress(progresses);
torrent_info::file_iterator start =
t.handle.get_torrent_info().begin_files();
torrent_info::file_iterator end =
t.handle.get_torrent_info().end_files();
long fileIndex = 0;
filter_out_t &filter_out = t.filter_out;
for(torrent_info::file_iterator i = start; i != end; ++i)
{
file_entry const &currFile = (*i);
file_info = Py_BuildValue(
"{s:s,s:d,s:d,s:f,s:i}",
"path", currFile.path.string().c_str(),
"offset", double(currFile.offset),
"size", double(currFile.size),
"progress", progresses[i - start]*100.0,
"filtered_out", long(filter_out.at(fileIndex))
);
fileIndex++;
temp_files.push_back(file_info);
};
PyObject *ret = PyTuple_New(temp_files.size());
for (unsigned long i = 0; i < temp_files.size(); i++)
PyTuple_SetItem(ret, i, temp_files[i]);
return ret;
};
static PyObject *torrent_set_filter_out(PyObject *self, PyObject *args)
{
python_long unique_ID;
PyObject *filter_out_object;
if (!PyArg_ParseTuple(args, "iO", &unique_ID, &filter_out_object))
return NULL;
long index = get_index_from_unique_ID(unique_ID);
if (PyErr_Occurred())
return NULL;
torrent_t &t = M_torrents->at(index);
long num_files = t.handle.get_torrent_info().num_files();
assert(PyList_Size(filter_out_object) == num_files);
for (long i = 0; i < num_files; i++)
{
t.filter_out.at(i) =
PyInt_AsLong(PyList_GetItem(filter_out_object, i));
};
t.handle.filter_files(t.filter_out);
Py_INCREF(Py_None); return Py_None;
}
// Shut down torrents gracefully
for (long i = 0; i < Num; i++)
internal_remove_torrent(0);
struct torrent_t {
torrent_handle handle;
unique_ID_t unique_ID;
filter_out_t filter_out;
torrent_name_t name;
};
typedef std::vector<torrent_t> torrents_t;
typedef torrents_t::iterator torrents_t_iterator;
class state:
def __init__: def __init__:
self.max_connections = 60 # Etc. etc. etc. self.max_connections = 60 # Etc. etc. etc.
# Prepare queue (queue is pickled, just like everything else) # Prepare queue (queue is pickled, just like everything else)
self.queue = [] # queue[x] is the unique_ID of the x-th queue position. Simple. self.queue = [] # queue[x] is the unique_ID of the x-th queue position. Simple.
# Torrents
self.torrents = []
self.unique_IDs = {}
class manager: class manager:
def __init__(self, pref_filename): def __init__(self, state_filename):
print "Init" print "Init"
self.pref_filename = pref_filename self.state_filename = state_filename
# Unpickle the preferences # Unpickle the state
try: try:
pkl_file = open(pref_filename, 'rb') pkl_file = open(state_filename, 'rb')
self.preferences = pickle.load(pkl_file) self.state = pickle.load(pkl_file)
pkl_file.close() pkl_file.close()
except IOError: except IOError:
self.preferences = new preferences() self.state = new state()
# How does the queue get updated? Use biology # How does the queue get updated? Use biology
def add_torrent(self, filename, save_dir, compact)
unique_ID = pytorrent_core.add_torrent(filename, save_dir, compact)
def quit(self): def quit(self):
# Pickle the preferences # Pickle the state
output = open(self.pref_filename, 'wb') output = open(self.state_filename, 'wb')
pickle.dump(self.preferences, output) pickle.dump(self.state, output)
output.close() output.close()

8
library/setup.py
View File

@ -23,12 +23,12 @@ import platform
pythonVersion = platform.python_version()[0:3] pythonVersion = platform.python_version()[0:3]
print "=========================================" print "========================================="
print "Creating pytorrent for Python " + pythonVersion print "Creating pytorrent_core for Python " + pythonVersion
print "=========================================" print "========================================="
from distutils.core import setup, Extension from distutils.core import setup, Extension
module1 = Extension('pytorrent', module1 = Extension('pytorrent_core',
include_dirs = ['./include', './include/libtorrent', include_dirs = ['./include', './include/libtorrent',
'/usr/include/python' + pythonVersion], '/usr/include/python' + pythonVersion],
libraries = ['boost_filesystem', 'boost_date_time', libraries = ['boost_filesystem', 'boost_date_time',
@ -46,7 +46,7 @@ module1 = Extension('pytorrent',
'peer_connection.cpp', 'peer_connection.cpp',
'piece_picker.cpp', 'piece_picker.cpp',
'policy.cpp', 'policy.cpp',
'pytorrent.cpp', 'pytorrent_core.cpp',
'session.cpp', 'session.cpp',
'session_impl.cpp', 'session_impl.cpp',
'sha1.cpp', 'sha1.cpp',
@ -68,7 +68,7 @@ module1 = Extension('pytorrent',
'./kademlia/rpc_manager.cpp', './kademlia/rpc_manager.cpp',
'./kademlia/traversal_algorithm.cpp']) './kademlia/traversal_algorithm.cpp'])
setup (name = 'pytorrent', setup (name = 'pytorrent_core',
version = '0.5.0', version = '0.5.0',
description = 'Wrapper code for libtorrent C++ torrent library (Sourceforge, not Rakshasa)', description = 'Wrapper code for libtorrent C++ torrent library (Sourceforge, not Rakshasa)',
ext_modules = [module1]) ext_modules = [module1])

8
library/test.py
View File

@ -9,16 +9,16 @@
#*/ #*/
import pytorrent import pytorrent_core
from time import sleep from time import sleep
pytorrent.init("PT", 0, 5, 0, 0, "pytorrent - testing only") pytorrent_core.init("PT", 0, 5, 0, 0, "pytorrent - testing only")
myTorrent = pytorrent.add_torrent("ubuntu.torrent", ".", True) myTorrent = pytorrent_core.add_torrent("ubuntu.torrent", ".", True)
while True: while True:
print "STATE:" print "STATE:"
print pytorrent.get_state(myTorrent) print pytorrent_core.get_state(myTorrent)
print "" print ""
sleep(1) sleep(1)