mediafile 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cac681a4c71a49d088590a7403cc02080c5bb36a
-  data.tar.gz: 606bd21a86ca1213b885729710d60d7730cdee2f
+  metadata.gz: c0ac9d9cb6df74d620341c0410167100c8ab9bb9
+  data.tar.gz: 21b7b5e10a2dbffea4222758f48ce2176e36e117
 SHA512:
-  metadata.gz: 94e1462a37a4535968baed779bfd274198c7d1032cea7e079d73bf087ef2f5d827ef257411ab0cd0de4aeba2a46c46c12c945be81d418545551932611b0d73fd
-  data.tar.gz: 1bb6182f3f01199253c2e8485c7474e19c4ec835faab869d9485191764abbda761cc555cefa5e635184a5a48d988eb7b0a2a72a3c90dc9d847db0e82752b7fd0
+  metadata.gz: fea4af286c2c6ffe85078a0d8064742baf58229c3c179f177eaed5151f5fe3e8eccdda321b081525f3f0ddb7e9453740c2ca9a5676d3a1e292b5ae4c2d48ee63
+  data.tar.gz: 894d6b89e8b32ebd7e34a7dc336579e7e209fff6381d2ed5b34b5c3acede6b6dbf5baba06600620095990da235de2000113bb10545440f692077d901479a7af0

data/bin/music_cp

@@ -19,12 +19,14 @@ opt_files = {
 }
 dest = "."
 verbose = false
+debug = false
 progress = true
 count = `grep -c '^processor' /proc/cpuinfo`.strip.to_i/2|1
 transcode = { flac: :mp3, wav: :mp3 }
 exclude_patterns = []
 album_artist = nil
 file_types = "{flac,mp3,MP3,FLAC,wav,WAV,m4a,M4A}"
+yes = nil
 
 opts = OptionParser.new do |opt|
 
@@ -58,6 +60,10 @@ opts = OptionParser.new do |opt|
   opt.on("-v", "--[no-]verbose", "Be verbose") do |v|
     verbose = v
   end
+  opt.on("--debug", "Show debug output.  Also enables verbose.") do
+    debug = true
+    verbose = true
+  end
   opt.on("-t", "--threads NUM",
          "Number of threads to spawn, useful for transcoding.  Default: #{count}" ) do |n|
     count = n.to_i
@@ -69,6 +75,9 @@ opts = OptionParser.new do |opt|
     puts MediaFile::VERSION
     exit 0
   end
+  opt.on("-y", "--yes", "Don't ask before running.") do
+    yes = "yes"
+  end
   opt.on_tail("-h", "--help", "Show this message") do
     warn opt
     exit
@@ -132,8 +141,8 @@ files.each { |l| puts "\t"+l }
 puts "#{files.count} files total"
 puts "The following transcode table will be used:"
 puts transcode.any? ? transcode : 'none'
-puts "Do you wish proceed? (Y/n)"
-y = gets
+puts "Do you wish to proceed? (Y/n)"
+y = yes || gets
 if /n/i.match(y)
   puts "User cancel."
   exit
@@ -143,6 +152,7 @@ copier = MediaFile::BulkMediaCopy.new(
   files,
   destination_root: dest,
   verbose: verbose,
+  debug: debug,
   transcode: transcode,
   progress: progress,
   album_artist: album_artist

data/lib/mediafile/bulkmediacopy.rb

@@ -1,10 +1,15 @@
+# vim:et sw=2 ts=2
+
+require 'mediafile'
 module MediaFile; class BulkMediaCopy
+  include ::MediaFile
   def initialize(source,
                  album_artist: nil,
                  destination_root: ".",
                  progress: false,
                  transcode: {},
-                 verbose: false)
+                 verbose: false,
+                 debug: false)
     source = case source
       when String
         [source]
@@ -18,14 +23,8 @@ module MediaFile; class BulkMediaCopy
     @destination_root   = destination_root
     @verbose            = verbose
     @progress           = progress
