torrent_client 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03d06ee01d006e8d24a119e266b2aaf08f4d7b64
-  data.tar.gz: 71da685aebeea8cfa4b1f29d62d6ea071c4fa6c3
+  metadata.gz: 77f3beb70a73972a925aaaa1b84fc400eb3e44df
+  data.tar.gz: 59b3fedbedbda0d258776a3108e89e1e8da0c208
 SHA512:
-  metadata.gz: f5bdbb04d6fb3fe9ecd5429a114b70378443cc6a7f5d3925b6c7fd7d0bcdae5a803a2f0e1e308931667314e271feed68250d5fbeeca72b9fe71c3b99085ebbf0
-  data.tar.gz: 85e7c24edc7c27b66c5822a88e9dc060f03f25df28f53efd71708d14e2267fcc9ef64b10f6424915ab7bf609e87e08f34533b3a12adbaeabbd748edccddb97ec
+  metadata.gz: 558e6b34501da7960c0982816c2d72c687d006508134ec2a18ca7badda3ae0a2404a45e312a2dafe78455d141f78d6694fc0d56f9976b18dbaa454952533690b
+  data.tar.gz: b1d8a7d96f6860d5e24a4373d28a2abf0e11944ac91b28a18afe016a06bdffcabc6733085023c1ea45f12b5369837f577c7e09fda85856cc991d596d415a66d2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.2.1] - 2016-04-06
+
+Fixes TorrentClient.verify, which wasn't returning false when the file was
+corrupted. Also should be more robust to halting on errors.
+
 ## [0.2.0] - 2016-04-06
 
 Adds TorrentClient.verify, moves libtorrent session creation to happen once when

data/ext/torrent_client/torrent_client.cc

@@ -53,7 +53,7 @@ extern "C" {
                 return Qnil;
             }
 
-            while (true) {
+            while (handle.is_valid()) {
                 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) {
@@ -75,7 +75,6 @@ extern "C" {
             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());
@@ -88,21 +87,22 @@ extern "C" {
                 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();
+            bool success = false;
+            bool running = true;
+            while (handle.is_valid()) {
+                if (_session->wait_for_alert(lt::seconds(1))) {
+                    std::auto_ptr<lt::alert> a = _session->pop_alert();
+                    if (a->type() == lt::torrent_checked_alert::alert_type) {
+                        handle.pause();
+                        success = handle.status(0).is_finished;
+                        break;
+                    }
+                }
             }
 
             _session->remove_torrent(handle);
 
-            if (status.state == lt::torrent_status::seeding ||
-                status.state == lt::torrent_status::queued_for_checking) {
-                return Qtrue;
-            } else {
-                return Qfalse;
-            }
+            return success ? Qtrue : Qfalse;
         } catch (std::exception &e) {
             rb_raise(rb_eRuntimeError, "failed from unknown exception");
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torrent_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Michael Smith