mediafile 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc13f96b854bf7530041bbb3fb933e4b823f2332
-  data.tar.gz: 4d1460b5f152ba6d99697eb769fe27b2b9dc7b6e
+  metadata.gz: 7c4b1216b3ffd74a6488945a3be0cafc10a96af3
+  data.tar.gz: 7e4adb066b6eddfcd9a6862fb2383af1339e77e6
 SHA512:
-  metadata.gz: 48d24d5bb657053fafd6e4c4c91e26419bffc71de1e2a38ac0a5fbda4b3a0ca603ca46c78b93bd10195f8b5c9763b62243598c9426e4563cf5cfce9f426ffd0e
-  data.tar.gz: d806f7edd72ba8c5656558f9f1cf0ba825059a4ab3a87c53e40ce1a78e614dfd0ae944625dd00ff4f8d68e7791cd082fed0221639b0652ace78e1c1d8b2b4b9a
+  metadata.gz: e42b66074d3e6e7830c3262108a32d15885a784e186fbdb5b33184def4d49b733d9fcb55b2e61a0b4144253d3ea2623eb7e3c9aff1789345ec08fddfeb30d4c3
+  data.tar.gz: de6e8a15eeba5e7fb2c2d83dd57c777d4b7e2852407254097875bf46e1592ca85a4fea1b08262dbb0df3d8ef7bf8842c8e9ef71f82f2711af921526ee955b05a

data/bin/music_cp

@@ -149,7 +149,7 @@ if files.empty?
   exit
 end
 puts "Full list of files to transfer to #{dest}:"
-files.each { |l| puts "\t" + l }
+files.each { |l| puts "  #{l}" }
 puts "#{files.count} files total"
 puts 'The following transcode table will be used:'
 puts transcode.any? ? transcode : 'none'

data/lib/mediafile/bulkmediacopy.rb

@@ -58,9 +58,17 @@ class BulkMediaCopy
       "(~%.2f songs/second))." % [(@count/duration)]
     dupes = @copies.select{ |_k,a| a.size > 1 }
     if dupes.any?
-      puts "dupes"
-      require 'pp'
-      pp dupes
+      msg = "*** Same file with multiple names detected ***"
+      puts
+      puts msg
+      puts "=" * msg.size
+      dupes.each do |k,v|
+        puts "#{k}:"
+        v.each do |a|
+          puts "    #{a}"
+        end
+      end
+      puts
     end
     if @failed.any?
       puts "Some files failed to transfer."
@@ -108,9 +116,8 @@ class BulkMediaCopy
   end
 
   def copy(mediafile)
-    dest = mediafile.out_path transcode_table: @transcode
     lock {
-      return unless copy_check? mediafile.source_md5, mediafile.source, dest
+      return unless copy_check?(mediafile)
       @count += 1
       if @progress
         left  = @work.count - @count
@@ -121,7 +128,7 @@ class BulkMediaCopy
         finished = @count.to_f / @work.count * 100
         f = finished == 100.0
         action = case
-                 when File.exists?(dest)
+                 when File.exist?(mediafile.out_path(transcode_table: @transcode))
                    'target already exists'
                  when @transcode[mediafile.type]
                    'transcode'
@@ -156,11 +163,19 @@ class BulkMediaCopy
     err
   end
 
-  def copy_check?(md5,name,dest)
+  def copy_check?(mediafile)
     # if multi-threaded, need to lock before calling
-    @copies[md5] << "#{name} => #{dest}"
+    @copies[mediafile.source_md5] <<
+      "#{mediafile.source} => #{mediafile.out_path(transcode_table:@transcode)}"
+    debug("md5 for #{mediafile.name} is #{mediafile.source_md5}")
     # return true if this is the only one
-    @copies[md5].count == 1
+    debug("#{@copies[mediafile.source_md5]}")
+    ret = @copies[mediafile.source_md5].count == 1
+    unless ret
+      info("Same file with multiple names detected:\n\t" +
+           "#{@copies[mediafile.source_md5].join("\n\t")}")
+    end
+    ret
   end
 
 end

data/lib/mediafile/mediafile.rb

@@ -30,7 +30,7 @@ class MediaFile
   end
 
   def source_md5
-    @source_md5 ||= Digest::MD5.hexdigest( @source )
+    @source_md5 ||= Digest::MD5.hexdigest( File.read(@source) )
   end
 
   def out_path(base_dir: @base_dir, transcode_table: {})
@@ -43,6 +43,10 @@ class MediaFile
 
   def copy(dest: @base_dir, transcode_table: {})
     destination = out_path base_dir: dest, transcode_table: transcode_table
+    debug "destination is '#{destination}'"
+    if destination =~ /\/\.[a-zA-Z0-9]+$/
+      raise "This is the error you've been looking for!\n '#{@source}' => '#{destination}'"
+    end
     temp_dest = tmp_path base_dir: dest, typ: transcode_table[@type]
     debug "temp dest is '#{temp_dest}'"
 
@@ -53,7 +57,9 @@ class MediaFile
     end
 
     unless check_transfer(temp_dest)
-      error "Two source files mapped to the same destination file!"
+      error "Another file is already getting " +
+            (transcode_table.has_key?(@type) ? 'transcoded' : 'copied') + 
+            "to the same destination path!"
       error "This file: #{@source} => #{temp_dest}"
       return
     end
@@ -61,22 +67,17 @@ class MediaFile
     debug("Create parent directories at '#{File.dirname destination}'.")
     FileUtils.mkdir_p File.dirname destination
     FileUtils.touch temp_dest
-    begin
-      if transcode_table.has_key?(@type)
-        transcode(transcode_table, temp_dest)
-        @disposition = 'transcoded'
-      else
-        FileUtils.cp(@source, temp_dest)
-        @disposition = 'copied'
-      end
-      set_album_artist(temp_dest)
-      set_comment_and_title(temp_dest)
-      set_cover_art(temp_dest)
-      FileUtils.mv temp_dest, destination
-    rescue => e
-      FileUtils.rm temp_dest if File.exist? temp_dest
-      raise e
+    if transcode_table.has_key?(@type)
+      transcode(transcode_table, temp_dest)
+      @disposition = 'transcoded'
+    else
+      FileUtils.cp(@source, temp_dest)
+      @disposition = 'copied'
     end
+    set_album_artist(temp_dest)
+    set_comment_and_title(temp_dest)
+    set_cover_art(temp_dest)
+    FileUtils.mv temp_dest, destination
   ensure
     FileUtils.rm temp_dest if File.exist? temp_dest
   end
@@ -176,8 +177,7 @@ class MediaFile
     tpids = pids.keys
     err = []
     begin
-      Timeout::timeout(60 * ( File.size(@source) / 1024 / 1024 /2 ) ) {
-        #Timeout::timeout(3 ) {
+      Timeout::timeout(60 * ( File.size(@source) / 1024 / 1024 /2 ) ) do
         while tpids.any? do
           sleep 0.2
           tpids.delete_if do |pid|
@@ -193,7 +193,7 @@ class MediaFile
             ret
           end
         end
-      }
+      end
     rescue Timeout::Error
       error "Timeout exceeded!\n" << tpids.map { |p|
         Process.kill 15, p

data/lib/mediafile/version.rb

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

metadata

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