-    @work               = source.map { |s|
-                            MediaFile.new(s,
-                              base_dir: @destination_root,
-                              force_album_artist: album_artist,
-                              verbose: @verbose,
-                              printer: proc{ |msg| self.safe_print( msg ) }
-                            )
-                          }
+    @album_artist       = album_artist
+    @work               = get_work(source)
     @width              = [@work.count.to_s.size, 2].max
     @name_width         = @work.max{ |a,b| a.name.size <=> b.name.size }.name.size
     @transcode          = transcode
@@ -59,29 +58,24 @@ module MediaFile; class BulkMediaCopy
     end
   end
 
-  def safe_print(message='')
-    locked {
-      print block_given? ? yield : message
-    }
-  end
-
   private
 
-  def locked
-    if @semaphore
-      @semaphore.synchronize {
-        yield
-      }
-    else
-      yield
-    end
+  def get_work(source)
+    source.map { |s|
+      MediaFile.new(
+        s,
+        base_dir: @destination_root,
+        force_album_artist: @album_artist,
+        verbose: @verbose,
+        debug: @debug,
+      )
+    }
   end
 
   def mcopy(max)
     raise "Argument must repond to :times" unless max.respond_to? :times
     raise "I haven't any work..." unless @work
-    require 'thread'
-    @semaphore = Mutex.new
+    initialize_threads(max)
     queue = Queue.new
     @work.each { |s| queue << s }
     threads = []
@@ -93,7 +87,7 @@ module MediaFile; class BulkMediaCopy
       end
     end
     threads.each { |t| t.join }
-    @semaphore = nil
+    cleanup
   end
 
   def scopy
@@ -105,7 +99,7 @@ module MediaFile; class BulkMediaCopy
 
   def copy(mediafile)
     dest = mediafile.out_path transcode_table: @transcode
