mediafile 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0ac9d9cb6df74d620341c0410167100c8ab9bb9
-  data.tar.gz: 21b7b5e10a2dbffea4222758f48ce2176e36e117
+  metadata.gz: 334aef8d37ba538e00245a02dc3aefafd60b4b3c
+  data.tar.gz: 4f8de891ef857224aced4f20d4ff9b7cb329ae7e
 SHA512:
-  metadata.gz: fea4af286c2c6ffe85078a0d8064742baf58229c3c179f177eaed5151f5fe3e8eccdda321b081525f3f0ddb7e9453740c2ca9a5676d3a1e292b5ae4c2d48ee63
-  data.tar.gz: 894d6b89e8b32ebd7e34a7dc336579e7e209fff6381d2ed5b34b5c3acede6b6dbf5baba06600620095990da235de2000113bb10545440f692077d901479a7af0
+  metadata.gz: 53186aae0f9fd1b468a9f2b1fdf8dbae02017e4a59fe7897acc3bd438074b4c6bf76fae29ae872936a9fb7d5465e4d1307b6b73e21942b1c80917019e1ed0da3
+  data.tar.gz: 169efd96844d7d386f72834407ea8f5e4daee2708fdb939d1d2d873133981fe9eacb9c638211eded3828d5176ac7624349dc7ab30cbd980bb24632391979203a

data/bin/music_cp

@@ -4,91 +4,106 @@
 
 require 'optparse'
 require 'mediafile'
-
-PROGNAME = File.basename($0)
+require 'English'
 
 def die(msg)
-  abort "#{PROGNAME}: #{msg}"
+  abort "#{$PROGRAM_NAME}: #{msg}"
 end
 
-kill = me = now = false
+kill = false
+me = false
 files = []
 opt_files = {
   flat: [],
   recurse: []
 }
-dest = "."
+dest = '.'
 verbose = false
 debug = false
 progress = true
-count = `grep -c '^processor' /proc/cpuinfo`.strip.to_i/2|1
+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}"
+file_types = '{flac,mp3,MP3,FLAC,wav,WAV,m4a,M4A}'
 yes = nil
 
 opts = OptionParser.new do |opt|
-
-  opt.on("-f", "--file FILE|DIR", "File or directory to copy.",
-         "If given a directory, will grab all files within non-recursively") do |e|
+  opt.on('-f', '--file FILE|DIR', 'File or directory to copy.',
+         'If given a directory, will grab all files' \
+         'within non-recursively') do |e|
     opt_files[:flat].concat e.split(',')
   end
-  opt.on("-r", "--recursive DIR", "Directory to recursively scan and copy") do |r|
+  opt.on('-r', '--recursive DIR',
+         'Directory to recursively scan and copy') do |r|
     opt_files[:recurse].concat r.split(',')
   end
-  opt.on("-d", "--destination PATH", "Where to copy file to.  Default: '#{dest}'",
-         "Will be created if it doesn't exist.") do |d|
+  opt.on('-d', '--destination PATH', 'Where to copy file to. '\
+         "Default: '#{dest}'",
+         'Will be created if it doesn\'t exist.') do |d|
     dest = d
   end
-  opt.on("--transcode <from=to[,from1=to1]>", "A comma-seperated series of name=value pairs.",
-         "Default is #{transcode.to_a.map{|i| i.join("=")}.join(",")}") do |fmt|
+  opt.on('--transcode <from=to[,from1=to1]>',
+         'A comma-seperated series of name=value pairs.',
+         'Default is ' \
+         "#{transcode.to_a.map { |i| i.join('=') }.join(',')}}") do |fmt|
     kill = true
-    transcode = Hash[ *fmt.split(",").map{|e| e.split("=").map{ |t| t.downcase.to_sym } }.flatten ]
+    transcode = Hash[*fmt.split(',').map do |e|
+      e.split('=').map do |t|
+        t.downcase.to_sym
+      end
+    end.flatten]
   end
-  opt.on("-c", "--copy", "Turn off transcoding.") do
+  opt.on('-c', '--copy', 'Turn off transcoding.') do
     transcode = {}
     me = true
   end
-  opt.on("--[no-]progress", "Set show progress true/false.  Default is #{progress}") do |t|
+  opt.on('--[no-]progress',
+         "Set show progress true/false.  Default is #{progress}") do |t|
     progress = t
   end
