mediafile 0.2.13 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1397ae7527dd5d9e250c6213f05c5a34b8ff5a8596405fca0db16dfe0c1f7d54
-  data.tar.gz: 0bbbaae4d48e9313970d03d802fc3a63bd53bf92af598e1dadda9fcb677d1092
+  metadata.gz: 1d13b07db004204da62e828da733ff2e350adea5340efd5dc53d6e6adbf2d8b9
+  data.tar.gz: 8a085e9ac0f79ba5a31538531a4f36537ddf295d413039b8d844e452bbe3f960
 SHA512:
-  metadata.gz: a4f0764054069b5a754606bae972fccd849625c725f93175a300eeb15ddaee9b0fa08918176776c4c85ad6a8bfafb91d77244044fba6b9174d22d56d034a0f46
-  data.tar.gz: ef61f10d368e12324aba99ee50fbd7255ae17e85d266394637d6133ec361e3d7422a04a095445507708ec18dfdb265b0807bc5cedfc1926ae45e17af71cb0030
+  metadata.gz: dc9392f337144ff23223e9703abca1d3702158088a16d1ae435a8e08b1948b3bed5e6dfa358644ccf77619e34c05bfd8cabb4ecb97bf62fcb01729599576fc89
+  data.tar.gz: 6c338249dc18475cd4bd4ae415b376929cb11be6bd8361c350d43145df663f2f944d5c60409fecaec1076dbd7aa699ac235eb997fe83528b4b59d6d3574b51d9

data/lib/mediafile/mediafile.rb

@@ -50,11 +50,13 @@ class MediaFile
     temp_dest = tmp_path base_dir: dest, typ: transcode_table[@type]
     debug "temp dest is '#{temp_dest}'"
 
-    if File.exist?(destination)
-      @noop = true
-      info("File already exists at destination: #{@source} => #{destination}")
-      return
-    end
+    lock {
+      if File.exist?(destination) || File.exist?(temp_dest)
+        @noop = true
+        info("File already exists at destination: #{@source} => #{destination}")
+      end
+    }
+    return if @noop
 
     unless check_transfer(temp_dest)
       error "Another file is already getting " +
@@ -63,7 +65,10 @@ class MediaFile
       error "This file: #{@source} => #{temp_dest}"
       return
     end
+    really_copy(temp_dest, destination, transcode_table)
+  end
 
+  def really_copy(temp_dest, destination, transcode_table)
     debug("Create parent directories at '#{File.dirname destination}'.")
     FileUtils.mkdir_p File.dirname destination
     FileUtils.touch temp_dest
@@ -287,7 +292,7 @@ class MediaFile
     case typ
     when :m4a
       TagLib::MP4::File.open(file) do |f|
-        return true if f.tag.item_list_map['covr'].to_cover_art_list.find do |p|
+        return true if f.tag.item_map['covr'].to_cover_art_list.find do |p|
           p.format == TagLib::MP4::CoverArt::JPEG
         end
       end
@@ -324,7 +329,7 @@ class MediaFile
     case @type
     when :m4a
       TagLib::MP4::File.open(@source) do |f|
-        p = f.tag.item_list_map['covr'].to_cover_art_list.first
+        p = f.tag.item_map['covr'].to_cover_art_list.first
         p.data if p
       end
     when :flac
@@ -355,7 +360,7 @@ class MediaFile
       TagLib::MP4::File.open(file) do
         c = TagLib::MP4::CoverArt.new(TagLib::MP4::CoverArt::JPEG, cover_art)
         item = TagLib::MP4::Item.from_cover_art_list([c])
-        file.tag.item_list_map.insert('covr', item)
+        file.tag.item_map.insert('covr', item)
         file.save
       end
     when :flac
@@ -396,7 +401,7 @@ class MediaFile
     case typ
     when :m4a
       TagLib::MP4::File.open(file) do |f|
-        f.tag.item_list_map.insert("aART",
+        f.tag.item_map.insert("aART",
                                    TagLib::MP4::Item.from_string_list([@force_album_artist]))
         f.save
       end
@@ -476,11 +481,11 @@ class MediaFile
     case @type
     when :m4a
       TagLib::MP4::File.open(@source) do |file|
-        @disc_number = file.tag.item_list_map["disk"] ?
-                       file.tag.item_list_map["disk"].to_int_pair[0] :
+        @disc_number = file.tag.item_map["disk"] ?
+                       file.tag.item_map["disk"].to_int_pair[0] :
                        nil
-        @album_artist = file.tag.item_list_map["aART"] ?
-                        file.tag.item_list_map["aART"].to_string_list[0] :
+        @album_artist = file.tag.item_map["aART"] ?
+                        file.tag.item_map["aART"].to_string_list[0] :
                         @album_artist
       end
     when :flac

data/lib/mediafile/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediafile
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeff Harvey-Smith