* Replaced DownloadFactory's m_variables with a torrent::Object map.

* Starting work on moving the download commands to the new command
framework.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@901 e378c898-3ddf-0310-93e7-cc216c733640

src/utils/Makefile.am

@@ -3,6 +3,8 @@ noinst_LIBRARIES = libsub_utils.a
 libsub_utils_a_SOURCES = \
 	command_slot.cc \
 	command_slot.h \
+	command_download_slot.cc \
+	command_download_slot.h \
 	command_variable.cc \
 	command_variable.h \
 	directory.cc \

src/utils/command_download_slot.cc

@@ -0,0 +1,143 @@
+// 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 "utils/parse.h"
+
+#include "command_download_slot.h"
+
+namespace utils {
+
+const torrent::Object
+CommandDownloadSlot::call_unknown(Variable* rawVariable, core::Download* download, const torrent::Object& rawArgs) {
+  CommandDownloadSlot* command = static_cast<CommandDownloadSlot*>(rawVariable);
+
+  return command->m_slot(download, rawArgs);
+}
+
+const torrent::Object
+CommandDownloadSlot::call_list(Variable* rawVariable, core::Download* download, const torrent::Object& rawArgs) {
+  CommandDownloadSlot* command = static_cast<CommandDownloadSlot*>(rawVariable);
+
+//   const torrent::Object& arg = to_single_argument(rawArgs);
+
+//   switch (arg.type()) {
+//   case torrent::Object::TYPE_VALUE:
+//     variable->m_variable = arg.as_value() ? (int64_t)1 : (int64_t)0;
+//     break;
+
+//   case torrent::Object::TYPE_STRING:
+//     // Move the checks into some is_true, is_false think in Variable.
+//     if (arg.as_string() == "yes" || arg.as_string() == "true")
+//       variable->m_variable = (int64_t)1;
+
+//     else if (arg.as_string() == "no" || arg.as_string() == "false")
+//       variable->m_variable = (int64_t)0;
+
+//     else
+//       throw torrent::input_error("String does not parse as a boolean.");
+
+//     break;
+
+//   default:
+//     throw torrent::input_error("Input is not a boolean.");
+//   }
+
+//   return variable->m_variable;
+
+  switch (rawArgs.type()) {
+//   case torrent::Object::TYPE_STRING:
+//     break;
+  case torrent::Object::TYPE_LIST:
+    return command->m_slot(download, rawArgs);
+  default:
+    throw torrent::input_error("Not a list.");
+  }
+}
+
+const torrent::Object
+CommandDownloadSlot::call_value_base(Variable* rawVariable, core::Download* download, const torrent::Object& rawArgs, int base, int unit) {
+  CommandDownloadSlot* command = static_cast<CommandDownloadSlot*>(rawVariable);
+
+  const torrent::Object& arg = to_single_argument(rawArgs);
+
+  switch (arg.type()) {
+  case torrent::Object::TYPE_VALUE:
+    // Should shift this one too, so it gives the right unit.
+    return command->m_slot(download, arg);
+
+  case torrent::Object::TYPE_STRING:
+  {
+    torrent::Object argValue(torrent::Object::TYPE_VALUE);
+
+    if (!utils::parse_whole_value_nothrow(arg.as_string().c_str(), &argValue.as_value(), base, unit))
+      throw torrent::input_error("Not a value.");
+
+    return command->m_slot(download, argValue);
+  }
+  default:
+    throw torrent::input_error("Not a value.");
+  }
+}
+
+const torrent::Object
+CommandDownloadSlot::call_string(Variable* rawVariable, core::Download* download, const torrent::Object& rawArgs) {
+  CommandDownloadSlot* command = static_cast<CommandDownloadSlot*>(rawVariable);
+
+  const torrent::Object& arg = to_single_argument(rawArgs);
+
+  switch (arg.type()) {
+//   case torrent::Object::TYPE_VALUE:
+//     break;
+
+  case torrent::Object::TYPE_STRING:
+    return command->m_slot(download, arg);
+    break;
+
+  default:
+    throw torrent::input_error("Not a string.");
+  }
+}
+
+// const torrent::Object&
+// CommandDownloadSlot::get_generic(Variable* rawVariable, const torrent::Object& args) {
+//   CommandVariable* variable = static_cast<CommandVariable*>(rawVariable);
+
+//   return variable->m_variable;
+// }
+
+}

src/utils/command_download_slot.h

@@ -0,0 +1,176 @@
+// 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_COMMAND_DOWNLOAD_SLOT_H
+#define RTORRENT_UTILS_COMMAND_DOWNLOAD_SLOT_H
+
+#include <functional>
+#include <limits>
+#include <inttypes.h>
+#include <torrent/object.h>
+#include <rak/functional_fun.h>
+
+#include "variable.h"
+
+namespace core {
+  class Download;
+}
+
+namespace utils {
+
+class CommandDownloadSlot : public Variable {
+public:
+  typedef rak::function2<torrent::Object, core::Download*, const torrent::Object&> slot_type;
+
+  CommandDownloadSlot() {}
+
+  CommandDownloadSlot(slot_type::base_type* s) {
+    m_slot.set(s);
+  }
+
+  void                set_slot(slot_type::base_type* s) { m_slot.set(s); }
+
+  static const torrent::Object call_unknown(Variable* rawVariable, core::Download* download, const torrent::Object& args);
+
+  static const torrent::Object call_list(Variable* rawVariable, core::Download* download, const torrent::Object& args);
+  static const torrent::Object call_string(Variable* rawVariable, core::Download* download, const torrent::Object& args);
+
+  static const torrent::Object call_value_base(Variable* rawVariable, core::Download* download, const torrent::Object& args, int base, int unit);
+
+  static const torrent::Object call_value(Variable* rawVariable, core::Download* download, const torrent::Object& args) { return call_value_base(rawVariable, download, args, 0, 1); }
+  static const torrent::Object call_value_kb(Variable* rawVariable, core::Download* download, const torrent::Object& args) { return call_value_base(rawVariable, download, args, 0, 1 << 10); }
+
+  template <int base, int unit>
+  static const torrent::Object call_value(Variable* rawVariable, core::Download* download, const torrent::Object& args)  { return call_value_base(rawVariable, download, args, base, unit); }
+
+//   static const torrent::Object& get_list(Variable* rawVariable, const torrent::Object& args);
+
+private:
+  slot_type           m_slot;
+};
+
+// Some slots that convert torrent::Object arguments to proper
+// function calls.
+
+template <typename Func, typename Result = typename Func::result_type>
+class object_d_void_fn_t : public rak::function_base2<torrent::Object, core::Download*, const torrent::Object&> {
+public:
+  object_d_void_fn_t(Func func) : m_func(func) {}
+  
+  virtual torrent::Object operator () (core::Download* download, const torrent::Object& arg1) { return torrent::Object(m_func(download)); }
+
+private:
+  Func m_func;
+};
+
+// template <typename Func>
+// class object_void_fn_t<Func, void> : public rak::function_base1<torrent::Object, const torrent::Object&> {
+// public:
+//   object_void_fn_t(Func func) : m_func(func) {}
+  
+//   virtual torrent::Object operator () (const torrent::Object& arg1) {
+//     m_func();
+//     return torrent::Object();
+//   }
+
+// private:
+//   Func m_func;
+// };
+
+// template <typename Func, typename Result = typename Func::result_type>
+// class object_value_fn1_t : public rak::function_base1<torrent::Object, const torrent::Object&> {
+// public:
+//   object_value_fn1_t(Func func) : m_func(func) {}
+  
+//   virtual torrent::Object operator () (const torrent::Object& arg1) { return torrent::Object((int64_t)m_func(arg1.as_value())); }
+
+// private:
+//   Func m_func;
+// };
+
+// template <typename Func>
+// class object_value_fn1_t<Func, void> : public rak::function_base1<torrent::Object, const torrent::Object&> {
+// public:
+//   object_value_fn1_t(Func func) : m_func(func) {}
+  
+//   virtual torrent::Object operator () (const torrent::Object& arg1) {
+//     m_func(arg1.as_value());
+
+//     return torrent::Object();
+//   }
+
+// private:
+//   Func m_func;
+// };
+
+// template <typename Func, typename Result = typename Func::result_type>
+// class object_string_fn1_t : public rak::function_base1<torrent::Object, const torrent::Object&> {
+// public:
+//   object_string_fn1_t(Func func) : m_func(func) {}
+  
+//   virtual torrent::Object operator () (const torrent::Object& arg1) { return torrent::Object(m_func(arg1.as_string())); }
+
+// private:
+//   Func m_func;
+// };
+
+// template <typename Func>
+// class object_string_fn1_t<Func, void> : public rak::function_base1<torrent::Object, const torrent::Object&> {
+// public:
+//   object_string_fn1_t(Func func) : m_func(func) {}
+  
+//   virtual torrent::Object operator () (const torrent::Object& arg1) {
+//     m_func(arg1.as_string());
+
+//     return torrent::Object();
+//   }
+
+// private:
+//   Func m_func;
+// };
+
+template <typename Return> object_d_void_fn_t<Return (*)(core::Download*), Return>*
+object_d_fn(Return (*func)(core::Download*)) {
+  return new object_d_void_fn_t<Return (*)(core::Download*), Return>(func);
+}
+
+// template <typename Func> object_void_fn_t<Func>*    object_void_fn(Func func)   { return new object_void_fn_t<Func>(func); }
+// template <typename Func> object_value_fn1_t<Func>*  object_value_fn(Func func)  { return new object_value_fn1_t<Func>(func); }
+// template <typename Func> object_string_fn1_t<Func>* object_string_fn(Func func) { return new object_string_fn1_t<Func>(func); }
+
+}
+
+#endif

src/utils/command_slot.h

@@ -38,7 +38,6 @@
 #define RTORRENT_UTILS_COMMAND_SLOT_H
 
 #include <functional>
-#include <string>
 #include <limits>
 #include <inttypes.h>
 #include <torrent/object.h>
@@ -48,10 +47,6 @@
 
 namespace utils {
 
-// The CommandSlot class uses union instead of creating multiple
-// derived classes so that it is possible to create an array
-// containing different slot types.
-
 class CommandSlot : public Variable {
 public:
   typedef rak::function1<torrent::Object, const torrent::Object&> slot_type;

src/utils/variable_map.cc

@@ -62,14 +62,14 @@ VariableMap::~VariableMap() {
 }
 
 void
-VariableMap::insert(key_type key, Variable* variable, generic_slot genericSlot, int flags,
+VariableMap::insert(key_type key, Variable* variable, generic_slot genericSlot, download_slot downloadSlot, int flags,
                     const char* parm, const char* doc) {
   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, variable_map_data_type(variable, genericSlot, NULL, flags, parm, doc)));
+  base_type::insert(itr, value_type(key, variable_map_data_type(variable, genericSlot, downloadSlot, flags, parm, doc)));
 }
 
 const VariableMap::mapped_type
@@ -250,4 +250,21 @@ VariableMap::call_command(key_type key, const mapped_type& arg) {
   return itr->second.m_genericSlot(itr->second.m_variable, arg);
 }
 
+const VariableMap::mapped_type
+VariableMap::call_command_d(key_type key, core::Download* download, const mapped_type& arg) {
+  const_iterator itr = base_type::find(key);
+
+  if (itr == base_type::end())
+    throw torrent::input_error("Variable \"" + std::string(key) + "\" does not exist.");
+
+  if (itr->second.m_downloadSlot == NULL) {
+    if (itr->second.m_genericSlot == NULL)
+      throw torrent::input_error("Variable does not have a generic slot.");
+
+    return itr->second.m_genericSlot(itr->second.m_variable, arg);
+  }
+
+  return itr->second.m_downloadSlot(itr->second.m_variable, download, arg);
+}
+
 }

src/utils/variable_map.h

@@ -112,7 +112,7 @@ public:
 
   // Allow NULL slot as a temporary compatibility hack.
 
-  void                insert(key_type key, Variable* variable, generic_slot genericSlot = NULL, int flags = 0,
+  void                insert(key_type key, Variable* variable, generic_slot genericSlot = NULL, download_slot downloadSlot = NULL, int flags = 0,
                              const char* parm = "", const char* doc = "");
 
   // Consider uninlining the helper functions.
@@ -147,6 +147,8 @@ public:
   void                call_command_set_string(key_type key, const std::string& arg)               { call_command(key, mapped_type(arg)); }
   void                call_command_set_std_string(const std::string& key, const std::string& arg) { call_command(key.c_str(), mapped_type(arg)); }
 
+  const mapped_type   call_command_d(key_type key, core::Download* download, const mapped_type& arg);
+
 private:
   VariableMap(const VariableMap&);
   void operator = (const VariableMap&);