-  opt.on("--exclude PATTERN", "-x PATTERN", String, "Exclude files that match the given pattern.",
-         "Can specify more than once, file is excluded if any pattern matches") do |p|
+  opt.on('--exclude PATTERN', '-x PATTERN', String,
+         'Exclude files that match the given pattern.',
+         'Can specify more than once, file is excluded' \
+         'if any pattern matches') do |p|
     exclude_patterns.concat p.split(',')
   end
-  opt.on("-v", "--[no-]verbose", "Be verbose") do |v|
+  opt.on('-v', '--[no-]verbose', 'Be verbose') do |v|
     verbose = v
   end
-  opt.on("--debug", "Show debug output.  Also enables verbose.") do
+  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|
+  opt.on('-t', '--threads NUM',
+         'Number of threads to spawn, useful for transcoding.',
+         "Default: #{count}") do |n|
     count = n.to_i
   end
-  opt.on("--set-aa ALBUM_ARTIST", String, "Set the album_artist for all tracks") do |a|
+  opt.on('--set-aa ALBUM_ARTIST', String,
+         'Set the album_artist for all tracks') do |a|
     album_artist = a
   end
-  opt.on("-V", "--version", "Disply the version and exit") do
+  opt.on('-V', '--version', 'Disply the version and exit') do
     puts MediaFile::VERSION
     exit 0
   end
-  opt.on("-y", "--yes", "Don't ask before running.") do
-    yes = "yes"
+  opt.on('-y', '--yes', 'Don\'t ask before running.') do
+    yes = 'yes'
   end
-  opt.on_tail("-h", "--help", "Show this message") do
+  opt.on_tail('-h', '--help', 'Show this message') do
     warn opt
     exit
   end
   begin
     opt.parse!
-    if kill and me
-      raise OptionParser::InvalidOption.new("--copy and --transcode are conflicting")
+    if kill && me
+      raise OptionParser::InvalidOption.new(
+        '--copy and --transcode are conflicting'
+      ), 'Argument Eror'
     end
   rescue OptionParser::InvalidOption
-    warn "#{PROGNAME}: #{$!}"
+    warn "#{PROGNAME}: #{$ERROR_INFO}"
     die opt
   end
 end
@@ -98,7 +113,7 @@ opt_files[:flat].each do |f|
   if File.file? f
     files << f
   elsif File.directory? f
-    files.concat Dir.glob( f + "/*.#{file_types}")
+    files.concat Dir.glob(f + "/*.#{file_types}")
   else
     warn "#{f} is not a file or a directory!"
   end
@@ -106,8 +121,8 @@ end
 
 # resolve recurse dirs
 opt_files[:recurse].each do |r|
-if File.directory? r
-    files.concat Dir.glob( r + "/**/*.#{file_types}")
+  if File.directory? r
+    files.concat Dir.glob(r + "/**/*.#{file_types}")
   else
     warn "#{r} is not a file or a directory!"
   end
@@ -115,36 +130,33 @@ end
 
 files = files.uniq.sort
 if exclude_patterns.any?
-  is_a_regexp = /\/?(.+?)(?:\/([imxouesn]*))?$/
+  is_a_regexp = %r{\/?(.+?)(?:\/([imxouesn]*))?$}
   pattern = Regexp.union(
-    exclude_patterns.map{ |pat|
+    exclude_patterns.map do |pat|
       m = pat.match(is_a_regexp)
-      if m
-        Regexp.new(*m.captures)
-      else
-        raise "Bag pattern: '#{pat}'"
-      end
-    }.compact
+      raise "Bag pattern: '#{pat}'" unless m
+      Regexp.new(*m.captures)
+    end.compact
   )
   puts "Using exclude pattern: #{pattern}" if verbose
   files.delete_if { |el| pattern.match el }
 end
 
 if files.empty?
-  warn "No file specified, exiting"
+  warn 'No file specified, exiting.'
   warn "Perhaps you excluded too many? '#{pattern}'" if exclude_patterns.any?
   warn opts
   exit
 end
 puts "Full list of files to transfer to #{dest}:"
-files.each { |l| puts "\t"+l }
+files.each { |l| puts "\t" + l }
 puts "#{files.count} files total"
