mediafile 0.1.9 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 334aef8d37ba538e00245a02dc3aefafd60b4b3c
-  data.tar.gz: 4f8de891ef857224aced4f20d4ff9b7cb329ae7e
+  metadata.gz: d5c394dc6d5a00be3d75ff15ee0b842743cfb86b
+  data.tar.gz: cad902cd12157f5792f3e56b87f417e9a3522b8c
 SHA512:
-  metadata.gz: 53186aae0f9fd1b468a9f2b1fdf8dbae02017e4a59fe7897acc3bd438074b4c6bf76fae29ae872936a9fb7d5465e4d1307b6b73e21942b1c80917019e1ed0da3
-  data.tar.gz: 169efd96844d7d386f72834407ea8f5e4daee2708fdb939d1d2d873133981fe9eacb9c638211eded3828d5176ac7624349dc7ab30cbd980bb24632391979203a
+  metadata.gz: 71d866a921add9b4b39a05d8fa20fe537a4d79b063fa99be72cea9e40ebf468ede7090d66ee177e5a5fec96df798e96456a5b0d7a0fa264272263de7566b8d95
+  data.tar.gz: d2de722d5d6039b8d988626edefbe84b5f4e24464e50868ce1849afb476cc2e2cd666990048a9bd4d37cce058938b2197b7577927537eccbce499dfe82c8008d

data/bin/music_cp

@@ -44,7 +44,7 @@ opts = OptionParser.new do |opt|
     dest = d
   end
   opt.on('--transcode <from=to[,from1=to1]>',
-         'A comma-seperated series of name=value pairs.',
+         'A comma-seperated list of name=value pairs.',
          'Default is ' \
          "#{transcode.to_a.map { |i| i.join('=') }.join(',')}}") do |fmt|
     kill = true
@@ -64,7 +64,7 @@ opts = OptionParser.new do |opt|
   end
   opt.on('--exclude PATTERN', '-x PATTERN', String,
          'Exclude files that match the given pattern.',
-         'Can specify more than once, file is excluded' \
+         'Can specify more than once, file is excluded ' \
          'if any pattern matches') do |p|
     exclude_patterns.concat p.split(',')
   end

data/lib/mediafile/bulkmediacopy.rb

@@ -40,13 +40,12 @@ class BulkMediaCopy
   def run(max=4)
     start = Time.new
     debug "Call run with max => '#{max}'"
-    puts "%#{@width + 8}s, %#{@width + 8}s,%#{@width + 8}s, %-#{@name_width}s => Destination Path" % [
+    puts "%#{@width + 8}s, %#{@width + 8}s,%#{@width + 9}s :: Mode" % [
       "Remaining",
       "Workers",
-      "Complete",
-      "File Name"
+      "Complete"
     ]
-    puts "%#{@width}d ( 100%%), %#{@width}d (%4.1f%%), %#{@width}d ( 0.0%%)" % [
+    puts "%#{@width}d ( 100%%), %#{@width}d (%4.1f%%), %#{@width}d ( 0.0%%) :: *wait*" % [
       @work.count,
       0,
       0,
@@ -56,7 +55,7 @@ class BulkMediaCopy
     stop = Time.new
     duration = stop - start
     puts "Copied #{@count} files in #{ "%d:%d:%d:%d" % duration.to_duration} " +
-      "(~#{(@count/duration).to_i} songs/second))."
+      "(~%.2f songs/second))." % [(@count/duration)]
     dupes = @copies.select{ |_k,a| a.size > 1 }
     if dupes.any?
       puts "dupes"
@@ -64,7 +63,7 @@ class BulkMediaCopy
       pp dupes
     end
     if @failed.any?
-      puts "Some files timed out"
+      puts "Some files failed to transfer."
       @failed.each { |f| puts f.to_s }
     end
   end
@@ -112,43 +111,42 @@ class BulkMediaCopy
     dest = mediafile.out_path transcode_table: @transcode
     lock {
       return unless copy_check? mediafile.source_md5, mediafile.source, dest
-    }
-
-    err = false
-    begin
-      mediafile.copy transcode_table: @transcode
-    rescue
-      @failed << mediafile
-      err = true
-    end
-
-    lock {
       @count += 1
       if @progress
         left  = @work.count - @count
         left_perc = left == 0 ? left : left.to_f / @work.count * 100
-        cur   = @copies.count - @count
+        cur = @copies.count - @count
         cur_perc = cur == 0 ? cur : cur.to_f / left * 100 # @work.count * 100
         c = cur_perc == 100
         finished = @count.to_f / @work.count * 100
         f = finished == 100.0
         print "%#{@width}d (%4.1f%%), %#{@width}d (%4.#{c ? 0 : 1}f%%), " \
-             "%#{@width}d (%4.#{f ? 0 : 1}f%%) :: %-s\n    source file => %-s\n    " \
-             "destination => %-s\n" % [
-          left,
-          left_perc,
-          cur,
-          cur_perc,
-          @count,
-          finished,
-          (@transcode[mediafile.type].nil? ? '*copy*' : '*transcode*'),
-          (mediafile.source + (err ? " **" : "") ),
-          mediafile.out_path(transcode_table:@transcode)
+          "%#{@width}d (%4.#{f ? 0 : 1}f%%) :: %-s\n    source file => %-s\n    " \
+          "destination => %-s\n" % [
+            left,
+            left_perc,
+            cur,
+            cur_perc,
+            @count,
+            finished,
+            (@transcode[mediafile.type].nil? ? '*copy*' : '*transcode*'),
+            (mediafile.source),
+            mediafile.out_path(transcode_table:@transcode)
         ]
       end
       debug "#{mediafile.type} == #{@transcode[mediafile.type]}"
     }
 
+    err = false
+    begin
+      mediafile.copy transcode_table: @transcode
+    rescue => e
+      debug("mediafile.copy failed.  #{e}")
+      @failed << mediafile
+      err = true
+      raise
+    end
+    err
   end
 
   def copy_check?(md5,name,dest)

data/lib/mediafile/mediafile.rb

@@ -8,7 +8,7 @@ class MediaFile
 
   attr_reader :source, :type, :name, :base_dir
 
-  def initialize(path,
+  def initialize(full_path,
                  base_dir: '.',
                  force_album_artist: nil,
                  verbose: false,
@@ -16,11 +16,15 @@ class MediaFile
     @base_dir = base_dir
     @destinations = Hash.new{ |k,v| k[v] = {} }
     @force_album_artist = force_album_artist
-    @name     = File.basename( path, File.extname( path ) )
-    @source   = path
-    @type     = path[/(\w+)$/].downcase.to_sym
+    @name     = File.basename( full_path, File.extname( full_path ) )
+    @source   = full_path
+    @type     = full_path[/(\w+)$/].downcase.to_sym
     @verbose  = verbose
     @debug    = debug
+    @cover = File.join(
+      File.dirname(full_path),
+      'cover.jpg')
+    @cover = nil unless File.exist?(@cover)
   end
 
   def source_md5
@@ -37,25 +41,30 @@ class MediaFile
 
   def copy(dest: @base_dir, transcode_table: {})
     destination = out_path base_dir: dest, transcode_table: transcode_table
-    temp_dest = tmp_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)
-        warn "File transfer is already in progress for #{@source} => #{temp_dest} => #{destination}"
-        warn "This shouldn't happen!  Check to make sure it was really copied."
+        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)
-        warn "File has already been transfered #{@source} => #{destination}" if @verbose
+        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
     }
     begin
       transcode_table.has_key?(@type) ?
         transcode(transcode_table, temp_dest) :
-        really_copy(@source, temp_dest)
+        FileUtils.cp(@source, temp_dest)
+      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
@@ -85,12 +94,6 @@ class MediaFile
        :title, :genre, :year, :track,
        :comment, :disc_number, :disc_total
 
-  def really_copy(src,dest)
-    FileUtils.cp(src, dest)
-    set_album_artist(dest)
-    set_comment_and_title(dest)
-  end
-
   def set_decoder()
     case @type
     when :flac
@@ -147,7 +150,7 @@ class MediaFile
   def transcode(trans , destination)
     to = trans[@type]
     if to == @type
-      safe_print "Attempting to transcode to the same format #{@source} from #{@type} to #{to}"
+      error "Attempting to transcode to the same format #{@source} from #{@type} to #{to}"
     end
     FileUtils.mkdir_p File.dirname destination
 
@@ -185,7 +188,7 @@ class MediaFile
         end
       }
     rescue Timeout::Error
-      safe_print "Timeout exceeded!\n" << tpids.map { |p|
+      error "Timeout exceeded!\n" << tpids.map { |p|
         Process.kill 15, p
         Process.kill 9, p
         "#{p} #{Process.wait2( p )[1]}"
@@ -194,9 +197,9 @@ class MediaFile
       raise
     end
     if err.any?
-      safe_print "###\nError transcoding #{@source}: #{err.map{ |it,stat|
+      error "###\nError transcoding #{@source}: #{err.map{ |it,stat|
         "#{it} EOT:#{stat.exitstatus} #{stat}" }.join(" and ") }\n###\n"
-      exit 1
+      raise
     end
   end
 
@@ -219,18 +222,16 @@ class MediaFile
     # this doesn't include the extension.
     @newname ||= (
       read_tags
-      #file = clean_string(
-        case
-        when (@disc_number && (@track > 0) && @title) && !(@disc_total && @disc_total == 1)
-          "%1d_%02d-" % [@disc_number, @track] + clean_string(@title)
-        when (@track > 0 && @title)
-          "%02d-" % @track + clean_string(@title)
-        when @title && @title != ""
-          clean_string(@title)
-        else
-          clean_string(@name)
-        end
-      #)
+      case
+      when (@disc_number && (@track > 0) && @title) && !(@disc_total && @disc_total == 1)
+        "%1d_%02d-" % [@disc_number, @track] + clean_string(@title)
+      when (@track > 0 && @title)
+        "%02d-" % @track + clean_string(@title)
+      when @title && @title != ""
+        clean_string(@title)
+      else
+        clean_string(@name)
+      end
     )
   end
 
@@ -264,17 +265,121 @@ class MediaFile
     "." + new_file_name
   end
 
-  def tmp_path(base_dir: @base_dir, transcode_table: {})
+  def tmp_path(base_dir: @base_dir, typ: nil)
+    typ ||= @type
     File.join(
       base_dir,
       relative_path,
       tmp_file_name,
-    ) << ".#{transcode_table[@type] || @type}"
+    ) << ".#{typ}"
+  end
+
+  def has_cover_art?(file)
+    typ = file[/(\w+)$/].downcase.to_sym
+    debug("Checking if #{file} has clover art. (#{typ})")
+    case typ
+    when :m4a
+      return true if file.tag.item_list_map['covr'].to_cover_art_list.find do |p|
+        p.format == TagLib::MP4::CoverArt::JPEG
+      end
+    when :flac
+      debug("It does.")
+      TagLib::FLAC::File.open(file) do |f|
+        return true if f.picture_list.find do |p|
+          p.type == TagLib::FLAC::Picture::FrontCover
+        end
+      end
+    when :mp3
+      TagLib::MPEG::File.open(file) do |f|
+        tag = f.id3v2_tag
+        # Don't overwrite an existing album cover.
+        debug("Checking if the target mp3 file already has a cover.")
+        return true if tag.frame_list('APIC').find do |p|
+          p.type == TagLib::ID3v2::AttachedPictureFrame::FrontCover
+        end
+      end
+    end
+    false
+  end
+
+  def set_cover_art(file)
+    debug("Checking for cover to apply to #{file}")
+    return if has_cover_art?(file)
+    write_cover_data(file, get_cover_data)
+  end
+
+  def get_cover_data
+    info("Getting cover art from #{@source}.")
+    #  This is bad maybe
+    @cover ? File.open(@cover, 'rb') { |c| c.read } :
+    case @type
+    when :m4a
+      TagLib::MP4::File.open(@source) do
+        p = mp4.tag.item_list_map['covr'].to_cover_art_list.first
+        p.data if p
+      end
+    when :flac
+      TagLib::FLAC::File.open(@source) do |f|
+        info("Geting cover art from #{@source}.")
+        p = f.picture_list.find { |i| i.type == TagLib::FLAC::Picture::FrontCover }
+        p.data if p
+      end
+    when :mp3
+      TagLib::MPEG::File.open(@source) do |f|
+        tag = f.id3v2_tag
+        p = tag.frame_list('APIC').first
+        p.picture if p
+      end
+    else
+      error "Unsupported file type '#{@type}'.  Not adding cover art from '#{@cover}'."
+      false
+    end
+  end
+
+  def write_cover_data(file, cover_art)
+    typ = file[/(\w+)$/].downcase.to_sym
+    case typ
+    when :m4a
+      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.save
+      end
+    when :flac
+      TagLib::FLAC::File.open(file) do |f|
+        pic = TagLib::FLAC::Picture.new
+        pic.type = TagLib::FLAC::Picture::FrontCover
+        pic.mime_type = 'image/jpeg'
+        pic.description = 'Cover'
+        pic.width = 90
+        pic.height = 90
+        pic.data = cover_art
+        info("Adding cover art tag to #{file}.")
+        f.add_picture(cover_art)
+        f.save
+      end
+    when :mp3
+      TagLib::MPEG::File.open(file) do |f|
+        tag = f.id3v2_tag
+        apic = TagLib::ID3v2::AttachedPictureFrame.new
+        apic.mime_type = 'image/jpeg'
+        apic.description = 'Cover'
+        apic.type = TagLib::ID3v2::AttachedPictureFrame::FrontCover
+        apic.picture = cover_art
+        tag.add_frame(apic)
+        f.save
+      end
+    else
+      error "Unsupported file type '#{typ}'.  Not adding cover art from '#{@cover}'."
+      false
+    end
   end
 
   def set_album_artist(file)
     return unless @force_album_artist
-    case @type
+    typ = file[/(\w+)$/].downcase.to_sym
+    case typ
     when :m4a
       TagLib::MP4::File.open(file) do |f|
         f.tag.item_list_map.insert("aART",
@@ -298,25 +403,27 @@ class MediaFile
           tag.add_frame(frame)
           f.save
         else
-          safe_print("##########\nNo tag returned for #{@name}: #{@source}\n#############\n\n")
+          error("##########\nNo tag returned for #{@name}: #{@source}\n#############\n\n")
         end
       end
     end
   end
 
   def set_comment_and_title(file)
-    klass = (@type == :mp3) ? TagLib::MPEG::File : TagLib::FileRef
-    method = (@type == :mp3) ? :id3v2_tag : :tag
+    debug "file is #{file}"
+    typ = file[/(\w+)$/].downcase.to_sym
+    klass  = (typ == :mp3) ? TagLib::MPEG::File : TagLib::FileRef
+    method = (typ == :mp3) ? :id3v2_tag : :tag
 
     klass.send(:open, file) do |f|
-      tag = if (@type == :mp3)
+      tag = if (typ == :mp3)
               f.send(method, true)
             else
               f.send(method)
             end
       tag.comment = "#{@comment}"
       tag.title = (@title || @name.tr('_',' ')) unless tag.title && tag.title != ""
-      if (@type == :mp3)
+      if (typ == :mp3)
         f.save(TagLib::MPEG::File::ID3v2)
       else
         f.save
@@ -332,7 +439,7 @@ class MediaFile
     @genre = nil
     @year = nil
     @track = 0
-    @comment = "MediaFile from source: #{@source}\n"
+    @comment = "MediaFile source: #{@source}\n"
     TagLib::FileRef.open(@source) do |file|
       unless file.null?
         tag = file.tag

data/lib/mediafile/version.rb

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

data/lib/mediafile.rb

@@ -77,4 +77,9 @@ module MediaFile
   def info(msg = '')
     safe_print("INFO: #{caller_locations(1, 2)[0].label} >> #{msg}") if @verbose
   end
+
+  def error(msg = '')
+    safe_print("ERROR: #{caller_locations(1, 2)[0].label} >> #{msg}")
+  end
+
 end

metadata

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