Changeset 4118

Timestamp:

10/28/08 22:20:46 (2 months ago)

Author:

andar

Message:

Update bindings

Files:

• branches/1.0.0_RC/libtorrent/bindings/python/src/alert.cpp (modified) (23 diffs)
• branches/1.0.0_RC/libtorrent/bindings/python/src/extensions.cpp (modified) (3 diffs)
• branches/1.0.0_RC/libtorrent/bindings/python/src/ip_filter.cpp (modified) (2 diffs)
• branches/1.0.0_RC/libtorrent/bindings/python/src/session.cpp (modified) (8 diffs)
• branches/1.0.0_RC/libtorrent/bindings/python/src/torrent_handle.cpp (modified) (6 diffs)
• branches/1.0.0_RC/libtorrent/bindings/python/src/torrent_info.cpp (modified) (4 diffs)
• trunk/libtorrent/bindings/python/src/alert.cpp (modified) (23 diffs)
• trunk/libtorrent/bindings/python/src/session.cpp (modified) (8 diffs)
• trunk/libtorrent/bindings/python/src/torrent_handle.cpp (modified) (6 diffs)
• trunk/libtorrent/bindings/python/src/torrent_info.cpp (modified) (4 diffs)

branches/1.0.0_RC/libtorrent/bindings/python/src/alert.cpp

@@ -57 +57 @@
             .def("what", &alert::what)
             .def("category", &alert::category)
+#ifndef TORRENT_NO_DEPRECATE
             .def("severity", &alert::severity, alert_severity_doc)
+#endif
             .def("__str__", &alert::message, alert_msg_doc)
             ;
@@ -68 +70 @@
             .value("fatal", alert::fatal)
             .value("none", alert::none)
-            ; 
+            ;
 
         enum_<alert::category_t>("category_t")
@@ -80 +82 @@
             .value("progress_notification", alert::progress_notification)
             .value("ip_block_notification", alert::ip_block_notification)
+            .value("performance_warning", alert::performance_warning)
             .value("all_categories", alert::all_categories)
-            ; 
+            ;
+
     }
 
@@ -154 +158 @@
         "torrent_finished_alert", torrent_finished_alert_doc, no_init
     );
-    
+
     class_<piece_finished_alert, bases<torrent_alert>, noncopyable>(
         "piece_finished_alert", piece_finished_alert_doc, no_init
@@ -160 +164 @@
         .def_readonly("piece_index", &piece_finished_alert::piece_index)
         ;
-    
+
     class_<block_finished_alert, bases<peer_alert>, noncopyable>(
         "block_finished_alert", block_finished_alert_doc, no_init
@@ -167 +171 @@
         .def_readonly("piece_index", &block_finished_alert::piece_index)
         ;
-    
+
     class_<block_downloading_alert, bases<peer_alert>, noncopyable>(
         "block_downloading_alert", block_downloading_alert_doc, no_init
@@ -175 +179 @@
         .def_readonly("piece_index", &block_downloading_alert::piece_index)
         ;
-        
+
     class_<storage_moved_alert, bases<torrent_alert>, noncopyable>(
         "storage_moved_alert", storage_moved_alert_doc, no_init
@@ -183 +187 @@
         "torrent_deleted_alert", torrent_deleted_alert_doc, no_init
     );
-    
+
     class_<torrent_paused_alert, bases<torrent_alert>, noncopyable>(
         "torrent_paused_alert", torrent_paused_alert_doc, no_init
@@ -191 +195 @@
         "torrent_checked_alert", torrent_checked_alert_doc, no_init
     );
-    
+
     class_<url_seed_alert, bases<torrent_alert>, noncopyable>(
         "url_seed_alert", url_seed_alert_doc, no_init
@@ -197 +201 @@
         .def_readonly("url", &url_seed_alert::url)
         ;
-        
+
     class_<file_error_alert, bases<torrent_alert>, noncopyable>(
         "file_error_alert", file_error_alert_doc, no_init
@@ -203 +207 @@
         .def_readonly("file", &file_error_alert::file)
         ;
-    
+
     class_<metadata_failed_alert, bases<torrent_alert>, noncopyable>(
         "metadata_failed_alert", metadata_failed_alert_doc, no_init
@@ -215 +219 @@
         "listen_failed_alert", listen_failed_alert_doc, no_init
     );
-    
+
     class_<listen_succeeded_alert, bases<alert>, noncopyable>(
         "listen_succeeded_alert", listen_succeeded_alert_doc, no_init
@@ -221 +225 @@
         .def_readonly("endpoint", &listen_succeeded_alert::endpoint)
         ;
-    
+
     class_<portmap_error_alert, bases<alert>, noncopyable>(
         "portmap_error_alert", portmap_error_alert_doc, no_init
@@ -228 +232 @@
         .def_readonly("type", &portmap_error_alert::type)
         ;
-        
+
     class_<portmap_alert, bases<alert>, noncopyable>(
         "portmap_alert", portmap_alert_doc, no_init
@@ -236 +240 @@
         .def_readonly("type", &portmap_alert::type)
         ;
-            
+
     class_<fastresume_rejected_alert, bases<torrent_alert>, noncopyable>(
         "fastresume_rejected_alert", fastresume_rejected_alert_doc, no_init
     );
-    
+
     class_<peer_blocked_alert, bases<alert>, noncopyable>(
         "peer_blocked_alert", peer_blocked_alert_doc, no_init
@@ -246 +250 @@
         .def_readonly("ip", &peer_blocked_alert::ip)
         ;
-        
+
     class_<scrape_reply_alert, bases<tracker_alert>, noncopyable>(
         "scrape_reply_alert", scrape_reply_alert_doc, no_init
@@ -253 +257 @@
         .def_readonly("complete", &scrape_reply_alert::complete)
         ;
-    
+
     class_<scrape_failed_alert, bases<tracker_alert>, noncopyable>(
         "scrape_failed_alert", scrape_failed_alert_doc, no_init
     );
-    
+
     class_<udp_error_alert, bases<alert>, noncopyable>(
         "udp_error_alert", udp_error_alert_doc, no_init
@@ -263 +267 @@
         .def_readonly("endpoint", &udp_error_alert::endpoint)
         ;
-    
+
     class_<external_ip_alert, bases<alert>, noncopyable>(
         "external_ip_alert", external_ip_alert_doc, no_init
@@ -289 +293 @@
         .def_readonly("msg", &file_rename_failed_alert::msg)
         ;
-        
-    class_<torrent_resumed_alert, bases<torrent_alert>, noncopyable>( 
-        "torrent_resumed_alert", no_init 
+
+    class_<torrent_resumed_alert, bases<torrent_alert>, noncopyable>(
+        "torrent_resumed_alert", no_init
         );
-        
+
         class_<state_changed_alert, bases<torrent_alert>, noncopyable>(
             "state_changed_alert", no_init
@@ -305 +309 @@
             .def_readonly("num_peers", &dht_reply_alert::num_peers)
             ;
-        
+
         class_<peer_unsnubbed_alert, bases<peer_alert>, noncopyable>(
             "peer_unsnubbed_alert", no_init
         );
-        
+
         class_<peer_snubbed_alert, bases<peer_alert>, noncopyable>(
             "peer_snubbed_alert", no_init
         );
-        
+
     class_<peer_connect_alert, bases<peer_alert>, noncopyable>(
         "peer_connect_alert", no_init
     );
-    
+
     class_<peer_disconnected_alert, bases<peer_alert>, noncopyable>(
         "peer_disconnected_alert", no_init
     );
-    
+
     class_<request_dropped_alert, bases<peer_alert>, noncopyable>(
         "request_dropped_alert", no_init
@@ -328 +332 @@
         .def_readonly("piece_index", &request_dropped_alert::piece_index)
     ;
-    
+
     class_<block_timeout_alert, bases<peer_alert>, noncopyable>(
         "block_timeout_alert", no_init
@@ -335 +339 @@
         .def_readonly("piece_index", &block_timeout_alert::piece_index)
     ;
-    
+
     class_<unwanted_block_alert, bases<peer_alert>, noncopyable>(
         "unwanted_block_alert", no_init
@@ -342 +346 @@
         .def_readonly("piece_index", &unwanted_block_alert::piece_index)
     ;
-    
+
     class_<torrent_delete_failed_alert, bases<torrent_alert>, noncopyable>(
         "torrent_delete_failed_alert", no_init
     );
-    
+
     class_<save_resume_data_failed_alert, bases<torrent_alert>, noncopyable>(
         "save_resume_data_failed_alert", no_init
     );
-    
+
+    class_<performance_alert, bases<torrent_alert>, noncopyable>(
+        "performance_alert", no_init
+    )
+        .def_readonly("warning_code", &performance_alert::warning_code)
+    ;
+    enum_<performance_alert::performance_warning_t>("performance_warning_t")
+        .value("outstanding_disk_buffer_limit_reached", performance_alert::outstanding_disk_buffer_limit_reached)
+        .value("outstanding_request_limit_reached", performance_alert::outstanding_request_limit_reached)
+    ;
+
+
+
 }

branches/1.0.0_RC/libtorrent/bindings/python/src/extensions.cpp

@@ -10 +10 @@
 #include <libtorrent/extensions/metadata_transfer.hpp>
 #include <libtorrent/extensions/ut_metadata.hpp>
+#include <libtorrent/extensions/smart_ban.hpp>
 #include <boost/python.hpp>
 #include "gil.hpp"
@@ -124 +125 @@
 }
 
+boost::shared_ptr<torrent_plugin> create_smart_ban_plugin_wrapper(torrent* t) {
+    return create_smart_ban_plugin(t, NULL);
+}
+
 void bind_extensions()
 {
@@ -161 +166 @@
     def("create_metadata_plugin", create_metadata_plugin_wrapper);
     def("create_ut_metadata_plugin", create_ut_metadata_plugin_wrapper);
+    def("create_smart_ban_plugin", create_smart_ban_plugin_wrapper);
 }
 

branches/1.0.0_RC/libtorrent/bindings/python/src/ip_filter.cpp

@@ -14 +14 @@
     void add_rule(ip_filter& filter, std::string start, std::string end, int flags)
     {
-        return filter.add_rule(address_v4::from_string(start), address_v4::from_string(end), flags);
+        return filter.add_rule(address::from_string(start), address::from_string(end), flags);
+    }
+    
+    int _access(ip_filter& filter, std::string addr)
+    {
+        return filter.access(address::from_string(addr));
     }
 }
@@ -21 +26 @@
 {
     class_<ip_filter>("ip_filter")
-        .def("add_rule", &add_rule)
-        .def("access", allow_threads(&ip_filter::access))
-        .def_readonly("export_filter", allow_threads(&ip_filter::export_filter))
+        .def("add_rule", add_rule)
+        .def("access", _access)
+        .def("export_filter", allow_threads(&ip_filter::export_filter))
     ;
 }

branches/1.0.0_RC/libtorrent/bindings/python/src/session.cpp

@@ -50 +50 @@
 extern char const* session_set_settings_doc;
 extern char const* session_set_pe_settings_doc;
-extern char const* session_get_pe_settings_doc; 
+extern char const* session_get_pe_settings_doc;
 extern char const* session_set_severity_level_doc;
 extern char const* session_pop_alert_doc;
@@ -105 +105 @@
       s.add_extension(invoke_extension_factory(e));
   }
+
+#ifndef TORRENT_NO_DEPRECATE
+  torrent_handle add_torrent_depr(session& s, torrent_info const& ti
+    , boost::filesystem::path const& save, entry const& resume
+    , storage_mode_t storage_mode, bool paused)
+  {
+      allow_threading_guard guard;
+      return s.add_torrent(ti, save, resume, storage_mode, paused, default_storage_constructor);
+  }
+#endif
 
   torrent_handle add_torrent(session& s, dict params)
@@ -137 +147 @@
       p.resume_data = &resume_buf;
     }
-    p.storage_mode = extract<storage_mode_t>(params["storage_mode"]);
-    p.paused = params["paused"];
-    p.auto_managed = params["auto_managed"];
-    p.duplicate_is_error = params["duplicate_is_error"];
+    if (params.has_key("storage_mode"))
+        p.storage_mode = extract<storage_mode_t>(params["storage_mode"]);
+    if (params.has_key("paused"))
+       p.paused = params["paused"];
+    if (params.has_key("auto_managed"))
+       p.auto_managed = params["auto_managed"];
+    if (params.has_key("duplicate_is_error"))
+       p.duplicate_is_error = params["duplicate_is_error"];
 
     return s.add_torrent(p);
@@ -170 +184 @@
      return ret;
   }
-  
+
 #ifndef TORRENT_DISABLE_GEO_IP
   bool load_asnum_db(session& s, std::string file)
@@ -260 +274 @@
         .value("start_default_features", session::start_default_features)
     ;
-    
+
     class_<session, boost::noncopyable>("session", session_doc, no_init)
         .def(
@@ -289 +303 @@
 #endif
         .def("add_torrent", &add_torrent, session_add_torrent_doc)
+#ifndef TORRENT_NO_DEPRECATE
+        .def(
+            "add_torrent", &add_torrent_depr
+          , (
+                arg("resume_data") = entry(), arg("storage_mode") = storage_mode_sparse,
+                arg("paused") = false
+            )
+          , session_add_torrent_doc
+        )
+#endif
         .def("remove_torrent", allow_threads(&session::remove_torrent), arg("option") = session::none
+
                           , session_remove_torrent_doc)
         .def(
@@ -337 +362 @@
         .def("load_state", allow_threads(&session::load_state))
         .def("state", allow_threads(&session::state))
+#ifndef TORRENT_NO_DEPRECATE
         .def(
             "set_severity_level", allow_threads(&session::set_severity_level)
           , session_set_severity_level_doc
         )
+#endif
         .def("set_alert_mask", allow_threads(&session::set_alert_mask))
         .def("pop_alert", allow_threads(&session::pop_alert), session_pop_alert_doc)
@@ -363 +390 @@
     register_ptr_to_python<std::auto_ptr<alert> >();
 }
-
-

branches/1.0.0_RC/libtorrent/bindings/python/src/torrent_handle.cpp

@@ -153 +153 @@
     list ret;
     std::vector<int> priorities = handle.file_priorities();
-    
+
     for (std::vector<int>::iterator i = priorities.begin(); i != priorities.end(); ++i)
         ret.append(*i);
-        
+
     return ret;
 }
@@ -254 +254 @@
     void (torrent_handle::*piece_priority1)(int, int) const = &torrent_handle::piece_priority;
 
-#ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES       
+#ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES
     bool (torrent_handle::*resolve_countries0)() const = &torrent_handle::resolve_countries;
     void (torrent_handle::*resolve_countries1)(bool) = &torrent_handle::resolve_countries;
@@ -282 +282 @@
         .def("resume", _(&torrent_handle::resume))
         .def("clear_error", _(&torrent_handle::clear_error))
-        
+
         .def("is_auto_managed", _(&torrent_handle::is_auto_managed))
         .def("auto_managed", _(&torrent_handle::auto_managed))
@@ -290 +290 @@
         .def("queue_position_top", _(&torrent_handle::queue_position_top))
         .def("queue_position_bottom", _(&torrent_handle::queue_position_bottom))
-        
-#ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES       
+
+#ifndef TORRENT_DISABLE_RESOLVE_COUNTRIES
         .def("resolve_countries", _(resolve_countries0))
         .def("resolve_countries", _(resolve_countries1))
 #endif
         // deprecated
+#ifndef TORRENT_NO_DEPRECATE
         .def("filter_piece", _(&torrent_handle::filter_piece))
         .def("is_piece_filtered", _(&torrent_handle::is_piece_filtered))
-
+        .def("write_resume_data", _(&torrent_handle::write_resume_data))
+#endif
         .def("piece_availability", piece_availability)
         .def("piece_priority", _(piece_priority0))
@@ -307 +309 @@
         .def("file_priorities", file_priorities)
         .def("use_interface", &torrent_handle::use_interface)
-        .def("write_resume_data", _(&torrent_handle::write_resume_data))
         .def("save_resume_data", _(&torrent_handle::save_resume_data))
         .def("force_reannounce", _(force_reannounce0))
@@ -332 +333 @@
         ;
 }
-

branches/1.0.0_RC/libtorrent/bindings/python/src/torrent_info.cpp

@@ -68 +68 @@
         return result;
     }
+
+    torrent_info construct0(std::string path) {
+        return torrent_info(fs::path(path));
+    }
 } // namespace unnamed
 
@@ -75 +79 @@
 
     class_<torrent_info, boost::intrusive_ptr<torrent_info> >("torrent_info", no_init)
+#ifndef TORRENT_NO_DEPRECATE
         .def(init<entry const&>())
+#endif
         .def(init<sha1_hash const&>())
         .def(init<char const*, int>())
-        
+        .def(init<boost::filesystem::path>())
+
         .def("add_tracker", &torrent_info::add_tracker, (arg("url"), arg("tier")=0))
         .def("add_url_seed", &torrent_info::add_url_seed)
@@ -88 +95 @@
         .def("piece_length", &torrent_info::piece_length)
         .def("num_pieces", &torrent_info::num_pieces)
+#ifndef TORRENT_NO_DEPRECATE
         .def("info_hash", &torrent_info::info_hash, copy)
-
+#endif
         .def("hash_for_piece", &torrent_info::hash_for_piece)
         .def("piece_size", &torrent_info::piece_size)
@@ -124 +132 @@
         ;
 }
-
-

trunk/libtorrent/bindings/python/src/alert.cpp

@@ -57 +57 @@
             .def("what", &alert::what)
             .def("category", &alert::category)
+#ifndef TORRENT_NO_DEPRECATE
             .def("severity", &alert::severity, alert_severity_doc)
+#endif
             .def("__str__", &alert::message, alert_msg_doc)
             ;
@@ -68 +70 @@
             .value("fatal", alert::fatal)
             .value("none", alert::none)
-            ; 
+            ;
 
         enum_<alert::category_t>("category_t")
@@ -80 +82 @@
             .value("progress_notification", alert::progress_notification)
             .value("ip_block_notification", alert::ip_block_notification)
+            .value("performance_warning", alert::performance_warning)
             .value("all_categories", alert::all_categories)
-            ; 
+            ;
+
     }
 
@@ -154 +158 @@
         "torrent_finished_alert", torrent_finished_alert_doc, no_init
     );
-    
+
     class_<piece_finished_alert, bases<torrent_alert>, noncopyable>(
         "piece_finished_alert", piece_finished_alert_doc, no_init
@@ -160 +164 @@
         .def_readonly("piece_index", &piece_finished_alert::piece_index)
         ;
-    
+
     class_<block_finished_alert, bases<peer_alert>, noncopyable>(
         "block_finished_alert", block_finished_alert_doc, no_init
@@ -167 +171 @@
         .def_readonly("piece_index", &block_finished_alert::piece_index)
         ;
-    
+
     class_<block_downloading_alert, bases<peer_alert>, noncopyable>(
         "block_downloading_alert", block_downloading_alert_doc, no_init
@@ -175 +179 @@
         .def_readonly("piece_index", &block_downloading_alert::piece_index)
         ;
-        
+
     class_<storage_moved_alert, bases<torrent_alert>, noncopyable>(
         "storage_moved_alert", storage_moved_alert_doc, no_init
@@ -183 +187 @@
         "torrent_deleted_alert", torrent_deleted_alert_doc, no_init
     );
-    
+
     class_<torrent_paused_alert, bases<torrent_alert>, noncopyable>(
         "torrent_paused_alert", torrent_paused_alert_doc, no_init
@@ -191 +195 @@
         "torrent_checked_alert", torrent_checked_alert_doc, no_init
     );
-    
+
     class_<url_seed_alert, bases<torrent_alert>, noncopyable>(
         "url_seed_alert", url_seed_alert_doc, no_init
@@ -197 +201 @@
         .def_readonly("url", &url_seed_alert::url)
         ;
-        
+
     class_<file_error_alert, bases<torrent_alert>, noncopyable>(
         "file_error_alert", file_error_alert_doc, no_init
@@ -203 +207 @@
         .def_readonly("file", &file_error_alert::file)
         ;