mediafile 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58cdd80b30a31b58efb8d9c89adab411a37ce313
-  data.tar.gz: 5ec9d81b1de89e060007a34fe1cdc7b81b4dc7cf
+  metadata.gz: 307185529981f4c30a6c4b5f0d0b62eafce6b6d7
+  data.tar.gz: 452c79b918f2497ee19d1bb65879fe4610323ae3
 SHA512:
-  metadata.gz: 14def08f1e8b54336384d47f94eda7f090b23be67fbe05d04dfc791db4845b97410cdb25f0a5e8f022b6ccd0691eb1ae23484e63feab3a1a0f27eba17f8534ef
-  data.tar.gz: 5ba30cc867c70413d1ed33312041250e401a68da69281d175e91d788d360b7218b7b45c1eb0a8289d545c1cf2d42e592d247767342d00721d197e219302566ec
+  metadata.gz: 7decae2949b7f13e4d158f4bb1ff02954859328030e6142514b8efd37a3dd28c57e00a261ffb965c7681712e3e752be840b0240c2c84248dc6e1081a39324033
+  data.tar.gz: 5ef40fe3ec1e51688fe6e9c1ba7ca3e4bb41cd165ce42a7aa25293fdb8cd9f7fd9d18fcb7ee02a42baf4b4475326a56f6eb6e5b78a83e3d0a64af168bbdeed9c

data/lib/mediafile.rb

@@ -2,14 +2,27 @@
 # vim:et sw=2 ts=2
 
 require 'fileutils'
+require 'mkmf'
 require 'digest/md5'
 require 'timeout'
 require 'taglib' 
 require 'mediafile/version'
 
+module MakeMakefile::Logging
+  @logfile = File::NULL
+end
+
 module MediaFile
 
   autoload :MediaFile,      'mediafile/mediafile.rb'
   autoload :BulkMediaCopy,  'mediafile/bulkmediacopy.rb'
 
+  missing = %i{ sox flac ffmpeg lame }.select do |cmd|
+    !find_executable("#{cmd}")
+  end
+  if missing && missing.any?
+    warn "The following executables weren't found in your $PATH: #{missing}\n" +
+         "Transcoding may not work in all cases."
+  end
+
 end

data/lib/mediafile/bulkmediacopy.rb

@@ -121,7 +121,8 @@ 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" % [
+        puts ("%#{@width}d (%4.1f%%), %#{@width}d (%4.#{c ? 0 : 1}f%%), " +
+             "%#{@width}d (%4.#{f ? 0 : 1}f%%) %-#{@name_width}s => %-s") % [
           left,
           left_perc,
           cur,

data/lib/mediafile/mediafile.rb

@@ -100,7 +100,7 @@ module MediaFile; class MediaFile
         (@disc_number ? ["-T", "discnumber=#{@disc_number}"] : [] ) +
         ["-"]
     when :mp3
-      %W{/usr/bin/lame --quiet --preset extreme -h --add-id3v2 --id3v2-only} +
+      %W{lame --quiet --preset extreme -h --add-id3v2 --id3v2-only} +
         (@title  ?  ["--tt", @title] : [] ) +
         (@artist ?  ["--ta", @artist]: [] ) +
         (@album  ?  ["--tl", @album] : [] ) +
@@ -120,7 +120,9 @@ module MediaFile; class MediaFile
 
   def transcode(trans , destination)
     to = trans[@type]
-    printit "Attempting to transcode to the same format #{@source} from #{@type} to #{to}" if to == @type
+    if to == @type
+      printit "Attempting to transcode to the same format #{@source} from #{@type} to #{to}"
+    end
     FileUtils.mkdir_p File.dirname destination
 
     decoder = set_decoder
@@ -166,7 +168,8 @@ module MediaFile; class MediaFile
       raise
     end
     if err.any?
-      printit "###\nError transcoding #{@source}: #{err.map{|it,stat| "#{it} EOT:#{stat.exitstatus} #{stat}" }.join(" and ")}\n###\n"
+      printit "###\nError transcoding #{@source}: #{err.map{ |it,stat|
+        "#{it} EOT:#{stat.exitstatus} #{stat}" }.join(" and ") }\n###\n"
       exit 1
     end
   end
@@ -175,17 +178,18 @@ module MediaFile; class MediaFile
   # it breaks windows (really!)
 
   def relative_path
-    return @relpath if @relpath
-    read_tags
-    dest = File.join(
-      [(@album_artist||"UNKNOWN"), (@album||"UNKNOWN")].map { |word|
-        word.gsub(/^\.+|\.+$/,"").gsub(/\//,"_")
-      }
+    @relpath ||= (
+      read_tags
+      dest = File.join(
+        [(@album_artist||"UNKNOWN"), (@album||"UNKNOWN")].map { |word|
+          word.gsub(/^\.+|\.+$/,"").gsub(/\//,"_")
+        }
+      )
+      bool=true
+      dest.gsub(/\s/,"_").gsub(/[,:)\]\[('"@$^*<>?!]/,"").gsub(/_[&]_/,"_and_").split('').map{ |c|
+        b = bool; bool = c.match('/|_'); b ? c.capitalize : c
+      }.join('').gsub(/__+/,'_')
     )
-    bool=true
-    @relpath = dest.gsub(/\s/,"_").gsub(/[,:)\]\[('"@$^*<>?!]/,"").gsub(/_[&]_/,"_and_").split('').map{ |c|
-      b = bool; bool = c.match('/|_'); b ? c.capitalize : c
-    }.join('').gsub(/__+/,'_')
   end
 
   def new_file_name
@@ -216,7 +220,7 @@ module MediaFile; class MediaFile
         /_[&]_/,"_and_"
       ).split('').map{ |c|
                     b = bool; bool = c.match('/|_'); b ? c.capitalize : c
-                  }.join('')
+                  }.join('').gsub(/__+/,'_')
     )
   end
 

data/lib/mediafile/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediafile
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jeff Harvey-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -64,9 +64,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Parse media file metadata.
 test_files: []
-has_rdoc: