unitf-tag 0.1.0 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd3119525797c4f3343cfbd7bd9228f75e47fae37d1eb2eea927a1d11c73819d
-  data.tar.gz: fe80b8b243dc3416c27fc31ec4b89cbe37891914e24a748d5e7827d5d0101af3
+  metadata.gz: 3844f8f9883d9584a03a19be4ca9200c7b2203ec5b0f6d7615477d097d430628
+  data.tar.gz: 55e82e675756dbb52721575c888b0e3b7fb1bb2f0a59c9eb8b6557c657c54f2a
 SHA512:
-  metadata.gz: 49a9d9a21aed7678da48f39f97a8c90283c818094dd6247a45f8425939e7641bac26c0698d3ba8d5fa3615f4a7b793e57b7fb7236a9d55909038482c99d89e75
-  data.tar.gz: 1afd544df883c40dd04fe37703c278df76e3064809c2d7a6b968ef43cd8545e4927097d8f78926c6147df24b9844d04ae24712a5fc346171e17f3a1376bee12b
+  metadata.gz: eb091d040bab764dda18aded5e23a7ed370f0b3b253a8b4b21b324b22a85b6ac079e6ce8fd530665f84fd9a0b30e454a846f7af64305b1bc601e988266bb4b31
+  data.tar.gz: 90448d8bf47f1973c1639c6fc81f18b258ed24e248f314f37a6d79a119e2e09420b14bede4c2276d6030bfeb7e7ec5f64929d9e51ee24c59ef662e9cccb315d2

data/.vscode/tasks.json

@@ -16,7 +16,7 @@
       "presentation": {
         "clear": true
       },
