mediafile 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1dbbce1323dc0990bbc33da1ec6dafbd36bd119
-  data.tar.gz: 50f4d1f802f3bef3dec4b2a4d2afc37d755ad6d7
+  metadata.gz: 0cf95d2ef90842833ff1684e63e819eb786eb3b6
+  data.tar.gz: bf5437da339bcd635853b6cb2535b25914d14691
 SHA512:
-  metadata.gz: 992909477ae50eaa4cba726c48f2472f87ea44beaf87d511048a8363ccb6abd7646779982f46d39cf6a39aa865ffd28367ff116a65cd9f8f827906e027cdcde8
-  data.tar.gz: 2d40a4d6cb26d86cb6088d959ae70ccad61e8cbec39c9ddac27ef8664e47d95d91428f85d49358884e8eca5f6f24c0db1e54d8fcd7d78864c8d3bf538a339861
+  metadata.gz: b9d7f53933c2b36e4788153a90109adfff0732d752ae6b55f39e69dace58a6b927904ae495792a5c8322e1e4e1f33aa7bbfc026b2ba2b2a4aa14fb5ead42c360
+  data.tar.gz: c14b16bf4336633b6322c9b8b9dca487e30b1d134d1cff43904d4e54f285e7d2c4d710523e3072b6177b168dc4089507fb71413a2e9fce06c37b989c5166cfca

data/lib/mediafile/mediafile.rb

@@ -43,21 +43,21 @@ class MediaFile
     destination = out_path base_dir: dest, transcode_table: transcode_table
     temp_dest = tmp_path base_dir: dest, typ: transcode_table[@type]
     debug "temp dest is '#{temp_dest}'"
-    lock{
-      if File.exist?(temp_dest)
-        error "File transfer is already in progress for #{@source} => #{temp_dest} => #{destination}"
-        error "This shouldn't happen!  Check to make sure it was really copied."
-        raise
-        #return
-      end
-      if File.exist?(destination)
-        info("File has already been transfered #{@source} => #{destination}")
-        return
-      end
-      debug("Create parent directories at '#{File.dirname destination}'.")
-      FileUtils.mkdir_p File.dirname destination
-      FileUtils.touch temp_dest
-    }
+
+    if File.exist?(destination)
+      info("File already exists at destination: #{@source} => #{destination}")
+      return
+    end
+
+    unless record_transfer(temp_dest)
+      error "Two source files mapped to the same destination file!"
+      error "This file: #{@source} => #{temp_dest}"
+      return
+    end
+
+    debug("Create parent directories at '#{File.dirname destination}'.")
+    FileUtils.mkdir_p File.dirname destination
+    FileUtils.touch temp_dest
     begin
       transcode_table.has_key?(@type) ?
         transcode(transcode_table, temp_dest) :

data/lib/mediafile/version.rb

@@ -1,3 +1,3 @@
 module MediaFile
-  VERSION = "0.2.4" unless defined?(::MediaFile::VERSION)
+  VERSION = "0.2.5" unless defined?(::MediaFile::VERSION)
 end

data/lib/mediafile.rb

@@ -5,7 +5,8 @@ require 'fileutils'
 require 'mkmf'
 require 'digest/md5'
 require 'timeout'
-require 'taglib' 
+require 'taglib'
+require 'set'
 require 'mediafile/version'
 
 module MakeMakefile::Logging
@@ -38,15 +39,22 @@ module MediaFile
   @@thread_count = nil
   @@mutex = nil
   @@initialized = false
+  @@transfers = Set.new
+
+  def check_transfer(path)
+    lock {
+      @@transfers.add? path
+    }
+  end
 
   def initialize_threads(count = 1)
     return if @@initialized
-    @@initialized = 1
     @@thread_count = count
     if @@thread_count > 1
       require 'thread'
       @@mutex = Mutex.new
     end
+    @@initialized = true
   end
 
   def safe_print(message = '')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediafile
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jeff Harvey-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby