fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-07 18:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Make VariableMap handle both global and core::Download

Browse Source 
variables. Variable now has functions for both void and
core::Download*, where the core::Download* is discarded if necessary.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@847 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2007-01-17 15:18:33 +00:00
parent d030c5401e
commit e59b5bf7b6
19 changed files with 414 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/variable_generic.cc
+54 -7
View File
@@ -102,22 +102,22 @@ VariableBool::set(const torrent::Object& arg) {
}
const torrent::Object&
VariableObject::get() {
VariableObject::get_d(core::Download* download) {
if (m_root.empty())
return m_bencode->get_key(m_key);
return download->bencode()->get_key(m_key);
else
return m_bencode->get_key(m_root).get_key(m_key);
return download->bencode()->get_key(m_root).get_key(m_key);
}
void
VariableObject::set(const torrent::Object& arg) {
VariableObject::set_d(core::Download* download, const torrent::Object& arg) {
// Consider removing if TYPE_NONE.
torrent::Object* root;
if (m_root.empty())
root = m_bencode;
root = download->bencode();
else
root = &m_bencode->get_key(m_root);
root = &download->bencode()->get_key(m_root);
switch (m_type) {
case torrent::Object::TYPE_NONE:
@@ -200,7 +200,7 @@ VariableValueSlot::set(const torrent::Object& arg) {
const torrent::Object&
VariableStringSlot::get() {
if (!m_slotGet.is_valid())
return m_cache;
return m_cache = torrent::Object();
m_cache = m_slotGet();
@@ -224,4 +224,51 @@ VariableStringSlot::set(const torrent::Object& arg) {
}
}
const torrent::Object&
VariableStringSlot::get_d(core::Download* download) {
// Should clear the cache.
if (!m_slotGetDownload.is_valid()) {
if (!m_slotGet.is_valid())
return m_cache = torrent::Object();
m_cache = m_slotGet();
} else {
m_cache = m_slotGetDownload(download);
}
return m_cache;
}
void
VariableStringSlot::set_d(core::Download* download, const torrent::Object& arg) {
if (!m_slotSetDownload.is_valid()) {
if (!m_slotSet.is_valid())
return;
switch (arg.type()) {
case torrent::Object::TYPE_STRING:
m_slotSet(arg.as_string());
break;
case torrent::Object::TYPE_NONE:
m_slotSet(std::string());
break;
default:
throw torrent::input_error("Not a string.");
}
} else {
switch (arg.type()) {
case torrent::Object::TYPE_STRING:
m_slotSetDownload(download, arg.as_string());
break;
case torrent::Object::TYPE_NONE:
m_slotSetDownload(download, std::string());
break;
default:
throw torrent::input_error("Not a string.");
}
}
}
}