unitf-tag 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 423a0e318af5b1d062e7b933b7487278d48ae1e0933c01663d2dff50aa59128a
-  data.tar.gz: a770fbd8c7762769571fddc563b78b6834c044a1deae55ac1d7d9b8bacbbfbb1
+  metadata.gz: da63e27abbe2ad5f02751954906494623640d52ebee71c99cdde24e0e5cc9b45
+  data.tar.gz: b6c8833b6a6c692fa584ba68e058cc0aa69f29b192d8d26b52bfa2c31e080dbb
 SHA512:
-  metadata.gz: 05dab0beb32b35c410b37bd536a26e30f45fa3fa9ca59c271dac272967ed69f1c75bc0890c325c83dfdc954722de69d6e63f00511623d9d9bdc0ada48fe5728c
-  data.tar.gz: 3d53e61c391f23bf1675e9787dfdd09489f9a660d0b2b7fadb9c1cd5487887892e6018846b7a4402eb0a578c643a5076dcd33f0954078a6c2d31877b65b66415
+  metadata.gz: 4e2bf3be1deb74914640c50e2fe3c424973742a48a0d006e889eae7b57b9cceb996897e1d431c02fe694fa2999a1f80fc161ef27fa1beab475f7d76e5eebd437
+  data.tar.gz: da3d156c8dd3d507588d11e2eee893d24952ea31f611ac556010793442174f2a93b32f3b55e508d44a555b6125a7a2e799686962e12acbea2681af443980dd87

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 → tag}

@@ -10,12 +10,7 @@ logger = Logger.new($stdout)
 
 actions = []
 files = []
-opt = {
-  recursive: false,
-  force: false
-}
-
-UnitF::Tag.logger.level = Logger::INFO
+opt = {}
 
 targets = OptionParser.new do |opts|
   opts.on('-r', '--recursive', 'Auto Cover') do
@@ -30,6 +25,14 @@ targets = OptionParser.new do |opts|
     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
@@ -67,25 +70,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
 

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.2"
+    VERSION = "0.1.7"
   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)
@@ -37,5 +47,22 @@ module UnitF
       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.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Matt Baron
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-27 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -24,11 +24,25 @@ 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
 executables:
-- rtag
+- tag
 extensions: []
 extra_rdoc_files: []
 files:
@@ -45,13 +59,14 @@ files:
 - bin/console
 - bin/setup
 - bin/test.rb
-- exe/rtag
+- exe/tag
 - 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

data/lib/unitf/version.rb

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