convertr 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/convertr.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{convertr}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Lityuga", "Alexander Svetkin"]

data/lib/convertr/convertor.rb

@@ -54,8 +54,9 @@ module Convertr
       @file = @task.file
       @logger.info("Started #{original_file}")
       begin
+        FileUtils.mkpath(indir)
+        FileUtils.cd(indir)
         fetch_file(@file.location, @file.filename)
-        FileUtils.cd indir
         process_profile(profile_by_bitrate(@task.bitrate))
         if @task.bitrate == 600
           count = calc_thumbnails_count(@file.duration)
@@ -72,12 +73,20 @@ module Convertr
       'SUCCESS'
     end # }}}
 
-    def fetch_file(source_url, filename) # скачивание файла по FTP {{{
-      FileUtils.mkpath(indir)
-      tmp_file = work_name + ".part"
+    # {{{
+    # Уже находясь в нужной директории, скачиваем файл по
+    # source_url через FTP во временный файл filename.part
+    # затем переименовываем его в filename
+    # Если файл уже скачан, завершаем работу
+    # Если находим временный файл - ждём, т.к., возможно
+    # другой процесс уже занят скачиванием файла, если
+    # ожидание продлится больше некоторого времени, удаляем
+    # временный файл и скачиваем самостоятельно
+    def fetch_file(source_url, filename) 
+      tmp_file = filename + ".part"
       started_at = Time.now
       loop do
-        return if ::File.exists? original_file
+        return if ::File.exists? filename
         if ::File.exists? tmp_file
           sleep(CONVERTOR_PAUSE_DELAY)
           if Time.now > started_at + CONVERTOR_MAX_FETCH_TIME
@@ -101,7 +110,7 @@ module Convertr
         end
       end
 
-      FileUtils.move tmp_file, original_file
+      FileUtils.move tmp_file, filename
     end # }}}
 
     def profile_by_bitrate(bitrate) # bitrate -> profile {{{
@@ -191,9 +200,9 @@ module Convertr
     end # }}}
 
     # тут чёрт ногу сломит с этими картами директорий
-    # /tmp/test.avi
+    # /tmp/test/test.avi
     def original_file
-      ::File.join(@conf.tmp_dir, ::File.basename(@file.filename))
+      ::File.join(@conf.tmp_dir, ::File.filename(@file.filename), ::File.basename(@file.filename))
     end
 
     # /tmp/test
@@ -201,11 +210,6 @@ module Convertr
       ::File.join(@conf.tmp_dir, ::File.filename(@file.filename))
     end
 
-    # /tmp/test/test
-    def work_name
-      ::File.join(@conf.tmp_dir, ::File.filename(@file.filename), ::File.filename(@file.filename))
-    end
-
     # test + suffix
     def filename_with_suffix(suffix)
       ::File.filename(@file.filename) + suffix

data/test/test_convertor.rb

@@ -87,40 +87,38 @@ class TestConvertor < Test::Unit::TestCase
         @convertor.task = Factory(:task, :file => @convertor.file, :crop => true, :deinterlace => true)
       end
       should "prepare valid shell command for thumbnail generation" do # {{{
-        assert_equal "/usr/local/bin/tmaker -i /tmp/test.avi  -c 20  -d  -w 150 -h 112 -o \"/tmp/output/x/y/test-%d-2.jpg\" 200 400 600",
+        assert_equal "/usr/local/bin/tmaker -i /tmp/test/test.avi  -c 20  -d  -w 150 -h 112 -o \"/tmp/output/x/y/test-%d-2.jpg\" 200 400 600",
           @convertor.instance_eval { make_thumbnails_cmd(3, 200, 150, nil, 2) }
       end # }}}
     end
     #}}}
     context "when source file is available locally" do # {{{
       setup do
-        @convertor.file = Factory(:file, :filename => 'test.avi', :location => 'ftp://example.com/test.avi')
-        FileUtils.touch '/tmp/test.avi'
+        FileUtils.touch '/tmp/test/test.avi'
         Net::FTP.expects(:open).never
       end
       should "return immediately on attempt to fetch file" do
-        assert_nil @convertor.instance_eval { fetch_file('ftp://example.com/test.avi', 'test.avi') }
+        assert_nil @convertor.instance_eval { fetch_file('ftp://example.com/test.avi', '/tmp/test/test.avi') }
       end
     end
     # }}}
     context "when source file is not available locally" do # {{{
       setup do
-        @convertor.file = Factory(:file, :filename => 'test.avi', :location => 'ftp://example.com/test.avi')
-        FileUtils.rm_rf '/tmp/test.avi'
+        FileUtils.rm_rf '/tmp/test/test.avi'
       end
 
       context "and ftp server works fine" do
         setup do
           ftp = mock()
           ftp.expects(:login).with('test','test')
-          ftp.expects(:getbinaryfile).with('test.avi', '/tmp/test/test.part', 1024)
+          ftp.expects(:getbinaryfile).with('test.avi', '/tmp/test/test.avi.part', 1024)
           ftp.expects(:close)
           Net::FTP.expects(:new).with('example.com', nil, nil, nil).returns(ftp)
         end
         should "download file by FTP" do
-          assert_equal 0, @convertor.instance_eval { fetch_file('ftp://example.com/test.avi', 'test.avi') }
+          assert_equal 0, @convertor.instance_eval { fetch_file('ftp://example.com/test.avi', '/tmp/test/test.avi') }
           assert !File.exists?('/tmp/test/test.avi.part')
-          assert File.exists?('/tmp/test.avi')
+          assert File.exists?('/tmp/test/test.avi')
         end
       end
 
@@ -134,7 +132,7 @@ class TestConvertor < Test::Unit::TestCase
         end
         should "remove tmp file and raise error" do
           assert_raise Net::FTPError do
-            @convertor.instance_eval { fetch_file('ftp://example.com/test.avi', 'test.avi') }
+            @convertor.instance_eval { fetch_file('ftp://example.com/test.avi', '/tmp/test/test.avi') }
           end
           assert !File.exists?('/tmp/test/test.avi.part')
         end
@@ -157,7 +155,7 @@ class TestConvertor < Test::Unit::TestCase
       end
     end 
     # }}}
-    context "successfuly processing some task" do
+    context "successfuly processing some task" do # {{{
       setup do
         file = Factory(:file, :filename => 'test.avi', :location => 'ftp://example.com/test.avi', :duration => 600)
         @convertor.task = Factory(:task, :file => file, :bitrate => 600)
@@ -172,7 +170,8 @@ class TestConvertor < Test::Unit::TestCase
         assert_equal 'SUCCESS', @convertor.instance_eval { process_task }
       end
     end
-    context "getting ftp error on processing some task" do
+    # }}}
+    context "getting ftp error on processing some task" do # {{{
       setup do
         file = Factory(:file, :filename => 'test.avi', :location => 'ftp://example.com/test.avi', :duration => 600)
         @convertor.task = Factory(:task, :file => file, :bitrate => 600)
@@ -184,7 +183,7 @@ class TestConvertor < Test::Unit::TestCase
       end
       should "return FAILURE" do
         assert_equal 'FAILURE', @convertor.instance_eval { process_task }
-      end
+      end #}}}
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: convertr
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ilya Lityuga