Swig refactor

frostwire · Jan 31, 2016 · 1a47c23 · 1a47c23
1 parent 4633322
commit 1a47c23
Show file tree

Hide file tree

Showing 15 changed files with 178 additions and 107 deletions.
diff --git a/src/main/java/com/frostwire/jlibtorrent/Downloader.java b/src/main/java/com/frostwire/jlibtorrent/Downloader.java
@@ -119,9 +119,9 @@ public void alert(Alert<?> alert) {
         if (add) {
             p.setName("fetchMagnet - " + uri);
 
-            long flags = p.getFlags();
+            long flags = p.get_flags();
             flags &= ~add_torrent_params.flags_t.flag_auto_managed.swigValue();
-            p.setFlags(flags);
+            p.set_flags(flags);
 
             ec.clear();
             th = s.getSwig().add_torrent(p, ec);

diff --git a/src/main/java/com/frostwire/jlibtorrent/Session.java b/src/main/java/com/frostwire/jlibtorrent/Session.java
@@ -845,7 +845,7 @@ private TorrentHandle addTorrentSupport(TorrentInfo ti, File saveDir, Priority[]
         }
         p.setStorage_mode(storage_mode_t.storage_mode_sparse);
 
-        long flags = p.getFlags();
+        long flags = p.get_flags();
 
         flags &= ~add_torrent_params.flags_t.flag_auto_managed.swigValue();
 
@@ -860,7 +860,7 @@ private TorrentHandle addTorrentSupport(TorrentInfo ti, File saveDir, Priority[]
             }
         }
 
-        p.setFlags(flags);
+        p.set_flags(flags);
 
         if (async) {
             s.async_add_torrent(p);

diff --git a/src/main/java/com/frostwire/jlibtorrent/Sha1Hash.java b/src/main/java/com/frostwire/jlibtorrent/Sha1Hash.java
@@ -23,7 +23,9 @@ public Sha1Hash(sha1_hash h) {
 
     public Sha1Hash(String hex) {
         this();
-        sha1_hash.from_hex(hex, h);
+        if (!sha1_hash.from_hex(hex, h)) {
+            throw new IllegalArgumentException("Invalid sha1 hex string");
+        }
     }
 
     /**

diff --git a/src/main/java/com/frostwire/jlibtorrent/alerts/DhtStatsAlert.java b/src/main/java/com/frostwire/jlibtorrent/alerts/DhtStatsAlert.java
@@ -56,6 +56,6 @@ public DHTRoutingBucket[] routingTable() {
     }
 
     public int totalNodes() {
-        return alert.totalNodes();
+        return alert.total_nodes();
     }
 }
diff --git a/src/main/java/com/frostwire/jlibtorrent/demo/CustomStorage.java b/src/main/java/com/frostwire/jlibtorrent/demo/CustomStorage.java
@@ -136,7 +136,7 @@ private static TorrentHandle addTorrentSupport(session s, TorrentInfo ti, File s
         }
         p.setStorage_mode(storage_mode_t.storage_mode_sparse);
 
-        long flags = p.getFlags();
+        long flags = p.get_flags();
 
         flags &= ~add_torrent_params.flags_t.flag_auto_managed.swigValue();
 
@@ -151,7 +151,7 @@ private static TorrentHandle addTorrentSupport(session s, TorrentInfo ti, File s
             }
         }
 
-        p.setFlags(flags);
+        p.set_flags(flags);
 
         if (async) {
             s.async_add_torrent(p);

diff --git a/src/main/java/com/frostwire/jlibtorrent/demo/GetMagnet2.java b/src/main/java/com/frostwire/jlibtorrent/demo/GetMagnet2.java
@@ -48,9 +48,9 @@ public void alert(Alert<?> alert) {
 
         p.setName("fetchMagnet - " + uri);
 
-        long flags = p.getFlags();
+        long flags = p.get_flags();
         flags &= ~add_torrent_params.flags_t.flag_auto_managed.swigValue();
-        p.setFlags(flags);
+        p.set_flags(flags);
 
         ec.clear();
         torrent_handle th = s.getSwig().add_torrent(p, ec);

diff --git a/src/main/java/com/frostwire/jlibtorrent/swig/add_torrent_params.java b/src/main/java/com/frostwire/jlibtorrent/swig/add_torrent_params.java
@@ -185,12 +185,12 @@ public int getDownload_limit() {
     return libtorrent_jni.add_torrent_params_download_limit_get(swigCPtr, this);
   }
 
-  public long getFlags() {
-    return libtorrent_jni.add_torrent_params_getFlags(swigCPtr, this);
+  public long get_flags() {
+    return libtorrent_jni.add_torrent_params_get_flags(swigCPtr, this);
   }
 
-  public void setFlags(long flags) {
-    libtorrent_jni.add_torrent_params_setFlags(swigCPtr, this, flags);
+  public void set_flags(long flags) {
+    libtorrent_jni.add_torrent_params_set_flags(swigCPtr, this, flags);
   }
 
   public void set_ti(torrent_info ti) {

diff --git a/src/main/java/com/frostwire/jlibtorrent/swig/bdecode_node.java b/src/main/java/com/frostwire/jlibtorrent/swig/bdecode_node.java
@@ -47,8 +47,8 @@ public bdecode_node.type_t type() {
     return bdecode_node.type_t.swigToEnum(libtorrent_jni.bdecode_node_type(swigCPtr, this));
   }
 
-  public boolean is_none_t() {
-    return libtorrent_jni.bdecode_node_is_none_t(swigCPtr, this);
+  public boolean op_bool() {
+    return libtorrent_jni.bdecode_node_op_bool(swigCPtr, this);
   }
 
   public bdecode_node non_owning() {

diff --git a/src/main/java/com/frostwire/jlibtorrent/swig/dht_stats_alert.java b/src/main/java/com/frostwire/jlibtorrent/swig/dht_stats_alert.java
@@ -69,8 +69,8 @@ public dht_routing_bucket_vector getRouting_table() {
     return (cPtr == 0) ? null : new dht_routing_bucket_vector(cPtr, false);
   }
 
-  public int totalNodes() {
-    return libtorrent_jni.dht_stats_alert_totalNodes(swigCPtr, this);
+  public int total_nodes() {
+    return libtorrent_jni.dht_stats_alert_total_nodes(swigCPtr, this);
   }
 
   public final static int priority = libtorrent_jni.dht_stats_alert_priority_get();

diff --git a/src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java b/src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java
@@ -537,7 +537,7 @@ public class libtorrent_jni {
   public final static native long get_http_category();
   public final static native long new_storage_error__SWIG_0();
   public final static native long new_storage_error__SWIG_1(long jarg1, error_code jarg1_);
-  public final static native boolean storage_error_value(long jarg1, storage_error jarg1_);
+  public final static native boolean storage_error_op_bool(long jarg1, storage_error jarg1_);
   public final static native void storage_error_ec_set(long jarg1, storage_error jarg1_, long jarg2, error_code jarg2_);
   public final static native long storage_error_ec_get(long jarg1, storage_error jarg1_);
   public final static native void storage_error_file_set(long jarg1, storage_error jarg1_, int jarg2);
@@ -1054,8 +1054,8 @@ public class libtorrent_jni {
   public final static native int add_torrent_params_upload_limit_get(long jarg1, add_torrent_params jarg1_);
   public final static native void add_torrent_params_download_limit_set(long jarg1, add_torrent_params jarg1_, int jarg2);
   public final static native int add_torrent_params_download_limit_get(long jarg1, add_torrent_params jarg1_);
-  public final static native long add_torrent_params_getFlags(long jarg1, add_torrent_params jarg1_);
-  public final static native void add_torrent_params_setFlags(long jarg1, add_torrent_params jarg1_, long jarg2);
+  public final static native long add_torrent_params_get_flags(long jarg1, add_torrent_params jarg1_);
+  public final static native void add_torrent_params_set_flags(long jarg1, add_torrent_params jarg1_, long jarg2);
   public final static native void add_torrent_params_set_ti(long jarg1, add_torrent_params jarg1_, long jarg2, torrent_info jarg2_);
   public final static native long add_torrent_params_create_instance();
   public final static native long add_torrent_params_create_instance_no_storage();
@@ -1711,6 +1711,8 @@ public class libtorrent_jni {
   public final static native long listen_failed_alert_error_get(long jarg1, listen_failed_alert jarg1_);
   public final static native void listen_failed_alert_operation_set(long jarg1, listen_failed_alert jarg1_, int jarg2);
   public final static native int listen_failed_alert_operation_get(long jarg1, listen_failed_alert jarg1_);
+  public final static native void listen_failed_alert_port_set(long jarg1, listen_failed_alert jarg1_, int jarg2);
+  public final static native int listen_failed_alert_port_get(long jarg1, listen_failed_alert jarg1_);
   public final static native void listen_failed_alert_sock_type_set(long jarg1, listen_failed_alert jarg1_, int jarg2);
   public final static native int listen_failed_alert_sock_type_get(long jarg1, listen_failed_alert jarg1_);
   public final static native void delete_listen_failed_alert(long jarg1);
@@ -2117,7 +2119,7 @@ public class libtorrent_jni {
   public final static native long dht_stats_alert_active_requests_get(long jarg1, dht_stats_alert jarg1_);
   public final static native void dht_stats_alert_routing_table_set(long jarg1, dht_stats_alert jarg1_, long jarg2, dht_routing_bucket_vector jarg2_);
   public final static native long dht_stats_alert_routing_table_get(long jarg1, dht_stats_alert jarg1_);
-  public final static native int dht_stats_alert_totalNodes(long jarg1, dht_stats_alert jarg1_);
+  public final static native int dht_stats_alert_total_nodes(long jarg1, dht_stats_alert jarg1_);
   public final static native void delete_dht_stats_alert(long jarg1);
   public final static native int incoming_request_alert_static_category_get();
   public final static native int incoming_request_alert_priority_get();
@@ -2690,7 +2692,7 @@ public class libtorrent_jni {
   public final static native long new_bdecode_node__SWIG_0();
   public final static native long new_bdecode_node__SWIG_1(long jarg1, bdecode_node jarg1_);
   public final static native int bdecode_node_type(long jarg1, bdecode_node jarg1_);
-  public final static native boolean bdecode_node_is_none_t(long jarg1, bdecode_node jarg1_);
+  public final static native boolean bdecode_node_op_bool(long jarg1, bdecode_node jarg1_);
   public final static native long bdecode_node_non_owning(long jarg1, bdecode_node jarg1_);
   public final static native long bdecode_node_data_section(long jarg1, bdecode_node jarg1_);
   public final static native String bdecode_node_list_string_value_at__SWIG_0(long jarg1, bdecode_node jarg1_, int jarg2, String jarg3);

diff --git a/src/main/java/com/frostwire/jlibtorrent/swig/listen_failed_alert.java b/src/main/java/com/frostwire/jlibtorrent/swig/listen_failed_alert.java
@@ -72,6 +72,14 @@ public int getOperation() {
     return libtorrent_jni.listen_failed_alert_operation_get(swigCPtr, this);
   }
 
+  public void setPort(int value) {
+    libtorrent_jni.listen_failed_alert_port_set(swigCPtr, this, value);
+  }
+
+  public int getPort() {
+    return libtorrent_jni.listen_failed_alert_port_get(swigCPtr, this);
+  }
+
   public void setSock_type(listen_failed_alert.socket_type_t value) {
     libtorrent_jni.listen_failed_alert_sock_type_set(swigCPtr, this, value.swigValue());
   }

diff --git a/src/main/java/com/frostwire/jlibtorrent/swig/storage_error.java b/src/main/java/com/frostwire/jlibtorrent/swig/storage_error.java
@@ -43,8 +43,8 @@ public storage_error(error_code e) {
     this(libtorrent_jni.new_storage_error__SWIG_1(error_code.getCPtr(e), e), true);
   }
 
-  public boolean value() {
-    return libtorrent_jni.storage_error_value(swigCPtr, this);
+  public boolean op_bool() {
+    return libtorrent_jni.storage_error_op_bool(swigCPtr, this);
   }
 
   public void setEc(error_code value) {

diff --git a/swig/libtorrent.i b/swig/libtorrent.i
@@ -307,40 +307,6 @@ namespace std {
         }
     };
 
-    // bool specialization
-    template<> class vector<bool> {
-    public:
-        typedef size_t size_type;
-        typedef bool value_type;
-        typedef bool const_reference;
-        vector();
-        vector(size_type n);
-        size_type size() const;
-        size_type capacity() const;
-        void reserve(size_type n);
-        %rename(isEmpty) empty;
-        bool empty() const;
-        void clear();
-        %rename(add) push_back;
-        void push_back(const value_type& x);
-        %extend {
-            bool get(int i) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    return (*self)[i];
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-            void set(int i, const value_type& val) throw (std::out_of_range) {
-                int size = int(self->size());
-                if (i>=0 && i<size)
-                    (*self)[i] = val;
-                else
-                    throw std::out_of_range("vector index out of range");
-            }
-        }
-    };
-
     template<class K, class T> class map {
     // add typemaps here
     public:
@@ -694,15 +660,13 @@ namespace std {
 %rename(op_lt) operator<;
 %rename(op_gt) operator>;
 %rename(op_get_at) operator[];
+%rename(op_bool) operator bool;
 
 %rename(libtorrent_no_error) libtorrent::errors::no_error;
 %rename(libtorrent_errors) libtorrent::errors::error_code_enum;
 %rename(bdecode_no_error) libtorrent::bdecode_errors::no_error;
 %rename(bdecode_errors) libtorrent::bdecode_errors::error_code_enum;
 
-%rename(value) libtorrent::storage_error::operator bool() const;
-%rename(is_none_t) libtorrent::bdecode_node::operator bool() const;
-
 %rename("$ignore", regextarget=1, %$isconstructor) ".*_alert$";
 
 %include <boost/system/error_code.hpp>
@@ -1009,6 +973,9 @@ namespace libtorrent {
     }
 
     void dht_get_item(std::vector<char>& key_v, std::string salt = std::string()) {
+        if (key_v.size() != 32) {
+            throw std::invalid_argument("Public key must be of size 32");
+        }
         boost::array<char, 32> key;
 
         for (int i = 0; i < 32; i++) {
@@ -1059,11 +1026,11 @@ namespace libtorrent {
 };
 
 %extend add_torrent_params {
-    long long getFlags() {
+    long long get_flags() {
         return (long long)$self->flags;
     }
 
-    void setFlags(long long flags) {
+    void set_flags(long long flags) {
         $self->flags = flags;
     }
 
@@ -1144,7 +1111,7 @@ namespace libtorrent {
 };
 
 %extend dht_stats_alert {
-    int totalNodes() {
+    int total_nodes() {
         int total = 0;
         for(std::vector<dht_routing_bucket>::const_iterator it = $self->routing_table.begin(),
             end($self->routing_table.end()); it != end; ++it) {