-puts "The following transcode table will be used:"
+puts 'The following transcode table will be used:'
 puts transcode.any? ? transcode : 'none'
-puts "Do you wish to proceed? (Y/n)"
+puts 'Do you wish to proceed? (Y/n)'
 y = yes || gets
-if /n/i.match(y)
-  puts "User cancel."
+if y =~ /n/i
+  puts 'User cancel.'
   exit
 end
 puts "Begin copy to #{dest}"
@@ -160,4 +172,4 @@ copier = MediaFile::BulkMediaCopy.new(
 
 copier.run count
 
-puts "Complete."
+puts 'Complete.'

data/lib/mediafile/bulkmediacopy.rb

@@ -1,7 +1,8 @@
 # vim:et sw=2 ts=2
 
 require 'mediafile'
-module MediaFile; class BulkMediaCopy
+module MediaFile;
+class BulkMediaCopy
   include ::MediaFile
   def initialize(source,
                  album_artist: nil,
@@ -9,19 +10,23 @@ module MediaFile; class BulkMediaCopy
                  progress: false,
                  transcode: {},
                  verbose: false,
-                 debug: false)
-    source = case source
+                 debug: false
+                )
+    source =
+      case source
       when String
         [source]
       when Array
         source
       else
-        raise "Bad value for required first arg 'source': '#{source.class}'.  Should be String or Array."
+        raise "Bad value for required first arg 'source': '#{source.class}'. " \
+              'Should be String or Array.'
       end
 
     @copies             = Hash.new { |h,k| h[k] = [] }
     @destination_root   = destination_root
     @verbose            = verbose
+    @debug              = debug
     @progress           = progress
     @album_artist       = album_artist
     @work               = get_work(source)
@@ -33,6 +38,8 @@ module MediaFile; class BulkMediaCopy
   end
 
   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" % [
       "Remaining",
       "Workers",
@@ -46,7 +53,11 @@ module MediaFile; class BulkMediaCopy
       0
     ]
     max > 1 ? mcopy(max) : scopy
-    dupes = @copies.select{ |k,a| a.size > 1 }
+    stop = Time.new
+    duration = stop - start
+    puts "Copied #{@count} files in #{ "%d:%d:%d:%d" % duration.to_duration} " +
+      "(~#{(@count/duration).to_i} songs/second))."
+    dupes = @copies.select{ |_k,a| a.size > 1 }
     if dupes.any?
       puts "dupes"
       require 'pp'
@@ -106,7 +117,7 @@ module MediaFile; class BulkMediaCopy
     err = false
     begin
       mediafile.copy transcode_table: @transcode
-    rescue Timeout::Error
+    rescue
       @failed << mediafile
       err = true
     end
@@ -121,18 +132,21 @@ module MediaFile; class BulkMediaCopy
         c = cur_perc == 100
         finished = @count.to_f / @work.count * 100
         f = finished == 100.0
-        puts ("%#{@width}d (%4.1f%%), %#{@width}d (%4.#{c ? 0 : 1}f%%), " +
-             "%#{@width}d (%4.#{f ? 0 : 1}f%%) %-#{@name_width}s => %-s") % [
+        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,
-          (mediafile.name + (err ? " **" : "") ),
+          (@transcode[mediafile.type].nil? ? '*copy*' : '*transcode*'),
+          (mediafile.source + (err ? " **" : "") ),
           mediafile.out_path(transcode_table:@transcode)
         ]
       end
+      debug "#{mediafile.type} == #{@transcode[mediafile.type]}"
     }
 
   end
@@ -144,5 +158,6 @@ module MediaFile; class BulkMediaCopy
     @copies[md5].count == 1
   end
 
-end; end
+end
+end
 

data/lib/mediafile/mediafile.rb

@@ -1,7 +1,9 @@
 # vim:et sw=2 ts=2
 
 require 'mediafile'
-module MediaFile; class MediaFile
+
+module MediaFile
+class MediaFile
   include ::MediaFile
 
   attr_reader :source, :type, :name, :base_dir
