mediafile 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fc4745ca61d0c560a088540bdc2c915883595f8
-  data.tar.gz: 6513da12413d7191bf965d6221ba262ef21f9498
+  metadata.gz: 58cdd80b30a31b58efb8d9c89adab411a37ce313
+  data.tar.gz: 5ec9d81b1de89e060007a34fe1cdc7b81b4dc7cf
 SHA512:
-  metadata.gz: 9ccbebb876f2dfa7335dddb456635475cc725614be46e8a351eb7c086122d087104eec53bd3e68ed17096dc20f07e99eb11b580adb9b7523c594c2af966e7e40
-  data.tar.gz: b3922fbb97e6fc38d076dc89a337e2d1a2a969f3eb2ee0847fb99f5a5ddf9911de08cd38d1a91ddc7c7ea79e8049fcd4eba426095b2599f6bb6da47f34124971
+  metadata.gz: 14def08f1e8b54336384d47f94eda7f090b23be67fbe05d04dfc791db4845b97410cdb25f0a5e8f022b6ccd0691eb1ae23484e63feab3a1a0f27eba17f8534ef
+  data.tar.gz: 5ba30cc867c70413d1ed33312041250e401a68da69281d175e91d788d360b7218b7b45c1eb0a8289d545c1cf2d42e592d247767342d00721d197e219302566ec

data/bin/music_cp

@@ -61,6 +61,10 @@ opts = OptionParser.new do |opt|
          "Number of threads to spawn, useful for transcoding.  Default: #{count}" ) do |n|
     count = n.to_i
   end
+  opt.on("-V", "--version", "Disply the version and exit") do
+    puts MediaFile::VERSION
+    exit 0
+  end
   opt.on_tail("-h", "--help", "Show this message") do
     warn opt
     exit

data/lib/mediafile/bulkmediacopy.rb

@@ -17,7 +17,6 @@ module MediaFile; class BulkMediaCopy
                             MediaFile.new(s,
                               base_dir: @destination_root,
                               verbose: @verbose,
-
                               printer: proc{ |msg| self.safe_print( msg ) }
                             )
                           }
@@ -56,7 +55,7 @@ module MediaFile; class BulkMediaCopy
 
   def safe_print(message='')
     locked {
-      puts block_given? ? yield : message
+      print block_given? ? yield : message
     }
   end
 

data/lib/mediafile/mediafile.rb

@@ -33,11 +33,9 @@ module MediaFile; class MediaFile
     unless File.exists? destination
       FileUtils.mkdir_p File.dirname destination
       begin
-        if transcode_table.has_key? @type
-          transcode transcode_table, temp_dest
-        else
-          FileUtils.cp @source, temp_dest
-        end
+        transcode_table.has_key?(@type) ?
+          transcode(transcode_table, temp_dest) :
+          FileUtils.cp(@source, temp_dest)
         FileUtils.mv temp_dest, destination
       rescue => e
         FileUtils.rm temp_dest if File.exists? temp_dest
@@ -91,7 +89,7 @@ module MediaFile; class MediaFile
     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}"]       : [] ) + 
+        (@artist ?  ["-T", "artist=#{@artist}"]       : [] ) +
         (@title  ?  ["-T", "title=#{@title}"]         : [] ) +
         (@album  ?  ["-T", "album=#{@album}"]         : [] ) +
         (@track > 0 ? ["-T", "tracknumber=#{@track}"] : [] ) +
@@ -157,19 +155,19 @@ module MediaFile; class MediaFile
             ret
           end
         end
-      } 
+      }
     rescue Timeout::Error
-      printit "Timeout exceeded!\n" << tpids.map { |p| 
+      printit "Timeout exceeded!\n" << tpids.map { |p|
         Process.kill 15, p
         Process.kill 9, p
         "#{p} #{Process.wait2( p )[1]}"
       }.join(", ")
       FileUtils.rm [destination]
-      raise 
+      raise
     end
     if err.any?
-      printit "Error with #{err.map{|it,stat| "#{it} EOT:#{stat.exitstatus} #{stat}" }.join(" and ")}"
-      #raise "Error #{@source} #{err}"
+      printit "###\nError transcoding #{@source}: #{err.map{|it,stat| "#{it} EOT:#{stat.exitstatus} #{stat}" }.join(" and ")}\n###\n"
+      exit 1
     end
   end
 
@@ -185,7 +183,7 @@ module MediaFile; class MediaFile
       }
     )
     bool=true
-    @relpath = dest.gsub(/\s/,"_").gsub(/[,:)\]\[('"@$^*<>?!]/,"").gsub(/_[&]_/,"_and_").split('').map{ |c| 
+    @relpath = dest.gsub(/\s/,"_").gsub(/[,:)\]\[('"@$^*<>?!]/,"").gsub(/_[&]_/,"_and_").split('').map{ |c|
       b = bool; bool = c.match('/|_'); b ? c.capitalize : c
     }.join('').gsub(/__+/,'_')
   end
@@ -194,27 +192,29 @@ module MediaFile; class MediaFile
     # this doesn't include the extension.
     @newname ||= (
       read_tags
-      bool=true
-      file= ( 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
-                @title
-              else
-                @name
-              end).gsub(
-                    /^\.+|\.+$/,""
-                  ).gsub(
-                    /\//,"_"
-                  ).gsub(
-                    /\s/,"_"
-                  ).gsub(
-                    /[,:)\]\[('"@$^*<>?!]/,""
-                  ).gsub(
-                    /_[&]_/,"_and_"
-                  ).split('').map{ |c|
+      bool = true
+      file = (
+        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
+          @title
+        else
+          @name
+        end
+      ).gsub(
+        /^\.+|\.+$/,""
+      ).gsub(
+        /\//,"_"
+      ).gsub(
+        /\s/,"_"
+      ).gsub(
+        /[,:)\]\[('"@$^*<>?!]/,""
+      ).gsub(
+        /_[&]_/,"_and_"
+      ).split('').map{ |c|
                     b = bool; bool = c.match('/|_'); b ? c.capitalize : c
                   }.join('')
     )
@@ -242,8 +242,8 @@ module MediaFile; class MediaFile
         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 
+        @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
@@ -253,18 +253,23 @@ module MediaFile; class MediaFile
     case @type
     when :m4a
       TagLib::MP4::File.open(@source) do |file|
-        @disc_number = file.tag.item_list_map["disk"].to_int_pair[0]
+        @disc_number = file.tag.item_list_map["disk"] ?
+                       file.tag.item_list_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
       end
     when :flac
       TagLib::FLAC::File.open(@source) do |file|
         if tag = file.xiph_comment
           [
-            [:album_artist, ['ALBUMARTIST', 'ALBUM ARTIST', 'ALBUM_ARTIST'], :to_s ],
-            [:disc_number,  ['DISCNUMBER'], :to_i ],
-            [:disc_total,   ['DISCTOTAL'], :to_i ]
+            [:@album_artist, ['ALBUMARTIST', 'ALBUM ARTIST', 'ALBUM_ARTIST'], :to_s ],
+            [:@disc_number,  ['DISCNUMBER'], :to_i ],
+            [:@disc_total,   ['DISCTOTAL'], :to_i ]
           ].each do |field,list,func|
             val = list.collect{ |i| tag.field_list_map[i] }.select{|i| i }.first
-            instance_variable_set("@#{field}", val[0].send(func)) if val
+            instance_variable_set(field, val[0].send(func)) if val
           end
         end
       end
@@ -272,9 +277,9 @@ module MediaFile; class MediaFile
       TagLib::MPEG::File.open(@source) do |file|
         tag = file.id3v2_tag
         if tag
-          [['TPE2', :@album_artist, :to_s], ['TPOS', :@disc_number, :to_i]].each do |t,v,m|
-            if tag.frame_list(t).first and tag.frame_list(t).first.to_s.size > 0
-              instance_variable_set( v, "#{tag.frame_list(t).first}".send( m.to_sym) )
+          [[:@album_artist, 'TPE2', :to_s], [:@disc_number, 'TPOS', :to_i]].each do |field,list,func|
+            if tag.frame_list(list).first and tag.frame_list(list).first.to_s.size > 0
+              instance_variable_set(field, "#{tag.frame_list(list).first}".send(func) )
             end
           end
         end

data/lib/mediafile/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediafile
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Jeff Harvey-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -38,11 +38,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- "./bin/music_cp"
+- "./lib/mediafile.rb"
+- "./lib/mediafile/bulkmediacopy.rb"
 - "./lib/mediafile/mediafile.rb"
 - "./lib/mediafile/version.rb"
-- "./lib/mediafile/bulkmediacopy.rb"
-- "./lib/mediafile.rb"
-- "./bin/music_cp"
 - bin/music_cp
 homepage: https://github.com/seginoviax/mediafile
 licenses:
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Parse media file metadata.