* Fixed a bug that cause the hash checker not to start.

* Added "base_path" and "base_filename" types to the
"create/delete_link" command.


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

Author: rakshasa

TODO_LONGTERM

@@ -43,32 +43,6 @@ not open. Or do session torrent saving as needed, when seeding is
 stopped etc. Perhaps a dirty flag.
 
 
-== Global and Download specific variables ==
-
-There are various things, ties to files, peer connection type etc that
-should be in a generic variable container thingie. In addition there
-should be a template for new downloads, download factory etc. The
-download factory's being given to the new download.
-
-Remember that we currently don't save sessions for inactive torrents.
-
-Some variables should have custom store/retrive slots. One kind could
-be used to store/retrive values from the bencoded data, with syntax
-like "rtorrent/state" etc.
-
-Stuff about new bencode thingie.
-
-Make it possible to do an validity check on a bencode stream.
-
-
-== Cleanup of the display manager ==
-
-Consider taking the tasks out of the Window class, and just use flags
-for those that want to be regulary updated.
-
-Get rid of the Element* classes?
-
-
 == Configurable keybindings ==
 
 ...

src/data/hash_torrent.cc

@@ -58,15 +58,10 @@ HashTorrent::start(bool tryQuick) {
   if (m_position == m_chunkList->size())
     return true;
 
-  if (!is_checking()) {
-    if (m_position > 0 || m_chunkList->empty())
-      throw internal_error("HashTorrent::start() call failed.");
+  if (m_position > 0 || m_chunkList->empty())
+    throw internal_error("HashTorrent::start() call failed.");
 
-    m_outstanding = 0;
-  }
-
-  // This doesn't really handle paused hashing properly... Do we set
-  // m_outstanding to -1 when stopping?
+  m_outstanding = 0;
 
   queue(tryQuick);
   return m_position == m_chunkList->size();
@@ -100,22 +95,17 @@ HashTorrent::confirm_checked() {
 
 void
 HashTorrent::receive_chunkdone() {
-  if (m_outstanding == -1)
-    throw internal_error("HashTorrent::receive_chunkdone() m_outstanding < 0.");
+  if (m_outstanding <= 0)
+    throw internal_error("HashTorrent::receive_chunkdone() m_outstanding <= 0.");
 
   // m_signalChunk will always point to
   // DownloadMain::receive_hash_done, so it will take care of cleanup.
   //
   // Make sure we call chunkdone before torrentDone has a chance to
   // trigger.
-//   m_slotChunkDone(handle, hash);
   m_outstanding--;
 
-  // Don't add more when we've stopped. Use some better condition than
-  // m_outstanding. This code is ugly... needs a refactoring, a
-  // seperate flag for active and allow pause or clearing the state.
-  if (m_outstanding >= 0)
-    queue(false);
+  queue(false);
 }
 
 // Mark unsuccessful checks so that if we have just stopped the

src/torrent/download.cc

@@ -119,19 +119,19 @@ Download::stop() {
 bool
 Download::hash_check(bool tryQuick) {
   if (m_ptr->hash_checker()->is_checking())
-    return m_ptr->hash_checker()->start(tryQuick);
+    throw internal_error("Download::hash_check(...) called but the hash is already being checked.");
 
   if (!m_ptr->info()->is_open() || m_ptr->info()->is_active())
     throw internal_error("Download::hash_check(...) called on a closed or active download.");
 
   if (m_ptr->hash_checker()->is_checked())
     throw internal_error("Download::hash_check(...) called but already hash checked.");
 
-  // The bitfield still hasn't been allocated, so no resume data was
-  // given. 
   Bitfield* bitfield = m_ptr->main()->file_list()->mutable_bitfield();
 
   if (bitfield->empty()) {
+    // The bitfield still hasn't been allocated, so no resume data was
+    // given. 
     bitfield->allocate();
     bitfield->unset_all();