Changeset 3768

Timestamp:

08/28/08 03:56:28 (4 months ago)

Author:

andar

Message:

lt sync 2642

Files:

• branches/1.0.0_RC/libtorrent/include/libtorrent/magnet_uri.hpp (modified) (1 diff)
• branches/1.0.0_RC/libtorrent/src/magnet_uri.cpp (modified) (1 diff)
• branches/1.0.0_RC/libtorrent/src/peer_connection.cpp (modified) (1 diff)
• branches/1.0.0_RC/libtorrent/src/torrent.cpp (modified) (2 diffs)
• trunk/libtorrent/include/libtorrent/magnet_uri.hpp (modified) (1 diff)
• trunk/libtorrent/src/magnet_uri.cpp (modified) (1 diff)
• trunk/libtorrent/src/peer_connection.cpp (modified) (1 diff)
• trunk/libtorrent/src/torrent.cpp (modified) (2 diffs)

branches/1.0.0_RC/libtorrent/include/libtorrent/magnet_uri.hpp

@@ -47 +47 @@
 
         std::string TORRENT_EXPORT make_magnet_uri(torrent_handle const& handle);
+        std::string TORRENT_EXPORT make_magnet_uri(torrent_info const& info);
 
 #ifndef TORRENT_NO_DEPRECATE

branches/1.0.0_RC/libtorrent/src/magnet_uri.cpp

@@ -70 +70 @@
         }
 
+        std::string make_magnet_uri(torrent_info const& info)
+        {
+                std::stringstream ret;
+                if (!info.is_valid()) return ret.str();
+
+                std::string name = info.name();
+
+                ret << "magnet:?xt=urn:btih:" << base32encode(
+                        std::string((char*)info.info_hash().begin(), 20));
+                if (!name.empty())
+                        ret << "&dn=" << escape_string(name.c_str(), name.length());
+                std::vector<announce_entry> const& tr = info.trackers();
+                if (!tr.empty())
+                {
+                        ret << "&tr=" << escape_string(tr[0].url.c_str()
+                                , tr[0].url.length());
+                }
+                return ret.str();
+        }
+
 #ifndef TORRENT_NO_DEPRECATE
         torrent_handle add_magnet_uri(session& ses, std::string const& uri

branches/1.0.0_RC/libtorrent/src/peer_connection.cpp

@@ -1707 +1707 @@
                 
                         if (t->alerts().should_post<file_error_alert>())
-                        {
                                 t->alerts().post_alert(file_error_alert(j.error_file, t->get_handle(), j.str));
-                        }
+                        t->set_error(j.str);
                         t->pause();
                         return;

branches/1.0.0_RC/libtorrent/src/torrent.cpp

@@ -331 +331 @@
         void torrent::start()
         {
+                // we need to start announcing since we don't have any
+                // metadata. To receive peers to ask for it.
                 if (m_torrent_file->is_valid()) init();
+                else if (!m_trackers.empty()) start_announcing();
+
                 if (m_abort) return;
         }
@@ -3920 +3924 @@
         {
                 if (is_paused()) return;
-                if (!m_files_checked) return;
+                // if we don't have metadata, we need to announce
+                // before checking files, to get peers to
+                // request the metadata from
+                if (!m_files_checked && valid_metadata()) return;
                 if (m_announcing) return;
 

trunk/libtorrent/include/libtorrent/magnet_uri.hpp

@@ -47 +47 @@
 
         std::string TORRENT_EXPORT make_magnet_uri(torrent_handle const& handle);
+        std::string TORRENT_EXPORT make_magnet_uri(torrent_info const& info);
 
 #ifndef TORRENT_NO_DEPRECATE

trunk/libtorrent/src/magnet_uri.cpp

@@ -70 +70 @@
         }
 
+        std::string make_magnet_uri(torrent_info const& info)
+        {
+                std::stringstream ret;
+                if (!info.is_valid()) return ret.str();
+
+                std::string name = info.name();
+
+                ret << "magnet:?xt=urn:btih:" << base32encode(
+                        std::string((char*)info.info_hash().begin(), 20));
+                if (!name.empty())
+                        ret << "&dn=" << escape_string(name.c_str(), name.length());
+                std::vector<announce_entry> const& tr = info.trackers();
+                if (!tr.empty())
+                {
+                        ret << "&tr=" << escape_string(tr[0].url.c_str()
+                                , tr[0].url.length());
+                }
+                return ret.str();
+        }
+
 #ifndef TORRENT_NO_DEPRECATE
         torrent_handle add_magnet_uri(session& ses, std::string const& uri

trunk/libtorrent/src/peer_connection.cpp

@@ -1707 +1707 @@
                 
                         if (t->alerts().should_post<file_error_alert>())
-                        {
                                 t->alerts().post_alert(file_error_alert(j.error_file, t->get_handle(), j.str));
-                        }
+                        t->set_error(j.str);
                         t->pause();
                         return;

trunk/libtorrent/src/torrent.cpp

@@ -331 +331 @@
         void torrent::start()
         {
+                // we need to start announcing since we don't have any
+                // metadata. To receive peers to ask for it.
                 if (m_torrent_file->is_valid()) init();
+                else if (!m_trackers.empty()) start_announcing();
+
                 if (m_abort) return;
         }
@@ -3920 +3924 @@
         {
                 if (is_paused()) return;
-                if (!m_files_checked) return;
+                // if we don't have metadata, we need to announce
+                // before checking files, to get peers to
+                // request the metadata from
+                if (!m_files_checked && valid_metadata()) return;
                 if (m_announcing) return;