Merge pull request #7 from TriPSs/master

Added .setup and fixed status event not working

Author: ghondar

android/torrent/src/main/java/com/ghondar/torrentstreamer/TorrentStreamer.java

@@ -28,57 +28,67 @@
 
 public class TorrentStreamer extends ReactContextBaseJavaModule implements TorrentListener {
 
-    private TorrentStream mTorrentStream;
+    private TorrentStream mTorrentStream = null;
     private ReactApplicationContext context;
 
     public TorrentStreamer(ReactApplicationContext reactContext) {
         super(reactContext);
         this.context = reactContext;
+    }
+
+    @Override
+    public String getName() {
+        return "TorrentStreamerAndroid";
+    }
 
+    @ReactMethod
+    public void stop() {
+        if (mTorrentStream != null && mTorrentStream.isStreaming()) {
+            mTorrentStream.stopStream();
+        }
+    }
+
+    @ReactMethod
+    public void setup(String location, Boolean removeAfterStop) {
         TorrentOptions torrentOptions = new TorrentOptions.Builder()
-                .saveLocation(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS))
+                .saveLocation(location)
                 .maxConnections(200)
                 .autoDownload(true)
-                .removeFilesAfterStop(true)
+                .removeFilesAfterStop(removeAfterStop)
                 .build();
 
         mTorrentStream = TorrentStream.init(torrentOptions);
         mTorrentStream.addListener(this);
     }
 
-    @Override
-    public String getName() {
-        return "TorrentStreamerAndroid";
+    @ReactMethod
+    public void setup(String location) {
+        this.setup(location, true);
     }
 
-    @ReactMethod
-    public void stop() {
-        if(mTorrentStream.isStreaming()){
-            mTorrentStream.stopStream();
+    private void setup() {
+        if (mTorrentStream == null) {
+            this.setup("" + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), true);
         }
     }
 
     @ReactMethod
     public void start(String magnetUrl) {
-
-
+        this.setup();
 
         mTorrentStream.startStream(magnetUrl);
     }
 
-    private void sendEvent(String eventName,
-                           @Nullable WritableMap params) {
+    private void sendEvent(String eventName, @Nullable WritableMap params) {
         this.context
                 .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                 .emit(eventName, params);
     }
 
     @Override
     public void onStreamPrepared(Torrent torrent) {
-
 //        Log.d("data", "OnStreamPrepared");
 
-
         WritableMap params = Arguments.createMap();
         params.putString("data", "OnStreamPrepared");
         sendEvent("progress", params);
@@ -89,11 +99,10 @@ public void onStreamPrepared(Torrent torrent) {
     public void onStreamStarted(Torrent torrent) {
 //        Log.d("data", "onStreamStarted");
 
-
         WritableMap params = Arguments.createMap();
         params.putString("data", "onStreamStarted");
         sendEvent("progress", params);
-}
+    }
 
     @Override
     public void onStreamError(Torrent torrent, Exception e) {
@@ -106,9 +115,9 @@ public void onStreamError(Torrent torrent, Exception e) {
     public void onStreamReady(Torrent torrent) {
 //        Log.d("url", torrent.getVideoFile().toString());
 
-
         WritableMap params = Arguments.createMap();
         params.putString("url", torrent.getVideoFile().toString());
+        params.putString("filename", torrent.getTorrentHandle().name());
         sendEvent("ready", params);
     }
 
@@ -120,10 +129,10 @@ public void onStreamProgress(Torrent torrent, StreamStatus status) {
 //        Log.d("seeds", "" + status.seeds);
 
         WritableMap params = Arguments.createMap();
-        params.putString("buffer", ""+status.bufferProgress);
-        params.putString("downloadSpeed", ""+status.downloadSpeed);
-        params.putString("progress", ""+status.progress);
-        params.putString("seeds", ""+status.seeds);
+        params.putString("buffer", "" + status.bufferProgress);
+        params.putString("downloadSpeed", "" + status.downloadSpeed);
+        params.putString("progress", "" + status.progress);
+        params.putString("seeds", "" + status.seeds);
         sendEvent("status", params);
     }
 
@@ -139,6 +148,7 @@ public void open(String url, String type) {
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setDataAndType(Uri.parse(url), type);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
         //Check that an app exists to receive the intent
         if (intent.resolveActivity(this.context.getPackageManager()) != null) {
             this.context.startActivity(intent);

index.js

@@ -4,6 +4,7 @@ var { TorrentStreamerAndroid } = NativeModules;
 var TORRENT_STREAMER_DOWNLOAD_EVENTS = {
   error: 'error',
   progress: 'progress',
+  status: 'status',
   ready: 'ready',
   stop: 'stop'
 };
@@ -26,6 +27,11 @@ var TorrentStreamer = {
     _TorrentStreamerDownloadHandlers[handler].remove();
     _TorrentStreamerDownloadHandlers[handler] = null;
   },
+  setup: function(location, removeAfterStop){
+    removeAfterStop = removeAfterStop || true
+    
+    TorrentStreamerAndroid.setup(location, removeAfterStop);
+  },
   start: function(url){
     TorrentStreamerAndroid.start(url);
   },
@@ -35,4 +41,4 @@ var TorrentStreamer = {
   }
 }
 
-module.exports = TorrentStreamer;
+module.exports = TorrentStreamer;