@@ -37,13 +39,14 @@ module MediaFile; class MediaFile
     destination = out_path base_dir: dest, transcode_table: transcode_table
     temp_dest = tmp_path base_dir: dest, transcode_table: transcode_table
     lock{
-      if File.exists?(destination)
-        warn "File has already been transfered #{@source} => #{destination}" if @verbose
-        return
-      end
-      if File.exists?(temp_dest)
+      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."
+        raise
+        #return
+      end
+      if File.exist?(destination)
+        warn "File has already been transfered #{@source} => #{destination}" if @verbose
         return
       end
       FileUtils.mkdir_p File.dirname destination
@@ -55,11 +58,11 @@ module MediaFile; class MediaFile
         really_copy(@source, temp_dest)
       FileUtils.mv temp_dest, destination
     rescue => e
-      FileUtils.rm temp_dest if File.exists? temp_dest
+      FileUtils.rm temp_dest if File.exist? temp_dest
       raise e
     end
   ensure
-    FileUtils.rm temp_dest if File.exists? temp_dest
+    FileUtils.rm temp_dest if File.exist? temp_dest
   end
 
   def to_s
@@ -67,6 +70,7 @@ module MediaFile; class MediaFile
   end
 
   def self.tags(*args)
+    private
     args.each do |arg|
       define_method arg do
         read_tags
@@ -75,12 +79,12 @@ module MediaFile; class MediaFile
     end
   end
 
+  private
+
   tags :album, :artist, :album_artist,
        :title, :genre, :year, :track,
        :comment, :disc_number, :disc_total
 
-  private
-
   def really_copy(src,dest)
     FileUtils.cp(src, dest)
     set_album_artist(dest)
@@ -105,37 +109,39 @@ module MediaFile; class MediaFile
 
   def set_encoder(to,destination)
     comment = "; Transcoded by MediaFile on #{Time.now}"
-    case to
-    when :flac
-      raise "Please don't transcode to flac.  It is broken right now"
-      %W{flac -7 -V -s -o #{destination}} +
-        (@artist ?  ["-T", "artist=#{@artist}"]       : [] ) +
-        (@title  ?  ["-T", "title=#{@title}"]         : [] ) +
-        (@album  ?  ["-T", "album=#{@album}"]         : [] ) +
-        (@track > 0 ? ["-T", "tracknumber=#{@track}"] : [] ) +
-        (@year   ?  ["-T", "date=#{@year}"]           : [] ) +
-        (@genre  ?  ["-T", "genre=#{@genre}"]         : [] ) +
-        ["-T", "comment=" + @comment + comment ] +
-        (@album_artist ? ["-T", "albumartist=#{@album_artist}"] : [] ) +
-        (@disc_number ? ["-T", "discnumber=#{@disc_number}"] : [] ) +
-        ["-"]
-    when :mp3
-      %W{lame --quiet --preset extreme -h --add-id3v2 --id3v2-only} +
-        (@title  ?  ["--tt", @title] : [] ) +
-        (@artist ?  ["--ta", @artist]: [] ) +
-        (@album  ?  ["--tl", @album] : [] ) +
-        (@track > 0 ? ["--tn", @track.to_s]: [] ) +
-        (@year   ?  ["--ty", @year.to_s ] : [] ) +
-        (@genre  ?  ["--tg", @genre ]: [] ) +
-        ["--tc",  @comment + comment ] +
-        (@album_artist ? ["--tv", "TPE2=#{@album_artist}"] : [] ) +
-        (@disc_number ? ["--tv", "TPOS=#{@disc_number}"] : [] ) +
-        ["-", destination]
-    when :wav
-      %W{dd of=#{destination}}
-    else
-      raise "Unknown target '#{to}'.  Cannot set encoder"
-    end
+    encoder = case to
+              when :flac
+                %W{flac -7 -V -s -o #{destination}} +
+                  (@artist ?  ["-T", "artist=#{@artist}"]       : [] ) +
+                  (@title  ?  ["-T", "title=#{@title}"]         : [] ) +
+                  (@album  ?  ["-T", "album=#{@album}"]         : [] ) +
+                  (@track > 0 ? ["-T", "tracknumber=#{@track}"] : [] ) +
+                  (@year   ?  ["-T", "date=#{@year}"]           : [] ) +
+                  (@genre  ?  ["-T", "genre=#{@genre}"]         : [] ) +
+                  ["-T", "comment=" + @comment + comment ] +
+                  (@album_artist ? ["-T", "albumartist=#{@album_artist}"] : [] ) +
+                  (@disc_number ? ["-T", "discnumber=#{@disc_number}"] : [] ) +
+                  ["-"]
+                  #raise "Please don't transcode to flac.  It is broken right now"
+              when :mp3
+                %W{lame --quiet --preset extreme -h --add-id3v2 --id3v2-only} +
+                  (@title  ?  ["--tt", @title] : [] ) +
+                  (@artist ?  ["--ta", @artist]: [] ) +
+                  (@album  ?  ["--tl", @album] : [] ) +
+                  (@track > 0 ? ["--tn", @track.to_s]: [] ) +
+                  (@year   ?  ["--ty", @year.to_s ] : [] ) +
+                  (@genre  ?  ["--tg", @genre ]: [] ) +
+                  ["--tc",  @comment + comment ] +
+                  (@album_artist ? ["--tv", "TPE2=#{@album_artist}"] : [] ) +
+                  (@disc_number ? ["--tv", "TPOS=#{@disc_number}"] : [] ) +
+                  ["-", destination]
+              when :wav
+                %W{dd of=#{destination}}
+              else
+                raise "Unknown target '#{to}'.  Cannot set encoder."
+              end
+    debug "Encoder set to '#{encoder}'"
+    encoder
   end
 
   def transcode(trans , destination)
@@ -149,7 +155,7 @@ module MediaFile; class MediaFile
 
     encoder = set_encoder(to, destination)
 
-    safe_print "Decoder: '#{decoder.join(' ')}'\nEncoder: '#{encoder.join(' ')}'" if @verbose
+    info "Decoder: '#{decoder.join(' ')}'\nEncoder: '#{encoder.join(' ')}'"
 
     pipes = Hash[[:encoder,:decoder].zip IO.pipe]
     #readable, writeable = IO.pipe
@@ -166,7 +172,7 @@ module MediaFile; class MediaFile
           sleep 0.2
           tpids.delete_if do |pid|
             ret = false
-            p, stat = Process.wait2 pid, Process::WNOHANG
+            _p, stat = Process.wait2 pid, Process::WNOHANG
             if stat
               pipes[pids[pid]].close unless pipes[pids[pid]].closed?
               ret = true
@@ -200,9 +206,10 @@ module MediaFile; class MediaFile
   def relative_path
     @relpath ||= (
       read_tags
-      dest = File.join(
+      File.join(
         [@album_artist, @album].map { |word|
-          clean_string(word)
+          debug word
+          clean_string word
         }
       )
     )
@@ -212,44 +219,45 @@ module MediaFile; class MediaFile
     # this doesn't include the extension.
     @newname ||= (
       read_tags
-      bool = true
-      file = clean_string(
+      #file = clean_string(
         case
         when (@disc_number && (@track > 0) && @title) && !(@disc_total && @disc_total == 1)
-          "%1d_%02d-" % [@disc_number, @track] + @title
+          "%1d_%02d-" % [@disc_number, @track] + clean_string(@title)
         when (@track > 0 && @title)
-          "%02d-" % @track + @title
+          "%02d-" % @track + clean_string(@title)
         when @title && @title != ""
-          @title
+          clean_string(@title)
         else
-          @name
+          clean_string(@name)
         end
-      )
+      #)
     )
   end
 
   def clean_string(my_string)
     my_string ||= ""
     t = my_string.gsub(
-      /^\.+|\.+$/,""
-    ).gsub(
-      /\//,"_"
+      /\.+|\.+$/,""
     ).gsub(
-      /\s/,"_"
+      /\/+|\s+/, '_'
     ).gsub(
       /[,:;)\]\[('"@$^*<>?!=]/,""
-    ).gsub(
-      /^[.]/,''
     ).gsub(
       /_?[&]_?/,"_and_"
     ).split('_').map{ |c|
-      puts "DEBUG: capitalize: '#{c}'" if @debug
-       "_and_" == c ? c : c.capitalize 
+      c.split('-').map{ |d|
+        next if d[/_/]
+        debug("capitalize: '#{d}'")
+        d.capitalize
+      }.join('-')
     }.join('_').gsub(
-      /__+/,'_'
-    ).gsub(/^[.]/, '')
-    puts "DEBUG: clean_string: '#{my_string} => '#{t}'" if @debug
+      /^[.]/, ''
+    ).gsub(
+      /_+/, '_'
+    )
     t == "" ? "UNKNOWN" : t
+    debug("clean_string: '#{my_string} => '#{t}'")
+    t
   end
 
   def tmp_file_name
@@ -265,12 +273,12 @@ module MediaFile; class MediaFile
   end
 
   def set_album_artist(file)
-    type = file[/(\w+)$/].downcase.to_sym
     return unless @force_album_artist
-    case type
+    case @type
     when :m4a
       TagLib::MP4::File.open(file) do |f|
-        f.tag.item_list_map.insert("aART", TagLib::MP4::Item.from_string_list([@force_album_artist]))
+        f.tag.item_list_map.insert("aART",
+                                   TagLib::MP4::Item.from_string_list([@force_album_artist]))
         f.save
       end
     when :flac
@@ -283,7 +291,8 @@ module MediaFile; class MediaFile
       end
     when :mp3
       TagLib::MPEG::File.open(file) do |f|
-        if tag = f.id3v2_tag
+        tag = f.id3v2_tag
+        if tag
           frame = TagLib::ID3v2::TextIdentificationFrame.new("TPE2", TagLib::String::UTF8)
           frame.text = @force_album_artist
           tag.add_frame(frame)
@@ -306,7 +315,7 @@ module MediaFile; class MediaFile
               f.send(method)
             end
       tag.comment = "#{@comment}"
-      tag.title = (@title || @name.gsub('_',' ')) unless tag.title && tag.title != ""
+      tag.title = (@title || @name.tr('_',' ')) unless tag.title && tag.title != ""
       if (@type == :mp3)
         f.save(TagLib::MPEG::File::ID3v2)
       else
@@ -349,7 +358,8 @@ module MediaFile; class MediaFile
       end
     when :flac
       TagLib::FLAC::File.open(@source) do |file|
-        if tag = file.xiph_comment
+        tag = file.xiph_comment
+        if tag
           [
             [:@album_artist, ['ALBUMARTIST', 'ALBUM ARTIST', 'ALBUM_ARTIST'], :to_s ],
             [:@disc_number,  ['DISCNUMBER'], :to_i ],
@@ -377,9 +387,10 @@ module MediaFile; class MediaFile
     else
       @album_artist ||= @artist
     end
-    puts "DEBUG: album:'#{@album}', artist:'#{@artist}'" +
-      " @title:'#{@title}'  @genre:'#{@genre}'  @year:'#{@year}'" if @debug
+    debug("album:'#{@album}', artist:'#{@artist}'" +
+      " title:'#{@title}'  genre:'#{@genre}'  year:'#{@year}'")
     @red = true
   end
-end; end
+end
+end
 

data/lib/mediafile/version.rb

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

data/lib/mediafile.rb

@@ -12,6 +12,14 @@ module MakeMakefile::Logging
   @logfile = File::NULL
 end
 
+class Numeric
+  def to_duration
+    [60,60,24].reduce([self.to_i]) do |m,o|
+      m.unshift(m.shift.divmod(o)).flatten
+    end
+  end
+end
+
 module MediaFile
 
   autoload :MediaFile,      'mediafile/mediafile.rb'
@@ -27,8 +35,8 @@ module MediaFile
 
   private
 
-  @@thread_count = 1
-  @@semaphore = nil
+  @@thread_count = nil
+  @@mutex = nil
   @@initialized = false
 
   def initialize_threads(count = 1)
@@ -37,29 +45,36 @@ module MediaFile
     @@thread_count = count
     if @@thread_count > 1
       require 'thread'
-      @@semaphore = Mutex.new
+      @@mutex = Mutex.new
     end
   end
 
   def safe_print(message = '')
     lock {
-      print block_given? ? yield : message
+      print block_given? ? yield : message + "\n"
     }
   end
 
   def cleanup
-    @@semaphore = nil
+    @@mutex = nil
     true
   end
 
   def lock
-    if @@semaphore
-      @@semaphore.synchronize {
+    if @@mutex && !@@mutex.owned?
+      @@mutex.synchronize do
         yield
-      }
+      end
     else
       yield
     end
   end
 
- end
+  def debug(msg = '')
+    safe_print("DEBUG: #{caller_locations(1, 2)[0].label} >> #{msg}") if @debug
+  end
+
+  def info(msg = '')
+    safe_print("INFO: #{caller_locations(1, 2)[0].label} >> #{msg}") if @verbose
+  end
+end

metadata

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