mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-08-13 13:42:30 +00:00
* New code for handling options/variables which used bencode and can
redirect get/set operations. * Fixed(?) a bug in RequestList::downloading(...) that could cause a segfault when pieces in the canceled list start downloading. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@622 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
@@ -3,6 +3,11 @@ noinst_LIBRARIES = libsub_utils.a
|
||||
libsub_utils_a_SOURCES = \
|
||||
directory.cc \
|
||||
directory.h \
|
||||
list_focus.h
|
||||
list_focus.h \
|
||||
variable.h \
|
||||
variable_generic.cc \
|
||||
variable_generic.h \
|
||||
variable_map.cc \
|
||||
variable_map.h
|
||||
|
||||
INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
// rTorrent - BitTorrent client
|
||||
// Copyright (C) 2006, Jari Sundell
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// In addition, as a special exception, the copyright holders give
|
||||
// permission to link the code of portions of this program with the
|
||||
// OpenSSL library under certain conditions as described in each
|
||||
// individual source file, and distribute linked combinations
|
||||
// including the two.
|
||||
//
|
||||
// You must obey the GNU General Public License in all respects for
|
||||
// all of the code used other than OpenSSL. If you modify file(s)
|
||||
// with this exception, you may extend this exception to your version
|
||||
// of the file(s), but you are not obligated to do so. If you do not
|
||||
// wish to do so, delete this exception statement from your version.
|
||||
// If you delete this exception statement from all source files in the
|
||||
// program, then also delete it here.
|
||||
//
|
||||
// Contact: Jari Sundell <jaris@ifi.uio.no>
|
||||
//
|
||||
// Skomakerveien 33
|
||||
// 3185 Skoppum, NORWAY
|
||||
|
||||
#ifndef RTORRENT_UTILS_VARIABLE_H
|
||||
#define RTORRENT_UTILS_VARIABLE_H
|
||||
|
||||
namespace torrent {
|
||||
class Bencode;
|
||||
}
|
||||
|
||||
namespace utils {
|
||||
|
||||
class Variable {
|
||||
public:
|
||||
Variable() {}
|
||||
virtual ~Variable() {}
|
||||
|
||||
virtual const torrent::Bencode& get() = 0;
|
||||
virtual void set(const torrent::Bencode& arg) = 0;
|
||||
|
||||
protected:
|
||||
Variable(const Variable&);
|
||||
void operator = (const Variable&);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,56 @@
|
||||
// rTorrent - BitTorrent client
|
||||
// Copyright (C) 2006, Jari Sundell
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// In addition, as a special exception, the copyright holders give
|
||||
// permission to link the code of portions of this program with the
|
||||
// OpenSSL library under certain conditions as described in each
|
||||
// individual source file, and distribute linked combinations
|
||||
// including the two.
|
||||
//
|
||||
// You must obey the GNU General Public License in all respects for
|
||||
// all of the code used other than OpenSSL. If you modify file(s)
|
||||
// with this exception, you may extend this exception to your version
|
||||
// of the file(s), but you are not obligated to do so. If you do not
|
||||
// wish to do so, delete this exception statement from your version.
|
||||
// If you delete this exception statement from all source files in the
|
||||
// program, then also delete it here.
|
||||
//
|
||||
// Contact: Jari Sundell <jaris@ifi.uio.no>
|
||||
//
|
||||
// Skomakerveien 33
|
||||
// 3185 Skoppum, NORWAY
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "variable_generic.h"
|
||||
|
||||
namespace utils {
|
||||
|
||||
// VariableString::~VariableString() {
|
||||
// }
|
||||
|
||||
// std::string
|
||||
// VariableString::get() {
|
||||
// return m_variable;
|
||||
// }
|
||||
|
||||
// void
|
||||
// VariableString::set(const std::string& arg) {
|
||||
// m_variable = arg;
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -0,0 +1,160 @@
|
||||
// rTorrent - BitTorrent client
|
||||
// Copyright (C) 2006, Jari Sundell
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// In addition, as a special exception, the copyright holders give
|
||||
// permission to link the code of portions of this program with the
|
||||
// OpenSSL library under certain conditions as described in each
|
||||
// individual source file, and distribute linked combinations
|
||||
// including the two.
|
||||
//
|
||||
// You must obey the GNU General Public License in all respects for
|
||||
// all of the code used other than OpenSSL. If you modify file(s)
|
||||
// with this exception, you may extend this exception to your version
|
||||
// of the file(s), but you are not obligated to do so. If you do not
|
||||
// wish to do so, delete this exception statement from your version.
|
||||
// If you delete this exception statement from all source files in the
|
||||
// program, then also delete it here.
|
||||
//
|
||||
// Contact: Jari Sundell <jaris@ifi.uio.no>
|
||||
//
|
||||
// Skomakerveien 33
|
||||
// 3185 Skoppum, NORWAY
|
||||
|
||||
#ifndef RTORRENT_UTILS_VARIABLE_GENERIC_H
|
||||
#define RTORRENT_UTILS_VARIABLE_GENERIC_H
|
||||
|
||||
#include <cstdio>
|
||||
#include <string>
|
||||
#include <inttypes.h>
|
||||
#include <rak/functional_fun.h>
|
||||
#include <torrent/bencode.h>
|
||||
#include <torrent/exceptions.h>
|
||||
|
||||
#include "variable.h"
|
||||
|
||||
namespace utils {
|
||||
|
||||
// class VariableS : public Variable {
|
||||
// public:
|
||||
// VariableString(const std::string& v = "") : m_variable(v) {}
|
||||
// virtual ~VariableString();
|
||||
|
||||
// virtual const torrent::Bencode& get();
|
||||
// virtual void set(const torrent::Bencode& arg);
|
||||
|
||||
// private:
|
||||
// std::string m_variable;
|
||||
// };
|
||||
|
||||
// VariableSlot?
|
||||
template <typename Get = std::string, typename Set = const std::string&>
|
||||
class VariableSlotString : public Variable {
|
||||
public:
|
||||
typedef rak::function0<Get> SlotGet;
|
||||
typedef rak::function1<void, Set> SlotSet;
|
||||
|
||||
VariableSlotString(typename SlotGet::base_type* slotGet, typename SlotSet::base_type* slotSet) {
|
||||
m_slotGet.set(slotGet);
|
||||
m_slotSet.set(slotSet);
|
||||
}
|
||||
|
||||
virtual ~VariableSlotString() {}
|
||||
|
||||
virtual const torrent::Bencode& get() {
|
||||
m_cache = m_slotGet();
|
||||
|
||||
if (!m_cache.is_string())
|
||||
throw torrent::internal_error("VariableSlotString::get() got wrong type.");
|
||||
|
||||
return m_cache;
|
||||
}
|
||||
|
||||
virtual void set(const torrent::Bencode& arg) {
|
||||
if (!arg.is_string())
|
||||
throw torrent::internal_error("VariableSlotString::set(...) got wrong type.");
|
||||
|
||||
m_slotSet(arg.as_string());
|
||||
}
|
||||
|
||||
private:
|
||||
SlotGet m_slotGet;
|
||||
SlotSet m_slotSet;
|
||||
|
||||
// Store the cache here to avoid unnessesary copying and such. This
|
||||
// should not result in any unresonable memory usage since few
|
||||
// strings will be very large.
|
||||
torrent::Bencode m_cache;
|
||||
};
|
||||
|
||||
template <typename Get, typename Set>
|
||||
class VariableSlotValue : public Variable {
|
||||
public:
|
||||
typedef rak::function0<Get> SlotGet;
|
||||
typedef rak::function1<void, Set> SlotSet;
|
||||
|
||||
VariableSlotValue(typename SlotGet::base_type* slotGet,
|
||||
typename SlotSet::base_type* slotSet,
|
||||
const char* pattern) {
|
||||
m_slotGet.set(slotGet);
|
||||
m_slotSet.set(slotSet);
|
||||
m_pattern = pattern;
|
||||
}
|
||||
|
||||
virtual ~VariableSlotValue() {}
|
||||
|
||||
virtual const torrent::Bencode& get() {
|
||||
m_cache = m_slotGet();
|
||||
|
||||
// Need this?
|
||||
if (!m_cache.is_value())
|
||||
throw torrent::internal_error("VariableSlotValue::get() got wrong type.");
|
||||
|
||||
return m_cache;
|
||||
}
|
||||
|
||||
virtual void set(const torrent::Bencode& arg) {
|
||||
if (arg.is_string()) {
|
||||
Set v;
|
||||
|
||||
if (std::sscanf(arg.as_string().c_str(), m_pattern, &v) != 1)
|
||||
throw torrent::input_error("Not a value.");
|
||||
|
||||
m_slotSet(v);
|
||||
|
||||
} else if (arg.is_value()) {
|
||||
m_slotSet(arg.as_value());
|
||||
|
||||
} else {
|
||||
throw torrent::input_error("Not a value");
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
SlotGet m_slotGet;
|
||||
SlotSet m_slotSet;
|
||||
|
||||
const char* m_pattern;
|
||||
|
||||
// Store the cache here to avoid unnessesary copying and such. This
|
||||
// should not result in any unresonable memory usage since few
|
||||
// strings will be very large.
|
||||
torrent::Bencode m_cache;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,97 @@
|
||||
// rTorrent - BitTorrent client
|
||||
// Copyright (C) 2006, Jari Sundell
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// In addition, as a special exception, the copyright holders give
|
||||
// permission to link the code of portions of this program with the
|
||||
// OpenSSL library under certain conditions as described in each
|
||||
// individual source file, and distribute linked combinations
|
||||
// including the two.
|
||||
//
|
||||
// You must obey the GNU General Public License in all respects for
|
||||
// all of the code used other than OpenSSL. If you modify file(s)
|
||||
// with this exception, you may extend this exception to your version
|
||||
// of the file(s), but you are not obligated to do so. If you do not
|
||||
// wish to do so, delete this exception statement from your version.
|
||||
// If you delete this exception statement from all source files in the
|
||||
// program, then also delete it here.
|
||||
//
|
||||
// Contact: Jari Sundell <jaris@ifi.uio.no>
|
||||
//
|
||||
// Skomakerveien 33
|
||||
// 3185 Skoppum, NORWAY
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <rak/functional.h>
|
||||
#include <torrent/exceptions.h>
|
||||
#include <torrent/bencode.h>
|
||||
|
||||
#include "variable.h"
|
||||
#include "variable_map.h"
|
||||
|
||||
namespace utils {
|
||||
|
||||
VariableMap::~VariableMap() {
|
||||
std::for_each(base_type::begin(), base_type::end(), rak::on(rak::mem_ptr_ref(&value_type::second), rak::call_delete<Variable>()));
|
||||
}
|
||||
|
||||
void
|
||||
VariableMap::insert(const std::string& key, Variable* v) {
|
||||
iterator itr = base_type::find(key);
|
||||
|
||||
if (itr != base_type::end())
|
||||
throw torrent::internal_error("VariableMap::insert(...) tried to insert an already existing key.");
|
||||
|
||||
base_type::insert(itr, value_type(key, v));
|
||||
}
|
||||
|
||||
const torrent::Bencode&
|
||||
VariableMap::get(const std::string& key) {
|
||||
iterator itr = base_type::find(key);
|
||||
|
||||
if (itr == base_type::end())
|
||||
throw torrent::input_error("Variable \"" + key + "\" does not exist.");
|
||||
|
||||
return itr->second->get();
|
||||
}
|
||||
|
||||
void
|
||||
VariableMap::set(const std::string& key, const torrent::Bencode& arg) {
|
||||
iterator itr = base_type::find(key);
|
||||
|
||||
// Later, allow the user to create new variables. Have a slot to
|
||||
// register that thing.
|
||||
if (itr == base_type::end())
|
||||
throw torrent::input_error("Variable \"" + key + "\" does not exist.");
|
||||
|
||||
itr->second->set(arg);
|
||||
}
|
||||
|
||||
void
|
||||
VariableMap::process_command(const std::string& command) {
|
||||
std::string::size_type pos = command.find('=');
|
||||
|
||||
if (pos == std::string::npos)
|
||||
throw torrent::input_error("Option handler could not find '=' in command.");
|
||||
|
||||
// Do sscanf, check for integer. Later move and make it smarter.
|
||||
|
||||
set(command.substr(0, pos), torrent::Bencode(command.substr(pos + 1, std::string::npos)));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
// rTorrent - BitTorrent client
|
||||
// Copyright (C) 2006, Jari Sundell
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// In addition, as a special exception, the copyright holders give
|
||||
// permission to link the code of portions of this program with the
|
||||
// OpenSSL library under certain conditions as described in each
|
||||
// individual source file, and distribute linked combinations
|
||||
// including the two.
|
||||
//
|
||||
// You must obey the GNU General Public License in all respects for
|
||||
// all of the code used other than OpenSSL. If you modify file(s)
|
||||
// with this exception, you may extend this exception to your version
|
||||
// of the file(s), but you are not obligated to do so. If you do not
|
||||
// wish to do so, delete this exception statement from your version.
|
||||
// If you delete this exception statement from all source files in the
|
||||
// program, then also delete it here.
|
||||
//
|
||||
// Contact: Jari Sundell <jaris@ifi.uio.no>
|
||||
//
|
||||
// Skomakerveien 33
|
||||
// 3185 Skoppum, NORWAY
|
||||
|
||||
#ifndef RTORRENT_UTILS_VARIABLE_MAP_H
|
||||
#define RTORRENT_UTILS_VARIABLE_MAP_H
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <torrent/bencode.h>
|
||||
|
||||
namespace utils {
|
||||
|
||||
class Variable;
|
||||
|
||||
class VariableMap : public std::map<std::string, Variable*> {
|
||||
public:
|
||||
typedef std::map<std::string, Variable*> base_type;
|
||||
|
||||
using base_type::iterator;
|
||||
using base_type::value_type;
|
||||
|
||||
VariableMap() {}
|
||||
~VariableMap();
|
||||
|
||||
void insert(const std::string& key, Variable* v);
|
||||
|
||||
// Consider taking char* start and finish instead of std::string to
|
||||
// avoid copying. Or make a view class.
|
||||
const torrent::Bencode& get(const std::string& key);
|
||||
|
||||
void set(const std::string& key, const torrent::Bencode& arg);
|
||||
void set_string(const std::string& key, const std::string& arg) { set(key, torrent::Bencode(arg)); }
|
||||
|
||||
// Temporary.
|
||||
void process_command(const std::string& command);
|
||||
|
||||
private:
|
||||
VariableMap(const VariableMap&);
|
||||
void operator = (const VariableMap&);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user