-    locked {
+    lock {
       return unless copy_check? mediafile.source_md5, mediafile.source, dest
     }
 
@@ -117,7 +111,7 @@ module MediaFile; class BulkMediaCopy
       err = true
     end
 
-    locked {
+    lock {
       @count += 1
       if @progress
         left  = @work.count - @count

data/lib/mediafile/mediafile.rb

@@ -1,23 +1,24 @@
-#!/usr/bin/env ruby
 # vim:et sw=2 ts=2
 
+require 'mediafile'
 module MediaFile; class MediaFile
+  include ::MediaFile
 
   attr_reader :source, :type, :name, :base_dir
 
   def initialize(path,
                  base_dir: '.',
                  force_album_artist: nil,
-                 printer: proc {|msg| puts msg},
-                 verbose: false)
+                 verbose: false,
+                 debug: false)
     @base_dir = base_dir
     @destinations = Hash.new{ |k,v| k[v] = {} }
     @force_album_artist = force_album_artist
     @name     = File.basename( path, File.extname( path ) )
-    @printer  = printer
     @source   = path
     @type     = path[/(\w+)$/].downcase.to_sym
     @verbose  = verbose
+    @debug    = debug
   end
 
   def source_md5
@@ -35,22 +36,30 @@ module MediaFile; 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
-    unless File.exists? destination
-      FileUtils.mkdir_p File.dirname destination
-      begin
-        transcode_table.has_key?(@type) ?
-          transcode(transcode_table, temp_dest) :
-          really_copy(@source, temp_dest)
-        FileUtils.mv temp_dest, destination
-      rescue => e
-        FileUtils.rm temp_dest if File.exists? temp_dest
-        raise e
+    lock{
+      if File.exists?(destination)
+        warn "File has already been transfered #{@source} => #{destination}" if @verbose
+        return
+      end
+      if File.exists?(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."
+        return
       end
+      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.mv temp_dest, destination
+    rescue => e
+      FileUtils.rm temp_dest if File.exists? temp_dest
+      raise e
     end
-  end
-
-  def printit(msg)
-    @printer.call msg
+  ensure
+    FileUtils.rm temp_dest if File.exists? temp_dest
   end
 
   def to_s
@@ -75,6 +84,7 @@ module MediaFile; class MediaFile
   def really_copy(src,dest)
     FileUtils.cp(src, dest)
     set_album_artist(dest)
+    set_comment_and_title(dest)
   end
 
   def set_decoder()
@@ -131,7 +141,7 @@ module MediaFile; class MediaFile
   def transcode(trans , destination)
     to = trans[@type]
     if to == @type
-      printit "Attempting to transcode to the same format #{@source} from #{@type} to #{to}"
+      safe_print "Attempting to transcode to the same format #{@source} from #{@type} to #{to}"
     end
     FileUtils.mkdir_p File.dirname destination
 
@@ -139,13 +149,13 @@ module MediaFile; class MediaFile
 
     encoder = set_encoder(to, destination)
 
-    printit "Decoder: '#{decoder.join(' ')}'\nEncoder: '#{encoder.join(' ')}'" if @verbose
+    safe_print "Decoder: '#{decoder.join(' ')}'\nEncoder: '#{encoder.join(' ')}'" if @verbose
 
     pipes = Hash[[:encoder,:decoder].zip IO.pipe]
     #readable, writeable = IO.pipe
     pids = {
-      spawn(*decoder, :out=>pipes[:decoder], :err=>"/dev/null") => :decoder,
-      spawn(*encoder, :in =>pipes[:encoder], :err=>"/dev/null") => :encoder,
+      spawn(*decoder, :out=>pipes[:decoder], :err=>"/tmp/decoder.err") => :decoder,
+      spawn(*encoder, :in =>pipes[:encoder], :err=>"/tmp/encoder.err") => :encoder,
     }
     tpids = pids.keys
     err = []
@@ -169,7 +179,7 @@ module MediaFile; class MediaFile
         end
       }
     rescue Timeout::Error
-      printit "Timeout exceeded!\n" << tpids.map { |p|
+      safe_print "Timeout exceeded!\n" << tpids.map { |p|
         Process.kill 15, p
         Process.kill 9, p
         "#{p} #{Process.wait2( p )[1]}"
@@ -178,7 +188,7 @@ module MediaFile; class MediaFile
       raise
     end
     if err.any?
-      printit "###\nError transcoding #{@source}: #{err.map{ |it,stat|
+      safe_print "###\nError transcoding #{@source}: #{err.map{ |it,stat|
         "#{it} EOT:#{stat.exitstatus} #{stat}" }.join(" and ") }\n###\n"
       exit 1
     end
@@ -191,14 +201,10 @@ module MediaFile; class MediaFile
     @relpath ||= (
       read_tags
       dest = File.join(
-        [(@album_artist||"UNKNOWN"), (@album||"UNKNOWN")].map { |word|
-          word.gsub(/^\.+|\.+$/,"").gsub(/\//,"_")
+        [@album_artist, @album].map { |word|
+          clean_string(word)
         }
       )
-      bool=true
-      dest.gsub(/\s/,"_").gsub(/[,:)\]\[('"@$^*<>?!]/,"").gsub(/_[&]_/,"_and_").split('').map{ |c|
-        b = bool; bool = c.match('/|_'); b ? c.capitalize : c
-      }.join('').gsub(/__+/,'_')
     )
   end
 
@@ -207,33 +213,45 @@ module MediaFile; class MediaFile
     @newname ||= (
       read_tags
       bool = true
-      file = (
+      file = clean_string(
         case
         when (@disc_number && (@track > 0) && @title) && !(@disc_total && @disc_total == 1)
           "%1d_%02d-" % [@disc_number, @track] + @title
         when (@track > 0 && @title)
           "%02d-" % @track + @title
-        when @title
+        when @title && @title != ""
           @title
         else
           @name
         end
-      ).gsub(
-        /^\.+|\.+$/,""
-      ).gsub(
-        /\//,"_"
-      ).gsub(
-        /\s/,"_"
-      ).gsub(
-        /[,:)\]\[('"@$^*<>?!=]/,""
-      ).gsub(
-        /_[&]_/,"_and_"
-      ).split('').map{ |c|
-                    b = bool; bool = c.match('/|_'); b ? c.capitalize : c
-                  }.join('').gsub(/__+/,'_')
+      )
     )
   end
 
+  def clean_string(my_string)
+    my_string ||= ""
+    t = my_string.gsub(
+      /^\.+|\.+$/,""
+    ).gsub(
+      /\//,"_"
+    ).gsub(
+      /\s/,"_"
+    ).gsub(
+      /[,:;)\]\[('"@$^*<>?!=]/,""
+    ).gsub(
+      /^[.]/,''
+    ).gsub(
+      /_?[&]_?/,"_and_"
+    ).split('_').map{ |c|
+      puts "DEBUG: capitalize: '#{c}'" if @debug
+       "_and_" == c ? c : c.capitalize 
+    }.join('_').gsub(
+      /__+/,'_'
+    ).gsub(/^[.]/, '')
+    puts "DEBUG: clean_string: '#{my_string} => '#{t}'" if @debug
+    t == "" ? "UNKNOWN" : t
+  end
+
   def tmp_file_name
     "." + new_file_name
   end
@@ -271,27 +289,51 @@ module MediaFile; class MediaFile
           tag.add_frame(frame)
           f.save
         else
-          printit("##########\nNo tag returned for #{@name}: #{@source}\n#############\n\n")
+          safe_print("##########\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
+
+    klass.send(:open, file) do |f|
+      tag = if (@type == :mp3)
+              f.send(method, true)
+            else
+              f.send(method)
+            end
+      tag.comment = "#{@comment}"
+      tag.title = (@title || @name.gsub('_',' ')) unless tag.title && tag.title != ""
+      if (@type == :mp3)
+        f.save(TagLib::MPEG::File::ID3v2)
+      else
+        f.save
+      end
+    end
+  end
+
   def read_tags
     return if @red
-    @album = @artist= @title = @genre = @year = nil
+    @album = nil
+    @artist= nil
+    @title = nil
+    @genre = nil
+    @year = nil
     @track = 0
-    @comment = ""
+    @comment = "MediaFile from source: #{@source}\n"
     TagLib::FileRef.open(@source) do |file|
       unless file.null?
         tag = file.tag
-        @album  = tag.album   if tag.album
-        @artist = tag.artist  if tag.artist
-        @title  = tag.title   if tag.title
-        @genre  = tag.genre   if tag.genre
-        @comment= tag.comment if tag.comment
-        @track  = tag.track   if tag.track
-        @year   = tag.year    if tag.year
+        @album  = tag.album   if tag.album && tag.album != ""
+        @artist = tag.artist  if tag.artist && tag.artist != ""
+        @title  = tag.title   if tag.title && tag.title != ""
+        @genre  = tag.genre   if tag.genre && tag.genre != ""
+        @comment+= tag.comment if tag.comment && tag.comment != ""
+        @track  = tag.track   if tag.track && tag.track != ""
+        @year   = tag.year    if tag.year && tag.year != ""
       end
     end
     @album_artist = @artist
@@ -335,6 +377,8 @@ module MediaFile; class MediaFile
     else
       @album_artist ||= @artist
     end
+    puts "DEBUG: album:'#{@album}', artist:'#{@artist}'" +
+      " @title:'#{@title}'  @genre:'#{@genre}'  @year:'#{@year}'" if @debug
     @red = true
   end
 end; end

data/lib/mediafile/version.rb

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

data/lib/mediafile.rb

@@ -25,4 +25,41 @@ module MediaFile
          "Transcoding may not work in all cases."
   end
 
-end
+  private
+
+  @@thread_count = 1
+  @@semaphore = nil
+  @@initialized = false
+
+  def initialize_threads(count = 1)
+    return if @@initialized
+    @@initialized = 1
+    @@thread_count = count
+    if @@thread_count > 1
+      require 'thread'
+      @@semaphore = Mutex.new
+    end
+  end
+
+  def safe_print(message = '')
+    lock {
+      print block_given? ? yield : message
+    }
+  end
+
+  def cleanup
+    @@semaphore = nil
+    true
+  end
+
+  def lock
+    if @@semaphore
+      @@semaphore.synchronize {
+        yield
+      }
+    else
+      yield
+    end
+  end
+
+ end

metadata

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