video-torrent-info 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79aa9eddaf64c89f8db33c47976c5b15bd73c41d
-  data.tar.gz: 3e2604e5d89f28d82d39d38767f9ceca18f866ae
+  metadata.gz: b71e5aefa32be1fbc835ed07180bf827f76e6269
+  data.tar.gz: e2cc0d4ee9d5557de8760e3d2f89b80eef7ed710
 SHA512:
-  metadata.gz: 452ecb6f7847cb7c2f06210eaf7ac0f11437da291d4fc02f42dc0e14ac8f6c5d7a29c458213d60b49fc5c7e6a461dcfd01ed2c1802a23ed948bd4c0802dc78d9
-  data.tar.gz: 2ff3cc939419b62dff4aa4ccf0f237259ed77fe701c1c23f86191ed73e8151c080273b3da7417a59e7e99d07e5aa42aa28d0628faa535e61fab5e78b27bb7f0a
+  metadata.gz: 7efcf563f6f6f580f3c2df4085aaa3604e6d77c27c354d0e7c24db2ef0087d507c253b28e5139431c69d5c47e6cb7e20d1b562a8a2607749fc166d577855b624
+  data.tar.gz: d93bc5b62f8e8fe9d55af9f5fced1e4bc73c56b292a9a46fe3d6fe5218d49907dbf6d8cfd29f18de57941d181bb94704aeffd88993dfae0ca9566f53323c9390

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/ext/torrent_client/torrent_client.cpp

@@ -18,7 +18,7 @@ struct MyException : public std::exception
    const char* what() const throw() { return s.c_str(); }
 };
 
-void load(String torrent_path, int idx, int size, String save_path, int port1, int port2)
+void load(String torrent_path, int idx, int size, String save_path, int port1, int port2, int timeout)
 {
   using namespace libtorrent;
 
@@ -57,6 +57,7 @@ void load(String torrent_path, int idx, int size, String save_path, int port1, i
   }
 
   size_type temp = 0;
+  int t = 0;
 
   while (true)
   {
@@ -69,7 +70,12 @@ void load(String torrent_path, int idx, int size, String save_path, int port1, i
     {
       return;
     }
-    sleep(1000);
+    if (t >= timeout * 1000)
+    {
+      return;
+    }
+    t++;
+    usleep(1000);
   }
 }
 void handle_my_exception(std::exception const & ex)

data/lib/video_torrent_info.rb

@@ -7,7 +7,8 @@ class VideoTorrentInfo
     port2: 8662,
     temp_path: '/tmp',
     supported_extensions: %w{ .avi .mkv .mpg .mpeg .3gp .wmv .mov .flv .mts },
-    download_limit: 1000000
+    download_limit: 1000000,
+    timeout: 60
   }
   def initialize(params = {})
     @params = DEFAULTS.merge(params)
@@ -17,7 +18,7 @@ class VideoTorrentInfo
     string = File.open(torrent_path){ |file| file.read }
     torrent = string.bdecode
     files = get_video_files(torrent)
-    @torrent_client.load(torrent_path, files.keys.first, @params[:download_limit], @params[:temp_path], @params[:port1], @params[:port2])
+    @torrent_client.load(torrent_path, files.keys.first, @params[:download_limit], @params[:temp_path], @params[:port1], @params[:port2], @params[:timeout])
     dest = @params[:temp_path] + '/' + files.values.first
     res = FFmpegVideoInfo.get(dest) 
     File.unlink(dest)

data/spec/lib/torrent_client_spec.rb

@@ -6,12 +6,12 @@ describe VideoTorrentInfo::TorrentClient do
   context 'when #load' do
     context 'with wrong file' do
       specify do
-        expect { subject.load('abra', 0, 1000000, 'cadabra', 8661, 8662) }.to raise_error('failed to load torrent info: No such file or directory')
+        expect { subject.load('abra', 0, 1000000, 'cadabra', 8661, 8662, 60) }.to raise_error('failed to load torrent info: No such file or directory')
       end
     end
     context 'with good file' do
       before do
-        subject.load('spec/fixtures/test.torrent', 0, 1000000, '/tmp', 8661, 8662)
+        subject.load('spec/fixtures/test.torrent', 0, 1000000, '/tmp', 8661, 8662, 60)
       end
       after do 
         File.unlink(target)

data/video-torrent-info.gemspec

@@ -2,15 +2,15 @@
 # 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.8 ruby lib
+# stub: video-torrent-info 0.1.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "video-torrent-info"
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pavel Tatarsky"]
-  s.date = "2013-12-13"
+  s.date = "2013-12-14"
   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"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video-torrent-info
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Pavel Tatarsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc