Skip to content

Commit

Permalink
Refactor in add_torrent_params swig API.
Browse files Browse the repository at this point in the history
  • Loading branch information
aldenml committed Feb 1, 2016
1 parent 5da6d58 commit 1f82ca1
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 21 deletions.
9 changes: 6 additions & 3 deletions src/main/java/com/frostwire/jlibtorrent/AddTorrentParams.java
@@ -1,7 +1,6 @@
package com.frostwire.jlibtorrent;

import com.frostwire.jlibtorrent.swig.add_torrent_params;
import com.frostwire.jlibtorrent.swig.torrent_info;

/**
* The {@link AddTorrentParams} is a parameter pack for adding torrents to a
Expand Down Expand Up @@ -327,7 +326,11 @@ public static AddTorrentParams createInstance() {
return new AddTorrentParams(add_torrent_params.create_instance());
}

public static AddTorrentParams createInstanceNoStorage() {
return new AddTorrentParams(add_torrent_params.create_instance_no_storage());
public static AddTorrentParams createInstanceDisabledStorage() {
return new AddTorrentParams(add_torrent_params.create_instance_disabled_storage());
}

public static AddTorrentParams createInstanceZeroStorage() {
return new AddTorrentParams(add_torrent_params.create_instance_zero_storage());
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/frostwire/jlibtorrent/Downloader.java
Expand Up @@ -67,7 +67,7 @@ public void download(TorrentInfo ti, File saveDir) {
* @return
*/
public byte[] fetchMagnet(String uri, long timeout) {
add_torrent_params p = add_torrent_params.create_instance_no_storage();
add_torrent_params p = add_torrent_params.create_instance_disabled_storage();
error_code ec = new error_code();
libtorrent.parse_magnet_uri(uri, p, ec);

Expand Down
Expand Up @@ -42,7 +42,7 @@ public void alert(Alert<?> alert) {
System.out.println("Waiting for nodes in DHT");
Thread.sleep(5000);

add_torrent_params p = add_torrent_params.create_instance_no_storage();
add_torrent_params p = add_torrent_params.create_instance_disabled_storage();
error_code ec = new error_code();
libtorrent.parse_magnet_uri(uri, p, ec);

Expand Down
Expand Up @@ -201,8 +201,12 @@ public static add_torrent_params create_instance() {
return new add_torrent_params(libtorrent_jni.add_torrent_params_create_instance(), true);
}

public static add_torrent_params create_instance_no_storage() {
return new add_torrent_params(libtorrent_jni.add_torrent_params_create_instance_no_storage(), true);
public static add_torrent_params create_instance_disabled_storage() {
return new add_torrent_params(libtorrent_jni.add_torrent_params_create_instance_disabled_storage(), true);
}

public static add_torrent_params create_instance_zero_storage() {
return new add_torrent_params(libtorrent_jni.add_torrent_params_create_instance_zero_storage(), true);
}

public static add_torrent_params create_instance_swig_storage(swig_storage_constructor sc) {
Expand Down
Expand Up @@ -1057,7 +1057,8 @@ public class libtorrent_jni {
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();
public final static native long add_torrent_params_create_instance_disabled_storage();
public final static native long add_torrent_params_create_instance_zero_storage();
public final static native long add_torrent_params_create_instance_swig_storage(long jarg1, swig_storage_constructor jarg1_);
public final static native void delete_add_torrent_params(long jarg1);
public final static native int op_bittorrent_get();
Expand Down
6 changes: 5 additions & 1 deletion swig/libtorrent.i
Expand Up @@ -1044,10 +1044,14 @@ namespace libtorrent {
return add_torrent_params();
}

static add_torrent_params create_instance_no_storage() {
static add_torrent_params create_instance_disabled_storage() {
return add_torrent_params(disabled_storage_constructor);
}

static add_torrent_params create_instance_zero_storage() {
return add_torrent_params(zero_storage_constructor);
}

static add_torrent_params create_instance_swig_storage(swig_storage_constructor* sc) {
return add_torrent_params(boost::bind(&swig_storage_constructor_cb, _1, sc));
}
Expand Down
33 changes: 28 additions & 5 deletions swig/libtorrent_jni.cpp
Expand Up @@ -1412,9 +1412,12 @@ SWIGINTERN void libtorrent_add_torrent_params_set_ti(libtorrent::add_torrent_par
SWIGINTERN libtorrent::add_torrent_params libtorrent_add_torrent_params_create_instance(){
return add_torrent_params();
}
SWIGINTERN libtorrent::add_torrent_params libtorrent_add_torrent_params_create_instance_no_storage(){
SWIGINTERN libtorrent::add_torrent_params libtorrent_add_torrent_params_create_instance_disabled_storage(){
return add_torrent_params(disabled_storage_constructor);
}
SWIGINTERN libtorrent::add_torrent_params libtorrent_add_torrent_params_create_instance_zero_storage(){
return add_torrent_params(zero_storage_constructor);
}
SWIGINTERN libtorrent::add_torrent_params libtorrent_add_torrent_params_create_instance_swig_storage(swig_storage_constructor *sc){
return add_torrent_params(boost::bind(&swig_storage_constructor_cb, _1, sc));
}
Expand Down Expand Up @@ -27388,15 +27391,35 @@ SWIGEXPORT jlong JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_add
}


SWIGEXPORT jlong JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_add_1torrent_1params_1create_1instance_1no_1storage(JNIEnv *jenv, jclass jcls) {
SWIGEXPORT jlong JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_add_1torrent_1params_1create_1instance_1disabled_1storage(JNIEnv *jenv, jclass jcls) {
jlong jresult = 0 ;
libtorrent::add_torrent_params result;

(void)jenv;
(void)jcls;
{
try {
result = libtorrent_add_torrent_params_create_instance_disabled_storage();
} catch (std::exception& e) {
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
} catch (...) {
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "Unknown exception type");
}
}
*(libtorrent::add_torrent_params **)&jresult = new libtorrent::add_torrent_params((const libtorrent::add_torrent_params &)result);
return jresult;
}


SWIGEXPORT jlong JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_add_1torrent_1params_1create_1instance_1zero_1storage(JNIEnv *jenv, jclass jcls) {
jlong jresult = 0 ;
libtorrent::add_torrent_params result;

(void)jenv;
(void)jcls;
{
try {
result = libtorrent_add_torrent_params_create_instance_no_storage();
result = libtorrent_add_torrent_params_create_instance_zero_storage();
} catch (std::exception& e) {
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, e.what());
} catch (...) {
Expand Down Expand Up @@ -64275,7 +64298,7 @@ SWIGEXPORT jstring JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_L

(void)jenv;
(void)jcls;
result = (char *)("1c4175102e4846b3cf3f1f3f882a787a6967595c");
result = (char *)("06aef866f6a86bda3135f6abdc7fd5377d3cbb02");
if (result) jresult = jenv->NewStringUTF((const char *)result);
return jresult;
}
Expand All @@ -64287,7 +64310,7 @@ SWIGEXPORT jstring JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_J

(void)jenv;
(void)jcls;
result = (char *)("63a4f477dfb0fd4235acbd5d71c2cc52a2da6c50");
result = (char *)("5da6d58ffb8f2e8b2e381406d8df9ef659b0caee");
if (result) jresult = jenv->NewStringUTF((const char *)result);
return jresult;
}
Expand Down
37 changes: 30 additions & 7 deletions swig/libtorrent_node.cpp
Expand Up @@ -2825,9 +2825,12 @@ SWIGINTERN void libtorrent_add_torrent_params_set_ti(libtorrent::add_torrent_par
SWIGINTERN libtorrent::add_torrent_params libtorrent_add_torrent_params_create_instance(){
return add_torrent_params();
}
SWIGINTERN libtorrent::add_torrent_params libtorrent_add_torrent_params_create_instance_no_storage(){
SWIGINTERN libtorrent::add_torrent_params libtorrent_add_torrent_params_create_instance_disabled_storage(){
return add_torrent_params(disabled_storage_constructor);
}
SWIGINTERN libtorrent::add_torrent_params libtorrent_add_torrent_params_create_instance_zero_storage(){
return add_torrent_params(zero_storage_constructor);
}
SWIGINTERN libtorrent::add_torrent_params libtorrent_add_torrent_params_create_instance_swig_storage(swig_storage_constructor *sc){
return add_torrent_params(boost::bind(&swig_storage_constructor_cb, _1, sc));
}
Expand Down Expand Up @@ -40910,15 +40913,34 @@ static SwigV8ReturnValue _wrap_add_torrent_params_create_instance(const SwigV8Ar
}


static SwigV8ReturnValue _wrap_add_torrent_params_create_instance_no_storage(const SwigV8Arguments &args) {
static SwigV8ReturnValue _wrap_add_torrent_params_create_instance_disabled_storage(const SwigV8Arguments &args) {
SWIGV8_HANDLESCOPE();

v8::Handle<v8::Value> jsresult;
libtorrent::add_torrent_params result;

if(args.Length() != 0) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for _wrap_add_torrent_params_create_instance_disabled_storage.");

result = libtorrent_add_torrent_params_create_instance_disabled_storage();
jsresult = SWIG_NewPointerObj((new libtorrent::add_torrent_params((const libtorrent::add_torrent_params&)(result))), SWIGTYPE_p_libtorrent__add_torrent_params, SWIG_POINTER_OWN | 0 );

SWIGV8_RETURN(jsresult);

goto fail;
fail:
SWIGV8_RETURN(SWIGV8_UNDEFINED());
}


static SwigV8ReturnValue _wrap_add_torrent_params_create_instance_zero_storage(const SwigV8Arguments &args) {
SWIGV8_HANDLESCOPE();

v8::Handle<v8::Value> jsresult;
libtorrent::add_torrent_params result;

if(args.Length() != 0) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for _wrap_add_torrent_params_create_instance_no_storage.");
if(args.Length() != 0) SWIG_exception_fail(SWIG_ERROR, "Illegal number of arguments for _wrap_add_torrent_params_create_instance_zero_storage.");

result = libtorrent_add_torrent_params_create_instance_no_storage();
result = libtorrent_add_torrent_params_create_instance_zero_storage();
jsresult = SWIG_NewPointerObj((new libtorrent::add_torrent_params((const libtorrent::add_torrent_params&)(result))), SWIGTYPE_p_libtorrent__add_torrent_params, SWIG_POINTER_OWN | 0 );

SWIGV8_RETURN(jsresult);
Expand Down Expand Up @@ -108431,7 +108453,7 @@ static SwigV8ReturnValue _wrap_LIBTORRENT_REVISION_SHA1(v8::Local<v8::String> pr

v8::Handle<v8::Value> jsresult;

jsresult = SWIG_FromCharPtr((const char *)"1c4175102e4846b3cf3f1f3f882a787a6967595c");
jsresult = SWIG_FromCharPtr((const char *)"06aef866f6a86bda3135f6abdc7fd5377d3cbb02");

SWIGV8_RETURN_INFO(jsresult, info);

Expand All @@ -108446,7 +108468,7 @@ static SwigV8ReturnValue _wrap_JLIBTORRENT_REVISION_SHA1(v8::Local<v8::String> p

v8::Handle<v8::Value> jsresult;

jsresult = SWIG_FromCharPtr((const char *)"63a4f477dfb0fd4235acbd5d71c2cc52a2da6c50");
jsresult = SWIG_FromCharPtr((const char *)"5da6d58ffb8f2e8b2e381406d8df9ef659b0caee");

SWIGV8_RETURN_INFO(jsresult, info);

Expand Down Expand Up @@ -120624,7 +120646,8 @@ SWIGV8_AddStaticVariable(_exports_add_torrent_params_obj, "flag_merge_resume_htt
SWIGV8_AddStaticVariable(_exports_add_torrent_params_obj, "flag_stop_when_ready", _wrap_libtorrent_add_torrent_params_flag_stop_when_ready, JS_veto_set_variable);
SWIGV8_AddStaticVariable(_exports_add_torrent_params_obj, "default_flags", _wrap_libtorrent_add_torrent_params_default_flags, JS_veto_set_variable);
SWIGV8_AddStaticFunction(_exports_add_torrent_params_obj, "create_instance", _wrap_add_torrent_params_create_instance);
SWIGV8_AddStaticFunction(_exports_add_torrent_params_obj, "create_instance_no_storage", _wrap_add_torrent_params_create_instance_no_storage);
SWIGV8_AddStaticFunction(_exports_add_torrent_params_obj, "create_instance_disabled_storage", _wrap_add_torrent_params_create_instance_disabled_storage);
SWIGV8_AddStaticFunction(_exports_add_torrent_params_obj, "create_instance_zero_storage", _wrap_add_torrent_params_create_instance_zero_storage);
SWIGV8_AddStaticFunction(_exports_add_torrent_params_obj, "create_instance_swig_storage", _wrap_add_torrent_params_create_instance_swig_storage);
SWIGV8_AddStaticVariable(_exports_stats_metric_obj, "type_counter", _wrap_libtorrent_stats_metric_type_counter, JS_veto_set_variable);
SWIGV8_AddStaticVariable(_exports_stats_metric_obj, "type_gauge", _wrap_libtorrent_stats_metric_type_gauge, JS_veto_set_variable);
Expand Down

0 comments on commit 1f82ca1

Please sign in to comment.