* Added "working_directory" option that calls chdir.

* Added "session_on_completion" option which saves the session torrent
when a download finishes.

* Handle SIGTERM gracefully, saving session torrents etc.

* Implemented session directory lockfile, use "session_lock" option to
disable.


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

src/utils/Makefile.am

@@ -4,6 +4,8 @@ libsub_utils_a_SOURCES = \
 	directory.cc \
 	directory.h \
 	list_focus.h \
+	lockfile.cc \
+	lockfile.h \
 	variable.h \
 	variable_generic.cc \
 	variable_generic.h \

src/utils/lockfile.cc

@@ -0,0 +1,75 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2005-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 <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include "lockfile.h"
+
+namespace utils {
+
+bool
+Lockfile::try_lock() {
+  if (m_path.empty()) {
+    m_id = "foo";
+    return true;
+  }
+
+  // Just do a simple locking for now that isn't safe for network
+  // devices.
+  int fd = ::open(m_path.c_str(), O_RDWR | O_CREAT | O_EXCL);
+
+  if (fd == -1)
+    return false;
+
+  m_id = "foo";
+  ::close(fd);
+
+  return true;
+}
+
+bool
+Lockfile::unlock() {
+  if (m_path.empty())
+    return true;
+  else
+    return ::unlink(m_path.c_str()) != -1;
+}
+
+}

src/utils/lockfile.h

@@ -0,0 +1,64 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2005-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_LOCKFILE_H
+#define RTORRENT_UTILS_LOCKFILE_H
+
+#include <string>
+
+namespace utils {
+
+class Lockfile {
+public:
+  
+  bool                is_locked() const                 { return !m_id.empty(); }
+
+  // If the path is empty no lock file will be created, although
+  // is_locked() will return true.
+  bool                try_lock();
+  bool                unlock();
+
+  const std::string&  path() const                      { return m_path; }
+  void                set_path(const std::string& path) { m_path = path; }
+
+private:
+  std::string         m_path;
+  std::string         m_id;
+};
+
+}
+
+#endif

src/utils/variable.h

@@ -37,6 +37,8 @@
 #ifndef RTORRENT_UTILS_VARIABLE_H
 #define RTORRENT_UTILS_VARIABLE_H
 
+#include <string>
+
 namespace torrent {
   class Bencode;
 }
@@ -49,7 +51,7 @@ public:
   virtual ~Variable() {}
 
   virtual const torrent::Bencode& get() = 0;
-  virtual void set(const torrent::Bencode& arg) = 0;
+  virtual void                    set(const torrent::Bencode& arg) = 0;
 
 protected:
   Variable(const Variable&);

src/utils/variable_generic.h

@@ -34,6 +34,9 @@
 //           Skomakerveien 33
 //           3185 Skoppum, NORWAY
 
+// Parts of this seems ugly in an attempt to avoid copying
+// data. Propably need to rewrite torrent::Bencode.
+
 #ifndef RTORRENT_UTILS_VARIABLE_GENERIC_H
 #define RTORRENT_UTILS_VARIABLE_GENERIC_H
 
@@ -56,7 +59,7 @@ public:
   virtual ~VariableAny();
 
   virtual const torrent::Bencode& get();
-  virtual void        set(const torrent::Bencode& arg);
+  virtual void                    set(const torrent::Bencode& arg);
 
 private:
   torrent::Bencode    m_variable;
@@ -68,7 +71,7 @@ public:
   virtual ~VariableValue();
 
   virtual const torrent::Bencode& get();
-  virtual void        set(const torrent::Bencode& arg);
+  virtual void                    set(const torrent::Bencode& arg);
 
 private:
   torrent::Bencode    m_variable;

src/utils/variable_map.cc

@@ -36,6 +36,7 @@
 
 #include "config.h"
 
+#include <cctype>
 #include <algorithm>
 #include <rak/functional.h>
 #include <torrent/exceptions.h>

src/utils/variable_map.h

@@ -61,7 +61,7 @@ public:
   // Consider taking char* start and finish instead of std::string to
   // avoid copying. Or make a view class.
   const mapped_type&  get(const std::string& key);
-  std::string         get_string(const std::string& key);
+  const std::string&  get_string(const std::string& key)                         { return get(key).as_string(); }
 
   void                set(const std::string& key, const mapped_type& arg);
   void                set_string(const std::string& key, const std::string& arg) { set(key, mapped_type(arg)); }
@@ -74,16 +74,6 @@ private:
   void operator = (const VariableMap&);
 };
 
-inline std::string
-VariableMap::get_string(const std::string& key) {
-  const mapped_type& v = get(key);
-
-  if (v.get_type() == mapped_type::TYPE_NONE)
-    return std::string();
-  else
-    return v.as_string();
-}
-
 }
 
 #endif