-      "command": "bundle exec ruby bin/test.rb"
+      "command": "bundle exec ruby exe/rtag /Users/mbaron/tag/music"
     },
     {
       "label": "test-project",

data/bin/test.rb

@@ -2,7 +2,10 @@ require 'optparse'
 
 require 'unitf/tag'
 
-file_str = '/Users/mbaron/tag/music/fIREHOSE3/Sometimes'
-file = UnitF::Tag::File.new(file_str)
+file_str = '/Users/mbaron/tag/music/fIREHOSE3/Sometimes/01 - Sometimes.flac'
 
-puts file.to_s
+file = UnitF::Tag::FLAC.new(file_str)
+
+file.open do |o|
+  pp o.info
+end

data/exe/rtag

@@ -11,32 +11,44 @@ logger = Logger.new($stdout)
 actions = []
 files = []
 opt = {
-  :recursive => false,
-  :force => false
+  recursive: false,
+  force: false
 }
 
 targets = OptionParser.new do |opts|
-  opts.on('-r', '--recursive', 'Auto Cover') do |item|
+  opts.on('-r', '--recursive', 'Auto Cover') do
     opt[:recursive] = true
   end
 
-  opts.on('-d', '--dump', 'Dump Tags') do |item|
+  opts.on('--dump', 'Dump Tags') do
     opt[:dump] = true
   end
 
-  opts.on('--auto_cover', 'Auto Cover') do |item|
+  opts.on('-d', '--debug', 'Debug') do
+    UnitF::Tag.logger.level = Logger::DEBUG
+  end
+
+  opts.on('-j', '--json', 'JSON Output') do
+    opt[:format] = :json
+  end
+
+  opts.on('-l', '--line', 'Single Line Output') do
+    opt[:format] = :line
+  end
+
+  opts.on('--auto_cover', 'Auto Cover') do
     actions << :auto_cover
   end
 
-  opts.on('--delete_cover', 'Delete Cover') do |item|
+  opts.on('--delete_cover', 'Delete Cover') do
     actions << :delete_cover
   end
 
-  opts.on('--auto_tag', 'Auto Tag') do |item|
+  opts.on('--auto_tag', 'Auto Tag') do
     actions << :auto_tag
   end
 
-  opts.on('-f', '--force', 'Force') do |arg|
+  opts.on('-f', '--force', 'Force') do
     opt[:force] = true
   end
 
@@ -61,25 +73,14 @@ targets = OptionParser.new do |opts|
   end
 end.parse!
 
-targets.each do |target|
-  files.concat(UnitF::Tag::process_target(target))
-end
-
-if files.size.zero? && actions.size.zero?
-  files = UnitF::Tag::find_files('.')
-end
+files = UnitF::Tag::FileSet.new(targets)
 
 if files.size.zero?
   logger.error('Cannot find any files to operate on')
 end
 
 if actions.size.zero?
-  files.each do |file|
-    file.open do |o|
-      o.print unless opt[:dump]
-      o.dump if opt[:dump]
-    end
-  end
+  UnitF::Tag.list(files, format: opt[:format])
   exit 0
 end
 
@@ -89,7 +90,7 @@ files.each do |file|
     actions.each do |action|
       case action
       when :delete_cover
-        logger.info("Delete cover")
+        logger.info('Delete cover')
         o.delete_cover!
       when :auto_cover
         unless o.cover?
@@ -101,7 +102,7 @@ files.each do |file|
           end
         end
       when :auto_tag
-        logger.info("Auto Tag")
+        logger.info('Auto Tag')
         o.auto_tag!
       when :artist
         logger.info("Setting artist to #{opt[:artist]}")
@@ -120,6 +121,6 @@ files.each do |file|
         o.tag.genre = opt[:track]
       end
     end
-    o.save
+    o.save || logger.error("Unable to save changes to #{file}")
   end
 end

data/lib/unitf/tag/export/exporter.rb

@@ -0,0 +1,18 @@
+require 'json'
+
+module UnitF
+  module Tag
+    class Exporter
+      def initialize
+        @objects = []
+      end
+
+      def spool(object)
+      end
+
+      def dump
+
+      end
+    end
+  end
+end

data/lib/unitf/tag/file.rb

@@ -2,6 +2,7 @@ require 'find'
 require 'taglib'
 require 'pathname'
 require 'logger'
+require 'json'
 
 module UnitF
   module Tag
@@ -14,6 +15,31 @@ module UnitF
         @file.tag
       end
 
+      def format_json
+        JSON.pretty_generate(info)
+      end
+
+      def format_line
+        buff = []
+        info.each_key do |key|
+          buff << "#{key}=#{info[key]}"
+        end
+        buff.join(',')
+      end
+
+      def info
+        {
+          file: realpath.to_path,
+          artist: tag.artist,
+          album: tag.album,
+          title: tag.title,
+          track: tag.track,
+          genre: tag.genre,
+          year: tag.year,
+          cover: cover?
+        }
+      end
+
       def print
         puts "File  : #{realpath}"
         puts "Artist: #{tag.artist}"

data/lib/unitf/tag/fileset.rb

@@ -0,0 +1,28 @@
+module UnitF
+  module Tag
+    class FileSet < Array
+      def initialize(targets)
+        targets.each do |target|
+          process_target(target)
+        end
+      end
+
+      def process_target(target)
+        if ::File.directory?(target)
+          find_files(target)
+        elsif UnitF::Tag.valid_file?(target)
+          append(UnitF::Tag::File.new(target))
+        end
+      end
+
+      def find_files(root_path)
+        Find.find(root_path) do |file_path|
+          UnitF::Log.debug("Considering #{file_path}")
+          next unless UnitF::Tag.valid_file?(file_path)
+          UnitF::Log.debug("Including #{file_path}")
+          append(UnitF::Tag::File.new(file_path))
+        end
+      end
+    end
+  end
+end

data/lib/unitf/tag/flac.rb

@@ -6,6 +6,14 @@ module UnitF
         @file = TagLib::FLAC::File.new(file_path)
       end
 
+      def info
+        super.merge!({
+          stats: stats,
+          sample_rate: @file.audio_properties.sample_rate,
+          bits_per_sample: @file.audio_properties.bits_per_sample
+        })
+      end
+
       def cover?
         @file.picture_list.each do |pic|
           return true if pic.type == TagLib::FLAC::Picture::FrontCover

data/lib/unitf/tag/mp3.rb

@@ -10,6 +10,14 @@ module UnitF
         sprintf("%.1fkHz/%dkbps", @file.audio_properties.sample_rate / 1000.to_f, @file.audio_properties.bitrate)
       end
 
+      def info
+        super.merge!({
+          stats: stats,
+          sample_rate: @file.audio_properties.sample_rate,
+          bitrate: @file.audio_properties.bitrate
+        })
+      end
+
       def cover?
         @file.id3v2_tag.frame_list('APIC').size > 0
       end

data/lib/unitf/tag/version.rb

@@ -2,6 +2,6 @@
 
 module Unitf
   module Tag
-    VERSION = "0.1.0"
+    VERSION = "0.1.6"
   end
 end

data/lib/unitf/tag.rb

@@ -2,20 +2,30 @@
 
 require_relative 'tag/version'
 require_relative 'tag/file'
+require_relative 'tag/fileset'
 require_relative 'tag/flac'
 require_relative 'tag/mp3'
 
+require 'unitf/logging'
+
 module UnitF
   module Tag
     class Error < StandardError; end
     class MissingCover < Error; end
 
     def self.logger
-      @logger ||= Logger.new($stdout)
+      unless @logger
+        @logger = UnitF::Logging::Logger.new
+        @logger.add_writer(UnitF::Logging::ConsoleWriter.new)
+      end
+      @logger
     end
 
     def self.valid_file?(file_path)
-      ::File.file?(file_path) && file_path.match(/\.(flac|mp3)$/i)
+      ::File.file?(file_path) && file_path.encode.match(/\.(flac|mp3)$/i)
+    rescue ArgumentError => e
+      logger.error("Error processing #{file_path} - #{e.message}")
+      false
     end
 
     def self.process_target(target)
@@ -31,10 +41,28 @@ module UnitF
     def self.find_files(root_path)
       files = []
       Find.find(root_path) do |file_path|
+        logger.debug("Considering #{file_path}")
         next unless valid_file?(file_path)
         files << UnitF::Tag::File.new(file_path)
       end
       files
     end
+
+    def self.list(files, format: :json)
+      buff = []
+      files.each do |file|
+        file.open do |o|
+          case format
+          when :json
+            buff << o.info
+          when :line
+            puts o.format_line
+          else
+            o.print
+          end
+        end
+      end
+      puts JSON.pretty_generate(buff) if format == :json
+    end
   end
 end

data/unitf-tag.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "taglib-ruby"
+  spec.add_dependency "unitf-logging"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitf-tag
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.6
 platform: ruby
 authors:
 - Matt Baron
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-27 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unitf-logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Audio File Tagging
 email:
 - mwb@unitf.net
@@ -47,11 +61,12 @@ files:
 - bin/test.rb
 - exe/rtag
 - lib/unitf/tag.rb
+- lib/unitf/tag/export/exporter.rb
 - lib/unitf/tag/file.rb
+- lib/unitf/tag/fileset.rb
 - lib/unitf/tag/flac.rb
 - lib/unitf/tag/mp3.rb
 - lib/unitf/tag/version.rb
-- lib/unitf/version.rb
 - tag
 - test.rb
 - unitf-tag.gemspec
@@ -78,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Audio File Tagging

data/lib/unitf/version.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Unitf
-  module Tagger
-    VERSION = "0.1.0"
-  end
-end