Changeset 963

Timestamp:

08/23/07 17:21:11 (5 years ago)

Author:

rakshasa

Message:

* Cleaned up the 'umask' command and renamed 'working_directory' to
'cwd'.

* Added 'd.{get,set}_custom[1-5]' for user scripts.

Location:

trunk

Files:

• libtorrent/rak/socket_address.h (modified) (1 diff)
• rtorrent/doc/rtorrent.1.xml (modified) (1 diff)
• rtorrent/rak/socket_address.h (modified) (1 diff)
• rtorrent/src/command_download.cc (modified) (2 diffs)
• rtorrent/src/command_helpers.h (modified) (2 diffs)
• rtorrent/src/command_local.cc (modified) (5 diffs)
• rtorrent/src/control.cc (modified) (1 diff)
• rtorrent/src/control.h (modified) (1 diff)
• rtorrent/src/core/download_factory.cc (modified) (1 diff)
• rtorrent/src/main.cc (modified) (1 diff)

trunk/libtorrent/rak/socket_address.h

@@ -75 +75 @@
 #else
   static const sa_family_t af_local  = AF_UNIX;
-  static const itn         pf_local  = PF_UNIX;
+  static const int         pf_local  = PF_UNIX;
 #endif
 

trunk/rtorrent/doc/rtorrent.1.xml

@@ -982 +982 @@
 
       <varlistentry>
-        <term>working_directory = <replaceable>directory</replaceable></term>
+        <term>cwd = <replaceable>directory</replaceable></term>
         <listitem><para>
 

trunk/rtorrent/rak/socket_address.h

@@ -75 +75 @@
 #else
   static const sa_family_t af_local  = AF_UNIX;
-  static const itn         pf_local  = PF_UNIX;
+  static const int         pf_local  = PF_UNIX;
 #endif
 

trunk/rtorrent/src/command_download.cc

@@ -313 +313 @@
   ADD_CD_SLOT("d.set_" key, call_string,  rpc::set_variable_d_fn(firstKey, secondKey), "i:s", "");
 
+#define ADD_CD_VARIABLE_STRING_PUBLIC(key, firstKey, secondKey) \
+  ADD_CD_SLOT_PUBLIC("d.get_" key, call_unknown, rpc::get_variable_d_fn(firstKey, secondKey), "i:", ""); \
+  ADD_CD_SLOT_PUBLIC("d.set_" key, call_string,  rpc::set_variable_d_fn(firstKey, secondKey), "i:s", "");
+
 #define ADD_CD_VALUE_UNI(key, get) \
   ADD_CD_SLOT_PUBLIC("d.get_" key, call_unknown, rpc::object_void_d_fn(get), "i:", "")
@@ -371 +375 @@
   ADD_CD_VALUE_UNI("is_hash_checking", rak::on(std::mem_fun(&core::Download::download), std::mem_fun(&torrent::Download::is_hash_checking)));
   ADD_CD_VALUE_UNI("is_multi_file",    rak::on(std::mem_fun(&core::Download::file_list), std::mem_fun(&torrent::FileList::is_multi_file)));
+
+  ADD_CD_VARIABLE_STRING_PUBLIC("custom1", "rtorrent", "custom1");
+  ADD_CD_VARIABLE_STRING_PUBLIC("custom2", "rtorrent", "custom2");
+  ADD_CD_VARIABLE_STRING_PUBLIC("custom3", "rtorrent", "custom3");
+  ADD_CD_VARIABLE_STRING_PUBLIC("custom4", "rtorrent", "custom4");
+  ADD_CD_VARIABLE_STRING_PUBLIC("custom5", "rtorrent", "custom5");
 
   // 0 - stopped

trunk/rtorrent/src/command_helpers.h

@@ -89 +89 @@
 add_variable("get_" key, "set_" key, key, &rpc::CommandVariable::get_string, &rpc::CommandVariable::set_string, std::string(defaultValue));
 
-#define ADD_VARIABLE_C_STRING(key, defaultValue) \
-add_variable("get_" key, NULL, NULL, &rpc::CommandVariable::get_string, NULL, std::string(defaultValue));
+#define ADD_C_STRING(key, defaultValue) \
+add_variable(key, NULL, NULL, &rpc::CommandVariable::get_string, NULL, std::string(defaultValue));
 
 #define ADD_COMMAND_SLOT(key, function, slot, parm, doc)    \
@@ -116 +116 @@
   ADD_COMMAND_SLOT("get_" key,  call_unknown, rpc::object_void_fn(get), "i:", "")
 
-#define ADD_COMMAND_VALUE_TRI_OCT(key, set, get) \
+#define ADD_COMMAND_VALUE_SET_OCT(prefix, key, set)                 \
   ADD_COMMAND_SLOT_PRIVATE(key, call_value_oct, rpc::object_value_fn(set)) \
-  ADD_COMMAND_COPY("set_" key,  call_value, "i:i", "")                      \
-  ADD_COMMAND_SLOT("get_" key,  call_unknown, rpc::object_void_fn(get), "i:", "")
+  ADD_COMMAND_COPY(prefix "set_" key,  call_value, "i:i", "")
 
-#define ADD_COMMAND_STRING_TRI(key, set, get) \
+#define ADD_COMMAND_VALUE_TRI_OCT(prefix, key, set, get)                 \
+  ADD_COMMAND_SLOT_PRIVATE(key, call_value_oct, rpc::object_value_fn(set)) \
+  ADD_COMMAND_COPY(prefix "set_" key,  call_value, "i:i", "")                      \
+  ADD_COMMAND_SLOT(prefix "get_" key,  call_unknown, rpc::object_void_fn(get), "i:", "")
+
+#define ADD_COMMAND_STRING_PREFIX(prefix, key, set, get) \
   ADD_COMMAND_SLOT_PRIVATE(key, call_string, rpc::object_string_fn(set))      \
-  ADD_COMMAND_COPY("set_" key,  call_string, "i:s", "") \
-  ADD_COMMAND_SLOT("get_" key,  call_unknown, rpc::object_void_fn(get), "s:", "")
+  ADD_COMMAND_COPY(prefix "set_" key,  call_string, "i:s", "") \
+  ADD_COMMAND_SLOT(prefix "get_" key,  call_unknown, rpc::object_void_fn(get), "s:", "")
+
+#define ADD_COMMAND_STRING_TRI(key, set, get)                    \
+  ADD_COMMAND_STRING_PREFIX("", key, set, get)
 
 #define ADD_COMMAND_VOID(key, slot) \

trunk/rtorrent/src/command_local.cc

@@ -42 +42 @@
 #include <rak/path.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <torrent/torrent.h>
 #include <torrent/chunk_manager.h>
@@ -82 +83 @@
 
 torrent::Object
-apply_get_hostname() {
+system_hostname() {
   char buffer[1024];
 
@@ -94 +95 @@
 }
 
+torrent::Object
+system_get_cwd() {
+  char* buffer = getcwd(NULL, 0);
+
+  if (buffer == NULL)
+    throw torrent::input_error("Unable to read cwd.");
+
+  torrent::Object result = torrent::Object(std::string(buffer));
+  free(buffer);
+
+  return result;
+}
+
+torrent::Object
+system_set_cwd(const torrent::Object& rawArgs) {
+  if (::chdir(rawArgs.as_string().c_str()) != 0)
+    throw torrent::input_error("Could not change current working directory.");
+
+  return torrent::Object();
+}
+
 void
 initialize_command_local() {
@@ -100 +122 @@
   core::DownloadStore*   dStore = control->core()->download_store();
 
-  ADD_VARIABLE_C_STRING("client_version",  PACKAGE_VERSION);
-  ADD_VARIABLE_C_STRING("library_version", torrent::version());
+  ADD_C_STRING("system.client_version",          PACKAGE_VERSION);
+  ADD_C_STRING("system.library_version",         torrent::version());
 
-  ADD_COMMAND_VOID("get_hostname",         rak::ptr_fun(&apply_get_hostname));
-  ADD_COMMAND_VOID("get_pid",              rak::ptr_fun(&getpid));
+  ADD_COMMAND_VOID("system.hostname",            rak::ptr_fun(&system_hostname));
+  ADD_COMMAND_VOID("system.pid",                 rak::ptr_fun(&getpid));
 
-  ADD_VARIABLE_STRING("name",              "");
+  ADD_COMMAND_VALUE_SET_OCT("system.", "umask",  std::ptr_fun(&umask));
+  ADD_COMMAND_STRING_PREFIX("system.", "cwd",    std::ptr_fun(system_set_cwd), rak::ptr_fun(&system_get_cwd));
+
+  ADD_VARIABLE_STRING("name",            "");
 
   ADD_VARIABLE_VALUE("max_file_size", -1);
@@ -126 +151 @@
   ADD_COMMAND_VOID("session_save",             rak::make_mem_fun(dList, &core::DownloadList::session_save));
 
-  ADD_COMMAND_VALUE_TRI_OCT("umask",           rak::make_mem_fun(control, &Control::set_umask), rak::make_mem_fun(control, &Control::umask));
-  ADD_COMMAND_STRING_TRI("working_directory",  rak::make_mem_fun(control, &Control::set_working_directory), rak::make_mem_fun(control, &Control::working_directory));
-
   ADD_COMMAND_LIST("execute",             rak::bind2_mem_fn(&rpc::execFile, &rpc::ExecFile::execute_object, rpc::ExecFile::flag_throw | rpc::ExecFile::flag_expand_tilde));
   ADD_COMMAND_LIST("execute_nothrow",     rak::bind2_mem_fn(&rpc::execFile, &rpc::ExecFile::execute_object, rpc::ExecFile::flag_expand_tilde));

trunk/rtorrent/src/control.cc

@@ -160 +160 @@
   return m_core->get_poll_manager()->get_torrent_poll();
 }
-
-void
-Control::set_umask(mode_t m) {
-  ::umask(m);
-
-  m_umask = m;
-}
-
-void
-Control::set_working_directory(const std::string& dir) {
-  if (::chdir(dir.c_str()) != 0)
-    throw torrent::input_error("Could not change working directory.");
-}

trunk/rtorrent/src/control.h

@@ -106 +106 @@
   void                inc_tick()                    { m_tick++; }
 
-  mode_t              umask() const                 { return m_umask; }
-  void                set_umask(mode_t m);
-
   const std::string&  working_directory() const     { return m_workingDirectory; }
   void                set_working_directory(const std::string& dir);

trunk/rtorrent/src/core/download_factory.cc

@@ -175 +175 @@
   initialize_rtorrent(download, rtorrent);
 
+  if (!rtorrent->has_key_string("custom1")) rtorrent->insert_key("custom1", std::string());
+  if (!rtorrent->has_key_string("custom2")) rtorrent->insert_key("custom2", std::string());
+  if (!rtorrent->has_key_string("custom3")) rtorrent->insert_key("custom3", std::string());
+  if (!rtorrent->has_key_string("custom4")) rtorrent->insert_key("custom4", std::string());
+  if (!rtorrent->has_key_string("custom5")) rtorrent->insert_key("custom5", std::string());
+
   // Move to 'rtorrent'.
   rpc::call_command_d("d.set_connection_leech", download, m_variables["connection_leech"]);

trunk/rtorrent/src/main.cc

@@ -167 +167 @@
 
     rpc::parse_command_multiple(rpc::make_target(),
-//       "set_name = $cat={$get_hostname=,:,$get_pid=}\n"
-       "set_name = \"$cat=$get_hostname=,:,$get_pid=\"\n"
+//       "set_name = $cat={$system.hostname=,:,$system.pid=}\n"
+       "set_name = \"$cat=$system.hostname=,:,$system.pid=\"\n"
 
        // Currently not doing any sorting on main.