torrent_client 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16bce221ec57ce23550242b63a6c4b4ca29514f0
-  data.tar.gz: ff62f2894030b4243cecc603c31963d2b464623d
+  metadata.gz: 03d06ee01d006e8d24a119e266b2aaf08f4d7b64
+  data.tar.gz: 71da685aebeea8cfa4b1f29d62d6ea071c4fa6c3
 SHA512:
-  metadata.gz: 94ce50a5192dfd6eb1f8bad579aca25689547de5c1b234d0f1303f5d6e575529d287101c6619a83c30d65b204939ff92e6f886af399aa9d5950bb57a60ce604d
-  data.tar.gz: 2b5e697f5c6fb2f7ca41d60b8b79ece0dc51ce9f96e0fc57af9562106840791fd988d2106ac908cab86dfe20fe87f7318f200cb222ac8789b354eb97d01bd407
+  metadata.gz: f5bdbb04d6fb3fe9ecd5429a114b70378443cc6a7f5d3925b6c7fd7d0bcdae5a803a2f0e1e308931667314e271feed68250d5fbeeca72b9fe71c3b99085ebbf0
+  data.tar.gz: 85e7c24edc7c27b66c5822a88e9dc060f03f25df28f53efd71708d14e2267fcc9ef64b10f6424915ab7bf609e87e08f34533b3a12adbaeabbd748edccddb97ec

data/CHANGELOG.md

@@ -1 +1,11 @@
 # Changelog
+
+## [0.2.0] - 2016-04-06
+
+Adds TorrentClient.verify, moves libtorrent session creation to happen once when
+the module is loaded, and adds instructions in the README.
+
+## [0.1.0] - 2016-04-05
+
+Initial release, supporting TorrentClient.download.
+

data/README.md

@@ -2,4 +2,20 @@
 
 A simple Ruby BitTorrent client based on libtorrent-rasterbar
 
+## Setup
+
 Requires [Boost](https://boost.org) and [libtorrent](http://libtorrent.org).
+On Mac OS X these can be setup with Homebrew
+```
+brew install boost libtorrent-rasterbar
+```
+
+## Usage
+
+```
+# Returns true if the torrent payload is complete on-disk, false otherwise.
+TorrentClient.verify '<file>.torrent' '<destination_dir>'
+
+# Downloads the torrent payload to the destination_dir. Returns when complete.
+TorrentClient.download '<file>.torrent' '<destination_dir>'
+```

data/ext/torrent_client/torrent_client.cc

@@ -5,33 +5,40 @@
 #include <libtorrent/torrent_info.hpp>
 #include <libtorrent/alert_types.hpp>
 
+namespace lt = libtorrent;
+
 VALUE TorrentClient = Qnil;
+std::auto_ptr<lt::session> _session;
 
 extern "C" {
     VALUE method_torrentclient_download(VALUE self, VALUE torrent_file, VALUE destination_dir);
+    VALUE method_torrentclient_verify(VALUE self, VALUE torrent_file, VALUE destination_dir);
 
     void Init_torrent_client()
     {
         TorrentClient = rb_define_module("TorrentClient");
         rb_define_singleton_method(TorrentClient, "download", RUBY_METHOD_FUNC(method_torrentclient_download), 2);
-    }
+        rb_define_singleton_method(TorrentClient, "verify", RUBY_METHOD_FUNC(method_torrentclient_verify), 2);
 
-    VALUE method_torrentclient_download(VALUE self, VALUE torrent_file, VALUE destination_dir)
-    {
         try {
-            namespace lt = libtorrent;
-
-            lt::session s;
-            s.set_alert_mask(lt::alert::status_notification | lt::alert::error_notification);
+            _session.reset(new lt::session());
+            _session->set_alert_mask(lt::alert::status_notification | lt::alert::error_notification);
 
             lt::error_code ec;
-            s.listen_on(std::make_pair(6881, 6889), ec);
+            _session->listen_on(std::make_pair(6881, 6889), ec);
             if (ec) {
                 std::string err = "failed to open listen socket: " + ec.message();
                 rb_raise(rb_eRuntimeError, err.c_str());
-                return Qnil;
             }
+        } catch (std::exception &e) {
+            rb_raise(rb_eRuntimeError, "failed from unknown exception");
+        }
+    }
 
+    VALUE method_torrentclient_download(VALUE self, VALUE torrent_file, VALUE destination_dir)
+    {
+        try {
+            lt::error_code ec;
             lt::add_torrent_params p;
             p.save_path = StringValueCStr(destination_dir);
             p.ti = new lt::torrent_info(StringValueCStr(torrent_file), ec);
@@ -40,20 +47,62 @@ extern "C" {
                 return Qnil;
             }
 
-            s.add_torrent(p, ec);
+            lt::torrent_handle handle = _session->add_torrent(p, ec);
             if (ec) {
                 rb_raise(rb_eRuntimeError, ec.message().c_str());
                 return Qnil;
             }
 
             while (true) {
-                if (s.wait_for_alert(lt::milliseconds(100))) {
-                    std::auto_ptr<lt::alert> a = s.pop_alert();
+                if (_session->wait_for_alert(lt::seconds(1))) {
+                    std::auto_ptr<lt::alert> a = _session->pop_alert();
                     if (a->type() == lt::torrent_finished_alert::alert_type) {
-                        return Qtrue;
+                        break;
                     }
                 }
             }
+            _session->remove_torrent(handle);
+            return Qtrue;
+        } catch (std::exception &e) {
+            rb_raise(rb_eRuntimeError, "failed from unknown exception");
+        }
+        return Qnil;
+    }
+
+    VALUE method_torrentclient_verify(VALUE self, VALUE torrent_file, VALUE destination_dir)
+    {
+        try {
+            lt::error_code ec;
+            lt::add_torrent_params p;
+            p.save_path = StringValueCStr(destination_dir);
+            p.flags = lt::add_torrent_params::flag_paused;
+            p.ti = new lt::torrent_info(StringValueCStr(torrent_file), ec);
+            if (ec) {
+                rb_raise(rb_eRuntimeError, ec.message().c_str());
+                return Qnil;
+            }
+
+            lt::torrent_handle handle = _session->add_torrent(p, ec);
+            if (ec) {
+                rb_raise(rb_eRuntimeError, ec.message().c_str());
+                return Qnil;
+            }
+
+            lt::torrent_status status = handle.status();
+            while (status.state == lt::torrent_status::checking_files ||
+                   status.state == lt::torrent_status::checking_resume_data) {
+                _session->wait_for_alert(lt::seconds(1));
+                status = handle.status();
+            }
+
+            _session->remove_torrent(handle);
+
+            if (status.state == lt::torrent_status::seeding ||
+                status.state == lt::torrent_status::queued_for_checking) {
+                return Qtrue;
+            } else {
+                return Qfalse;
+            }
         } catch (std::exception &e) {
             rb_raise(rb_eRuntimeError, "failed from unknown exception");
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torrent_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler