video-torrent-info 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 082713f2508e9fadfad84ac92241763a06883393
-  data.tar.gz: 9ea61a608bb666fdb011816748e8d0964174d95e
+  metadata.gz: 2db267eadd752409c38dc33beeb0d9903f4e5307
+  data.tar.gz: b3c963fb20e24dfd5261e7787f52e5e5df00260f
 SHA512:
-  metadata.gz: b716966aca9da16c8a76a21c15642e13a5d65b03adf313cb905f788f791c56ef5bdb31f9fdf0f3d2b219cf8834c9db9e2d4f4c3d6e747deaa253221c07d6a384
-  data.tar.gz: 1ae3f7d8c04dba00a3a89fb935e3854bd86dae83a2079e1dc1dbabb99d1043e36aea8b7c0f7eb2363c2967b915858d84b52e429955d0faeb4d6f5d35e7172100
+  metadata.gz: 610b7b35c335b6ca45778d215dbe6975d73a8460556c127baccf578e295b4c3e21d0135f2c13f1cc81838a7d4dc84e16043219e77fd16af042aafbbd56bd556b
+  data.tar.gz: a7975a11a5573afbe0621a59680583ba947ee10a1638cee9a921f1bae1b24009fa67e09b34e057b6d1f1ef8a9ea09e1730651722e3288bcf3cccadd442d4248d

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/ext/torrent_client/torrent_client.cpp

@@ -2,6 +2,8 @@
 #include <sstream>
 #include <iostream>
 #include <exception>
+#include <stdio.h>
+#include <unistd.h>
 #include "libtorrent/entry.hpp"
 #include "libtorrent/bencode.hpp"
 #include "libtorrent/session.hpp"
@@ -17,14 +19,19 @@ struct MyException : public std::exception
    ~MyException() throw () {}
    const char* what() const throw() { return s.c_str(); }
 };
+void term(int signum)
+{
+    exit(1);
+}
 
 void load(String torrent_path, int idx, int size, String save_path, int port1, int port2, int timeout)
 {
   using namespace libtorrent;
 
   session s;
-  error_code ec;
   std::ostringstream err;
+  signal(SIGINT,  term);
+  signal(SIGTERM, term);
   s.listen_on(std::make_pair(port1, port2), ec);
   if (ec)
   {
@@ -60,12 +67,13 @@ void load(String torrent_path, int idx, int size, String save_path, int port1, i
 
   size_type temp = 0;
   int t = 0;
+  bool finish = false;
 
   while (true)
   {
     torrent_status st = h.status();
     if (st.is_finished == true) {
-      return;
+      finish = true;
     }
     if (st.total_done > temp)
     {
@@ -74,10 +82,14 @@ void load(String torrent_path, int idx, int size, String save_path, int port1, i
     }
     if (size > 0 && temp >= size)
     {
-      return;
+      finish = true;
     }
     if (t >= timeout * 1000)
     {
+      finish = true;
+    }
+    if (finish) {
+      s.abort();
       return;
     }
     t++;

data/lib/video_torrent_info.rb

@@ -7,8 +7,8 @@ class VideoTorrentInfo
     port2: 8662,
     temp_path: '/tmp',
     supported_extensions: %w{ .avi .mkv .mpg .mpeg .3gp .wmv .mov .flv .mts .mp4 },
-    download_limit: -1,
-    timeout: 60
+    download_limit: 100000,
+    timeout: 30
   }
   def initialize(params = {})
     @params = DEFAULTS.merge(params)

data/spec/lib/torrent_client_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 require 'torrent_client'
 describe VideoTorrentInfo::TorrentClient do
-  let(:torrent) { 'spec/fixtures/test.torrent' }
-  let(:target) { '/tmp/Соседи.На тропе войны.(Logan1995).avi' }
+  let(:torrent) { 'spec/fixtures/test3.torrent' }
+  let(:target) { '/tmp/44.2015.WEB-DLRip.1.46GB.avi' }
   let(:port1) { 8661 }
   let(:port2) { port1 + 1 }
   let(:path) { '/tmp' }
   let(:size) { 100000 }
-  let(:timeout) { 6000 }
+  let(:timeout) { 60 }
   subject { VideoTorrentInfo::TorrentClient.new }
   context 'when #load' do
     context 'with wrong file' do
@@ -24,20 +24,7 @@ describe VideoTorrentInfo::TorrentClient do
           File.unlink(target) rescue nil
         end
         specify do
-          expect(File.exist?(target)).to be_true
-        end
-      end
-      context 'full file' do
-        let(:torrent) { 'spec/fixtures/test2.torrent' }
-        let(:target) { '/tmp/Tom_&_Jerry/TOM-1/07. Мышонок-стратег.avi' }
-        before do
-          subject.load(torrent, 0, -1, path, port1, port2, timeout)
-        end
-        after do
-          File.unlink(target)
-        end
-        specify do
-          expect(File.exist?(target)).to be_true
+          expect(File.exist?(target)).to be_truthy
         end
       end
     end

data/spec/lib/video_torrent_info_spec.rb

@@ -5,7 +5,7 @@ describe VideoTorrentInfo do
   context 'when #load' do
     context 'with good file' do
       specify do
-        expect(subject.load('spec/fixtures/test.torrent')['format_name']).to eql('avi')
+        expect(subject.load('spec/fixtures/test3.torrent')['format_name']).to eql('avi')
       end
     end
   end

data/video-torrent-info.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: video-torrent-info 0.1.15 ruby lib
+# stub: video-torrent-info 0.1.16 ruby lib
 # stub: ext/torrent_client/extconf.rb
 
 Gem::Specification.new do |s|
   s.name = "video-torrent-info"
-  s.version = "0.1.15"
+  s.version = "0.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Pavel Tatarsky"]
-  s.date = "2015-06-05"
+  s.date = "2015-07-10"
   s.description = "It simply loads small part of torrent that contains metadata and processes it with ffmpeg"
   s.email = "fazzzenda@mail.ru"
   s.extensions = ["ext/torrent_client/extconf.rb"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/video_torrent_info.rb",
     "spec/fixtures/test.torrent",
     "spec/fixtures/test2.torrent",
+    "spec/fixtures/test3.torrent",
     "spec/lib/torrent_client_spec.rb",
     "spec/lib/video_torrent_info_spec.rb",
     "spec/spec_helper.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video-torrent-info
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Pavel Tatarsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -145,6 +145,7 @@ files:
 - lib/video_torrent_info.rb
 - spec/fixtures/test.torrent
 - spec/fixtures/test2.torrent
+- spec/fixtures/test3.torrent
 - spec/lib/torrent_client_spec.rb
 - spec/lib/video_torrent_info_spec.rb
 - spec/spec_helper.rb