mediafile 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 119b0a54c4c60f5422faa73912fefbcfd97390ec
-  data.tar.gz: b7d0d780c5a49fe57b7adbd9125723316d8bfa3b
+  metadata.gz: 1fc4745ca61d0c560a088540bdc2c915883595f8
+  data.tar.gz: 6513da12413d7191bf965d6221ba262ef21f9498
 SHA512:
-  metadata.gz: 9995f98f87546a394e5d26494442d1ecd3109a297d8e7596f36494ff41ff3b7eff4484fc23a17984a7ebdb42d65989271d4b5c6d702411632234b407ee72902d
-  data.tar.gz: 99e25a1163b071e326826a490b26e145b68fd67522b40ba591d2b8b1ff921fd37dc0fa856a3ad7d9d1d6cb51cc18a98d989f9fa85897924bc4c25cbc6c25c628
+  metadata.gz: 9ccbebb876f2dfa7335dddb456635475cc725614be46e8a351eb7c086122d087104eec53bd3e68ed17096dc20f07e99eb11b580adb9b7523c594c2af966e7e40
+  data.tar.gz: b3922fbb97e6fc38d076dc89a337e2d1a2a969f3eb2ee0847fb99f5a5ddf9911de08cd38d1a91ddc7c7ea79e8049fcd4eba426095b2599f6bb6da47f34124971

data/bin/music_cp

@@ -2,10 +2,7 @@
 # vim:et sw=2 ts=2
 #
 
-require 'fileutils'
 require 'optparse'
-require 'digest/md5'
-require 'timeout'
 require 'mediafile'
 
 PROGNAME = File.basename($0)
@@ -16,6 +13,10 @@ end
 
 kill = me = now = false
 files = []
+opt_files = {
+  flat: [],
+  recurse: []
+}
 dest = "."
 verbose = false
 progress = true
@@ -23,23 +24,15 @@ count = `grep -c '^processor' /proc/cpuinfo`.strip.to_i/2|1
 transcode = { flac: :mp3, wav: :mp3 }
 exclude_patterns = []
 file_types = "{flac,mp3,MP3,FLAC,wav,WAV,m4a,M4A}"
+
 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|
-    e.split(",").each do |f|
-      if File.file? f
-        files << f
-      elsif File.directory? f
-        files.concat Dir.glob( f + "/*.#{file_types}")
-      else
-        warn "#{f} is not a file or a directory!"
-      end
-    end
+    opt_files[:flat].concat e.split(',')
   end
   opt.on("-r", "--recursive DIR", "Directory to recursively scan and copy") do |r|
-    raise "Directory '#{r}' does not exist" unless File.directory? r
-    files.concat Dir.glob( r + "/**/*.#{file_types}")
+    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|
@@ -59,7 +52,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 if any pattern matches") do |p|
-    exclude_patterns << p
+    exclude_patterns.concat p.split(',')
   end
   opt.on("-v", "--[no-]verbose", "Be verbose") do |v|
     verbose = v
@@ -83,13 +76,46 @@ opts = OptionParser.new do |opt|
   end
 end
 
+# resolve flat dirs
+opt_files[:flat].each do |f|
+  if File.file? f
+    files << f
+  elsif File.directory? f
+    files.concat Dir.glob( f + "/*.#{file_types}")
+  else
+    warn "#{f} is not a file or a directory!"
+  end
+end
+
+# resolve recurse dirs
+opt_files[:recurse].each do |r|
+if File.directory? r
+    files.concat Dir.glob( r + "/**/*.#{file_types}")
+  else
+    warn "#{r} is not a file or a directory!"
+  end
+end
+
 files = files.uniq.sort
 if exclude_patterns.any?
-  pattern = Regexp.new(exclude_patterns.join("|"))
+  is_a_regexp = /\/?(.+?)(?:\/([imxouesn]*))?$/
+  pattern = Regexp.union(
+    exclude_patterns.map{ |pat|
+      m = pat.match(is_a_regexp)
+      if m
+        Regexp.new(*m.captures)
+      else
+        raise "Bag pattern: '#{pat}'"
+      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 "Perhaps you excluded too many? '#{pattern}'" if exclude_patterns.any?
   warn opts
   exit
 end
@@ -98,14 +124,20 @@ 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 procede? (Y/n)"
+puts "Do you wish proceed? (Y/n)"
 y = gets
 if /n/i.match(y)
   puts "User cancel."
   exit
 end
 puts "Begin copy to #{dest}"
-copier = MediaFile::BulkMediaCopy.new(files, destination_root: dest, verbose: verbose, transcode: transcode, progress: progress)
+copier = MediaFile::BulkMediaCopy.new(
+  files,
+  destination_root: dest,
+  verbose: verbose,
+  transcode: transcode,
+  progress: progress
+)
 
 copier.run count
 

data/lib/mediafile/mediafile.rb

@@ -63,7 +63,9 @@ module MediaFile; class MediaFile
     end
   end
 
-  tags :album, :artist, :album_artist, :title, :genre, :year, :track, :comment, :disc_number, :disc_total
+  tags :album, :artist, :album_artist,
+       :title, :genre, :year, :track,
+       :comment, :disc_number, :disc_total
 
   private
 

data/lib/mediafile/version.rb

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

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: mediafile
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Jeff Harvey-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 description: Parse media file metadata, copy or transcode mediafiles.
@@ -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/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:
@@ -54,17 +54,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Parse media file metadata.